TxJsonNode

Author: rashtao

src/main/java/com/arangodb/springframework/config/ArangoConfiguration.java

@@ -93,7 +93,7 @@ public <T> T deserialize(byte[] content, Class<T> clazz) {
             @Override
             public <T> T deserialize(byte[] content, Class<T> clazz, RequestContext ctx) {
                 try {
-                    return converter.read(clazz, om.readTree(content), new TransactionMappingContext(ctx));
+                    return converter.read(clazz, new TxJsonNode(om.readTree(content), new TransactionMappingContext(ctx)));
                 } catch (Exception e) {
                     throw new MappingException("Exception while deserializing.", e);
                 }

src/main/java/com/arangodb/springframework/core/convert/ArangoEntityReader.java

@@ -21,25 +21,17 @@
 package com.arangodb.springframework.core.convert;
 
 import com.arangodb.springframework.core.mapping.TransactionMappingContext;
-
 import com.fasterxml.jackson.databind.JsonNode;
+import org.springframework.data.convert.EntityReader;
 
 /**
  * @author Mark Vollmary
  * @author Christian Lechner
  */
-public interface ArangoEntityReader {
+public interface ArangoEntityReader extends EntityReader<Object, TxJsonNode> {
 
-    // FIXME: remove
     default <R> R read(Class<R> type, JsonNode source) {
-        return read(type, source, TransactionMappingContext.EMPTY);
+        return read(type, new TxJsonNode(source, TransactionMappingContext.EMPTY));
     }
 
-    /**
-     * Reads the given source into the given type.
-     *
-     * @param type   they type to convert the given source to.
-     * @param source the source to create an object of the given type from.
-     */
-    <R> R read(Class<R> type, JsonNode source, TransactionMappingContext ctx);
 }

src/main/java/com/arangodb/springframework/core/convert/DefaultArangoConverter.java

@@ -0,0 +1,13 @@
+package com.arangodb.springframework.core.convert;
+
+import com.arangodb.springframework.core.mapping.TransactionMappingContext;
+import com.fasterxml.jackson.databind.JsonNode;
+
+/**
+ * JsonNode with TransactionMappingContext
+ */
+public record TxJsonNode(
+        JsonNode value,
+        TransactionMappingContext transactionContext
+) {
+}

src/main/java/com/arangodb/springframework/core/convert/TxJsonNode.java

@@ -23,8 +23,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import com.arangodb.springframework.core.convert.TxJsonNode;
 import com.arangodb.springframework.core.mapping.ArangoMappingContext;
-import com.fasterxml.jackson.databind.JsonNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.repository.query.RepositoryQuery;
@@ -186,7 +186,7 @@ private Class<?> getTypeToRead(final ResultProcessor processor) {
 		}
 
 		if (method.isGeoQuery()) {
-			return JsonNode.class;
+			return TxJsonNode.class;
 		}
 
 		final Class<?> typeToRead = processor.getReturnedType().getTypeToRead();

src/main/java/com/arangodb/springframework/repository/query/AbstractArangoQuery.java

@@ -29,6 +29,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
+import com.arangodb.springframework.core.convert.TxJsonNode;
 import com.fasterxml.jackson.databind.JsonNode;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -142,20 +143,21 @@ private GeoResult<?> buildGeoResult(final ArangoCursor<?> cursor) {
         // FIXME
         while (cursor.hasNext() && geoResult == null) {
             final Object object = cursor.next();
-            if (!(object instanceof JsonNode)) {
+            if (!(object instanceof TxJsonNode)) {
                 // FIXME
                 continue;
             }
 
-            final JsonNode slice = (JsonNode) object;
+            final TxJsonNode data = (TxJsonNode) object;
+            final JsonNode slice = data.value();
             final JsonNode distSlice = slice.get("_distance");
             final Double distanceInMeters = distSlice.isDouble() ? distSlice.doubleValue() : null;
             if (distanceInMeters == null) {
                 // FIXME
                 continue;
             }
 
-            final Object entity = operations.getConverter().read(domainClass, slice);
+            final Object entity = operations.getConverter().read(domainClass, data);
             final Distance distance = new Distance(distanceInMeters / 1000, Metrics.KILOMETERS);
             geoResult = new GeoResult<>(entity, distance);
         }
@@ -169,20 +171,21 @@ private GeoResult<?> buildGeoResult(final ArangoCursor<?> cursor) {
      * @return GeoResult object
      */
     private GeoResult<?> buildGeoResult(final Object object) {
-        if (object == null || !(object instanceof JsonNode)) {
+        if (object == null || !(object instanceof TxJsonNode)) {
             // FIXME
             return null;
         }
 
-        final JsonNode slice = (JsonNode) object;
+        final TxJsonNode data = (TxJsonNode) object;
+        final JsonNode slice = data.value();
         final JsonNode distSlice = slice.get("_distance");
         final Double distanceInMeters = distSlice.isDouble() ? distSlice.doubleValue() : null;
         if (distanceInMeters == null) {
             // FIXME
             return null;
         }
 
-        final Object entity = operations.getConverter().read(domainClass, slice);
+        final Object entity = operations.getConverter().read(domainClass, data);
         final Distance distance = new Distance(distanceInMeters / 1000, Metrics.KILOMETERS);
         return new GeoResult<>(entity, distance);
     }

src/main/java/com/arangodb/springframework/repository/query/ArangoResultConverter.java

@@ -235,7 +235,7 @@ public void geoMapping() throws JSONException, JsonProcessingException {
         String jsonString = jsonMapper.writeValueAsString(written);
         JSONObject json = new JSONObject(jsonString);
 
-        GeoTestEntity read = converter.read(GeoTestEntity.class, written, TransactionMappingContext.EMPTY);
+        GeoTestEntity read = converter.read(GeoTestEntity.class, written);
         assertThat(read.geoJson, is(entity.geoJson));
         JSONAssert.assertEquals(
                 "{ type: Point, coordinates: [1.1, 2.2] }",