Skip to content
This repository was archived by the owner on Aug 1, 2025. It is now read-only.

Commit 504e1de

Browse files
timparsonstimparsons
authored
Merge pull request #14 from Breeding-Insight/bug/BI-1909
BI-1909
2 parents 43c67e6 + 57da450 commit 504e1de

File tree

75 files changed

+721
-559
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+721
-559
lines changed

‎src/main/java/org/brapi/test/BrAPITestServer/model/entity/BrAPIPrimaryEntity.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@
66
import java.util.Map;
77
import java.util.Map.Entry;
88

9-
import javax.persistence.CascadeType;
10-
import javax.persistence.Column;
11-
import javax.persistence.JoinColumn;
12-
import javax.persistence.JoinTable;
13-
import javax.persistence.ManyToMany;
14-
import javax.persistence.MappedSuperclass;
9+
import javax.persistence.*;
1510

1611
import io.swagger.model.ExternalReferences;
1712
import io.swagger.model.ExternalReferencesInner;

‎src/main/java/org/brapi/test/BrAPITestServer/model/entity/CoordinateEntity.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
package org.brapi.test.BrAPITestServer.model.entity;
22

33
import java.math.BigDecimal;
4-
import javax.persistence.Column;
5-
import javax.persistence.Entity;
6-
import javax.persistence.ManyToOne;
7-
import javax.persistence.Table;
4+
import javax.persistence.*;
85

96
@Entity
107
@Table(name="coordinate")
@@ -15,7 +12,7 @@ public class CoordinateEntity extends BrAPIBaseEntity{
1512
private BigDecimal latitude;
1613
@Column(precision = 9, scale = 6)
1714
private BigDecimal altitude;
18-
@ManyToOne
15+
@ManyToOne(fetch = FetchType.LAZY)
1916
private GeoJSONEntity geoJSON;
2017

2118
public GeoJSONEntity getGeoJSON() {

‎src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/DataLinkEntity.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package org.brapi.test.BrAPITestServer.model.entity.core;
22

3-
import javax.persistence.Column;
4-
import javax.persistence.Entity;
5-
import javax.persistence.ManyToOne;
6-
import javax.persistence.Table;
3+
import javax.persistence.*;
74

85
import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
96

@@ -26,7 +23,7 @@ public class DataLinkEntity extends BrAPIBaseEntity {
2623
private String url;
2724
@Column
2825
private String version;
29-
@ManyToOne
26+
@ManyToOne(fetch = FetchType.LAZY)
3027
private StudyEntity study;
3128

3229
public String getDataFormat() {

‎src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/DatasetAuthorshipEntity.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22

33
import java.util.Date;
44

5-
import javax.persistence.Column;
6-
import javax.persistence.Entity;
7-
import javax.persistence.ManyToOne;
8-
import javax.persistence.Table;
5+
import javax.persistence.*;
96

107
import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
118

@@ -20,7 +17,7 @@ public class DatasetAuthorshipEntity extends BrAPIBaseEntity {
2017
private Date publicReleaseDate;
2118
@Column
2219
private Date submissionDate;
23-
@ManyToOne
20+
@ManyToOne(fetch = FetchType.LAZY)
2421
private TrialEntity trial;
2522

2623
public TrialEntity getTrial() {

‎src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/EnvironmentParametersEntity.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package org.brapi.test.BrAPITestServer.model.entity.core;
22

3-
import javax.persistence.Column;
4-
import javax.persistence.Entity;
5-
import javax.persistence.ManyToOne;
6-
import javax.persistence.Table;
3+
import javax.persistence.*;
74

85
import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
96

@@ -24,7 +21,7 @@ public class EnvironmentParametersEntity extends BrAPIBaseEntity {
2421
private String value;
2522
@Column
2623
private String valuePUI;
27-
@ManyToOne
24+
@ManyToOne(fetch = FetchType.LAZY)
2825
private StudyEntity study;
2926

3027
public StudyEntity getStudy() {

‎src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/ExperimentalDesignEntity.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package org.brapi.test.BrAPITestServer.model.entity.core;
22

3-
import javax.persistence.Column;
4-
import javax.persistence.Entity;
5-
import javax.persistence.OneToOne;
6-
import javax.persistence.Table;
3+
import javax.persistence.*;
74

85
import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
96

@@ -14,7 +11,7 @@ public class ExperimentalDesignEntity extends BrAPIBaseEntity {
1411
private String PUI;
1512
@Column
1613
private String description;
17-
@OneToOne
14+
@OneToOne(fetch = FetchType.LAZY)
1815
private StudyEntity study;
1916

2017
public StudyEntity getStudy() {

‎src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/GrowthFacilityEntity.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package org.brapi.test.BrAPITestServer.model.entity.core;
22

3-
import javax.persistence.Column;
4-
import javax.persistence.Entity;
5-
import javax.persistence.OneToOne;
6-
import javax.persistence.Table;
3+
import javax.persistence.*;
74

85
import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
96

@@ -14,7 +11,7 @@ public class GrowthFacilityEntity extends BrAPIBaseEntity {
1411
private String PUI;
1512
@Column
1613
private String description;
17-
@OneToOne
14+
@OneToOne(fetch = FetchType.LAZY)
1815
private StudyEntity study;
1916

2017
public StudyEntity getStudy() {

‎src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/ListEntity.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,7 @@
33
import java.util.Date;
44
import java.util.List;
55

6-
import javax.persistence.CascadeType;
7-
import javax.persistence.Column;
8-
import javax.persistence.Entity;
9-
import javax.persistence.ManyToOne;
10-
import javax.persistence.OneToMany;
11-
import javax.persistence.Table;
6+
import javax.persistence.*;
127

138
import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
149

@@ -32,7 +27,7 @@ public class ListEntity extends BrAPIPrimaryEntity {
3227
@Column
3328
private ListTypes listType;
3429

35-
@ManyToOne
30+
@ManyToOne(fetch = FetchType.LAZY)
3631
private PersonEntity listOwnerPerson;
3732
@OneToMany(mappedBy="list", cascade = CascadeType.ALL)
3833
private List<ListItemEntity> data;

‎src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/ListItemEntity.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
package org.brapi.test.BrAPITestServer.model.entity.core;
22

3-
import javax.persistence.CascadeType;
4-
import javax.persistence.Column;
5-
import javax.persistence.Entity;
6-
import javax.persistence.ManyToOne;
7-
import javax.persistence.Table;
3+
import javax.persistence.*;
84

95
import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
106

117
@Entity
128
@Table(name = "list_item")
139
public class ListItemEntity extends BrAPIBaseEntity {
14-
@ManyToOne(cascade = CascadeType.ALL)
10+
@ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
1511
private ListEntity list;
1612
@Column
1713
private String item;

‎src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/LocationEntity.java‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
package org.brapi.test.BrAPITestServer.model.entity.core;
22

3-
import javax.persistence.CascadeType;
4-
import javax.persistence.Column;
5-
import javax.persistence.Entity;
6-
import javax.persistence.ManyToOne;
7-
import javax.persistence.OneToOne;
8-
import javax.persistence.Table;
3+
import javax.persistence.*;
94

105
import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
116
import org.brapi.test.BrAPITestServer.model.entity.GeoJSONEntity;
@@ -19,7 +14,7 @@ public class LocationEntity extends BrAPIPrimaryEntity{
1914
private String coordinateDescription;
2015
@Column
2116
private String coordinateUncertainty;
22-
@OneToOne(cascade = CascadeType.ALL, orphanRemoval = true)
17+
@OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
2318
private GeoJSONEntity coordinates;
2419
@Column
2520
private String countryCode;
@@ -45,11 +40,11 @@ public class LocationEntity extends BrAPIPrimaryEntity{
4540
private String slope;
4641
@Column
4742
private String topography;
48-
@ManyToOne
43+
@ManyToOne(fetch = FetchType.LAZY)
4944
private CropEntity crop;
50-
@ManyToOne
45+
@ManyToOne(fetch = FetchType.LAZY)
5146
private ProgramEntity program;
52-
@ManyToOne
47+
@ManyToOne(fetch = FetchType.LAZY)
5348
private LocationEntity parentLocation;
5449

5550
public LocationEntity getParentLocation() {

0 commit comments

Comments
 (0)