v8: serde refactoring

.circleci/config.yml

@@ -509,16 +509,8 @@ workflows:
           matrix:
             parameters:
               args:
-                - '-Dadb.jackson.version=2.21.1'
-                - '-Dadb.jackson.version=2.20.2'
-                - '-Dadb.jackson.version=2.19.4'
-                - '-Dadb.jackson.version=2.18.6'
-                - '-Dadb.jackson.version=2.17.3'
-                - '-Dadb.jackson.version=2.16.2'
-                - '-Dadb.jackson.version=2.15.4'
-                - '-Dadb.jackson.version=2.14.3'
-                - '-Dadb.jackson.version=2.13.5'
-                - '-Dadb.jackson.version=2.12.7'
+                - '-Dadb.jackson.version=3.0.4'
+                - '-Dadb.jackson.version=3.1.2'
           filters:
             tags:
               only: /^v.*/

core/pom.xml

@@ -25,12 +25,12 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
+            <groupId>tools.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
+            <groupId>tools.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
             <scope>compile</scope>
         </dependency>
@@ -40,7 +40,7 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <groupId>tools.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jakarta-jsonp</artifactId>
             <scope>compile</scope>
         </dependency>
@@ -49,6 +49,12 @@
             <artifactId>jsr305</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>jakarta.json.bind</groupId>
+            <artifactId>jakarta.json.bind-api</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>

core/src/main/java/com/arangodb/ArangoDB.java

@@ -426,8 +426,6 @@ public ArangoDB build() {
             }
 
             ProtocolProvider protocolProvider = protocolProvider(config.getProtocol());
-            config.setProtocolModule(protocolProvider.protocolModule());
-
             ConnectionFactory connectionFactory = protocolProvider.createConnectionFactory(config.getProtocolConfig());
             Collection<Host> hostList = createHostList(connectionFactory);
             HostResolver hostResolver = createHostResolver(hostList, connectionFactory);
@@ -732,7 +730,7 @@ public Builder responseQueueTimeSamples(final Integer responseQueueTimeSamples)
          * - body payload of requests and responses in {@link ArangoDB#execute(Request, Class)}
          * <p>
          * However, note that the following types will always be serialized and deserialized using the internal serde:
-         * - {@link com.fasterxml.jackson.databind.JsonNode}
+         * - {@link tools.jackson.databind.JsonNode}
          * - {@link com.arangodb.util.RawJson}
          * - {@link com.arangodb.util.RawBytes}
          * - {@link com.arangodb.entity.BaseDocument}
@@ -828,29 +826,11 @@ protected ProtocolProvider protocolProvider(Protocol protocol) {
 
         @UnstableApi
         protected HostHandler createHostHandler(@UnstableApi final HostResolver hostResolver) {
-
-            final HostHandler hostHandler;
-
-            LoadBalancingStrategy loadBalancingStrategy = config.getLoadBalancingStrategy();
-            if (loadBalancingStrategy != null) {
-                switch (loadBalancingStrategy) {
-                    case ONE_RANDOM:
-                        hostHandler = new RandomHostHandler(hostResolver, new FallbackHostHandler(hostResolver));
-                        break;
-                    case ROUND_ROBIN:
-                        hostHandler = new RoundRobinHostHandler(hostResolver);
-                        break;
-                    case NONE:
-                    default:
-                        hostHandler = new FallbackHostHandler(hostResolver);
-                        break;
-                }
-            } else {
-                hostHandler = new FallbackHostHandler(hostResolver);
-            }
-
-            LOG.debug("HostHandler is {}", hostHandler.getClass().getSimpleName());
-            return hostHandler;
+            return switch (config.getLoadBalancingStrategy()) {
+                case ONE_RANDOM -> new RandomHostHandler(hostResolver, new FallbackHostHandler(hostResolver));
+                case ROUND_ROBIN -> new RoundRobinHostHandler(hostResolver);
+                default -> new FallbackHostHandler(hostResolver);
+            };
         }
 
         @UnstableApi

core/src/main/java/com/arangodb/PackageVersion.java.in

@@ -9,7 +9,7 @@ public final class PackageVersion {
 
     private static boolean isShaded() {
         try {
-            Class.forName("com.arangodb.shaded.fasterxml.jackson.core.JsonFactory");
+            Class.forName("com.arangodb.shaded.jackson.core.json.JsonFactory");
             return true;
         } catch (ClassNotFoundException e) {
             return false;

core/src/main/java/com/arangodb/entity/AbstractBaseDocument.java

@@ -45,7 +45,7 @@ abstract class AbstractBaseDocument implements Serializable {
             DocumentFields.KEY,
             DocumentFields.REV
     };
-    private final HashMap<String, Object> properties;
+    private  HashMap<String, Object> properties;
 
     AbstractBaseDocument() {
         properties = new HashMap<>();

core/src/main/java/com/arangodb/entity/AqlQueryExplainEntity.java

@@ -68,7 +68,7 @@ public int hashCode() {
     }
 
     public static final class ExecutionPlan {
-        private final Map<String, Object> properties = new HashMap<>();
+        private  Map<String, Object> properties = new HashMap<>();
         private Collection<ExecutionNode> nodes;
         private Double estimatedCost;
         private Collection<ExecutionCollection> collections;
@@ -118,7 +118,7 @@ public int hashCode() {
     }
 
     public static final class ExecutionNode {
-        private final Map<String, Object> properties = new HashMap<>();
+        private  Map<String, Object> properties = new HashMap<>();
 
         @JsonAnySetter
         public void add(String key, Object value) {
@@ -143,7 +143,7 @@ public int hashCode() {
     }
 
     public static final class ExecutionVariable {
-        private final Map<String, Object> properties = new HashMap<>();
+        private  Map<String, Object> properties = new HashMap<>();
 
         @JsonAnySetter
         public void add(String key, Object value) {
@@ -168,7 +168,7 @@ public int hashCode() {
     }
 
     public static final class ExecutionCollection {
-        private final Map<String, Object> properties = new HashMap<>();
+        private  Map<String, Object> properties = new HashMap<>();
 
         @JsonAnySetter
         public void add(String key, Object value) {
@@ -193,7 +193,7 @@ public int hashCode() {
     }
 
     public static final class ExecutionStats {
-        private final Map<String, Object> properties = new HashMap<>();
+        private  Map<String, Object> properties = new HashMap<>();
 
         @JsonAnySetter
         public void add(String key, Object value) {

core/src/main/java/com/arangodb/entity/CollectionType.java

@@ -27,7 +27,7 @@ public enum CollectionType {
 
     DOCUMENT(2), EDGES(3);
 
-    private final int type;
+    private  int type;
 
     CollectionType(final int type) {
         this.type = type;

core/src/main/java/com/arangodb/entity/CursorEntity.java

@@ -39,7 +39,7 @@ public final class CursorEntity<T> {
     private List<T> result;
     private Boolean potentialDirtyRead;
     private String nextBatchId;
-    private final Extras extra = new Extras();
+    private  Extras extra = new Extras();
 
     public String getId() {
         return id;
@@ -124,7 +124,7 @@ public int hashCode() {
     }
 
     public static final class Extras {
-        private final Collection<CursorWarning> warnings = Collections.emptyList();
+        private  Collection<CursorWarning> warnings = Collections.emptyList();
         private CursorStats stats;
 
         public CursorStats getStats() {

core/src/main/java/com/arangodb/entity/CursorStats.java

@@ -7,7 +7,7 @@
 import java.util.Objects;
 
 public final class CursorStats {
-    private final Map<String, Object> properties = new HashMap<>();
+    private  Map<String, Object> properties = new HashMap<>();
     private Long writesExecuted;
     private Long writesIgnored;
     private Long scannedFull;

core/src/main/java/com/arangodb/entity/EdgeDefinition.java

@@ -32,7 +32,7 @@ public final class EdgeDefinition {
     private String collection;
     private Collection<String> from;
     private Collection<String> to;
-    private final Options options = new Options();
+    private  Options options = new Options();
 
     public String getCollection() {
         return collection;

core/src/main/java/com/arangodb/entity/InvertedIndexField.java

@@ -15,7 +15,7 @@ public final class InvertedIndexField {
     private Boolean searchField;
     private Boolean trackListPositions;
     private Boolean cache;
-    private final Set<AnalyzerFeature> features = new HashSet<>();
+    private Set<AnalyzerFeature> features = new HashSet<>();
     private Collection<InvertedIndexField> nested;
 
     public String getName() {

core/src/main/java/com/arangodb/entity/InvertedIndexPrimarySort.java

@@ -14,7 +14,7 @@
  * @since ArangoDB 3.10
  */
 public final class InvertedIndexPrimarySort {
-    private final List<Field> fields = new ArrayList<>();
+    private List<Field> fields = new ArrayList<>();
     private ArangoSearchCompression compression;
     private Boolean cache;
 
@@ -75,8 +75,8 @@ public int hashCode() {
     }
 
     public static class Field {
-        private final String field;
-        private final Direction direction;
+        private  String field;
+        private  Direction direction;
 
         /**
          * @param field     An attribute path. The . character denotes sub-attributes.

core/src/main/java/com/arangodb/entity/LogLevel.java

@@ -27,7 +27,7 @@ public enum LogLevel {
 
     FATAL(0), ERROR(1), WARNING(2), INFO(3), DEBUG(4);
 
-    private final int level;
+    private  int level;
 
     LogLevel(final int level) {
         this.level = level;

core/src/main/java/com/arangodb/entity/ReplicationFactor.java

@@ -46,7 +46,7 @@ public String get() {
 
     final class NumericReplicationFactor implements ReplicationFactor {
 
-        private final Integer value;
+        private  Integer value;
 
         public NumericReplicationFactor(Integer value) {
             this.value = value;

core/src/main/java/com/arangodb/entity/ShardingStrategy.java

@@ -32,7 +32,7 @@ public enum ShardingStrategy {
     ENTERPRISE_HASH_SMART_EDGE("enterprise-hash-smart-edge"),
     ENTERPRISE_HEX_SMART_VERTEX("enterprise-hex-smart-vertex");
 
-    private final String internalName;
+    private  String internalName;
 
     ShardingStrategy(String internalName) {
         this.internalName = internalName;

core/src/main/java/com/arangodb/entity/VectorIndexParams.java

@@ -82,7 +82,7 @@ public VectorIndexParams metric(Metric metric) {
         return this;
     }
 
-    public Integer getnLists() {
+    public Integer getNLists() {
         return nLists;
     }
 

core/src/main/java/com/arangodb/entity/arangosearch/ArangoSearchCompression.java

@@ -37,7 +37,7 @@ public enum ArangoSearchCompression {
      */
     none("none");
 
-    private final String value;
+    private  String value;
 
     ArangoSearchCompression(String value) {
         this.value = value;

core/src/main/java/com/arangodb/entity/arangosearch/ArangoSearchPropertiesEntity.java

@@ -22,7 +22,7 @@
 
 import com.arangodb.entity.ViewEntity;
 import com.arangodb.internal.serde.InternalDeserializers;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import tools.jackson.databind.annotation.JsonDeserialize;
 
 import java.util.Collection;
 import java.util.Objects;

core/src/main/java/com/arangodb/entity/arangosearch/CollectionLink.java

@@ -25,8 +25,8 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.annotation.JsonDeserialize;
+import tools.jackson.databind.annotation.JsonSerialize;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -37,7 +37,7 @@
  */
 public final class CollectionLink {
 
-    private final String name;
+    private  String name;
     private Collection<String> analyzers;
     private Boolean includeAllFields;
     private Boolean trackListPositions;

core/src/main/java/com/arangodb/entity/arangosearch/FieldLink.java

@@ -5,16 +5,16 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.annotation.JsonDeserialize;
+import tools.jackson.databind.annotation.JsonSerialize;
 
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Objects;
 
 public final class FieldLink {
 
-    private final String name;
+    private  String name;
     private Collection<String> analyzers;
     private Boolean includeAllFields;
     private Boolean trackListPositions;

core/src/main/java/com/arangodb/entity/arangosearch/PrimarySort.java

@@ -30,7 +30,7 @@
  */
 public final class PrimarySort {
 
-    private final String fieldName;
+    private  String fieldName;
     private Boolean ascending;
 
     public PrimarySort(

core/src/main/java/com/arangodb/entity/arangosearch/SearchAliasIndex.java

@@ -10,9 +10,9 @@
  * @since ArabgoDB 3.10
  */
 public final class SearchAliasIndex {
-    private final String collection;
-    private final String index;
-    private final OperationType operation;
+    private  String collection;
+    private  String index;
+    private  OperationType operation;
 
     /**
      * @param collection The name of a collection.

core/src/main/java/com/arangodb/entity/arangosearch/SearchAliasPropertiesEntity.java

@@ -31,7 +31,7 @@
  */
 public final class SearchAliasPropertiesEntity extends ViewEntity {
 
-    private final Collection<SearchAliasIndex> indexes = new ArrayList<>();
+    private  Collection<SearchAliasIndex> indexes = new ArrayList<>();
 
     /**
      * @return A list of inverted indexes to add to the View.

core/src/main/java/com/arangodb/entity/arangosearch/StoredValue.java

@@ -33,9 +33,9 @@
  */
 public final class StoredValue {
 
-    private final List<String> fields;
-    private final ArangoSearchCompression compression;
-    private final Boolean cache;
+    private  List<String> fields;
+    private  ArangoSearchCompression compression;
+    private  Boolean cache;
 
     /**
      * @param fields      A list of attribute paths. The . character denotes sub-attributes.

core/src/main/java/com/arangodb/entity/arangosearch/analyzer/StopwordsAnalyzerProperties.java

@@ -33,8 +33,8 @@
  */
 public final class StopwordsAnalyzerProperties {
 
-    private final List<String> stopwords;
-    private final boolean hex;
+    private  List<String> stopwords;
+    private  boolean hex;
 
     public StopwordsAnalyzerProperties() {
         stopwords = new ArrayList<>();