Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DE-771] stream transactions mapping #303

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[DE-771] stream transactions mapping #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 22 additions & 34 deletions src/main/java/com/arangodb/springframework/config/ArangoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,19 @@
*/
package com.arangodb.springframework.config;

import java.io.IOException;
import java.lang.annotation.Annotation;
import java.util.Collection;
import java.util.Collections;
import java.util.Optional;
import java.util.Set;

import com.arangodb.ArangoDB;
import com.arangodb.ArangoDBException;
import com.arangodb.ContentType;
import com.arangodb.RequestContext;
import com.arangodb.serde.ArangoSerde;
import com.arangodb.serde.jackson.JacksonMapperProvider;
import com.arangodb.springframework.annotation.*;
import com.arangodb.springframework.core.ArangoOperations;
import com.arangodb.springframework.core.convert.*;
import com.arangodb.springframework.core.convert.resolver.*;
import com.arangodb.springframework.core.mapping.ArangoMappingContext;
import com.arangodb.springframework.core.mapping.TransactionMappingContext;
import com.arangodb.springframework.core.template.ArangoTemplate;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.context.annotation.Bean;
Expand All @@ -22,31 +25,11 @@
import org.springframework.data.mapping.model.FieldNamingStrategy;
import org.springframework.data.mapping.model.PropertyNameFieldNamingStrategy;

import com.arangodb.ArangoDB;
import com.arangodb.ArangoDBException;
import com.arangodb.springframework.annotation.Document;
import com.arangodb.springframework.annotation.Edge;
import com.arangodb.springframework.annotation.From;
import com.arangodb.springframework.annotation.Ref;
import com.arangodb.springframework.annotation.Relations;
import com.arangodb.springframework.annotation.To;
import com.arangodb.springframework.core.ArangoOperations;
import com.arangodb.springframework.core.convert.ArangoConverter;
import com.arangodb.springframework.core.convert.ArangoCustomConversions;
import com.arangodb.springframework.core.convert.ArangoTypeMapper;
import com.arangodb.springframework.core.convert.DefaultArangoConverter;
import com.arangodb.springframework.core.convert.DefaultArangoTypeMapper;
import com.arangodb.springframework.core.convert.resolver.DocumentFromResolver;
import com.arangodb.springframework.core.convert.resolver.DocumentToResolver;
import com.arangodb.springframework.core.convert.resolver.EdgeFromResolver;
import com.arangodb.springframework.core.convert.resolver.EdgeToResolver;
import com.arangodb.springframework.core.convert.resolver.RefResolver;
import com.arangodb.springframework.core.convert.resolver.ReferenceResolver;
import com.arangodb.springframework.core.convert.resolver.RelationResolver;
import com.arangodb.springframework.core.convert.resolver.RelationsResolver;
import com.arangodb.springframework.core.convert.resolver.ResolverFactory;
import com.arangodb.springframework.core.mapping.ArangoMappingContext;
import com.arangodb.springframework.core.template.ArangoTemplate;
import java.lang.annotation.Annotation;
import java.util.Collection;
import java.util.Collections;
import java.util.Optional;
import java.util.Set;

/**
* Defines methods to customize the Java-based configuration for Spring Data
Expand Down Expand Up @@ -104,9 +87,14 @@ public byte[] serialize(Object value) {

@Override
public <T> T deserialize(byte[] content, Class<T> clazz) {
return deserialize(content, clazz, RequestContext.EMPTY);
}

@Override
public <T> T deserialize(byte[] content, Class<T> clazz, RequestContext ctx) {
try {
return converter.read(clazz, om.readTree(content));
} catch (IOException e) {
return converter.read(clazz, new ArangoJsonNode(om.readTree(content), new TransactionMappingContext(ctx)));
} catch (Exception e) {
throw new MappingException("Exception while deserializing.", e);
}
}
Expand Down
10 changes: 7 additions & 3 deletions src/main/java/com/arangodb/springframework/core/convert/ArangoEntityReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,18 @@

package com.arangodb.springframework.core.convert;

import org.springframework.data.convert.EntityReader;

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 extends EntityReader<Object, JsonNode> {
public interface ArangoEntityReader extends EntityReader<Object, ArangoJsonNode> {

default <R> R read(Class<R> type, JsonNode source) {
return read(type, new ArangoJsonNode(source, TransactionMappingContext.EMPTY));
}

}
13 changes: 13 additions & 0 deletions src/main/java/com/arangodb/springframework/core/convert/ArangoJsonNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 ArangoJsonNode(
JsonNode value,
TransactionMappingContext transactionContext
) {
}
Loading