Skip to content

Commit 7b29bff

Browse files
rashtaorashtao
authored
Mapping refactoring (#311)
* added changes from #303 * added test changes from #303
1 parent 6d4e94e commit 7b29bff

35 files changed

+746
-337
lines changed

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

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
/**
2828
* @author Mark Vollmary
2929
* @author Christian Lechner
30-
*
3130
*/
3231
public interface ArangoEntityReader extends EntityReader<Object, JsonNode> {
3332

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

+11-11
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,8 @@ private void readProperty(
222222
final String parentId,
223223
final PersistentPropertyAccessor<?> accessor,
224224
final JsonNode source,
225-
final ArangoPersistentProperty property) {
226-
225+
final ArangoPersistentProperty property
226+
) {
227227
Object propertyValue = readPropertyValue(entity, parentId, source, property);
228228
if (propertyValue != null || !property.getType().isPrimitive()) {
229229
accessor.setProperty(property, propertyValue);
@@ -234,8 +234,8 @@ private Object readPropertyValue(
234234
final ArangoPersistentEntity<?> entity,
235235
final String parentId,
236236
final JsonNode source,
237-
final ArangoPersistentProperty property) {
238-
237+
final ArangoPersistentProperty property
238+
) {
239239
Optional<Ref> ref = property.getRef();
240240
if (ref.isPresent()) {
241241
return readReference(source, property, ref.get()).orElse(null);
@@ -329,8 +329,8 @@ private Object readArray(final TypeInformation<?> type, final JsonNode source) {
329329
private Optional<Object> readReference(
330330
final JsonNode source,
331331
final ArangoPersistentProperty property,
332-
final Annotation annotation) {
333-
332+
final Annotation annotation
333+
) {
334334
if (source.isMissingNode() || source.isNull()) {
335335
return Optional.empty();
336336
}
@@ -366,8 +366,8 @@ private <A extends Annotation> Optional<Object> readRelation(
366366
final String parentId,
367367
final JsonNode source,
368368
final ArangoPersistentProperty property,
369-
final A annotation) {
370-
369+
final A annotation
370+
) {
371371
if (source.isNull()) {
372372
return Optional.empty();
373373
}
@@ -505,8 +505,8 @@ private DBDocumentEntity readDBDocumentEntity(final JsonNode source) {
505505

506506
private ParameterValueProvider<ArangoPersistentProperty> getParameterProvider(
507507
final ArangoPersistentEntity<?> entity,
508-
final JsonNode source) {
509-
508+
final JsonNode source
509+
) {
510510
PropertyValueProvider<ArangoPersistentProperty> provider = new ArangoPropertyValueProvider(entity, source);
511511
return new PersistentEntityParameterValueProvider<>(entity, provider, null);
512512
}
@@ -781,7 +781,7 @@ private Optional<String> getRefId(final Object source, final ArangoPersistentEnt
781781
.map(key -> {
782782
if (annotation != null) {
783783
return resolverFactory.getReferenceResolver(annotation)
784-
.map(resolver -> resolver.write(source, entity, convertId(key), annotation))
784+
.map(resolver -> resolver.write(source, entity, convertId(key)))
785785
.orElseThrow(() -> new IllegalArgumentException("Missing reference resolver for " + annotation));
786786
} else {
787787
return MetadataUtils.createIdFromCollectionAndKey(entity.getCollection(), convertId(key));

‎src/main/java/com/arangodb/springframework/core/convert/resolver/AbstractResolver.java

+9-20
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
package com.arangodb.springframework.core.convert.resolver;
2222

2323
import java.io.Serializable;
24-
import java.lang.annotation.Annotation;
2524
import java.lang.reflect.Method;
25+
import java.util.function.Supplier;
2626

2727
import org.aopalliance.intercept.MethodInvocation;
2828
import org.springframework.aop.framework.ProxyFactory;
@@ -39,9 +39,8 @@
3939
/**
4040
* @author Mark Vollmary
4141
* @author Christian Lechner
42-
*
4342
*/
44-
public abstract class AbstractResolver<A extends Annotation> {
43+
public abstract class AbstractResolver {
4544

4645
private static final Method GET_ENTITY_METHOD;
4746
private static final Method GET_REF_ID_METHOD;
@@ -66,19 +65,11 @@ protected AbstractResolver(final ConversionService conversionService) {
6665
this.objenesis = new ObjenesisStd(true);
6766
}
6867

69-
public interface ResolverCallback<A extends Annotation> {
70-
71-
Object resolve(String id, TypeInformation<?> type, A annotation);
72-
73-
}
74-
75-
@SuppressWarnings({ "rawtypes", "unchecked" })
7668
protected Object proxy(
7769
final String id,
7870
final TypeInformation<?> type,
79-
final A annotation,
80-
final ResolverCallback<A> callback) {
81-
final ProxyInterceptor interceptor = new ProxyInterceptor(id, type, annotation, callback, conversionService);
71+
final Supplier<Object> callback) {
72+
final ProxyInterceptor interceptor = new ProxyInterceptor(id, type, callback, conversionService);
8273
if (type.getType().isInterface()) {
8374
final ProxyFactory proxyFactory = new ProxyFactory(new Class<?>[] { type.getType() });
8475
for (final Class<?> interf : type.getType().getInterfaces()) {
@@ -102,24 +93,22 @@ private Class<?> enhancedTypeFor(final Class<?> type) {
10293
return enhancer.createClass();
10394
}
10495

105-
static class ProxyInterceptor<A extends Annotation> implements Serializable,
96+
static class ProxyInterceptor implements Serializable,
10697
org.springframework.cglib.proxy.MethodInterceptor, org.aopalliance.intercept.MethodInterceptor {
10798

10899
private static final long serialVersionUID = -6722757823918987065L;
109100
private final String id;
110101
final TypeInformation<?> type;
111-
private final A annotation;
112-
private final ResolverCallback<A> callback;
102+
private final Supplier<Object> callback;
113103
private volatile boolean resolved;
114104
private Object result;
115105
private final ConversionService conversionService;
116106

117-
public ProxyInterceptor(final String id, final TypeInformation<?> type, final A annotation,
118-
final ResolverCallback<A> callback, final ConversionService conversionService) {
107+
public ProxyInterceptor(final String id, final TypeInformation<?> type,
108+
final Supplier<Object> callback, final ConversionService conversionService) {
119109
super();
120110
this.id = id;
121111
this.type = type;
122-
this.annotation = annotation;
123112
this.callback = callback;
124113
this.conversionService = conversionService;
125114
result = null;
@@ -178,7 +167,7 @@ private Object ensureResolved() {
178167

179168
private synchronized Object resolve() {
180169
if (!resolved) {
181-
return convertIfNecessary(callback.resolve(id, type, annotation), type.getType());
170+
return convertIfNecessary(callback.get(), type.getType());
182171
}
183172
return result;
184173
}

‎src/main/java/com/arangodb/springframework/core/convert/resolver/DocumentFromResolver.java

+33-32
Original file line numberDiff line numberDiff line change
@@ -30,49 +30,50 @@
3030
import java.util.Collection;
3131
import java.util.HashMap;
3232
import java.util.Map;
33+
import java.util.function.Supplier;
3334

3435
/**
3536
* @author Mark Vollmary
3637
* @author Christian Lechner
37-
*
3838
*/
39-
public class DocumentFromResolver extends AbstractResolver<From> implements RelationResolver<From> {
39+
public class DocumentFromResolver extends AbstractResolver implements RelationResolver<From> {
4040

41-
private final ArangoOperations template;
41+
private final ArangoOperations template;
4242

43-
public DocumentFromResolver(final ArangoOperations template) {
44-
super(template.getConverter().getConversionService());
45-
this.template = template;
46-
}
43+
public DocumentFromResolver(final ArangoOperations template) {
44+
super(template.getConverter().getConversionService());
45+
this.template = template;
46+
}
4747

48-
@Override
49-
public Object resolveOne(final String id, final TypeInformation<?> type, Collection<TypeInformation<?>> traversedTypes, final From annotation) {
50-
return annotation.lazy() ? proxy(id, type, annotation, (i, t, a) -> _resolveOne(i, t))
51-
: _resolveOne(id, type);
52-
}
48+
@Override
49+
public Object resolveOne(final String id, final TypeInformation<?> type, Collection<TypeInformation<?>> traversedTypes,
50+
final From annotation) {
51+
Supplier<Object> supplier = () -> _resolveOne(id, type);
52+
return annotation.lazy() ? proxy(id, type, supplier) : supplier.get();
53+
}
5354

54-
private Object _resolveOne(final String id, final TypeInformation<?> type) {
55-
ArangoCursor<?> it = _resolve(id, type.getType(), true);
56-
return it.hasNext() ? it.next() : null;
57-
}
55+
private Object _resolveOne(final String id, final TypeInformation<?> type) {
56+
ArangoCursor<?> it = _resolve(id, type.getType(), true);
57+
return it.hasNext() ? it.next() : null;
58+
}
5859

59-
@Override
60-
public Object resolveMultiple(final String id, final TypeInformation<?> type, Collection<TypeInformation<?>> traversedTypes, final From annotation) {
61-
return annotation.lazy() ? proxy(id, type, annotation, (i, t, a) -> _resolveMultiple(i, t))
62-
: _resolveMultiple(id, type);
63-
}
60+
@Override
61+
public Object resolveMultiple(final String id, final TypeInformation<?> type, Collection<TypeInformation<?>> traversedTypes,
62+
final From annotation) {
63+
Supplier<Object> supplier = () -> _resolveMultiple(id, type);
64+
return annotation.lazy() ? proxy(id, type, supplier) : supplier.get();
65+
}
6466

65-
private Object _resolveMultiple(final String id, final TypeInformation<?> type) {
66-
return _resolve(id, getNonNullComponentType(type).getType(), false).asListRemaining();
67-
}
67+
private Object _resolveMultiple(final String id, final TypeInformation<?> type) {
68+
return _resolve(id, getNonNullComponentType(type).getType(), false).asListRemaining();
69+
}
6870

69-
private ArangoCursor<?> _resolve(final String id, final Class<?> type, final boolean limit) {
70-
final String query = String.format("FOR e IN @@edge FILTER e._from == @id %s RETURN e", limit ? "LIMIT 1" : "");
71-
Map<String, Object> bindVars = new HashMap<>();
72-
bindVars.put("@edge", type);
73-
bindVars.put("id", id);
74-
return template.query(query, bindVars, new AqlQueryOptions(),
75-
type);
76-
}
71+
private ArangoCursor<?> _resolve(final String id, final Class<?> type, final boolean limit) {
72+
final String query = String.format("FOR e IN @@edge FILTER e._from == @id %s RETURN e", limit ? "LIMIT 1" : "");
73+
Map<String, Object> bindVars = new HashMap<>();
74+
bindVars.put("@edge", type);
75+
bindVars.put("id", id);
76+
return template.query(query, bindVars, new AqlQueryOptions(), type);
77+
}
7778

7879
}

‎src/main/java/com/arangodb/springframework/core/convert/resolver/DocumentToResolver.java

+33-30
Original file line numberDiff line numberDiff line change
@@ -30,47 +30,50 @@
3030
import java.util.Collection;
3131
import java.util.HashMap;
3232
import java.util.Map;
33+
import java.util.function.Supplier;
3334

3435
/**
3536
* @author Mark Vollmary
3637
* @author Christian Lechner
37-
*
3838
*/
39-
public class DocumentToResolver extends AbstractResolver<To> implements RelationResolver<To> {
39+
public class DocumentToResolver extends AbstractResolver implements RelationResolver<To> {
4040

41-
private final ArangoOperations template;
41+
private final ArangoOperations template;
4242

43-
public DocumentToResolver(final ArangoOperations template) {
44-
super(template.getConverter().getConversionService());
45-
this.template = template;
46-
}
43+
public DocumentToResolver(final ArangoOperations template) {
44+
super(template.getConverter().getConversionService());
45+
this.template = template;
46+
}
4747

48-
@Override
49-
public Object resolveOne(final String id, final TypeInformation<?> type, Collection<TypeInformation<?>> traversedTypes, final To annotation) {
50-
return annotation.lazy() ? proxy(id, type, annotation, (i, t, a) -> _resolveOne(i, t)) : _resolveOne(id, type);
51-
}
48+
@Override
49+
public Object resolveOne(final String id, final TypeInformation<?> type, Collection<TypeInformation<?>> traversedTypes,
50+
final To annotation) {
51+
Supplier<Object> supplier = () -> _resolveOne(id, type);
52+
return annotation.lazy() ? proxy(id, type, supplier) : supplier.get();
53+
}
5254

53-
private Object _resolveOne(final String id, final TypeInformation<?> type) {
54-
ArangoCursor<?> it = _resolve(id, type.getType(), true);
55-
return it.hasNext() ? it.next() : null;
56-
}
55+
private Object _resolveOne(final String id, final TypeInformation<?> type) {
56+
ArangoCursor<?> it = _resolve(id, type.getType(), true);
57+
return it.hasNext() ? it.next() : null;
58+
}
5759

58-
@Override
59-
public Object resolveMultiple(final String id, final TypeInformation<?> type, Collection<TypeInformation<?>> traversedTypes, final To annotation) {
60-
return annotation.lazy() ? proxy(id, type, annotation, (i, t, a) -> _resolveMultiple(i, t))
61-
: _resolveMultiple(id, type);
62-
}
60+
@Override
61+
public Object resolveMultiple(final String id, final TypeInformation<?> type, Collection<TypeInformation<?>> traversedTypes,
62+
final To annotation) {
63+
Supplier<Object> supplier = () -> _resolveMultiple(id, type);
64+
return annotation.lazy() ? proxy(id, type, supplier) : supplier.get();
65+
}
6366

64-
private Object _resolveMultiple(final String id, final TypeInformation<?> type) {
65-
return _resolve(id, getNonNullComponentType(type).getType(), false).asListRemaining();
66-
}
67+
private Object _resolveMultiple(final String id, final TypeInformation<?> type) {
68+
return _resolve(id, getNonNullComponentType(type).getType(), false).asListRemaining();
69+
}
6770

68-
private ArangoCursor<?> _resolve(final String id, final Class<?> type, final boolean limit) {
69-
final String query = String.format("FOR e IN @@edge FILTER e._to == @id %s RETURN e", limit ? "LIMIT 1" : "");
70-
Map<String, Object> bindVars = new HashMap<>();
71-
bindVars.put("@edge", type);
72-
bindVars.put("id", id);
73-
return template.query(query, bindVars, new AqlQueryOptions(), type);
74-
}
71+
private ArangoCursor<?> _resolve(final String id, final Class<?> type, final boolean limit) {
72+
final String query = String.format("FOR e IN @@edge FILTER e._to == @id %s RETURN e", limit ? "LIMIT 1" : "");
73+
Map<String, Object> bindVars = new HashMap<>();
74+
bindVars.put("@edge", type);
75+
bindVars.put("id", id);
76+
return template.query(query, bindVars, new AqlQueryOptions(), type);
77+
}
7578

7679
}

‎src/main/java/com/arangodb/springframework/core/convert/resolver/EdgeFromResolver.java

+8-5
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
import com.arangodb.springframework.core.ArangoOperations;
2727

2828
import java.util.Collection;
29+
import java.util.function.Supplier;
2930

3031
/**
3132
* @author Mark Vollmary
32-
*
3333
*/
34-
public class EdgeFromResolver extends AbstractResolver<From> implements RelationResolver<From> {
34+
public class EdgeFromResolver extends AbstractResolver implements RelationResolver<From> {
3535

3636
private final ArangoOperations template;
3737

@@ -41,8 +41,10 @@ public EdgeFromResolver(final ArangoOperations template) {
4141
}
4242

4343
@Override
44-
public Object resolveOne(final String id, final TypeInformation<?> type, Collection<TypeInformation<?>> traversedTypes, final From annotation) {
45-
return annotation.lazy() ? proxy(id, type, annotation, (i, t, a) -> _resolveOne(i, t)) : _resolveOne(id, type);
44+
public Object resolveOne(final String id, final TypeInformation<?> type, Collection<TypeInformation<?>> traversedTypes,
45+
final From annotation) {
46+
Supplier<Object> supplier = () -> _resolveOne(id, type);
47+
return annotation.lazy() ? proxy(id, type, supplier) : supplier.get();
4648
}
4749

4850
private Object _resolveOne(final String id, final TypeInformation<?> type) {
@@ -51,7 +53,8 @@ private Object _resolveOne(final String id, final TypeInformation<?> type) {
5153
}
5254

5355
@Override
54-
public Object resolveMultiple(final String id, final TypeInformation<?> type, Collection<TypeInformation<?>> traversedTypes, final From annotation) {
56+
public Object resolveMultiple(final String id, final TypeInformation<?> type, Collection<TypeInformation<?>> traversedTypes,
57+
final From annotation) {
5558
throw new UnsupportedOperationException("Edges with multiple 'from' values are not supported.");
5659
}
5760

‎src/main/java/com/arangodb/springframework/core/convert/resolver/EdgeToResolver.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
import com.arangodb.springframework.core.ArangoOperations;
2727

2828
import java.util.Collection;
29+
import java.util.function.Supplier;
2930

3031
/**
3132
* @author Mark Vollmary
32-
*
3333
*/
34-
public class EdgeToResolver extends AbstractResolver<To> implements RelationResolver<To> {
34+
public class EdgeToResolver extends AbstractResolver implements RelationResolver<To> {
3535

3636
private final ArangoOperations template;
3737

@@ -41,8 +41,10 @@ public EdgeToResolver(final ArangoOperations template) {
4141
}
4242

4343
@Override
44-
public Object resolveOne(final String id, final TypeInformation<?> type, Collection<TypeInformation<?>> traversedTypes, final To annotation) {
45-
return annotation.lazy() ? proxy(id, type, annotation, (i, t, a) -> _resolveOne(i, t)) : _resolveOne(id, type);
44+
public Object resolveOne(final String id, final TypeInformation<?> type, Collection<TypeInformation<?>> traversedTypes,
45+
final To annotation) {
46+
Supplier<Object> supplier = () -> _resolveOne(id, type);
47+
return annotation.lazy() ? proxy(id, type, supplier) : supplier.get();
4648
}
4749

4850
private Object _resolveOne(final String id, final TypeInformation<?> type) {

0 commit comments

Comments
 (0)