[BI-2826] 2.2 Support for ObservationLevelName Endpoints

brapi-java-client/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.brapi</groupId>
         <artifactId>brapi</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <name>${project.artifactId}</name>

brapi-java-client/src/main/java/org/brapi/client/v2/modules/phenotype/ObservationLevelNamesApi.java

@@ -0,0 +1,202 @@
+package org.brapi.client.v2.modules.phenotype;
+
+import com.google.gson.reflect.TypeToken;
+import okhttp3.Call;
+import org.brapi.client.v2.ApiResponse;
+import org.brapi.client.v2.BrAPIClient;
+import org.brapi.client.v2.Configuration;
+import org.brapi.client.v2.model.exceptions.ApiException;
+import org.brapi.v2.model.pheno.BrAPIObservationUnitHierarchyLevel;
+import org.brapi.v2.model.pheno.response.BrAPIObservationLevelListResponse;
+import org.brapi.v2.model.pheno.response.BrAPIObservationLevelSingleResponse;
+
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class ObservationLevelNamesApi {
+
+    private BrAPIClient apiClient;
+
+    public ObservationLevelNamesApi() {
+        this(Configuration.getDefaultApiClient());
+    }
+
+    public ObservationLevelNamesApi(BrAPIClient apiClient) {
+        this.apiClient = apiClient;
+    }
+
+    public BrAPIClient getApiClient() {
+        return apiClient;
+    }
+
+    public void setApiClient(BrAPIClient apiClient) {
+        this.apiClient = apiClient;
+    }
+
+    private Call observationLevelNamesGetCall(String programDbId, Boolean all, Integer page, Integer pageSize) throws ApiException {
+        Object localVarPostBody = null;
+
+        // create path and map variables
+        String localVarPath = "/observationlevelnames";
+
+        Map<String, String> localVarQueryParams = new HashMap<>();
+        Map<String, String> localVarCollectionQueryParams = new HashMap<>();
+        if (programDbId != null)
+            apiClient.prepQueryParameter(localVarQueryParams, "programDbId", programDbId);
+        if (all != null) {
+            apiClient.prepQueryParameter(localVarQueryParams, "all", all);
+        }
+        if (page != null)
+            apiClient.prepQueryParameter(localVarQueryParams, "page", page);
+        if (pageSize != null)
+            apiClient.prepQueryParameter(localVarQueryParams, "pageSize", pageSize);
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+                "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        String[] localVarAuthNames = new String[] { "AuthorizationToken" };
+        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames);
+    }
+
+    public ApiResponse<BrAPIObservationLevelListResponse> observationLevelNamesGet(String programDbId, Boolean all, Integer page, Integer pageSize) throws ApiException {
+        Call call = observationLevelNamesGetCall(programDbId, all, page, pageSize);
+        Type localVarReturnType = new TypeToken<BrAPIObservationLevelListResponse>(){}.getType();
+        return apiClient.execute(call, localVarReturnType);
+    }
+
+    private Call observationLevelNamesPostCall(List<BrAPIObservationUnitHierarchyLevel> body) throws ApiException {
+        if(body == null) {throw new IllegalArgumentException("body cannot be null"); }
+        Object localVarPostBody = body;
+
+        // create path and map variables
+        String localVarPath = "/observationlevelnames";
+
+        Map<String, String> localVarQueryParams = new HashMap<>();
+        Map<String, String> localVarCollectionQueryParams = new HashMap<>();
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+                "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+                "application/json"
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        String[] localVarAuthNames = new String[] { "AuthorizationToken" };
+        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames);
+    }
+
+    public ApiResponse<BrAPIObservationLevelListResponse> observationLevelNamesPost(List<BrAPIObservationUnitHierarchyLevel> body) throws ApiException {
+        Call call = observationLevelNamesPostCall(body);
+        Type localVarReturnType = new TypeToken<BrAPIObservationLevelListResponse>(){}.getType();
+        return apiClient.execute(call, localVarReturnType);
+    }
+
+    private Call observationLevelNameDbIdPutCall(String levelNameDbId, BrAPIObservationUnitHierarchyLevel body) throws ApiException {
+        if(levelNameDbId == null) {
+            throw new IllegalArgumentException("levelNameDbId cannot be null");
+        }
+        if(body == null) {
+            throw new IllegalArgumentException("body cannot be null");
+        }
+        Object localVarPostBody = body;
+
+        // create path and map variables
+        String localVarPath = "/observationlevelnames/{levelNameDbId}"
+                .replaceAll("\\{" + "levelNameDbId" + "\\}", apiClient.escapeString(levelNameDbId));
+
+        Map<String, String> localVarQueryParams = new HashMap<>();
+        Map<String, String> localVarCollectionQueryParams = new HashMap<>();
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+                "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+                "application/json"
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        String[] localVarAuthNames = new String[] { "AuthorizationToken" };
+        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames);
+    }
+
+    public ApiResponse<BrAPIObservationLevelSingleResponse> observationLevelNameDbIdPut(String levelNameDbId, BrAPIObservationUnitHierarchyLevel body) throws ApiException {
+        Call call = observationLevelNameDbIdPutCall(levelNameDbId, body);
+        Type localVarReturnType = new TypeToken<BrAPIObservationLevelSingleResponse>(){}.getType();
+        return apiClient.execute(call, localVarReturnType);
+    }
+
+    private Call observationLevelNameDbIdDeleteCall(String levelNameDbId) throws ApiException {
+        if(levelNameDbId == null) {
+            throw new IllegalArgumentException("levelNameDbId cannot be null");
+        }
+
+        Object localVarPostBody = null;
+
+        // create path and map variables
+        String localVarPath = "/observationlevelnames/{levelNameDbId}"
+                .replaceAll("\\{" + "levelNameDbId" + "\\}", apiClient.escapeString(levelNameDbId));
+
+        Map<String, String> localVarQueryParams = new HashMap<>();
+        Map<String, String> localVarCollectionQueryParams = new HashMap<>();
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+                "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+                "application/json"
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        String[] localVarAuthNames = new String[] { "AuthorizationToken" };
+        return apiClient.buildCall(localVarPath, "DELETE", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames);
+    }
+
+    public ApiResponse<BrAPIObservationLevelSingleResponse> observationLevelNameDbIdDelete(String levelNameDbId) throws ApiException {
+        Call call = observationLevelNameDbIdDeleteCall(levelNameDbId);
+        Type localVarReturnType = new TypeToken<BrAPIObservationLevelSingleResponse>(){}.getType();
+        return apiClient.execute(call, localVarReturnType);
+    }
+
+}

brapi-java-model/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.brapi</groupId>
         <artifactId>brapi</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <name>${project.artifactId}</name>

brapi-java-model/src/main/java/org/brapi/v2/model/pheno/BrAPIObservationUnitHierarchyLevel.java

@@ -2,31 +2,46 @@
 
 import java.util.Objects;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
-
-
-
 /**
  * Observation levels indicate the granularity level at which the measurements are taken. `levelName` defines the level, `levelOrder` defines where that level exists in the hierarchy of levels. `levelOrder`s lower numbers are at the top of the hierarchy (ie field > 0) and higher numbers are at the bottom of the hierarchy (ie plant > 6). 
  */
 
-
-
 public class BrAPIObservationUnitHierarchyLevel   {
 
+  @JsonProperty("levelNameDbId")
+  private String levelNameDbId = null;
+
   @JsonProperty("levelName")
   private String levelName = null;
 
   @JsonProperty("levelOrder")
   private Integer levelOrder = null;
 
+  @JsonProperty("programDbId")
+  @JsonInclude(JsonInclude.Include.NON_NULL)
+  private String programDbId = null;
+
+  // NOTE: This property is NOT used for lookups, only responses.
+  @JsonProperty("programName")
+  @JsonInclude(JsonInclude.Include.NON_NULL)
+  private String programName = null;
+
   public BrAPIObservationUnitHierarchyLevel levelName(String levelName) {
     this.levelName = levelName;
     return this;
   }
 
+  public String getLevelNameDbId() {
+    return levelNameDbId;
+  }
+
+  public void setLevelNameDbId(String value) {
+    this.levelNameDbId = value;
+  }
+
   /**
    * A name for this level
    * @return levelName
@@ -60,6 +75,21 @@ public void setLevelOrder(Integer levelOrder) {
     this.levelOrder = levelOrder;
   }
 
+  public String getProgramDbId() {
+    return programDbId;
+  }
+
+  public void setProgramDbId(String value) {
+    this.programDbId = value;
+  }
+
+  public String getProgramName() {
+    return programName;
+  }
+
+  public void setProgramName(String value) {
+    this.programName = value;
+  }
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -86,6 +116,9 @@ public String toString() {
 
     sb.append("    levelName: ").append(toIndentedString(levelName)).append("\n");
     sb.append("    levelOrder: ").append(toIndentedString(levelOrder)).append("\n");
+    sb.append("    levelNameDbId:  ").append(toIndentedString(levelNameDbId)).append("\n");
+    sb.append("    programDbId: ").append(toIndentedString(programDbId)).append("\n");
+    sb.append("    programName:  ").append(toIndentedString(programName)).append("\n");
     sb.append("}");
     return sb.toString();
   }