support ArangoJsonNode converters

Author: rashtao

src/main/java/com/arangodb/springframework/core/mapping/ArangoSimpleTypes.java

@@ -33,6 +33,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import com.arangodb.springframework.core.convert.ArangoJsonNode;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
 
 import com.arangodb.springframework.core.convert.DBDocumentEntity;
@@ -51,8 +52,10 @@ public final class ArangoSimpleTypes {
 	static {
 		final Set<Class<?>> simpleTypes = new HashSet<>();
 
-		// com.arangodb.*
 		simpleTypes.add(JsonNode.class);
+
+		// com.arangodb.*
+		simpleTypes.add(ArangoJsonNode.class);
 		simpleTypes.add(DBDocumentEntity.class);
 
 		// java.math.*

src/test/java/com/arangodb/springframework/ArangoMultiTenancyRepositoryTestConfiguration.java

@@ -64,6 +64,7 @@ public String database() {
 		converters.add(new CustomMappingTest.CustomJsonNodeWriteTestConverter());
 		converters.add(new CustomMappingTest.CustomDBEntityReadTestConverter());
 		converters.add(new CustomMappingTest.CustomDBEntityWriteTestConverter());
+		converters.add(new CustomMappingTest.CustomArangoJsonNodeReadTestConverter());
 		return converters;
 	}
 

src/test/java/com/arangodb/springframework/ArangoMultiTenancyTestConfiguration.java

@@ -59,6 +59,7 @@ public String database() {
 		converters.add(new CustomMappingTest.CustomJsonNodeWriteTestConverter());
 		converters.add(new CustomMappingTest.CustomDBEntityReadTestConverter());
 		converters.add(new CustomMappingTest.CustomDBEntityWriteTestConverter());
+		converters.add(new CustomMappingTest.CustomArangoJsonNodeReadTestConverter());
 		return converters;
 	}
 

src/test/java/com/arangodb/springframework/ArangoTestConfiguration.java

@@ -87,6 +87,7 @@ public String database() {
         converters.add(new CustomMappingTest.CustomJsonNodeWriteTestConverter());
         converters.add(new CustomMappingTest.CustomDBEntityReadTestConverter());
         converters.add(new CustomMappingTest.CustomDBEntityWriteTestConverter());
+        converters.add(new CustomMappingTest.CustomArangoJsonNodeReadTestConverter());
         return converters;
     }
 

src/test/java/com/arangodb/springframework/core/mapping/CustomMappingTest.java

@@ -27,8 +27,11 @@
 import java.util.Optional;
 
 import com.arangodb.ArangoCollection;
+import com.arangodb.springframework.core.convert.ArangoJsonNode;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import lombok.AllArgsConstructor;
+import lombok.Data;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.convert.converter.Converter;
 
@@ -83,6 +86,13 @@ public void setValue(final String value) {
 
     }
 
+    @Data
+    @AllArgsConstructor
+    @Document
+    public static class CustomArangoJsonNodeTestEntity {
+        private String value;
+    }
+
     public static class CustomJsonNodeWriteTestConverter implements Converter<CustomJsonNodeTestEntity, JsonNode> {
         @Override
         public JsonNode convert(final CustomJsonNodeTestEntity source) {
@@ -97,6 +107,13 @@ public CustomJsonNodeTestEntity convert(final JsonNode source) {
         }
     }
 
+    public static class CustomArangoJsonNodeReadTestConverter implements Converter<ArangoJsonNode, CustomArangoJsonNodeTestEntity> {
+        @Override
+        public CustomArangoJsonNodeTestEntity convert(final ArangoJsonNode source) {
+            return new CustomArangoJsonNodeTestEntity(source.value().get(FIELD).textValue());
+        }
+    }
+
     @Test
     public void customToJsonNode() {
         final DocumentEntity meta = template.insert(new CustomJsonNodeTestEntity("abc"));
@@ -114,6 +131,14 @@ public void jsonNodeToCustom() {
         assertThat(doc.get().getValue(), is("abc"));
     }
 
+    @Test
+    public void arangoJsonNodeToCustom() {
+        final DocumentEntity meta = template.insert(new TestEntity("abc"));
+        final Optional<CustomArangoJsonNodeTestEntity> doc = template.find(meta.getId(), CustomArangoJsonNodeTestEntity.class);
+        assertThat(doc.isPresent(), is(true));
+        assertThat(doc.get().getValue(), is("abc"));
+    }
+
     @Test
     public void customToJsonNodeFromDriver() {
         ArangoCollection col = db.collection("customJsonNodeTestEntity");
@@ -131,6 +156,14 @@ public void jsonNodeToCustomFromDriver() {
         assertThat(doc.getValue(), is("abc"));
     }
 
+    @Test
+    public void arangoJsonNodeToCustomFromDriver() {
+        ArangoCollection col = db.collection("testEntity");
+        final DocumentEntity meta = col.insertDocument(new TestEntity("abc"));
+        final CustomArangoJsonNodeTestEntity doc = col.getDocument(meta.getKey(), CustomArangoJsonNodeTestEntity.class);
+        assertThat(doc.getValue(), is("abc"));
+    }
+
     @Document()
     public static class CustomDBEntityTestEntity {
         private String value;