serde serialization refactoring: collections API

Author: rashtao

src/main/java/com/arangodb/internal/InternalArangoCollection.java

@@ -180,7 +180,7 @@ protected <T> ResponseDeserializer<MultiDocumentEntity<DocumentCreateEntity<T>>>
     }
 
     protected Request importDocumentsRequest(final String values, final DocumentImportOptions options) {
-        return importDocumentsRequest(options).putQueryParam("type", ImportType.auto).setBody(util().serialize(values));
+        return importDocumentsRequest(options).putQueryParam("type", ImportType.auto).setBody(util().serialize(util().parseJson(values)));
     }
 
     protected Request importDocumentsRequest(final Collection<?> values, final DocumentImportOptions options) {

src/main/java/com/arangodb/internal/util/DefaultArangoSerialization.java

@@ -28,6 +28,7 @@
 import com.arangodb.util.ArangoSerializer;
 import com.arangodb.velocypack.VPackParser;
 import com.arangodb.velocypack.VPackSlice;
+import com.fasterxml.jackson.databind.JsonNode;
 
 import java.lang.reflect.Type;
 
@@ -49,13 +50,12 @@ public DefaultArangoSerialization(final ArangoSerializer serializer, final Arang
 
     @Override
     public VPackSlice serialize(final Object entity) throws ArangoDBException {
-//        return serializer.serialize(entity);
         DataType dataType = serde.getDataType();
         switch (dataType) {
             case JSON:
                 String json = new String(serde.serialize(entity));
                 VPackParser parser = new VPackParser.Builder().build();
-                return parser.fromJson(json);
+                return parser.fromJson(json, true);
             case VPACK:
                 return new VPackSlice(serde.serialize(entity));
             default:
@@ -73,4 +73,8 @@ public <T> T deserialize(final VPackSlice vpack, final Type type) throws ArangoD
         return deserializer.deserialize(vpack, type);
     }
 
+    @Override
+    public JsonNode parseJson(String json) {
+        return serde.parseJson(json);
+    }
 }

src/main/java/com/arangodb/mapping/ArangoJack.java

@@ -51,6 +51,11 @@
  */
 public class ArangoJack implements ArangoSerialization {
 
+    @Override
+    public JsonNode parseJson(String json) {
+        return null;
+    }
+
     public interface ConfigureFunction {
         void configure(ObjectMapper mapper);
     }

src/main/java/com/arangodb/model/AqlFunctionCreateOptions.java

@@ -44,7 +44,7 @@ protected AqlFunctionCreateOptions name(final String name) {
         return this;
     }
 
-    protected String getName() {
+    public String getName() {
         return name;
     }
 
@@ -57,7 +57,7 @@ protected AqlFunctionCreateOptions code(final String code) {
         return this;
     }
 
-    protected String getCode() {
+    public String getCode() {
         return code;
     }
 

src/main/java/com/arangodb/model/AqlQueryExplainOptions.java

@@ -52,7 +52,7 @@ protected AqlQueryExplainOptions bindVars(final VPackSlice bindVars) {
         return this;
     }
 
-    protected String getQuery() {
+    public String getQuery() {
         return query;
     }
 
@@ -119,7 +119,7 @@ public static class Options {
         private Integer maxNumberOfPlans;
         private Boolean allPlans;
 
-        protected Optimizer getOptimizer() {
+        public Optimizer getOptimizer() {
             if (optimizer == null) {
                 optimizer = new Optimizer();
             }

src/main/java/com/arangodb/model/AqlQueryParseOptions.java

@@ -32,7 +32,7 @@ public AqlQueryParseOptions() {
         super();
     }
 
-    protected String getQuery() {
+    public String getQuery() {
         return query;
     }
 

src/main/java/com/arangodb/model/CollectionCreateOptions.java

@@ -25,6 +25,8 @@
 import com.arangodb.entity.KeyType;
 import com.arangodb.entity.ReplicationFactor;
 
+import java.util.Objects;
+
 /**
  * @author Mark Vollmary
  * @see <a href="https://www.arangodb.com/docs/stable/http/collection-creating.html#create-collection">API
@@ -37,7 +39,7 @@ public class CollectionCreateOptions {
     private Integer writeConcern;
     private KeyOptions keyOptions;
     private Boolean waitForSync;
-    private String[] shardKeys;
+    private String[] shardKeys = new String[]{};
     private Integer numberOfShards;
     private Boolean isSystem;
     private CollectionType type;
@@ -166,6 +168,7 @@ public String[] getShardKeys() {
      * @return options
      */
     public CollectionCreateOptions shardKeys(final String... shardKeys) {
+        Objects.requireNonNull(shardKeys);
         this.shardKeys = shardKeys;
         return this;
     }

src/main/java/com/arangodb/model/CollectionSchema.java

@@ -22,28 +22,25 @@
 package com.arangodb.model;
 
 
+import com.arangodb.serde.InternalSerializers;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
 /**
  * @author Michele Rastelli
  * @see <a href="https://www.arangodb.com/docs/stable/data-modeling-documents-schema-validation.html">API Documentation</a>
  * @since ArangoDB 3.7
  */
 public class CollectionSchema {
 
-    /**
-     * Value to unset the collection schema on properties update {@link com.arangodb.ArangoCollection#changeProperties(CollectionPropertiesOptions)}.
-     */
-    public static final CollectionSchema NULL_SCHEMA = new CollectionSchema()
-            .setLevel(null)
-            .setMessage(null)
-            .setRule(null);
-
     private String rule;
     private Level level;
     private String message;
 
     /**
      * @return JSON Schema description
      */
+    @JsonSerialize(using = InternalSerializers.CollectionSchemaRuleSerializer.class)
     public String getRule() {
         return rule;
     }
@@ -82,11 +79,13 @@ public enum Level {
         /**
          * The rule is inactive and validation thus turned off.
          */
+        @JsonProperty("none")
         NONE("none"),
 
         /**
          * Only newly inserted documents are validated.
          */
+        @JsonProperty("new")
         NEW("new"),
 
         /**
@@ -95,11 +94,13 @@ public enum Level {
          * but you want to stop the insertion of more invalid documents and prohibit that valid documents are changed to
          * invalid documents.
          */
+        @JsonProperty("moderate")
         MODERATE("moderate"),
 
         /**
          * All new and modified document must strictly pass validation. No exceptions are made (default).
          */
+        @JsonProperty("strict")
         STRICT("strict");
 
         private final String value;

src/main/java/com/arangodb/model/FulltextIndexOptions.java

@@ -42,7 +42,7 @@ protected FulltextIndexOptions getThis() {
         return this;
     }
 
-    protected Iterable<String> getFields() {
+    public Iterable<String> getFields() {
         return fields;
     }
 
@@ -55,7 +55,7 @@ protected FulltextIndexOptions fields(final Iterable<String> fields) {
         return this;
     }
 
-    protected IndexType getType() {
+    public IndexType getType() {
         return type;
     }
 

src/main/java/com/arangodb/model/GeoIndexOptions.java

@@ -41,7 +41,7 @@ protected GeoIndexOptions getThis() {
         return this;
     }
 
-    protected Iterable<String> getFields() {
+    public Iterable<String> getFields() {
         return fields;
     }
 
@@ -54,7 +54,7 @@ protected GeoIndexOptions fields(final Iterable<String> fields) {
         return this;
     }
 
-    protected IndexType getType() {
+    public IndexType getType() {
         return type;
     }