Merge remote-tracking branch 'origin/issue-167' into develop-2.1

Breeding-Insight · Oct 6, 2023 · f2f6857 · f2f6857
2 parents 637b060 + 73ddaf6
commit f2f6857
Show file tree

Hide file tree

Showing 5 changed files with 857 additions and 563 deletions.
diff --git a/...ent/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/SeedLotQueryParams.java b/...ent/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/SeedLotQueryParams.java
@@ -26,28 +26,34 @@
 
 import org.brapi.client.v2.model.queryParams.core.BrAPIQueryParams;
 
-
 @Getter
 @Setter
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-@Accessors(fluent=true)
+@Accessors(fluent = true)
 public class SeedLotQueryParams extends BrAPIQueryParams {
 
-    private String seedLotDbId;
-    private String germplasmDbId;
-    private String externalReferenceSource;
-    private String externalReferenceId;
-    @Deprecated
-    private String externalReferenceID;
-
-    public String getExternalReferenceId() {
+	private String seedLotDbId;
+	private String germplasmDbId;
+	private String externalReferenceSource;
+	private String externalReferenceId;
+	@Deprecated
+	private String externalReferenceID;
+	private String germplasmName;
+	private String crossDbId;
+	private String commonCropName;
+	private String crossName;
+	private String programDbId;
+
+	public String getExternalReferenceId() {
 		return externalReferenceId;
 	}
-    public String externalReferenceId() {
+
+	public String externalReferenceId() {
 		return externalReferenceId;
 	}
+
 	public void setExternalReferenceId(String externalReferenceId) {
 		this.externalReferenceId = externalReferenceId;
 	}
@@ -56,10 +62,12 @@ public void setExternalReferenceId(String externalReferenceId) {
 	public String getExternalReferenceID() {
 		return externalReferenceID;
 	}
+
 	@Deprecated
 	public String externalReferenceID() {
 		return externalReferenceID;
 	}
+
 	@Deprecated
 	public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;

diff --git a/...n/java/org/brapi/client/v2/model/queryParams/germplasm/SeedLotTransactionQueryParams.java b/...n/java/org/brapi/client/v2/model/queryParams/germplasm/SeedLotTransactionQueryParams.java
@@ -26,29 +26,35 @@
 
 import org.brapi.client.v2.model.queryParams.core.BrAPIQueryParams;
 
-
 @Getter
 @Setter
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-@Accessors(fluent=true)
+@Accessors(fluent = true)
 public class SeedLotTransactionQueryParams extends BrAPIQueryParams {
 
-    private String transactionDbId;
-    private String seedLotDbId;
-    private String germplasmDbId;
-    private String externalReferenceSource;
-    private String externalReferenceId;
-    @Deprecated
-    private String externalReferenceID;
-
-    public String getExternalReferenceId() {
+	private String transactionDbId;
+	private String seedLotDbId;
+	private String germplasmDbId;
+	private String externalReferenceSource;
+	private String externalReferenceId;
+	@Deprecated
+	private String externalReferenceID;
+	private String germplasmName;
+	private String crossDbId;
+	private String commonCropName;
+	private String crossName;
+	private String programDbId;
+
+	public String getExternalReferenceId() {
 		return externalReferenceId;
 	}
-    public String externalReferenceId() {
+
+	public String externalReferenceId() {
 		return externalReferenceId;
 	}
+
 	public void setExternalReferenceId(String externalReferenceId) {
 		this.externalReferenceId = externalReferenceId;
 	}
@@ -57,10 +63,12 @@ public void setExternalReferenceId(String externalReferenceId) {
 	public String getExternalReferenceID() {
 		return externalReferenceID;
 	}
+
 	@Deprecated
 	public String externalReferenceID() {
 		return externalReferenceID;
 	}
+
 	@Deprecated
 	public void setExternalReferenceID(String externalReferenceID) {
 		this.externalReferenceID = externalReferenceID;