BaseDocument not serializable

Author: rashtao

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

@@ -26,7 +26,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
-import java.io.Serializable;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -36,9 +35,7 @@
  * @author Mark Vollmary
  * @author Michele Rastelli
  */
-abstract class AbstractBaseDocument implements Serializable {
-
-    private static final long serialVersionUID = 846874908582L;
+abstract class AbstractBaseDocument {
 
     private static final String[] META_PROPS = new String[]{
             DocumentFields.ID,

driver/src/main/java/com/arangodb/entity/BaseDocument.java

@@ -20,16 +20,13 @@
 
 package com.arangodb.entity;
 
-import java.io.Serializable;
 import java.util.Map;
 
 /**
  * @author Mark Vollmary
  * @author Michele Rastelli
  */
-public final class BaseDocument extends AbstractBaseDocument implements Serializable {
-
-    private static final long serialVersionUID = 733033350470L;
+public final class BaseDocument extends AbstractBaseDocument {
 
     public BaseDocument() {
         super();

driver/src/main/java/com/arangodb/entity/BaseEdgeDocument.java

@@ -23,16 +23,13 @@
 import com.arangodb.internal.DocumentFields;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
-import java.io.Serializable;
 import java.util.Map;
 
 /**
  * @author Mark Vollmary
  * @author Michele Rastelli
  */
-public final class BaseEdgeDocument extends AbstractBaseDocument implements Serializable {
-
-    private static final long serialVersionUID = 356629614444L;
+public final class BaseEdgeDocument extends AbstractBaseDocument {
 
     private static final String[] META_PROPS = new String[]{
             DocumentFields.ID,

driver/src/main/resources/META-INF/native-image/com.arangodb/arangodb-java-driver/serialization-config.json

@@ -1,16 +1,4 @@
 [
-  {
-    "name": "com.arangodb.entity.AbstractBaseDocument"
-  },
-  {
-    "name": "com.arangodb.entity.BaseDocument"
-  },
-  {
-    "name": "com.arangodb.entity.BaseEdgeDocument"
-  },
-  {
-    "name": "java.util.HashMap"
-  },
   {
     "name": "com.arangodb.entity.ErrorEntity"
   },

driver/src/test/java/com/arangodb/SerializableTest.java

@@ -1,31 +1,22 @@
 package com.arangodb;
 
-import com.arangodb.entity.BaseDocument;
 import com.arangodb.entity.ErrorEntity;
+import com.arangodb.internal.net.ArangoDBRedirectException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import org.junit.jupiter.api.Test;
 
 import java.io.*;
+import java.util.Collections;
+import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SerializableTest {
+class SerializableTest {
 
     @Test
-    public void serializeBaseDocument() throws IOException, ClassNotFoundException {
-        BaseDocument bd = new BaseDocument("poaids");
-        bd.setId("apdso/02193");
-        bd.setRevision("poip");
-        bd.addAttribute("aaa", "bbb");
-
-        BaseDocument bd2 = roundTrip(bd);
-        assertThat(bd).isEqualTo(bd2);
-    }
-
-    @Test
-    public void serializeArangoDBException() throws IOException, ClassNotFoundException {
+    void serializeArangoDBException() throws IOException, ClassNotFoundException {
         ObjectMapper mapper = new ObjectMapper();
         JsonNode jn = JsonNodeFactory.instance.objectNode()
                 .put("errorMessage", "boomError")
@@ -42,6 +33,23 @@ public void serializeArangoDBException() throws IOException, ClassNotFoundExcept
         assertThat(e2.getRequestId()).isEqualTo(e.getRequestId());
     }
 
+    @Test
+    void serializeArangoDBRedirectException() throws IOException, ClassNotFoundException {
+        ArangoDBRedirectException e = new ArangoDBRedirectException("foo", "bar");
+        ArangoDBRedirectException e2 = roundTrip(e);
+        assertThat(e2.getMessage()).isEqualTo(e.getMessage());
+        assertThat(e2.getLocation()).isEqualTo(e.getLocation());
+    }
+
+    @Test
+    void serializeArangoDBMultipleException() throws IOException, ClassNotFoundException {
+        List<Throwable> exceptions = Collections.singletonList(new RuntimeException("foo"));
+        ArangoDBMultipleException e = new ArangoDBMultipleException(exceptions);
+        ArangoDBMultipleException e2 = roundTrip(e);
+        assertThat(e2.getExceptions()).hasSize(1);
+        assertThat(e2.getExceptions().iterator().next().getMessage()).isEqualTo("foo");
+    }
+
     private <T> T roundTrip(T input) throws IOException, ClassNotFoundException {
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         ObjectOutputStream objectOutputStream = new ObjectOutputStream(os);

resilience-tests/pom.xml

@@ -11,6 +11,11 @@
 
     <artifactId>resilience-tests</artifactId>
 
+    <properties>
+        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.mock-server</groupId>

shaded-integration-tests/src/test/native/java/com/arangodb/SerializableTest.java

@@ -1,31 +1,22 @@
 package com.arangodb;
 
-import com.arangodb.entity.BaseDocument;
 import com.arangodb.entity.ErrorEntity;
+import com.arangodb.internal.net.ArangoDBRedirectException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import org.junit.jupiter.api.Test;
 
 import java.io.*;
+import java.util.Collections;
+import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SerializableTest {
+class SerializableTest {
 
     @Test
-    public void serializeBaseDocument() throws IOException, ClassNotFoundException {
-        BaseDocument bd = new BaseDocument("poaids");
-        bd.setId("apdso/02193");
-        bd.setRevision("poip");
-        bd.addAttribute("aaa", "bbb");
-
-        BaseDocument bd2 = roundTrip(bd);
-        assertThat(bd).isEqualTo(bd2);
-    }
-
-    @Test
-    public void serializeArangoDBException() throws IOException, ClassNotFoundException {
+    void serializeArangoDBException() throws IOException, ClassNotFoundException {
         ObjectMapper mapper = new ObjectMapper();
         JsonNode jn = JsonNodeFactory.instance.objectNode()
                 .put("errorMessage", "boomError")
@@ -42,6 +33,23 @@ public void serializeArangoDBException() throws IOException, ClassNotFoundExcept
         assertThat(e2.getRequestId()).isEqualTo(e.getRequestId());
     }
 
+    @Test
+    void serializeArangoDBRedirectException() throws IOException, ClassNotFoundException {
+        ArangoDBRedirectException e = new ArangoDBRedirectException("foo", "bar");
+        ArangoDBRedirectException e2 = roundTrip(e);
+        assertThat(e2.getMessage()).isEqualTo(e.getMessage());
+        assertThat(e2.getLocation()).isEqualTo(e.getLocation());
+    }
+
+    @Test
+    void serializeArangoDBMultipleException() throws IOException, ClassNotFoundException {
+        List<Throwable> exceptions = Collections.singletonList(new RuntimeException("foo"));
+        ArangoDBMultipleException e = new ArangoDBMultipleException(exceptions);
+        ArangoDBMultipleException e2 = roundTrip(e);
+        assertThat(e2.getExceptions()).hasSize(1);
+        assertThat(e2.getExceptions().iterator().next().getMessage()).isEqualTo("foo");
+    }
+
     private <T> T roundTrip(T input) throws IOException, ClassNotFoundException {
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         ObjectOutputStream objectOutputStream = new ObjectOutputStream(os);

shaded/src/main/resources/META-INF/native-image/com.arangodb/arangodb-java-driver-shaded/serialization-config.json

@@ -1,16 +1,4 @@
 [
-  {
-    "name": "com.arangodb.entity.AbstractBaseDocument"
-  },
-  {
-    "name": "com.arangodb.entity.BaseDocument"
-  },
-  {
-    "name": "com.arangodb.entity.BaseEdgeDocument"
-  },
-  {
-    "name": "java.util.HashMap"
-  },
   {
     "name": "com.arangodb.entity.ErrorEntity"
   },