array search (#202)

Co-authored-by: Paulo Ferreira <paulo.ferreira25@gmail.com>

Author: PauloFerreira25

src/main/java/com/arangodb/springframework/repository/ArangoExampleConverter.java

@@ -23,14 +23,17 @@
 import java.lang.annotation.Annotation;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.ExampleMatcher;
 import org.springframework.data.mapping.AssociationHandler;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
+
 import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
 
 import com.arangodb.springframework.core.convert.resolver.ReferenceResolver;
 import com.arangodb.springframework.core.convert.resolver.ResolverFactory;
@@ -78,10 +81,15 @@ private void traversePropertyTree(final Example<T> example, final StringBuilder
 				final ArangoPersistentEntity<?> persistentEntity = context
 						.getPersistentEntity(property.getActualType());
 				final StringBuilder predicateBuilderArray = new StringBuilder();
-				for (Object item : (Iterable) value) {
+				for (Object item : (Iterable<?>) value) {
 					final StringBuilder predicateBuilderArrayItem = new StringBuilder();
-					traversePropertyTree(example, predicateBuilderArrayItem, bindVars, "", fullJavaPath,
-							persistentEntity, item, "CURRENT");
+					if (ClassUtils.isPrimitiveOrWrapper(item.getClass()) || item.getClass() == String.class) {
+						addPredicate(example, predicateBuilderArrayItem, bindVars, null, fullJavaPath, item, "CURRENT");
+					} else {
+						traversePropertyTree(example, predicateBuilderArrayItem, bindVars, "", fullJavaPath,
+								persistentEntity, item, "CURRENT");
+					}
+
 					if (predicateBuilderArray.length() > 0) {
 						predicateBuilderArray.append(" OR ");
 					}
@@ -154,9 +162,18 @@ private void addPredicate(final Example<T> example, final StringBuilder predicat
 							: specifier.getStringMatcher();
 			final String string = (String) value;
 			if (stringMatcher == ExampleMatcher.StringMatcher.REGEX) {
-				clause = String.format("REGEX_TEST(%s.%s, @%s, %b)", bindEntintyName, fullPath, binding, ignoreCase);
+				if (Objects.isNull(fullPath)) {
+					clause = String.format("REGEX_TEST(%s, @%s, %b)", bindEntintyName, binding, ignoreCase);
+				} else {
+					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);
+				if (Objects.isNull(fullPath)) {
+					clause = String.format("LIKE(%s, @%s, %b)", bindEntintyName, binding, ignoreCase);
+				} else {
+					clause = String.format("LIKE(%s.%s, @%s, %b)", bindEntintyName, fullPath, binding, ignoreCase);
+				}
 			}
 			switch (stringMatcher) {
 			case STARTING:
@@ -178,7 +195,12 @@ private void addPredicate(final Example<T> example, final StringBuilder predicat
 				break;
 			}
 		} else {
-			clause = String.format("%s.%s == @%s", bindEntintyName, fullPath, binding);
+			if (Objects.isNull(fullPath)) {
+				clause = String.format("%s == @%s", bindEntintyName, binding);
+			} else {
+				clause = String.format("%s.%s == @%s", bindEntintyName, fullPath, binding);
+			}
+
 		}
 		predicateBuilder.append(clause);
 		if (value != null) {

src/test/java/com/arangodb/springframework/repository/ArangoRepositoryTest.java

@@ -373,6 +373,22 @@ public void findAllByExampleWithArrayORTest() {
 		assertEquals(check, retrieved);
 	}
 
+	@Test
+	public void findAllByExampleWhitArrayStringTest() {
+		final List<Customer> toBeRetrieved = new LinkedList<>();
+		final Customer customer1 = new Customer("AbbaXP", "BbaaaaXZ", 1001);
+		final Customer customer2 = new Customer("Bwa?[a.b]baAaGH", "", 67);
+		customer1.setStringList(Arrays.asList("testA", "testB", "testC"));
+		customer2.setStringList(Arrays.asList("test1", "test2", "test3"));
+		toBeRetrieved.add(customer1);
+		toBeRetrieved.add(customer2);
+		repository.saveAll(toBeRetrieved);
+		final Customer exampleCustomer = new Customer("AbbaXP", "BbaaaaXZ", 1001);
+		exampleCustomer.setStringList(Arrays.asList("testB"));
+		final Example<Customer> example = Example.of(exampleCustomer);
+		final Customer retrieved = repository.findOne(example).get();
+		assertEquals(customer1, retrieved);
+	}
 
 
 	@Test