Skip to content

Regex ExampleMatcher Implementation #195

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 2 commits into from
Jul 31, 2020
Merged

Regex ExampleMatcher Implementation #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c88e61f
update gitignore
PauloFerreira25 Jul 30, 2020
35236c3
Regex
PauloFerreira25 Jul 30, 2020
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: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ local.properties
.settings/
.loadpath
.recommenders
.project
.classpath

# External tool builders
.externalToolBuilders/
Expand Down
9 changes: 8 additions & 1 deletion 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 @@ -126,7 +126,11 @@ private void addPredicate(
? example.getMatcher().getDefaultStringMatcher()
: specifier.getStringMatcher();
final String string = (String) value;
clause = String.format("LIKE(e.%s, @%s, %b)", fullPath, binding, ignoreCase);
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);
}
switch (stringMatcher) {
case STARTING:
value = escape(string) + "%";
Expand All @@ -137,6 +141,9 @@ private void addPredicate(
case CONTAINING:
value = "%" + escape(string) + "%";
break;
case REGEX:
value = escape(string);
break;
case DEFAULT:
case EXACT:
default:
Expand Down
77 changes: 54 additions & 23 deletions src/test/java/com/arangodb/springframework/repository/ArangoRepositoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,27 @@
package com.arangodb.springframework.repository;

import com.arangodb.springframework.testdata.Address;
import com.arangodb.springframework.testdata.Customer;
import com.arangodb.springframework.testdata.ShoppingCart;
import org.junit.Test;
import org.springframework.data.domain.*;
import org.springframework.data.domain.ExampleMatcher.StringMatcher;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;

import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.Optional;

import static org.hamcrest.Matchers.is;
import static org.junit.Assert.*;
import org.junit.Test;
import org.springframework.data.domain.Example;
import org.springframework.data.domain.ExampleMatcher;
import org.springframework.data.domain.ExampleMatcher.StringMatcher;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;

import com.arangodb.springframework.testdata.Address;
import com.arangodb.springframework.testdata.Customer;
import com.arangodb.springframework.testdata.ShoppingCart;

/**
* Created by F625633 on 06/07/2017.
Expand Down Expand Up @@ -178,6 +186,29 @@ public void findAllByExampleTest() {
assertTrue(equals(checkList, retrievedList, cmp, eq, false));
}

@Test
public void findAllByExampleRegexTest() {
final List<Customer> toBeRetrieved = new LinkedList<>();
final Customer check1 = new Customer("B", "X", 0);
final Customer check2 = new Customer("B", "Y", 0);
toBeRetrieved.add(new Customer("A", "Z", 0));
toBeRetrieved.add(check1);
toBeRetrieved.add(check2);
toBeRetrieved.add(new Customer("C", "V", 0));
repository.saveAll(toBeRetrieved);
Customer find = new Customer("([B])", null, 0);
ExampleMatcher exampleMatcher = ExampleMatcher.matching().withIgnoreNullValues().withMatcher("name",
match -> match.regex());
final Example<Customer> example = Example.of(find, exampleMatcher);
final Iterable<?> retrieved = repository.findAll(example);
final List<Customer> retrievedList = new LinkedList<>();
retrieved.forEach(e -> retrievedList.add((Customer) e));
final List<Customer> checkList = new LinkedList<>();
checkList.add(check1);
checkList.add(check2);
assertTrue(equals(checkList, retrievedList, cmp, eq, false));
}

@Test
public void findAllSortByExampleTest() {
final List<Customer> toBeRetrieved = new LinkedList<>();
Expand All @@ -186,8 +217,8 @@ public void findAllSortByExampleTest() {
toBeRetrieved.add(new Customer("B", "D", 0));
repository.saveAll(toBeRetrieved);
repository.save(new Customer("A", "A", 1));
final Example<Customer> example = Example.of(new Customer("", "", 0),
ExampleMatcher.matchingAny().withIgnoreNullValues().withIgnorePaths(new String[] { "location", "alive" }));
final Example<Customer> example = Example.of(new Customer("", "", 0), ExampleMatcher.matchingAny()
.withIgnoreNullValues().withIgnorePaths(new String[] { "location", "alive" }));
final List<Sort.Order> orders = new LinkedList<>();
orders.add(new Sort.Order(Sort.Direction.ASC, "name"));
orders.add(new Sort.Order(Sort.Direction.ASC, "surname"));
Expand All @@ -211,8 +242,8 @@ public void findAllPageableByExampleTest() {
toBeRetrieved.add(new Customer("F", "R", 0));
repository.saveAll(toBeRetrieved);
repository.save(new Customer("A", "A", 1));
final Example<Customer> example = Example.of(new Customer("", "", 0),
ExampleMatcher.matchingAny().withIgnoreNullValues().withIgnorePaths(new String[] { "location", "alive" }));
final Example<Customer> example = Example.of(new Customer("", "", 0), ExampleMatcher.matchingAny()
.withIgnoreNullValues().withIgnorePaths(new String[] { "location", "alive" }));
final List<Sort.Order> orders = new LinkedList<>();
orders.add(new Sort.Order(Sort.Direction.ASC, "name"));
orders.add(new Sort.Order(Sort.Direction.ASC, "surname"));
Expand Down Expand Up @@ -242,8 +273,8 @@ public void countByExampleTest() {
toBeRetrieved.add(new Customer("F", "Q", 0));
toBeRetrieved.add(new Customer("F", "R", 0));
repository.saveAll(toBeRetrieved);
final Example<Customer> example = Example.of(new Customer("", "", 0),
ExampleMatcher.matchingAny().withIgnoreNullValues().withIgnorePaths(new String[] { "location", "alive" }));
final Example<Customer> example = Example.of(new Customer("", "", 0), ExampleMatcher.matchingAny()
.withIgnoreNullValues().withIgnorePaths(new String[] { "location", "alive" }));
final long size = repository.count(example);
assertTrue(size == toBeRetrieved.size());
}
Expand Down Expand Up @@ -296,9 +327,9 @@ public void endingWithByExampleNestedTest() {
nested3.setNestedCustomer(nested2);
exampleCustomer.setNestedCustomer(nested3);
final Example<Customer> example = Example.of(exampleCustomer,
ExampleMatcher.matching().withMatcher("nestedCustomer.name", match -> match.endsWith())
.withIgnoreCase("nestedCustomer.name").withIgnoreNullValues()
.withTransformer("nestedCustomer.age", o -> Optional.of(Integer.valueOf(o.get().toString()) + 1)));
ExampleMatcher.matching().withMatcher("nestedCustomer.name", match -> match.endsWith())
.withIgnoreCase("nestedCustomer.name").withIgnoreNullValues().withTransformer(
"nestedCustomer.age", o -> Optional.of(Integer.valueOf(o.get().toString()) + 1)));
final Customer retrieved = repository.findOne(example).get();
assertEquals(check, retrieved);
}
Expand All @@ -321,10 +352,10 @@ public void endingWithByExampleNestedIncludeNullTest() {
nested3.setNestedCustomer(nested2);
exampleCustomer.setNestedCustomer(nested3);
final Example<Customer> example = Example.of(exampleCustomer,
ExampleMatcher.matching().withMatcher("nestedCustomer.name", match -> match.endsWith())
.withIgnorePaths(new String[] { "arangoId", "id", "key", "rev" })
.withIgnoreCase("nestedCustomer.name").withIncludeNullValues()
.withTransformer("nestedCustomer.age", o -> Optional.of(Integer.valueOf(o.get().toString()) + 1)));
ExampleMatcher.matching().withMatcher("nestedCustomer.name", match -> match.endsWith())
.withIgnorePaths(new String[] { "arangoId", "id", "key", "rev" })
.withIgnoreCase("nestedCustomer.name").withIncludeNullValues().withTransformer(
"nestedCustomer.age", o -> Optional.of(Integer.valueOf(o.get().toString()) + 1)));
final Customer retrieved = repository.findOne(example).get();
assertEquals(check, retrieved);
}
Expand All @@ -337,8 +368,8 @@ public void containingExampleTest() {
final Customer probe = new Customer();
probe.setName("am");
final Example<Customer> example = Example.of(probe,
ExampleMatcher.matching().withStringMatcher(StringMatcher.CONTAINING).withIgnorePaths("arangoId", "id",
"key", "rev", "surname", "age"));
ExampleMatcher.matching().withStringMatcher(StringMatcher.CONTAINING).withIgnorePaths("arangoId", "id",
"key", "rev", "surname", "age"));
final Optional<Customer> retrieved = repository.findOne(example);
assertThat(retrieved.isPresent(), is(true));
assertThat(retrieved.get().getName(), is("name"));
Expand Down