FMWK-215 Update Java client to 7.0.0 (#97)

aerospike · Aug 8, 2023 · de87d5f · de87d5f
1 parent 9bcce57
commit de87d5f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -30,7 +30,7 @@
         <maven.gpg.plugin.version>1.6</maven.gpg.plugin.version>
         <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
         <jackson-databind.version>2.14.1</jackson-databind.version>
-        <aerospike-client.version>6.1.6</aerospike-client.version>
+        <aerospike-client.version>7.0.0</aerospike-client.version>
         <json-path.version>2.7.0</json-path.version>
         <lombok.version>1.18.24</lombok.version>
         <junit-jupiter.version>5.9.2</junit-jupiter.version>

diff --git a/src/main/java/com/aerospike/documentapi/util/Utils.java b/src/main/java/com/aerospike/documentapi/util/Utils.java
@@ -1,8 +1,8 @@
 package com.aerospike.documentapi.util;
 
 import com.aerospike.client.Bin;
+import com.aerospike.client.Value;
 import com.aerospike.client.cdt.CTX;
-import com.aerospike.client.cdt.MapOrder;
 import com.aerospike.documentapi.jsonpath.JsonPathObject;
 import com.aerospike.documentapi.jsonpath.JsonPathParser;
 import com.aerospike.documentapi.jsonpath.PathDetails;
@@ -11,7 +11,6 @@
 import lombok.experimental.UtilityClass;
 
 import java.util.List;
-import java.util.Map;
 
 @UtilityClass
 public class Utils {
@@ -25,11 +24,7 @@ public static Bin createBinByJsonNodeType(String binName, JsonNode jsonNode) {
     }
 
     public static Bin createBin(String binName, Object jsonObject) {
-        if (jsonObject instanceof Map) {
-            return new Bin(binName, (Map<?, ?>) jsonObject, MapOrder.KEY_ORDERED);
-        } else {
-            return new Bin(binName, jsonObject);
-        }
+        return new Bin(binName, Value.get(jsonObject));
     }
 
     public static void validateNotArray(Object object) throws IllegalArgumentException {

diff --git a/src/test/java/com/aerospike/documentapi/DocumentAPIBatchTests.java b/src/test/java/com/aerospike/documentapi/DocumentAPIBatchTests.java
@@ -325,9 +325,12 @@ void testNegativeBatchPut() {
         assertTrue(results.stream().anyMatch(res -> res.resultCode != ResultCode.OK));
 
         // making sure all records contain the resulting record == null and the necessary resulting code
-        // OP_NOT_APPLICABLE = 26, PARAMETER_ERROR = 4
-        batchOpsList.forEach(batchOp -> assertTrue(batchOp.getBatchRecord().record == null
-                && (batchOp.getBatchRecord().resultCode == 26 || batchOp.getBatchRecord().resultCode == 4)));
+        // OP_NOT_APPLICABLE = 26, PARAMETER_ERROR = 4, BIN_TYPE_ERROR = 12
+        batchOpsList.forEach(batchOp -> {
+            BatchRecord batchRecord = batchOp.getBatchRecord();
+            assertTrue(batchRecord.record == null
+                    && (batchRecord.resultCode == 26 || batchRecord.resultCode == 4 || batchRecord.resultCode == 12));
+        });
     }
 
     /**