|
3 | 3 | */
|
4 | 4 | package com.arangodb.springframework.config;
|
5 | 5 |
|
6 |
| -import java.io.IOException; |
7 |
| -import java.lang.annotation.Annotation; |
8 |
| -import java.util.Collection; |
9 |
| -import java.util.Collections; |
10 |
| -import java.util.Optional; |
11 |
| -import java.util.Set; |
12 |
| - |
| 6 | +import com.arangodb.ArangoDB; |
| 7 | +import com.arangodb.ArangoDBException; |
13 | 8 | import com.arangodb.ContentType;
|
| 9 | +import com.arangodb.RequestContext; |
14 | 10 | import com.arangodb.serde.ArangoSerde;
|
15 | 11 | import com.arangodb.serde.jackson.JacksonMapperProvider;
|
| 12 | +import com.arangodb.springframework.annotation.*; |
| 13 | +import com.arangodb.springframework.core.ArangoOperations; |
| 14 | +import com.arangodb.springframework.core.convert.*; |
| 15 | +import com.arangodb.springframework.core.convert.resolver.*; |
| 16 | +import com.arangodb.springframework.core.mapping.ArangoMappingContext; |
| 17 | +import com.arangodb.springframework.core.mapping.TransactionMappingContext; |
| 18 | +import com.arangodb.springframework.core.template.ArangoTemplate; |
16 | 19 | import com.fasterxml.jackson.core.JsonProcessingException;
|
17 | 20 | import com.fasterxml.jackson.databind.ObjectMapper;
|
18 | 21 | import org.springframework.context.annotation.Bean;
|
|
22 | 25 | import org.springframework.data.mapping.model.FieldNamingStrategy;
|
23 | 26 | import org.springframework.data.mapping.model.PropertyNameFieldNamingStrategy;
|
24 | 27 |
|
25 |
| -import com.arangodb.ArangoDB; |
26 |
| -import com.arangodb.ArangoDBException; |
27 |
| -import com.arangodb.springframework.annotation.Document; |
28 |
| -import com.arangodb.springframework.annotation.Edge; |
29 |
| -import com.arangodb.springframework.annotation.From; |
30 |
| -import com.arangodb.springframework.annotation.Ref; |
31 |
| -import com.arangodb.springframework.annotation.Relations; |
32 |
| -import com.arangodb.springframework.annotation.To; |
33 |
| -import com.arangodb.springframework.core.ArangoOperations; |
34 |
| -import com.arangodb.springframework.core.convert.ArangoConverter; |
35 |
| -import com.arangodb.springframework.core.convert.ArangoCustomConversions; |
36 |
| -import com.arangodb.springframework.core.convert.ArangoTypeMapper; |
37 |
| -import com.arangodb.springframework.core.convert.DefaultArangoConverter; |
38 |
| -import com.arangodb.springframework.core.convert.DefaultArangoTypeMapper; |
39 |
| -import com.arangodb.springframework.core.convert.resolver.DocumentFromResolver; |
40 |
| -import com.arangodb.springframework.core.convert.resolver.DocumentToResolver; |
41 |
| -import com.arangodb.springframework.core.convert.resolver.EdgeFromResolver; |
42 |
| -import com.arangodb.springframework.core.convert.resolver.EdgeToResolver; |
43 |
| -import com.arangodb.springframework.core.convert.resolver.RefResolver; |
44 |
| -import com.arangodb.springframework.core.convert.resolver.ReferenceResolver; |
45 |
| -import com.arangodb.springframework.core.convert.resolver.RelationResolver; |
46 |
| -import com.arangodb.springframework.core.convert.resolver.RelationsResolver; |
47 |
| -import com.arangodb.springframework.core.convert.resolver.ResolverFactory; |
48 |
| -import com.arangodb.springframework.core.mapping.ArangoMappingContext; |
49 |
| -import com.arangodb.springframework.core.template.ArangoTemplate; |
| 28 | +import java.lang.annotation.Annotation; |
| 29 | +import java.util.Collection; |
| 30 | +import java.util.Collections; |
| 31 | +import java.util.Optional; |
| 32 | +import java.util.Set; |
50 | 33 |
|
51 | 34 | /**
|
52 | 35 | * Defines methods to customize the Java-based configuration for Spring Data
|
@@ -104,9 +87,14 @@ public byte[] serialize(Object value) {
|
104 | 87 |
|
105 | 88 | @Override
|
106 | 89 | public <T> T deserialize(byte[] content, Class<T> clazz) {
|
| 90 | + return deserialize(content, clazz, RequestContext.EMPTY); |
| 91 | + } |
| 92 | + |
| 93 | + @Override |
| 94 | + public <T> T deserialize(byte[] content, Class<T> clazz, RequestContext ctx) { |
107 | 95 | try {
|
108 |
| - return converter.read(clazz, om.readTree(content)); |
109 |
| - } catch (IOException e) { |
| 96 | + return converter.read(clazz, new ArangoJsonNode(om.readTree(content), new TransactionMappingContext(ctx))); |
| 97 | + } catch (Exception e) { |
110 | 98 | throw new MappingException("Exception while deserializing.", e);
|
111 | 99 | }
|
112 | 100 | }
|
|
0 commit comments