merge for release v0.9.1

brapi-java-client/src/test/java/org/brapi/client/v2/BrAPIClientTest.java

@@ -69,7 +69,7 @@ public BrAPIClientTest() {
                 .withEnv("BRAPI_DB_PASSWORD", "postgres")
                 .withClasspathResourceMapping("brapi/properties/application.properties", "/home/brapi/properties/application.properties", BindMode.READ_ONLY)
                 .withClasspathResourceMapping("sql/", "/home/brapi/sql/", BindMode.READ_ONLY)
-                .waitingFor(Wait.forLogMessage(".*Started BrapiTestServer in \\d*.\\d* seconds.*", 1).withStartupTimeout(Duration.ofMinutes(1)));
+                .waitingFor(Wait.forLogMessage(".*Started BrapiTestServer in \\d*.\\d* seconds.*", 1).withStartupTimeout(Duration.ofMinutes(5)));
 
         dbContainer.start();
         brapiContainer.start();

brapi-java-model/src/main/java/org/brapi/v2/model/germ/request/BrAPIPedigreeSearchRequest.java

@@ -17,12 +17,13 @@
 import java.util.Objects;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.brapi.v2.model.BrAPISearchRequestParametersPaging;
 
 /**
  * PedigreeSearchRequest
  */
 
-public class BrAPIPedigreeSearchRequest {
+public class BrAPIPedigreeSearchRequest extends BrAPISearchRequestParametersPaging {
     @JsonProperty("accessionNumbers")
     private List<String> accessionNumbers = null;
 
@@ -74,12 +75,6 @@ public class BrAPIPedigreeSearchRequest {
     @JsonProperty("instituteCodes")
     private List<String> instituteCodes = null;
 
-    @JsonProperty("page")
-    private Integer page = null;
-
-    @JsonProperty("pageSize")
-    private Integer pageSize = null;
-
     @JsonProperty("pedigreeDepth")
     private Integer pedigreeDepth = null;
 
@@ -520,42 +515,6 @@ public void setInstituteCodes(List<String> instituteCodes) {
         this.instituteCodes = instituteCodes;
     }
 
-    public BrAPIPedigreeSearchRequest page(Integer page) {
-        this.page = page;
-        return this;
-    }
-
-    /**
-     * Which result page is requested. The page indexing starts at 0 (the first page is &#x27;page&#x27;&#x3D; 0). Default is &#x60;0&#x60;.
-     *
-     * @return page
-     **/
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public BrAPIPedigreeSearchRequest pageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    /**
-     * The size of the pages to be returned. Default is &#x60;1000&#x60;.
-     *
-     * @return pageSize
-     **/
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
     public BrAPIPedigreeSearchRequest pedigreeDepth(Integer pedigreeDepth) {
         this.pedigreeDepth = pedigreeDepth;
         return this;
@@ -827,8 +786,6 @@ public boolean equals(Object o) {
                 Objects.equals(this.includeProgeny, pedigreeSearchRequest.includeProgeny) &&
                 Objects.equals(this.includeSiblings, pedigreeSearchRequest.includeSiblings) &&
                 Objects.equals(this.instituteCodes, pedigreeSearchRequest.instituteCodes) &&
-                Objects.equals(this.page, pedigreeSearchRequest.page) &&
-                Objects.equals(this.pageSize, pedigreeSearchRequest.pageSize) &&
                 Objects.equals(this.pedigreeDepth, pedigreeSearchRequest.pedigreeDepth) &&
                 Objects.equals(this.progenyDepth, pedigreeSearchRequest.progenyDepth) &&
                 Objects.equals(this.programDbIds, pedigreeSearchRequest.programDbIds) &&
@@ -843,7 +800,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(accessionNumbers, binomialNames, collections, commonCropNames, externalReferenceIDs, externalReferenceIds, externalReferenceSources, familyCodes, genus, germplasmDbIds, germplasmNames, germplasmPUIs, includeFullTree, includeParents, includeProgeny, includeSiblings, instituteCodes, page, pageSize, pedigreeDepth, progenyDepth, programDbIds, programNames, species, studyDbIds, studyNames, synonyms, trialDbIds, trialNames);
+        return Objects.hash(accessionNumbers, binomialNames, collections, commonCropNames, externalReferenceIDs, externalReferenceIds, externalReferenceSources, familyCodes, genus, germplasmDbIds, germplasmNames, germplasmPUIs, includeFullTree, includeParents, includeProgeny, includeSiblings, instituteCodes, pedigreeDepth, progenyDepth, programDbIds, programNames, species, studyDbIds, studyNames, synonyms, trialDbIds, trialNames);
     }
 
 
@@ -869,8 +826,6 @@ public String toString() {
         sb.append("    includeProgeny: ").append(toIndentedString(includeProgeny)).append("\n");
         sb.append("    includeSiblings: ").append(toIndentedString(includeSiblings)).append("\n");
         sb.append("    instituteCodes: ").append(toIndentedString(instituteCodes)).append("\n");
-        sb.append("    page: ").append(toIndentedString(page)).append("\n");
-        sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
         sb.append("    pedigreeDepth: ").append(toIndentedString(pedigreeDepth)).append("\n");
         sb.append("    progenyDepth: ").append(toIndentedString(progenyDepth)).append("\n");
         sb.append("    programDbIds: ").append(toIndentedString(programDbIds)).append("\n");

brapi-java-model/src/main/java/org/brapi/v2/model/germ/response/BrAPIPedigreeListResponse.java

@@ -18,12 +18,14 @@
 
 import org.brapi.v2.model.BrAPIContext;
 import org.brapi.v2.model.BrAPIMetadata;
+import org.brapi.v2.model.BrAPIResponse;
+import org.brapi.v2.model.pheno.response.BrAPIObservationUnitListResponseResult;
 
 /**
  * PedigreeListResponse
  */
 
-public class BrAPIPedigreeListResponse {
+public class BrAPIPedigreeListResponse implements BrAPIResponse<BrAPIPedigreeListResponseResult> {
     @JsonProperty("@context")
     private BrAPIContext _atContext = null;
 

brapi-java-model/src/main/java/org/brapi/v2/model/germ/response/BrAPIPedigreeListResponseResult.java

@@ -18,13 +18,15 @@
 import java.util.List;
 import java.util.Objects;
 
+import org.brapi.v2.model.BrAPIResponseResult;
 import org.brapi.v2.model.germ.BrAPIPedigreeNode;
+import org.brapi.v2.model.pheno.BrAPIObservationUnit;
 
 /**
  * PedigreeListResponseResult
  */
 
-public class BrAPIPedigreeListResponseResult {
+public class BrAPIPedigreeListResponseResult implements BrAPIResponseResult<BrAPIPedigreeNode> {
 	@JsonProperty("data")
     private List<BrAPIPedigreeNode> data = new ArrayList<BrAPIPedigreeNode>();