[DE-219] new serializer

.github/workflows/maven.yml

@@ -129,3 +129,46 @@ jobs:
         run: mvn -version
       - name: Test
         run: mvn --no-transfer-progress test -DargLine="-Duser.language=${{matrix.user-language}}"
+
+  jackson-test:
+    timeout-minutes: 20
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        jackson-version:
+          - 2.13.3
+          - 2.12.7
+          - 2.11.4
+          - 2.10.5
+        docker-img:
+          - docker.io/arangodb/arangodb:3.9.1
+        topology:
+          - single
+        db-ext-names:
+          - false
+        java-version:
+          - 17
+        user-language:
+          - en
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v2
+        with:
+          java-version: ${{matrix.java-version}}
+          distribution: 'adopt'
+          cache: maven
+      - name: Start Database
+        run: ./docker/start_db.sh
+        env:
+          ARANGO_LICENSE_KEY: ${{ secrets.ARANGO_LICENSE_KEY }}
+          STARTER_MODE: ${{matrix.topology}}
+          DOCKER_IMAGE: ${{matrix.docker-img}}
+          DATABASE_EXTENDED_NAMES: ${{matrix.db-ext-names}}
+      - name: Info
+        run: mvn -version
+      - name: Test
+        run: mvn --no-transfer-progress test -Djackson.version=${{jackson-version}}

pom.xml

@@ -23,6 +23,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <jackson.version>2.13.3</jackson.version>
     </properties>
 
     <developers>
@@ -89,7 +90,7 @@
                     <plugin>
                         <groupId>org.graalvm.buildtools</groupId>
                         <artifactId>native-maven-plugin</artifactId>
-                        <version>0.9.11</version>
+                        <version>0.9.13</version>
                         <extensions>true</extensions>
                         <executions>
                             <execution>
@@ -102,6 +103,7 @@
                             </execution>
                         </executions>
                         <configuration>
+                            <quickBuild>true</quickBuild>
                             <skip>false</skip>
                             <buildArgs>
                                 <buildArg>--no-fallback</buildArg>
@@ -233,10 +235,6 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>com.arangodb</groupId>
-            <artifactId>velocypack</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -245,11 +243,28 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.arangodb</groupId>
             <artifactId>jackson-dataformat-velocypack</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>jakarta.json.bind</groupId>
+            <artifactId>jakarta.json.bind-api</artifactId>
+            <version>3.0.0</version>
+        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
@@ -288,10 +303,23 @@
             <version>22.1.0</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse</groupId>
+            <artifactId>yasson</artifactId>
+            <version>3.0.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>com.fasterxml.jackson</groupId>
+                <artifactId>jackson-bom</artifactId>
+                <version>${jackson.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
             <dependency>
                 <groupId>com.arangodb</groupId>
                 <artifactId>jackson-dataformat-velocypack</artifactId>
@@ -317,11 +345,6 @@
                 <artifactId>commons-logging</artifactId>
                 <version>1.2</version>
             </dependency>
-            <dependency>
-                <groupId>com.arangodb</groupId>
-                <artifactId>velocypack</artifactId>
-                <version>2.5.4</version>
-            </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>

src/main/java/com/arangodb/ArangoCollection.java

@@ -35,7 +35,7 @@
  * @see <a href="https://www.arangodb.com/docs/stable/http/collection.html">Documents API Documentation</a>
  */
 @SuppressWarnings("UnusedReturnValue")
-public interface ArangoCollection extends ArangoSerializationAccessor {
+public interface ArangoCollection extends ArangoSerdeAccessor {
 
     /**
      * The the handler of the database the collection is within
@@ -55,7 +55,7 @@ public interface ArangoCollection extends ArangoSerializationAccessor {
      * Creates a new document from the given document, unless there is already a document with the _key given. If no
      * _key is given, a new unique _key is generated automatically.
      *
-     * @param value A representation of a single document (POJO, VPackSlice or String for JSON)
+     * @param value A representation of a single document (POJO, {@link com.arangodb.util.RawJson} or {@link com.arangodb.util.RawBytes})
      * @return information about the document
      * @throws ArangoDBException
      * @see <a href="https://www.arangodb.com/docs/stable/http/document-working-with-documents.html#create-document">API
@@ -67,7 +67,7 @@ public interface ArangoCollection extends ArangoSerializationAccessor {
      * Creates a new document from the given document, unless there is already a document with the _key given. If no
      * _key is given, a new unique _key is generated automatically.
      *
-     * @param value   A representation of a single document (POJO, VPackSlice or String for JSON)
+     * @param value   A representation of a single document (POJO, {@link com.arangodb.util.RawJson} or {@link com.arangodb.util.RawBytes})
      * @param options Additional options, can be null
      * @return information about the document
      * @throws ArangoDBException
@@ -83,7 +83,7 @@ public interface ArangoCollection extends ArangoSerializationAccessor {
      * Limitations:
      * - the fields having {@code null} value are always removed during serialization
      *
-     * @param values A List of documents (POJO, VPackSlice or String for JSON)
+     * @param values A List of documents (POJO, {@link com.arangodb.util.RawJson} or {@link com.arangodb.util.RawBytes})
      * @return information about the documents
      * @throws ArangoDBException
      * @see <a href="https://www.arangodb.com/docs/stable/http/document-working-with-documents.html#create-document">API
@@ -98,7 +98,7 @@ public interface ArangoCollection extends ArangoSerializationAccessor {
      * Limitations:
      * - the fields having {@code null} value are always removed during serialization
      *
-     * @param values  A List of documents (POJO, VPackSlice or String for JSON)
+     * @param values  A List of documents (POJO, {@link com.arangodb.util.RawJson} or {@link com.arangodb.util.RawBytes})
      * @param options Additional options, can be null
      * @return information about the documents
      * @throws ArangoDBException
@@ -162,7 +162,7 @@ <T> MultiDocumentEntity<DocumentCreateEntity<T>> insertDocuments(
      * Retrieves the document with the given {@code key} from the collection.
      *
      * @param key  The key of the document
-     * @param type The type of the document (POJO class, VPackSlice or String for JSON)
+     * @param type The type of the document (POJO, {@link com.arangodb.util.RawJson} or {@link com.arangodb.util.RawBytes})
      * @return the document identified by the key
      * @throws ArangoDBException
      * @see <a href="https://www.arangodb.com/docs/stable/http/document-working-with-documents.html#read-document">API
@@ -174,7 +174,7 @@ <T> MultiDocumentEntity<DocumentCreateEntity<T>> insertDocuments(
      * Retrieves the document with the given {@code key} from the collection.
      *
      * @param key     The key of the document
-     * @param type    The type of the document (POJO class, VPackSlice or String for JSON)
+     * @param type    The type of the document (POJO, {@link com.arangodb.util.RawJson} or {@link com.arangodb.util.RawBytes})
      * @param options Additional options, can be null
      * @return the document identified by the key
      * @throws ArangoDBException
@@ -187,7 +187,7 @@ <T> MultiDocumentEntity<DocumentCreateEntity<T>> insertDocuments(
      * Retrieves multiple documents with the given {@code _key} from the collection.
      *
      * @param keys The keys of the documents
-     * @param type The type of the documents (POJO class, VPackSlice or String for JSON)
+     * @param type The type of the documents (POJO, {@link com.arangodb.util.RawJson} or {@link com.arangodb.util.RawBytes})
      * @return the documents and possible errors
      * @throws ArangoDBException
      */
@@ -197,7 +197,7 @@ <T> MultiDocumentEntity<DocumentCreateEntity<T>> insertDocuments(
      * Retrieves multiple documents with the given {@code _key} from the collection.
      *
      * @param keys    The keys of the documents
-     * @param type    The type of the documents (POJO class, VPackSlice or String for JSON)
+     * @param type    The type of the documents (POJO, {@link com.arangodb.util.RawJson} or {@link com.arangodb.util.RawBytes})
      * @param options Additional options, can be null
      * @return the documents and possible errors
      * @throws ArangoDBException
@@ -210,7 +210,7 @@ <T> MultiDocumentEntity<T> getDocuments(Collection<String> keys, Class<T> type,
      * precondition is violated
      *
      * @param key   The key of the document
-     * @param value A representation of a single document (POJO, VPackSlice or String for JSON)
+     * @param value A representation of a single document (POJO, {@link com.arangodb.util.RawJson} or {@link com.arangodb.util.RawBytes})
      * @return information about the document
      * @throws ArangoDBException
      * @see <a href="https://www.arangodb.com/docs/stable/http/document-working-with-documents.html#replace-document">API
@@ -223,7 +223,7 @@ <T> MultiDocumentEntity<T> getDocuments(Collection<String> keys, Class<T> type,
      * precondition is violated
      *
      * @param key     The key of the document
-     * @param value   A representation of a single document (POJO, VPackSlice or String for JSON)
+     * @param value   A representation of a single document (POJO, {@link com.arangodb.util.RawJson} or {@link com.arangodb.util.RawBytes})
      * @param options Additional options, can be null
      * @return information about the document
      * @throws ArangoDBException
@@ -240,7 +240,7 @@ <T> DocumentUpdateEntity<T> replaceDocument(String key, T value, DocumentReplace
      * Limitations:
      * - the fields having {@code null} value are always removed during serialization
      *
-     * @param values A List of documents (POJO, VPackSlice or String for JSON)
+     * @param values A List of documents (POJO, {@link com.arangodb.util.RawJson} or {@link com.arangodb.util.RawBytes})
      * @return information about the documents
      * @throws ArangoDBException
      * @see <a href="https://www.arangodb.com/docs/stable/http/document-working-with-documents.html#replace-documents">API
@@ -255,7 +255,7 @@ <T> DocumentUpdateEntity<T> replaceDocument(String key, T value, DocumentReplace
      * Limitations:
      * - the fields having {@code null} value are always removed during serialization
      *
-     * @param values  A List of documents (POJO, VPackSlice or String for JSON)
+     * @param values  A List of documents (POJO, {@link com.arangodb.util.RawJson} or {@link com.arangodb.util.RawBytes})
      * @param options Additional options, can be null
      * @return information about the documents
      * @throws ArangoDBException
@@ -271,7 +271,7 @@ <T> MultiDocumentEntity<DocumentUpdateEntity<T>> replaceDocuments(
      * they do not yet exist, and overwritten in the existing document if they do exist there.
      *
      * @param key   The key of the document
-     * @param value A representation of a single document (POJO, VPackSlice or String for JSON)
+     * @param value A representation of a single document (POJO, {@link com.arangodb.util.RawJson} or {@link com.arangodb.util.RawBytes})
      * @return information about the document
      * @throws ArangoDBException
      * @see <a href="https://www.arangodb.com/docs/stable/http/document-working-with-documents.html#update-document">API
@@ -285,7 +285,7 @@ <T> MultiDocumentEntity<DocumentUpdateEntity<T>> replaceDocuments(
      * they do not yet exist, and overwritten in the existing document if they do exist there.
      *
      * @param key     The key of the document
-     * @param value   A representation of a single document (POJO, VPackSlice or String for JSON)
+     * @param value   A representation of a single document (POJO, {@link com.arangodb.util.RawJson} or {@link com.arangodb.util.RawBytes})
      * @param options Additional options, can be null
      * @return information about the document
      * @throws ArangoDBException
@@ -301,7 +301,7 @@ <T> DocumentUpdateEntity<T> updateDocument(String key, T value, DocumentUpdateOp
      * they do not yet exist, and overwritten in the existing document if they do exist there.
      *
      * @param key        The key of the document
-     * @param value      A representation of a single document (POJO, VPackSlice or String for JSON)
+     * @param value      A representation of a single document (POJO, {@link com.arangodb.util.RawJson} or {@link com.arangodb.util.RawBytes})
      * @param options    Additional options, can be null
      * @param returnType Type of the returned newDocument and/or oldDocument
      * @return information about the document
@@ -318,7 +318,7 @@ <T, U> DocumentUpdateEntity<U> updateDocument(String key, T value, DocumentUpdat
      * attributes from the patch documents will be added to the existing documents if they do not yet exist, and
      * overwritten in the existing documents if they do exist there.
      *
-     * @param values A list of documents (POJO, VPackSlice or String for JSON)
+     * @param values A list of documents (POJO, {@link com.arangodb.util.RawJson} or {@link com.arangodb.util.RawBytes})
      * @return information about the documents
      * @throws ArangoDBException
      * @see <a href="https://www.arangodb.com/docs/stable/http/document-working-with-documents.html#update-documents">API
@@ -332,7 +332,7 @@ <T, U> DocumentUpdateEntity<U> updateDocument(String key, T value, DocumentUpdat
      * attributes from the patch documents will be added to the existing documents if they do not yet exist, and
      * overwritten in the existing documents if they do exist there.
      *
-     * @param values  A list of documents (POJO, VPackSlice or String for JSON)
+     * @param values  A list of documents (POJO, {@link com.arangodb.util.RawJson} or {@link com.arangodb.util.RawBytes})
      * @param options Additional options, can be null
      * @return information about the documents
      * @throws ArangoDBException
@@ -348,7 +348,7 @@ <T> MultiDocumentEntity<DocumentUpdateEntity<T>> updateDocuments(
      * attributes from the patch documents will be added to the existing documents if they do not yet exist, and
      * overwritten in the existing documents if they do exist there.
      *
-     * @param values     A list of documents (POJO, VPackSlice or String for JSON)
+     * @param values     A list of documents (POJO, {@link com.arangodb.util.RawJson} or {@link com.arangodb.util.RawBytes})
      * @param options    Additional options, can be null
      * @param returnType Type of the returned newDocument and/or oldDocument
      * @return information about the documents
@@ -374,7 +374,7 @@ <T, U> MultiDocumentEntity<DocumentUpdateEntity<U>> updateDocuments(
      * Deletes the document with the given {@code key} from the collection.
      *
      * @param key     The key of the document
-     * @param type    The type of the document (POJO class, VPackSlice or String for JSON). Only necessary if
+     * @param type    The type of the document (POJO, {@link com.arangodb.util.RawJson} or {@link com.arangodb.util.RawBytes}). Only necessary if
      *                options.returnOld is set to true, otherwise can be null.
      * @param options Additional options, can be null
      * @return information about the document
@@ -401,7 +401,7 @@ <T> DocumentDeleteEntity<T> deleteDocument(String key, Class<T> type, DocumentDe
      * Deletes multiple documents from the collection.
      *
      * @param values  The keys of the documents or the documents themselves
-     * @param type    The type of the documents (POJO class, VPackSlice or String for JSON). Only necessary if
+     * @param type    The type of the documents (POJO, {@link com.arangodb.util.RawJson} or {@link com.arangodb.util.RawBytes}). Only necessary if
      *                options.returnOld is set to true, otherwise can be null.
      * @param options Additional options, can be null
      * @return information about the documents

src/main/java/com/arangodb/ArangoCursor.java

@@ -20,8 +20,8 @@
 
 package com.arangodb;
 
-import com.arangodb.entity.CursorEntity.Stats;
-import com.arangodb.entity.CursorEntity.Warning;
+import com.arangodb.entity.CursorStats;
+import com.arangodb.entity.CursorWarning;
 
 import java.io.Closeable;
 import java.util.Collection;
@@ -53,12 +53,12 @@ public interface ArangoCursor<T> extends ArangoIterable<T>, ArangoIterator<T>, C
      * number of modified documents and the number of documents that could not be modified due to an error (if
      * ignoreErrors query option is specified)
      */
-    Stats getStats();
+    CursorStats getStats();
 
     /**
      * @return warnings which the query could have been produced
      */
-    Collection<Warning> getWarnings();
+    Collection<CursorWarning> getWarnings();
 
     /**
      * @return indicating whether the query result was served from the query cache or not