Spring/spring-data-examples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#297 - Update to changes in ExampleMatcher API.

Browse Source
This commit is contained in:
Oliver Gierke
2017-07-25 14:22:45 +02:00
parent 80b70e6bd2
commit b87336ba8f
3 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
jpa/query-by-example/src/test/java/example/springdata/jpa/querybyexample/UserRepositoryIntegrationTests.java
View File

@@ -16,8 +16,10 @@
package example.springdata.jpa.querybyexample;
import static org.assertj.core.api.Assertions.*;
import static org.springframework.data.domain.ExampleMatcher.GenericPropertyMatchers.*;
import static org.springframework.data.domain.ExampleMatcher.*;
import static org.springframework.data.domain.ExampleMatcher.GenericPropertyMatchers.*;
import java.util.Optional;
import org.junit.Before;
import org.junit.Test;
@@ -25,7 +27,7 @@ import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.data.domain.Example;
import org.springframework.data.domain.ExampleMatcher.*;
import org.springframework.data.domain.ExampleMatcher.StringMatcher;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.transaction.annotation.Transactional;
@@ -36,7 +38,6 @@ import org.springframework.transaction.annotation.Transactional;
* @author Oliver Gierke
* @author Jens Schauder
*/
@SuppressWarnings("unused")
@RunWith(SpringRunner.class)
@Transactional
@SpringBootTest
@@ -75,7 +76,7 @@ public class UserRepositoryIntegrationTests {
@Test
public void ignorePropertiesAndMatchByAge() {
Example<User> example = Example.of(flynn, matching().//
Example<User> example = Example.of(flynn, matching(). //
withIgnorePaths("firstname", "lastname"));
assertThat(repository.findOne(example)).contains(flynn);
@@ -87,7 +88,7 @@ public class UserRepositoryIntegrationTests {
@Test
public void substringMatching() {
Example<User> example = Example.of(new User("er", null, null), matching().//
Example<User> example = Example.of(new User("er", null, null), matching(). //
withStringMatcher(StringMatcher.ENDING));
assertThat(repository.findAll(example)).containsExactly(skyler, walter);
@@ -99,11 +100,10 @@ public class UserRepositoryIntegrationTests {
@Test
public void matchStartingStringsIgnoreCase() {
Example<User> example = Example.of(new User("Walter", "WHITE", null),
matching().//
withIgnorePaths("age").//
withMatcher("firstname", startsWith()).//
withMatcher("lastname", ignoreCase()));
Example<User> example = Example.of(new User("Walter", "WHITE", null), matching(). //
withIgnorePaths("age"). //
withMatcher("firstname", startsWith()). //
withMatcher("lastname", ignoreCase()));
assertThat(repository.findAll(example)).containsExactlyInAnyOrder(flynn, walter);
}
@@ -114,11 +114,10 @@ public class UserRepositoryIntegrationTests {
@Test
public void configuringMatchersUsingLambdas() {
Example<User> example = Example.of(new User("Walter", "WHITE", null),
matching().//
withIgnorePaths("age").//
withMatcher("firstname", matcher -> matcher.startsWith()).//
withMatcher("lastname", matcher -> matcher.ignoreCase()));
Example<User> example = Example.of(new User("Walter", "WHITE", null), matching(). //
withIgnorePaths("age"). //
withMatcher("firstname", matcher -> matcher.startsWith()). //
withMatcher("lastname", matcher -> matcher.ignoreCase()));
assertThat(repository.findAll(example)).containsExactlyInAnyOrder(flynn, walter);
}
@@ -130,7 +129,7 @@ public class UserRepositoryIntegrationTests {
public void valueTransformer() {
Example<User> example = Example.of(new User(null, "White", 99), matching(). //
withMatcher("age", matcher -> matcher.transform(value -> Integer.valueOf(50))));
withMatcher("age", matcher -> matcher.transform(value -> Optional.of(Integer.valueOf(50)))));
assertThat(repository.findAll(example)).containsExactly(walter);
}

22
mongodb/query-by-example/src/test/java/example/springdata/mongodb/querybyexample/MongoOperationsIntegrationTests.java
View File

@@ -24,6 +24,8 @@ import static org.springframework.data.domain.ExampleMatcher.GenericPropertyMatc
import static org.springframework.data.mongodb.core.query.Criteria.*;
import static org.springframework.data.mongodb.core.query.Query.*;
import java.util.Optional;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -109,11 +111,10 @@ public class MongoOperationsIntegrationTests {
@Test
public void matchStartingStringsIgnoreCase() {
Example<Person> example = Example.of(new Person("Walter", "WHITE", null),
matching(). //
withIgnorePaths("age").//
withMatcher("firstname", startsWith()).//
withMatcher("lastname", ignoreCase()));
Example<Person> example = Example.of(new Person("Walter", "WHITE", null), matching(). //
withIgnorePaths("age").//
withMatcher("firstname", startsWith()).//
withMatcher("lastname", ignoreCase()));
assertThat(operations.find(query(byExample(example)), Person.class), hasItems(flynn, walter));
}
@@ -124,11 +125,10 @@ public class MongoOperationsIntegrationTests {
@Test
public void configuringMatchersUsingLambdas() {
Example<Person> example = Example.of(new Person("Walter", "WHITE", null),
matching().//
withIgnorePaths("age"). //
withMatcher("firstname", matcher -> matcher.startsWith()). //
withMatcher("lastname", matcher -> matcher.ignoreCase()));
Example<Person> example = Example.of(new Person("Walter", "WHITE", null), matching().//
withIgnorePaths("age"). //
withMatcher("firstname", matcher -> matcher.startsWith()). //
withMatcher("lastname", matcher -> matcher.ignoreCase()));
assertThat(operations.find(query(byExample(example)), Person.class), hasItems(flynn, walter));
}
@@ -140,7 +140,7 @@ public class MongoOperationsIntegrationTests {
public void valueTransformer() {
Example<Person> example = Example.of(new Person(null, "White", 99), matching(). //
withMatcher("age", matcher -> matcher.transform(value -> Integer.valueOf(50))));
withMatcher("age", matcher -> matcher.transform(value -> Optional.of(Integer.valueOf(50)))));
assertThat(operations.find(query(byExample(example)), Person.class), hasItems(walter));
}

30
mongodb/query-by-example/src/test/java/example/springdata/mongodb/querybyexample/UserRepositoryIntegrationTests.java
View File

@@ -16,8 +16,10 @@
package example.springdata.mongodb.querybyexample;
import static org.assertj.core.api.Assertions.*;
import static org.springframework.data.domain.ExampleMatcher.GenericPropertyMatchers.*;
import static org.springframework.data.domain.ExampleMatcher.*;
import static org.springframework.data.domain.ExampleMatcher.GenericPropertyMatchers.*;
import java.util.Optional;
import org.junit.Before;
import org.junit.Test;
@@ -25,7 +27,7 @@ import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.data.domain.Example;
import org.springframework.data.domain.ExampleMatcher.*;
import org.springframework.data.domain.ExampleMatcher.StringMatcher;
import org.springframework.test.context.junit4.SpringRunner;
/**
@@ -85,7 +87,7 @@ public class UserRepositoryIntegrationTests {
@Test
public void substringMatching() {
Example<Person> example = Example.of(new Person("er", null, null), matching().//
Example<Person> example = Example.of(new Person("er", null, null), matching(). //
withStringMatcher(StringMatcher.ENDING));
assertThat(repository.findAll(example)).containsExactlyInAnyOrder(skyler, walter);
@@ -97,7 +99,7 @@ public class UserRepositoryIntegrationTests {
@Test
public void regexMatching() {
Example<Person> example = Example.of(new Person("(Skyl|Walt)er", null, null), matching().//
Example<Person> example = Example.of(new Person("(Skyl|Walt)er", null, null), matching(). //
withMatcher("firstname", matcher -> matcher.regex()));
assertThat(repository.findAll(example)).contains(skyler, walter);
@@ -109,11 +111,10 @@ public class UserRepositoryIntegrationTests {
@Test
public void matchStartingStringsIgnoreCase() {
Example<Person> example = Example.of(new Person("Walter", "WHITE", null),
matching().//
withIgnorePaths("age").//
withMatcher("firstname", startsWith()).//
withMatcher("lastname", ignoreCase()));
Example<Person> example = Example.of(new Person("Walter", "WHITE", null), matching(). //
withIgnorePaths("age"). //
withMatcher("firstname", startsWith()). //
withMatcher("lastname", ignoreCase()));
assertThat(repository.findAll(example)).containsExactlyInAnyOrder(flynn, walter);
}
@@ -124,11 +125,10 @@ public class UserRepositoryIntegrationTests {
@Test
public void configuringMatchersUsingLambdas() {
Example<Person> example = Example.of(new Person("Walter", "WHITE", null),
matching().//
withIgnorePaths("age").//
withMatcher("firstname", matcher -> matcher.startsWith()).//
withMatcher("lastname", matcher -> matcher.ignoreCase()));
Example<Person> example = Example.of(new Person("Walter", "WHITE", null), matching(). //
withIgnorePaths("age"). //
withMatcher("firstname", matcher -> matcher.startsWith()). //
withMatcher("lastname", matcher -> matcher.ignoreCase()));
assertThat(repository.findAll(example)).containsExactlyInAnyOrder(flynn, walter);
}
@@ -140,7 +140,7 @@ public class UserRepositoryIntegrationTests {
public void valueTransformer() {
Example<Person> example = Example.of(new Person(null, "White", 99), matching(). //
withMatcher("age", matcher -> matcher.transform(value -> Integer.valueOf(50))));
withMatcher("age", matcher -> matcher.transform(value -> Optional.of(Integer.valueOf(50)))));
assertThat(repository.findAll(example)).containsExactlyInAnyOrder(walter);
}