Merge pull request #220 from Breeding-Insight/develop

Merge for release 0.9
Breeding-Insight · Apr 10, 2024 · 42211ab · 42211ab
2 parents c224ba3 + c0c585d
commit 42211ab
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/brapi-java-client/src/test/java/org/brapi/client/v2/modules/germplasm/PedigreeAPITests.java b/brapi-java-client/src/test/java/org/brapi/client/v2/modules/germplasm/PedigreeAPITests.java
@@ -17,6 +17,8 @@
 
 package org.brapi.client.v2.modules.germplasm;
 
+import com.google.gson.JsonObject;
+
 import org.apache.commons.lang3.tuple.Pair;
 import org.brapi.client.v2.ApiResponse;
 import org.brapi.client.v2.BrAPIClientTest;
@@ -109,8 +111,8 @@ public void searchPedigreeGetResponse() throws Exception {
     @Test
     public void createPedigreeSuccess() throws Exception {
 
-        Map<String, String> additionalInfo = new HashMap<String, String>();
-        additionalInfo.put("test_key", "test_value");
+        JsonObject additionalInfo = new JsonObject();
+        additionalInfo.addProperty("test_key", "test_value");
         List<BrAPIExternalReference> externalReferences = new ArrayList<>();
         externalReferences.add(new BrAPIExternalReference()
                 .referenceID(UUID.randomUUID().toString())

diff --git a/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNode.java b/brapi-java-model/src/main/java/org/brapi/v2/model/germ/BrAPIPedigreeNode.java
@@ -18,6 +18,7 @@
 import java.util.Map;
 import java.util.Objects;
 
+import com.google.gson.JsonObject;
 import org.brapi.v2.model.BrAPIExternalReference;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -28,7 +29,7 @@
 
 public class BrAPIPedigreeNode {
     @JsonProperty("additionalInfo")
-    private Map<String, String> additionalInfo = null;
+    private JsonObject additionalInfo = null;
 
     @JsonProperty("breedingMethodDbId")
     private String breedingMethodDbId = null;
@@ -76,16 +77,16 @@ public class BrAPIPedigreeNode {
     @JsonProperty("siblings")
     private List<BrAPIPedigreeNodeSibling> siblings = null;
 
-    public BrAPIPedigreeNode additionalInfo(Map<String, String> additionalInfo) {
+    public BrAPIPedigreeNode additionalInfo(JsonObject additionalInfo) {
         this.additionalInfo = additionalInfo;
         return this;
     }
 
     public BrAPIPedigreeNode putAdditionalInfoItem(String key, String additionalInfoItem) {
         if (this.additionalInfo == null) {
-            this.additionalInfo = new HashMap<String, String>();
+            this.additionalInfo = new JsonObject();
         }
-        this.additionalInfo.put(key, additionalInfoItem);
+        this.additionalInfo.addProperty(key, additionalInfoItem);
         return this;
     }
 
@@ -94,11 +95,11 @@ public BrAPIPedigreeNode putAdditionalInfoItem(String key, String additionalInfo
      *
      * @return additionalInfo
      **/
-    public Map<String, String> getAdditionalInfo() {
+    public JsonObject getAdditionalInfo() {
         return additionalInfo;
     }
 
-    public void setAdditionalInfo(Map<String, String> additionalInfo) {
+    public void setAdditionalInfo(JsonObject additionalInfo) {
         this.additionalInfo = additionalInfo;
     }
 

diff --git a/pom.xml b/pom.xml
@@ -141,6 +141,17 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.sonatype.plugins</groupId>
+        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <version>1.6.7</version>
+        <extensions>true</extensions>
+        <configuration>
+          <serverId>ossrh</serverId>
+          <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+          <autoReleaseAfterClose>true</autoReleaseAfterClose>
+        </configuration>
+      </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>