Skip to content

Find By Example With Array #197

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

Merged
merged 1 commit into from
Aug 11, 2020
Merged

Find By Example With Array #197

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
2 changes: 1 addition & 1 deletion 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 @@ -56,7 +56,7 @@ public interface ArangoConfiguration {

@Bean
default ArangoOperations arangoTemplate() throws Exception {
return new ArangoTemplate(arango().build(), database(), arangoConverter());
return new ArangoTemplate(arango().build(), database(), arangoConverter(), resolverFactory());
}

@Bean
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/arangodb/springframework/core/ArangoOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import com.arangodb.model.DocumentReplaceOptions;
import com.arangodb.model.DocumentUpdateOptions;
import com.arangodb.springframework.core.convert.ArangoConverter;
import com.arangodb.springframework.core.convert.resolver.ResolverFactory;

/**
* Interface that specifies a basic set of ArangoDB operations.
Expand Down Expand Up @@ -581,5 +582,7 @@ public enum UpsertStrategy {
Iterable<UserEntity> getUsers() throws DataAccessException;

ArangoConverter getConverter();

ResolverFactory getResolverFactory();

}
4 changes: 2 additions & 2 deletions src/main/java/com/arangodb/springframework/core/convert/resolver/RefResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ public Object resolve(final String id, final TypeInformation<?> type, final Ref
}

@Override
public String write(final Object source, final ArangoPersistentEntity<?> entity, final String id, final Ref annotation) {
return MetadataUtils.createIdFromCollectionAndKey(entity.getCollection(), id);
public String write(final Object source, final ArangoPersistentEntity<?> entity, final Object id, final Ref annotation) {
return MetadataUtils.createIdFromCollectionAndKey(entity.getCollection(), String.valueOf(id));
}


Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/arangodb/springframework/core/convert/resolver/ReferenceResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ public interface ReferenceResolver<A extends Annotation> {

Object resolveMultiple(Collection<String> ids, TypeInformation<?> type, A annotation);

public String write(Object source, ArangoPersistentEntity<?> entity, String id, Ref annotation);
public String write(Object source, ArangoPersistentEntity<?> entity, Object id, Ref annotation);

}
213 changes: 113 additions & 100 deletions src/main/java/com/arangodb/springframework/core/template/ArangoTemplate.java
View file
Open in desktop

Large diffs are not rendered by default.

91 changes: 59 additions & 32 deletions src/main/java/com/arangodb/springframework/repository/ArangoExampleConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

package com.arangodb.springframework.repository;

import java.lang.annotation.Annotation;
import java.util.HashSet;
import java.util.Map;
import java.util.Optional;
Expand All @@ -31,37 +32,39 @@
import org.springframework.data.mapping.PersistentPropertyAccessor;
import org.springframework.util.Assert;

import com.arangodb.springframework.core.convert.resolver.ReferenceResolver;
import com.arangodb.springframework.core.convert.resolver.ResolverFactory;
import com.arangodb.springframework.core.mapping.ArangoMappingContext;
import com.arangodb.springframework.core.mapping.ArangoPersistentEntity;
import com.arangodb.springframework.core.mapping.ArangoPersistentProperty;

/**
* Converts Example to String representing predicate expression and puts necessary bindings in the given bindVars Map
* Converts Example to String representing predicate expression and puts
* necessary bindings in the given bindVars Map
*/
public class ArangoExampleConverter<T> {

private final ArangoMappingContext context;
private final ResolverFactory resolverFactory;

public ArangoExampleConverter(final ArangoMappingContext context) {
public ArangoExampleConverter(final ArangoMappingContext context, final ResolverFactory resolverFactory) {
this.context = context;
this.resolverFactory = resolverFactory;
}

public String convertExampleToPredicate(final Example<T> example, final Map<String, Object> bindVars) {
final StringBuilder predicateBuilder = new StringBuilder();
final ArangoPersistentEntity<?> persistentEntity = context.getPersistentEntity(example.getProbeType());
Assert.isTrue(example.getProbe() != null, "Probe in Example cannot be null");
traversePropertyTree(example, predicateBuilder, bindVars, "", "", persistentEntity, example.getProbe());
final String bindEntintyName = "e";
traversePropertyTree(example, predicateBuilder, bindVars, "", "", persistentEntity, example.getProbe(),
bindEntintyName);
return predicateBuilder.toString();
}

private void traversePropertyTree(
final Example<T> example,
final StringBuilder predicateBuilder,
final Map<String, Object> bindVars,
final String path,
final String javaPath,
final ArangoPersistentEntity<?> entity,
final Object object) {
private void traversePropertyTree(final Example<T> example, final StringBuilder predicateBuilder,
final Map<String, Object> bindVars, final String path, final String javaPath,
final ArangoPersistentEntity<?> entity, final Object object, final String bindEntintyName) {
final PersistentPropertyAccessor<?> accessor = entity.getPropertyAccessor(object);
entity.doWithProperties((final ArangoPersistentProperty property) -> {
if (property.getFrom().isPresent() || property.getTo().isPresent() || property.getRelations().isPresent()) {
Expand All @@ -70,13 +73,35 @@ private void traversePropertyTree(
final String fullPath = path + (path.length() == 0 ? "" : ".") + property.getFieldName();
final String fullJavaPath = javaPath + (javaPath.length() == 0 ? "" : ".") + property.getName();
final Object value = accessor.getProperty(property);
if (property.isEntity() && value != null) {

if (property.isCollectionLike() && value != null) {
final ArangoPersistentEntity<?> persistentEntity = context
.getPersistentEntity(property.getActualType());
final StringBuilder predicateBuilderArray = new StringBuilder();
for (Object item : (Iterable) value) {
final StringBuilder predicateBuilderArrayItem = new StringBuilder();
traversePropertyTree(example, predicateBuilderArrayItem, bindVars, "", fullJavaPath,
persistentEntity, item, "CURRENT");
if (predicateBuilderArray.length() > 0) {
predicateBuilderArray.append(" OR ");
}
predicateBuilderArray.append(predicateBuilderArrayItem.toString());
}
final String delimiter = example.getMatcher().isAllMatching() ? " AND " : " OR ";
if (predicateBuilder.length() > 0) {
predicateBuilder.append(delimiter);
}
String clause = String.format("LENGTH(%s.%s[* FILTER %s ])>0", bindEntintyName, property.getName(),
predicateBuilderArray.toString());
predicateBuilder.append(clause);

} else if (property.isEntity() && value != null) {
final ArangoPersistentEntity<?> persistentEntity = context.getPersistentEntity(property.getType());
traversePropertyTree(example, predicateBuilder, bindVars, fullPath, fullJavaPath, persistentEntity,
value);
value, bindEntintyName);
} else if (!example.getMatcher().isIgnoredPath(fullJavaPath) && (value != null
|| example.getMatcher().getNullHandler().equals(ExampleMatcher.NullHandler.INCLUDE))) {
addPredicate(example, predicateBuilder, bindVars, fullPath, fullJavaPath, value);
addPredicate(example, predicateBuilder, bindVars, fullPath, fullJavaPath, value, bindEntintyName);
}
});

Expand All @@ -91,20 +116,22 @@ private void traversePropertyTree(
final ArangoPersistentEntity<?> persistentEntity = context.getPersistentEntity(property.getType());
final PersistentPropertyAccessor<?> associatedAccessor = persistentEntity.getPropertyAccessor(value);
final Object idValue = associatedAccessor.getProperty(persistentEntity.getIdProperty());

String refIdValue = String.format("%s/%s", persistentEntity.getCollection(), idValue);
addPredicate(example, predicateBuilder, bindVars, fullPath, fullJavaPath, refIdValue);
String refIdValue = null;
if (property.getRef().isPresent()) {
final Optional<ReferenceResolver<Annotation>> resolver = resolverFactory
.getReferenceResolver(property.getRef().get());
refIdValue = resolver.get().write(value, persistentEntity, idValue, property.getRef().get());
} else {
refIdValue = String.format("%s/%s", persistentEntity.getCollection(), idValue);
}
addPredicate(example, predicateBuilder, bindVars, fullPath, fullJavaPath, refIdValue, bindEntintyName);
}
});
}

private void addPredicate(
final Example<T> example,
final StringBuilder predicateBuilder,
final Map<String, Object> bindVars,
final String fullPath,
final String fullJavaPath,
Object value) {
private void addPredicate(final Example<T> example, final StringBuilder predicateBuilder,
final Map<String, Object> bindVars, final String fullPath, final String fullJavaPath, Object value,
final String bindEntintyName) {
final String delimiter = example.getMatcher().isAllMatching() ? " AND " : " OR ";
if (predicateBuilder.length() > 0) {
predicateBuilder.append(delimiter);
Expand All @@ -117,7 +144,7 @@ private void addPredicate(
value = specifier.transformValue(Optional.of(value)).orElse(null);
}
if (value == null) {
clause = String.format("e.%s == null", fullPath);
clause = String.format("%s.%s == null", bindEntintyName, fullPath);
} else if (String.class.isAssignableFrom(value.getClass())) {
final boolean ignoreCase = specifier == null ? example.getMatcher().isIgnoreCaseEnabled()
: (specifier.getIgnoreCase() == null ? false : specifier.getIgnoreCase());
Expand All @@ -127,10 +154,10 @@ private void addPredicate(
: specifier.getStringMatcher();
final String string = (String) value;
if (stringMatcher == ExampleMatcher.StringMatcher.REGEX) {
clause = String.format("REGEX_TEST(e.%s, @%s, %b)", fullPath, binding, ignoreCase);
} else {
clause = String.format("LIKE(e.%s, @%s, %b)", fullPath, binding, ignoreCase);
}
clause = String.format("REGEX_TEST(%s.%s, @%s, %b)", bindEntintyName, fullPath, binding, ignoreCase);
} else {
clause = String.format("LIKE(%s.%s, @%s, %b)", bindEntintyName, fullPath, binding, ignoreCase);
}
switch (stringMatcher) {
case STARTING:
value = escape(string) + "%";
Expand All @@ -142,16 +169,16 @@ private void addPredicate(
value = "%" + escape(string) + "%";
break;
case REGEX:
value = escape(string);
break;
value = escape(string);
break;
case DEFAULT:
case EXACT:
default:
value = escape(string);
break;
}
} else {
clause = "e." + fullPath + " == @" + binding;
clause = String.format("%s.%s == @%s", bindEntintyName, fullPath, binding);
}
predicateBuilder.append(clause);
if (value != null) {
Expand Down
Loading