diff --git a/cassandra/example/pom.xml b/cassandra/example/pom.xml index d3624fcc..47b62410 100644 --- a/cassandra/example/pom.xml +++ b/cassandra/example/pom.xml @@ -7,7 +7,7 @@ org.springframework.data.examples spring-data-cassandra-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT ../pom.xml diff --git a/cassandra/example/src/main/java/example/springdata/cassandra/convert/ConverterConfiguration.java b/cassandra/example/src/main/java/example/springdata/cassandra/convert/ConverterConfiguration.java index b813798b..fd62c085 100644 --- a/cassandra/example/src/main/java/example/springdata/cassandra/convert/ConverterConfiguration.java +++ b/cassandra/example/src/main/java/example/springdata/cassandra/convert/ConverterConfiguration.java @@ -23,7 +23,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; import org.springframework.data.cassandra.config.SchemaAction; import org.springframework.data.cassandra.config.java.AbstractCassandraConfiguration; -import org.springframework.data.cassandra.convert.CustomConversions; +import org.springframework.data.cassandra.convert.CassandraCustomConversions; import org.springframework.data.cassandra.repository.config.EnableCassandraRepositories; import org.springframework.util.StringUtils; @@ -55,14 +55,14 @@ class ConverterConfiguration extends AbstractCassandraConfiguration { } @Override - public CustomConversions customConversions() { + public CassandraCustomConversions customConversions() { List> converters = new ArrayList<>(); converters.add(new PersonWriteConverter()); converters.add(new PersonReadConverter()); converters.add(new CustomAddressbookReadConverter()); - return new CustomConversions(converters); + return new CassandraCustomConversions(converters); } /** diff --git a/cassandra/example/src/test/java/example/springdata/cassandra/basic/BasicUserRepositoryTests.java b/cassandra/example/src/test/java/example/springdata/cassandra/basic/BasicUserRepositoryTests.java index b5456fbd..7170fd3c 100644 --- a/cassandra/example/src/test/java/example/springdata/cassandra/basic/BasicUserRepositoryTests.java +++ b/cassandra/example/src/test/java/example/springdata/cassandra/basic/BasicUserRepositoryTests.java @@ -71,7 +71,7 @@ public class BasicUserRepositoryTests { user = repository.save(user); - assertThat(repository.findOne(user.getId()), is(user)); + assertThat(repository.findById(user.getId()), is(user)); } /** diff --git a/cassandra/java8/pom.xml b/cassandra/java8/pom.xml index 6bbc36bf..f6bf0ff2 100644 --- a/cassandra/java8/pom.xml +++ b/cassandra/java8/pom.xml @@ -5,7 +5,7 @@ org.springframework.data.examples spring-data-cassandra-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT ../pom.xml diff --git a/cassandra/pom.xml b/cassandra/pom.xml index 60afd4a8..f45e35f6 100644 --- a/cassandra/pom.xml +++ b/cassandra/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.examples spring-data-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT Spring Data Cassandra - Examples diff --git a/cassandra/reactive/pom.xml b/cassandra/reactive/pom.xml index e3bcf226..2d6f3da9 100644 --- a/cassandra/reactive/pom.xml +++ b/cassandra/reactive/pom.xml @@ -5,7 +5,7 @@ org.springframework.data.examples spring-data-cassandra-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT spring-data-cassandra-reactive diff --git a/cassandra/util/pom.xml b/cassandra/util/pom.xml index 9d1c1785..f97697bc 100644 --- a/cassandra/util/pom.xml +++ b/cassandra/util/pom.xml @@ -5,7 +5,7 @@ org.springframework.data.examples spring-data-cassandra-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT ../pom.xml diff --git a/elasticsearch/example/pom.xml b/elasticsearch/example/pom.xml index accbd48d..6037cfaf 100644 --- a/elasticsearch/example/pom.xml +++ b/elasticsearch/example/pom.xml @@ -13,7 +13,7 @@ org.springframework.data.examples spring-data-elasticsearch-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml index 616a1d9a..74af5503 100644 --- a/elasticsearch/pom.xml +++ b/elasticsearch/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.examples spring-data-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT Spring Data Elasticsearch - Examples @@ -16,7 +16,7 @@ https://github.com/spring-projects/spring-data-elasticsearch - 2.2.0 + 5.4.0 diff --git a/jpa/eclipselink/pom.xml b/jpa/eclipselink/pom.xml index b829b973..f6a702d5 100644 --- a/jpa/eclipselink/pom.xml +++ b/jpa/eclipselink/pom.xml @@ -7,7 +7,7 @@ org.springframework.data.examples spring-data-jpa-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT ../pom.xml diff --git a/jpa/eclipselink/src/test/java/example/springdata/jpa/eclipselink/CustomerRepositoryIntegrationTests.java b/jpa/eclipselink/src/test/java/example/springdata/jpa/eclipselink/CustomerRepositoryIntegrationTests.java index 93de48bc..1717e05e 100644 --- a/jpa/eclipselink/src/test/java/example/springdata/jpa/eclipselink/CustomerRepositoryIntegrationTests.java +++ b/jpa/eclipselink/src/test/java/example/springdata/jpa/eclipselink/CustomerRepositoryIntegrationTests.java @@ -15,8 +15,7 @@ */ package example.springdata.jpa.eclipselink; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import javax.transaction.Transactional; @@ -43,6 +42,6 @@ public class CustomerRepositoryIntegrationTests { Customer dave = customers.save(new Customer("Dave", "Matthews")); - assertThat(customers.findOne(dave.getId()), is(dave)); + assertThat(customers.findById(dave.getId())).hasValue(dave); } } diff --git a/jpa/example/pom.xml b/jpa/example/pom.xml index 00aaa9da..fdcb1d66 100644 --- a/jpa/example/pom.xml +++ b/jpa/example/pom.xml @@ -7,7 +7,7 @@ org.springframework.data.examples spring-data-jpa-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT ../pom.xml diff --git a/jpa/example/src/main/java/example/springdata/jpa/auditing/AuditorAwareImpl.java b/jpa/example/src/main/java/example/springdata/jpa/auditing/AuditorAwareImpl.java index 38138ffb..0820ba19 100644 --- a/jpa/example/src/main/java/example/springdata/jpa/auditing/AuditorAwareImpl.java +++ b/jpa/example/src/main/java/example/springdata/jpa/auditing/AuditorAwareImpl.java @@ -15,6 +15,8 @@ */ package example.springdata.jpa.auditing; +import java.util.Optional; + import org.springframework.data.domain.AuditorAware; /** @@ -27,20 +29,20 @@ import org.springframework.data.domain.AuditorAware; */ public class AuditorAwareImpl implements AuditorAware { - private AuditableUser auditor; + private Optional auditor = Optional.empty(); /** * @param auditor the auditor to set */ public void setAuditor(AuditableUser auditor) { - this.auditor = auditor; + this.auditor = Optional.of(auditor); } /* * (non-Javadoc) * @see org.springframework.data.domain.AuditorAware#getCurrentAuditor() */ - public AuditableUser getCurrentAuditor() { + public Optional getCurrentAuditor() { return auditor; } } diff --git a/jpa/example/src/test/java/example/springdata/jpa/basics/BasicFactorySetup.java b/jpa/example/src/test/java/example/springdata/jpa/basics/BasicFactorySetup.java index d1f8269b..d458aee5 100644 --- a/jpa/example/src/test/java/example/springdata/jpa/basics/BasicFactorySetup.java +++ b/jpa/example/src/test/java/example/springdata/jpa/basics/BasicFactorySetup.java @@ -15,7 +15,10 @@ */ package example.springdata.jpa.basics; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; + +import example.springdata.jpa.simple.SimpleUserRepository; +import example.springdata.jpa.simple.User; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; @@ -26,9 +29,6 @@ import org.junit.Before; import org.junit.Test; import org.springframework.data.jpa.repository.support.JpaRepositoryFactory; -import example.springdata.jpa.simple.SimpleUserRepository; -import example.springdata.jpa.simple.User; - /** * Test case showing how to use the basic {@link GenericDaoFactory} * @@ -81,8 +81,8 @@ public class BasicFactorySetup { @Test public void executingFinders() { - assertEquals(user, userRepository.findByTheUsersName("username")); - assertEquals(user, userRepository.findByLastname("lastname").get(0)); - assertEquals(user, userRepository.findByFirstname("firstname").get(0)); + assertThat(userRepository.findByTheUsersName("username")).isEqualTo(user); + assertThat(userRepository.findByLastname("lastname")).first().isEqualTo(user); + assertThat(userRepository.findByFirstname("firstname")).first().isEqualTo(user); } } diff --git a/jpa/example/src/test/java/example/springdata/jpa/basics/BasicSample.java b/jpa/example/src/test/java/example/springdata/jpa/basics/BasicSample.java index dc7d62de..4d02ab7a 100644 --- a/jpa/example/src/test/java/example/springdata/jpa/basics/BasicSample.java +++ b/jpa/example/src/test/java/example/springdata/jpa/basics/BasicSample.java @@ -19,7 +19,9 @@ ess or implied. */ package example.springdata.jpa.basics; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; + +import example.springdata.jpa.simple.User; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; @@ -31,8 +33,6 @@ import org.junit.Test; import org.springframework.data.jpa.repository.support.SimpleJpaRepository; import org.springframework.data.repository.CrudRepository; -import example.springdata.jpa.simple.User; - /** * This unit tests shows plain usage of {@link SimpleJpaRepository}. * @@ -41,8 +41,8 @@ import example.springdata.jpa.simple.User; */ public class BasicSample { - private CrudRepository userRepository; - private EntityManager em; + CrudRepository userRepository; + EntityManager em; /** * Sets up a {@link SimpleJpaRepository} instance. @@ -65,7 +65,7 @@ public class BasicSample { /** * Tests saving users. Don't mimic transactionality shown here. It seriously lacks resource cleanup in case of an - * exception. Simplification serves descriptivness. + * exception. Simplification serves descriptiveness. */ @Test public void savingUsers() { @@ -75,6 +75,6 @@ public class BasicSample { user = userRepository.save(user); - assertEquals(user, userRepository.findOne(user.getId())); + assertThat(userRepository.findById(user.getId())).hasValue(user); } } diff --git a/jpa/example/src/test/java/example/springdata/jpa/caching/CachingRepositoryTests.java b/jpa/example/src/test/java/example/springdata/jpa/caching/CachingRepositoryTests.java index 08f7e1d5..cd94d4bf 100644 --- a/jpa/example/src/test/java/example/springdata/jpa/caching/CachingRepositoryTests.java +++ b/jpa/example/src/test/java/example/springdata/jpa/caching/CachingRepositoryTests.java @@ -15,15 +15,13 @@ */ package example.springdata.jpa.caching; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cache.Cache; -import org.springframework.cache.Cache.ValueWrapper; import org.springframework.cache.CacheManager; import org.springframework.cache.annotation.Cacheable; import org.springframework.test.context.junit4.SpringRunner; @@ -51,12 +49,10 @@ public abstract class CachingRepositoryTests { dave = repository.save(dave); - User result = repository.findByUsername("dmatthews"); - assertThat(result, is(dave)); + assertThat(repository.findByUsername("dmatthews")).isEqualTo(dave); // Verify entity cached Cache cache = cacheManager.getCache("byUsername"); - ValueWrapper wrapper = cache.get("dmatthews"); - assertThat(wrapper.get(), is((Object) dave)); + assertThat(cache.get("dmatthews").get()).isEqualTo(dave); } } diff --git a/jpa/example/src/test/java/example/springdata/jpa/custom/UserRepositoryCustomizationTests.java b/jpa/example/src/test/java/example/springdata/jpa/custom/UserRepositoryCustomizationTests.java index e7900ffd..149b6687 100644 --- a/jpa/example/src/test/java/example/springdata/jpa/custom/UserRepositoryCustomizationTests.java +++ b/jpa/example/src/test/java/example/springdata/jpa/custom/UserRepositoryCustomizationTests.java @@ -15,7 +15,7 @@ */ package example.springdata.jpa.custom; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.List; @@ -51,7 +51,7 @@ public class UserRepositoryCustomizationTests { user = repository.save(user); - assertEquals(user, repository.findOne(user.getId())); + assertThat(repository.findById(user.getId())).hasValue(user); } @Test @@ -65,11 +65,8 @@ public class UserRepositoryCustomizationTests { List users = repository.findByLastname("lastname"); - assertNotNull(users); - assertTrue(users.contains(user)); - - User reference = repository.findByTheUsersName("foobar"); - assertEquals(user, reference); + assertThat(users).contains(user); + assertThat(user).isEqualTo(repository.findByTheUsersName("foobar")); } /** @@ -85,7 +82,6 @@ public class UserRepositoryCustomizationTests { List users = repository.myCustomBatchOperation(); - assertNotNull(users); - assertTrue(users.contains(user)); + assertThat(users).contains(user); } } diff --git a/jpa/example/src/test/java/example/springdata/jpa/customall/UserRepositoryCustomizationTests.java b/jpa/example/src/test/java/example/springdata/jpa/customall/UserRepositoryCustomizationTests.java index 12684266..c78191bd 100644 --- a/jpa/example/src/test/java/example/springdata/jpa/customall/UserRepositoryCustomizationTests.java +++ b/jpa/example/src/test/java/example/springdata/jpa/customall/UserRepositoryCustomizationTests.java @@ -15,8 +15,7 @@ */ package example.springdata.jpa.customall; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.junit.runner.RunWith; @@ -40,6 +39,6 @@ public class UserRepositoryCustomizationTests { @Test public void invokesCustomMethod() { - assertThat(repository.customMethod(), is(0L)); + assertThat(repository.customMethod()).isEqualTo(0L); } } diff --git a/jpa/example/src/test/java/example/springdata/jpa/projections/CustomerRepositoryIntegrationTest.java b/jpa/example/src/test/java/example/springdata/jpa/projections/CustomerRepositoryIntegrationTest.java index 4573ae37..513a8f0c 100644 --- a/jpa/example/src/test/java/example/springdata/jpa/projections/CustomerRepositoryIntegrationTest.java +++ b/jpa/example/src/test/java/example/springdata/jpa/projections/CustomerRepositoryIntegrationTest.java @@ -15,8 +15,7 @@ */ package example.springdata.jpa.projections; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.Collection; import java.util.Map; @@ -64,37 +63,35 @@ public class CustomerRepositoryIntegrationTest { @Test public void projectsEntityIntoInterface() { - Collection result = customers.findAllProjectedBy(); - - assertThat(result, hasSize(2)); - assertThat(result.iterator().next().getFirstname(), is("Dave")); + assertThat(customers.findAllProjectedBy())// + .hasSize(2)// + .first().satisfies(it -> assertThat(it.getFirstname()).isEqualTo("Dave")); } @Test public void projectsMapIntoInterface() { - Collection result = customers.findsByProjectedColumns(); + assertThat(customers.findsByProjectedColumns())// + .hasSize(2)// + .first().satisfies(it -> assertThat(it.getFirstname()).isEqualTo("Dave")); - assertThat(result, hasSize(2)); - assertThat(result.iterator().next().getFirstname(), is("Dave")); } @Test public void projectsToDto() { - Collection result = customers.findAllDtoedBy(); - - assertThat(result, hasSize(2)); - assertThat(result.iterator().next().getFirstname(), is("Dave")); + assertThat(customers.findAllDtoedBy())// + .hasSize(2)// + .first().satisfies(it -> assertThat(it.getFirstname()).isEqualTo("Dave")); } @Test public void projectsDynamically() { - Collection result = customers.findByFirstname("Dave", CustomerProjection.class); - - assertThat(result, hasSize(1)); - assertThat(result.iterator().next().getFirstname(), is("Dave")); + assertThat(customers.findByFirstname("Dave", CustomerProjection.class))// + .hasSize(1)// + .first()// + .satisfies(it -> assertThat(it.getFirstname()).isEqualTo("Dave")); } @Test @@ -102,10 +99,11 @@ public class CustomerRepositoryIntegrationTest { CustomerSummary result = customers.findProjectedById(dave.getId(), CustomerSummary.class); - assertThat(result.getFullName(), is("Dave Matthews")); + assertThat(result.getFullName()).isEqualTo("Dave Matthews"); // Proxy backed by original instance as the projection uses dynamic elements - assertThat(((TargetAware) result).getTarget(), is(instanceOf(Customer.class))); + assertThat(result).isInstanceOfSatisfying(TargetAware.class, + it -> assertThat(it.getTarget()).isInstanceOf(Customer.class)); } @Test @@ -113,8 +111,9 @@ public class CustomerRepositoryIntegrationTest { CustomerProjection projectedDave = customers.findProjectedById(dave.getId()); - assertThat(projectedDave.getFirstname(), is("Dave")); - assertThat(((TargetAware) projectedDave).getTarget(), is(instanceOf(Map.class))); + assertThat(projectedDave.getFirstname()).isEqualTo("Dave"); + assertThat(projectedDave).isInstanceOfSatisfying(TargetAware.class, + it -> assertThat(it.getTarget()).isInstanceOf(Map.class)); } @Test @@ -122,21 +121,21 @@ public class CustomerRepositoryIntegrationTest { Collection result = customers.findDtoWithConstructorExpression("Dave"); - assertThat(result, hasSize(1)); - assertThat(result.iterator().next().getFirstname(), is("Dave")); + assertThat(result).hasSize(1); + assertThat(result.iterator().next().getFirstname()).isEqualTo("Dave"); } @Test public void supportsProjectionInCombinationWithPagination() { Page page = customers - .findPagedProjectedBy(new PageRequest(0, 1, new Sort(Direction.ASC, "lastname"))); + .findPagedProjectedBy(PageRequest.of(0, 1, Sort.by(Direction.ASC, "lastname"))); - assertThat(page.getContent().get(0).getFirstname(), is("Carter")); + assertThat(page.getContent().get(0).getFirstname()).isEqualTo("Carter"); } @Test public void appliesProjectionToOptional() { - assertThat(customers.findOptionalProjectionByLastname("Beauford").isPresent(), is(true)); + assertThat(customers.findOptionalProjectionByLastname("Beauford")).isPresent(); } } diff --git a/jpa/example/src/test/java/example/springdata/jpa/simple/SimpleUserRepositoryTests.java b/jpa/example/src/test/java/example/springdata/jpa/simple/SimpleUserRepositoryTests.java index 1322810d..fff06a0b 100644 --- a/jpa/example/src/test/java/example/springdata/jpa/simple/SimpleUserRepositoryTests.java +++ b/jpa/example/src/test/java/example/springdata/jpa/simple/SimpleUserRepositoryTests.java @@ -15,8 +15,9 @@ */ package example.springdata.jpa.simple; +import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertThat; import static org.springframework.data.domain.Sort.Direction.*; import java.util.ArrayList; @@ -64,7 +65,7 @@ public class SimpleUserRepositoryTests { user = repository.save(user); - assertThat(repository.findOne(user.getId()), is(user)); + assertThat(repository.findById(user.getId())).hasValue(user); } @Test @@ -72,10 +73,7 @@ public class SimpleUserRepositoryTests { user = repository.save(user); - List users = repository.findByLastname("lastname"); - - assertThat(users, is(notNullValue())); - assertThat(users.contains(user), is(true)); + assertThat(repository.findByLastname("lastname")).contains(user); } @Test @@ -83,19 +81,17 @@ public class SimpleUserRepositoryTests { user = repository.save(user); - List users = repository.findByFirstnameOrLastname("lastname"); - - assertThat(users.contains(user), is(true)); + assertThat(repository.findByFirstnameOrLastname("lastname")).contains(user); } @Test public void useOptionalAsReturnAndParameterType() { - assertThat(repository.findByUsername(Optional.of("foobar")), is(Optional.empty())); + assertThat(repository.findByUsername(Optional.of("foobar"))).isEmpty(); repository.save(user); - assertThat(repository.findByUsername(Optional.of("foobar")).isPresent(), is(true)); + assertThat(repository.findByUsername(Optional.of("foobar"))).isPresent(); } @Test @@ -109,10 +105,10 @@ public class SimpleUserRepositoryTests { User user3 = new User(); user3.setLastname("no-positive-match"); - repository.save(Arrays.asList(user, user2, user3)); + repository.saveAll(Arrays.asList(user, user2, user3)); - assertThat(repository.removeByLastname(user.getLastname()), is(2L)); - assertThat(repository.exists(user3.getId()), is(true)); + assertThat(repository.removeByLastname(user.getLastname())).isEqualTo(2L); + assertThat(repository.existsById(user3.getId())).isTrue(); } @Test @@ -132,11 +128,11 @@ public class SimpleUserRepositoryTests { source.add(user); } - repository.save(source); + repository.saveAll(source); - Slice users = repository.findByLastnameOrderByUsernameAsc(this.user.getLastname(), new PageRequest(1, 5)); + Slice users = repository.findByLastnameOrderByUsernameAsc(this.user.getLastname(), PageRequest.of(1, 5)); - assertThat(users, contains(source.subList(5, 10).toArray())); + assertThat(users).containsAll(source.subList(5, 10)); } @Test @@ -152,7 +148,7 @@ public class SimpleUserRepositoryTests { user2.setLastname("lastname-2"); // we deliberatly save the items in reverse - repository.save(Arrays.asList(user2, user1, user0)); + repository.saveAll(Arrays.asList(user2, user1, user0)); List result = repository.findFirst2ByOrderByLastnameAsc(); @@ -173,7 +169,7 @@ public class SimpleUserRepositoryTests { user2.setLastname("lastname-2"); // we deliberately save the items in reverse - repository.save(Arrays.asList(user2, user1, user0)); + repository.saveAll(Arrays.asList(user2, user1, user0)); List resultAsc = repository.findTop2By(new Sort(ASC, "lastname")); @@ -197,7 +193,7 @@ public class SimpleUserRepositoryTests { User third = new User(); - repository.save(Arrays.asList(first, second, third)); + repository.saveAll(Arrays.asList(first, second, third)); User reference = new User(); reference.setFirstname("firstname"); diff --git a/jpa/interceptors/pom.xml b/jpa/interceptors/pom.xml index 64e0acc1..33740a90 100644 --- a/jpa/interceptors/pom.xml +++ b/jpa/interceptors/pom.xml @@ -6,7 +6,7 @@ org.springframework.data.examples spring-data-jpa-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT ../pom.xml diff --git a/jpa/java8/pom.xml b/jpa/java8/pom.xml index 83752d09..ebe88a47 100644 --- a/jpa/java8/pom.xml +++ b/jpa/java8/pom.xml @@ -5,7 +5,7 @@ org.springframework.data.examples spring-data-jpa-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT spring-data-jpa-java8 diff --git a/jpa/java8/src/main/java/example/springdata/jpa/java8/CustomerRepository.java b/jpa/java8/src/main/java/example/springdata/jpa/java8/CustomerRepository.java index 008e4150..9f1eb877 100644 --- a/jpa/java8/src/main/java/example/springdata/jpa/java8/CustomerRepository.java +++ b/jpa/java8/src/main/java/example/springdata/jpa/java8/CustomerRepository.java @@ -39,7 +39,7 @@ public interface CustomerRepository extends Repository { * @param id * @return */ - Optional findOne(Long id); + Optional findById(Long id); /** * Saves the given {@link Customer}. diff --git a/jpa/java8/src/test/java/example/springdata/jpa/java8/Java8IntegrationTests.java b/jpa/java8/src/test/java/example/springdata/jpa/java8/Java8IntegrationTests.java index 7227f9db..d783cb5b 100644 --- a/jpa/java8/src/test/java/example/springdata/jpa/java8/Java8IntegrationTests.java +++ b/jpa/java8/src/test/java/example/springdata/jpa/java8/Java8IntegrationTests.java @@ -15,8 +15,7 @@ */ package example.springdata.jpa.java8; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import lombok.extern.slf4j.Slf4j; @@ -54,8 +53,8 @@ public class Java8IntegrationTests { Customer carter = repository.save(new Customer("Carter", "Beauford")); - assertThat(repository.findOne(carter.id).isPresent(), is(true)); - assertThat(repository.findOne(carter.id + 1), is(Optional. empty())); + assertThat(repository.findById(carter.id)).isPresent(); + assertThat(repository.findById(carter.id + 1)).isEmpty(); } @Test @@ -63,8 +62,8 @@ public class Java8IntegrationTests { Customer customer = repository.save(new Customer("Dave", "Matthews")); - assertThat(customer.createdDate, is(notNullValue())); - assertThat(customer.modifiedDate, is(notNullValue())); + assertThat(customer.createdDate).isNotNull(); + assertThat(customer.modifiedDate).isNotNull(); } @Test @@ -73,8 +72,7 @@ public class Java8IntegrationTests { Customer customer = repository.save(new Customer("Dave", "Matthews")); Optional result = repository.findByLastname(customer); - assertThat(result.isPresent(), is(true)); - assertThat(result.get(), is(customer)); + assertThat(result).hasValue(customer); } /** @@ -88,7 +86,7 @@ public class Java8IntegrationTests { Customer customer2 = repository.save(new Customer("Customer2", "Bar")); try (Stream stream = repository.streamAllCustomers()) { - assertThat(stream.collect(Collectors.toList()), hasItems(customer1, customer2)); + assertThat(stream.collect(Collectors.toList())).contains(customer1, customer2); } } @@ -103,7 +101,7 @@ public class Java8IntegrationTests { Customer customer2 = repository.save(new Customer("Customer2", "Bar")); try (Stream stream = repository.findAllByLastnameIsNotNull()) { - assertThat(stream.collect(Collectors.toList()), hasItems(customer1, customer2)); + assertThat(stream.collect(Collectors.toList())).contains(customer1, customer2); } } @@ -131,7 +129,7 @@ public class Java8IntegrationTests { CompletableFuture future = repository.readAllBy().thenAccept(customers -> { - assertThat(customers, hasSize(2)); + assertThat(customers).hasSize(2); customers.forEach(customer -> log.info(customer.toString())); log.info("Completed!"); }); diff --git a/jpa/javaslang/pom.xml b/jpa/javaslang/pom.xml index 0971a39e..4aa5641b 100644 --- a/jpa/javaslang/pom.xml +++ b/jpa/javaslang/pom.xml @@ -5,7 +5,7 @@ org.springframework.data.examples spring-data-jpa-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT spring-data-jpa-javaslang diff --git a/jpa/jpa21/pom.xml b/jpa/jpa21/pom.xml index 3a93e7ec..0e19f6d0 100644 --- a/jpa/jpa21/pom.xml +++ b/jpa/jpa21/pom.xml @@ -5,7 +5,7 @@ org.springframework.data.examples spring-data-jpa-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT spring-data-jpa-jpa21 diff --git a/jpa/multiple-datasources/pom.xml b/jpa/multiple-datasources/pom.xml index 163bcda7..318b5921 100644 --- a/jpa/multiple-datasources/pom.xml +++ b/jpa/multiple-datasources/pom.xml @@ -5,7 +5,7 @@ org.springframework.data.examples spring-data-jpa-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT spring-data-jpa-multiple-datasources diff --git a/jpa/pom.xml b/jpa/pom.xml index ddd8bc01..28cbfdbc 100644 --- a/jpa/pom.xml +++ b/jpa/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.examples spring-data-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT Spring Data JPA - Examples @@ -23,7 +23,7 @@ java8 javaslang jpa21 - security + multiple-datasources eclipselink query-by-example diff --git a/jpa/query-by-example/pom.xml b/jpa/query-by-example/pom.xml index 0a2ee143..d23afe6c 100644 --- a/jpa/query-by-example/pom.xml +++ b/jpa/query-by-example/pom.xml @@ -5,7 +5,7 @@ org.springframework.data.examples spring-data-jpa-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT spring-data-jpa-query-by-example diff --git a/jpa/showcase/pom.xml b/jpa/showcase/pom.xml index 116db613..b255e404 100644 --- a/jpa/showcase/pom.xml +++ b/jpa/showcase/pom.xml @@ -7,7 +7,7 @@ org.springframework.data.examples spring-data-jpa-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT ../pom.xml diff --git a/jpa/showcase/src/snippets/java/example/springdata/jpa/showcase/snippets/AccountRepository.java b/jpa/showcase/src/snippets/java/example/springdata/jpa/showcase/snippets/AccountRepository.java index ec904773..f1e398f9 100644 --- a/jpa/showcase/src/snippets/java/example/springdata/jpa/showcase/snippets/AccountRepository.java +++ b/jpa/showcase/src/snippets/java/example/springdata/jpa/showcase/snippets/AccountRepository.java @@ -15,23 +15,23 @@ */ package example.springdata.jpa.showcase.snippets; -import java.util.List; - -import org.springframework.data.querydsl.QueryDslPredicateExecutor; -import org.springframework.data.repository.CrudRepository; -import org.springframework.data.repository.NoRepositoryBean; - import example.springdata.jpa.showcase.core.Account; import example.springdata.jpa.showcase.core.Customer; +import java.util.List; + +import org.springframework.data.querydsl.QuerydslPredicateExecutor; +import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.NoRepositoryBean; + /** * Repository to manage {@link Account} instances. * * @author Oliver Gierke */ @NoRepositoryBean -public interface AccountRepository extends CrudRepository, AccountRepositoryCustom, - QueryDslPredicateExecutor { +public interface AccountRepository + extends CrudRepository, AccountRepositoryCustom, QuerydslPredicateExecutor { /** * Returns all accounts belonging to the given {@link Customer}. diff --git a/jpa/showcase/src/test-snippets/java/example/springdata/jpa/showcase/snippets/test/AccountRepositoryIntegrationTest.java b/jpa/showcase/src/test-snippets/java/example/springdata/jpa/showcase/snippets/test/AccountRepositoryIntegrationTest.java index f2e03a57..f3dbbf8b 100644 --- a/jpa/showcase/src/test-snippets/java/example/springdata/jpa/showcase/snippets/test/AccountRepositoryIntegrationTest.java +++ b/jpa/showcase/src/test-snippets/java/example/springdata/jpa/showcase/snippets/test/AccountRepositoryIntegrationTest.java @@ -16,14 +16,17 @@ package example.springdata.jpa.showcase.snippets.test; import static example.springdata.jpa.showcase.snippets.AccountPredicates.*; +import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; - -import org.joda.time.LocalDate; +import static org.junit.Assert.assertThat; import example.springdata.jpa.showcase.core.Account; import example.springdata.jpa.showcase.snippets.AccountRepository; +import java.util.Optional; + +import org.joda.time.LocalDate; + /** * @author Oliver Gierke */ @@ -39,12 +42,12 @@ public abstract class AccountRepositoryIntegrationTest { public void findsExpiredAccounts() { - Account expired = accountRepository.findOne(1L); - Account valid = accountRepository.findOne(2L); + Optional expired = accountRepository.findById(1L); + Optional valid = accountRepository.findById(2L); Iterable findAll = accountRepository.findAll(expiresBefore(new LocalDate(2011, 3, 1))); - assertThat(findAll, hasItem(expired)); - assertThat(findAll, not(hasItem(valid))); + assertThat(findAll).contains(expired.get()); + assertThat(findAll).doesNotContain(valid.get()); } } diff --git a/jpa/showcase/src/test-snippets/java/example/springdata/jpa/showcase/snippets/test/CustomerRepositoryIntegrationTest.java b/jpa/showcase/src/test-snippets/java/example/springdata/jpa/showcase/snippets/test/CustomerRepositoryIntegrationTest.java index 14674a5b..341c4d10 100644 --- a/jpa/showcase/src/test-snippets/java/example/springdata/jpa/showcase/snippets/test/CustomerRepositoryIntegrationTest.java +++ b/jpa/showcase/src/test-snippets/java/example/springdata/jpa/showcase/snippets/test/CustomerRepositoryIntegrationTest.java @@ -16,18 +16,18 @@ package example.springdata.jpa.showcase.snippets.test; import static example.springdata.jpa.showcase.snippets.CustomerSpecifications.*; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.springframework.data.jpa.domain.Specifications.*; -import java.util.List; - -import org.joda.time.LocalDate; -import org.springframework.data.jpa.domain.Specification; - import example.springdata.jpa.showcase.after.CustomerRepository; import example.springdata.jpa.showcase.core.Customer; +import java.util.List; +import java.util.Optional; + +import org.joda.time.LocalDate; +import org.springframework.data.jpa.domain.Specification; + /** * Snippets to show the usage of {@link Specification}s. * @@ -39,12 +39,12 @@ public class CustomerRepositoryIntegrationTest { public void findsCustomersBySpecification() throws Exception { - Customer dave = repository.findOne(1L); + Optional dave = repository.findById(1L); LocalDate expiryLimit = new LocalDate(2011, 3, 1); List result = repository.findAll(where(accountExpiresBefore(expiryLimit))); - assertThat(result.size(), is(1)); - assertThat(result, hasItems(dave)); + assertThat(result).hasSize(1); + assertThat(dave).hasValueSatisfying(it -> assertThat(result).contains(it)); } } diff --git a/jpa/showcase/src/test/java/example/springdata/jpa/showcase/after/AccountRepositoryIntegrationTest.java b/jpa/showcase/src/test/java/example/springdata/jpa/showcase/after/AccountRepositoryIntegrationTest.java index 15df7752..8c49b387 100644 --- a/jpa/showcase/src/test/java/example/springdata/jpa/showcase/after/AccountRepositoryIntegrationTest.java +++ b/jpa/showcase/src/test/java/example/springdata/jpa/showcase/after/AccountRepositoryIntegrationTest.java @@ -15,18 +15,19 @@ */ package example.springdata.jpa.showcase.after; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; - -import java.util.List; - -import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; +import static org.assertj.core.api.Assertions.*; import example.springdata.jpa.showcase.AbstractShowcaseTest; import example.springdata.jpa.showcase.core.Account; import example.springdata.jpa.showcase.core.Customer; +import java.util.Collections; +import java.util.List; +import java.util.Optional; + +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; + /** * Integration tests for Spring Data JPA {@link AccountRepository}. * @@ -41,16 +42,17 @@ public class AccountRepositoryIntegrationTest extends AbstractShowcaseTest { public void savesAccount() { Account account = accountRepository.save(new Account()); - assertThat(account.getId(), is(notNullValue())); + + assertThat(account.getId()).isNotNull(); } @Test public void findsCustomersAccounts() { - Customer customer = customerRepository.findOne(1L); - List accounts = accountRepository.findByCustomer(customer); + Optional customer = customerRepository.findById(1L); + List accounts = customer.map(accountRepository::findByCustomer).orElse(Collections.emptyList()); - assertFalse(accounts.isEmpty()); - assertThat(accounts.get(0).getCustomer(), is(customer)); + assertThat(accounts).isNotEmpty(); + assertThat(customer).hasValueSatisfying(it -> assertThat(accounts.get(0).getCustomer()).isEqualTo(it)); } } diff --git a/jpa/showcase/src/test/java/example/springdata/jpa/showcase/after/CustomerRepositoryIntegrationTest.java b/jpa/showcase/src/test/java/example/springdata/jpa/showcase/after/CustomerRepositoryIntegrationTest.java index 48a54039..279e7026 100644 --- a/jpa/showcase/src/test/java/example/springdata/jpa/showcase/after/CustomerRepositoryIntegrationTest.java +++ b/jpa/showcase/src/test/java/example/springdata/jpa/showcase/after/CustomerRepositoryIntegrationTest.java @@ -16,11 +16,14 @@ package example.springdata.jpa.showcase.after; import static example.springdata.jpa.showcase.snippets.CustomerSpecifications.*; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.springframework.data.jpa.domain.Specifications.*; +import example.springdata.jpa.showcase.AbstractShowcaseTest; +import example.springdata.jpa.showcase.core.Customer; + import java.util.List; +import java.util.Optional; import org.joda.time.LocalDate; import org.junit.Test; @@ -28,9 +31,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; -import example.springdata.jpa.showcase.AbstractShowcaseTest; -import example.springdata.jpa.showcase.core.Customer; - /** * Integration tests for Spring Data JPA {@link CustomerRepository}. * @@ -42,40 +42,36 @@ public class CustomerRepositoryIntegrationTest extends AbstractShowcaseTest { @Test public void findsAllCustomers() throws Exception { - - Iterable result = repository.findAll(); - - assertThat(result, is(notNullValue())); - assertTrue(result.iterator().hasNext()); + assertThat(repository.findAll()).isNotEmpty(); } @Test public void findsFirstPageOfMatthews() throws Exception { - Page customers = repository.findByLastname("Matthews", new PageRequest(0, 2)); + Page customers = repository.findByLastname("Matthews", PageRequest.of(0, 2)); - assertThat(customers.getContent().size(), is(2)); - assertFalse(customers.hasPrevious()); + assertThat(customers.getContent()).hasSize(2); + assertThat(customers.hasPrevious()).isFalse(); } @Test public void findsCustomerById() throws Exception { - Customer customer = repository.findOne(2L); - - assertThat(customer.getFirstname(), is("Carter")); - assertThat(customer.getLastname(), is("Beauford")); + assertThat(repository.findById(2L)).hasValueSatisfying(it -> { + assertThat(it.getFirstname()).isEqualTo("Carter"); + assertThat(it.getLastname()).isEqualTo("Beauford"); + }); } @Test public void findsCustomersBySpecification() throws Exception { - Customer dave = repository.findOne(1L); + Optional dave = repository.findById(1L); LocalDate expiryLimit = new LocalDate(2011, 3, 1); List result = repository.findAll(where(accountExpiresBefore(expiryLimit))); - assertThat(result.size(), is(1)); - assertThat(result, hasItems(dave)); + assertThat(result).hasSize(1); + assertThat(dave).hasValueSatisfying(it -> assertThat(result).contains(it)); } } diff --git a/ldap/example/pom.xml b/ldap/example/pom.xml index 22668267..36f2c169 100644 --- a/ldap/example/pom.xml +++ b/ldap/example/pom.xml @@ -9,7 +9,7 @@ org.springframework.data.examples spring-data-ldap-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT ../pom.xml diff --git a/ldap/example/src/test/java/example/springdata/ldap/PersonRepositoryIntegrationTests.java b/ldap/example/src/test/java/example/springdata/ldap/PersonRepositoryIntegrationTests.java index c2cf2778..508712c6 100644 --- a/ldap/example/src/test/java/example/springdata/ldap/PersonRepositoryIntegrationTests.java +++ b/ldap/example/src/test/java/example/springdata/ldap/PersonRepositoryIntegrationTests.java @@ -18,6 +18,7 @@ package example.springdata.ldap; import static org.assertj.core.api.Assertions.*; import java.util.List; +import java.util.Optional; import javax.naming.InvalidNameException; import javax.naming.ldap.LdapName; @@ -47,12 +48,13 @@ public class PersonRepositoryIntegrationTests { @Test public void findOneByName() throws InvalidNameException { - Person person = personRepository.findOne(new LdapName("uid=bob,ou=people,dc=springframework,dc=org")); + Optional person = personRepository.findById(new LdapName("uid=bob,ou=people,dc=springframework,dc=org")); - assertThat(person).isNotNull(); - assertThat(person.getFullName()).isEqualTo("Bob Hamilton"); - assertThat(person.getLastname()).isEqualTo("Hamilton"); - assertThat(person.getUid()).isEqualTo("bob"); + assertThat(person).hasValueSatisfying(it -> { + assertThat(it.getFullName()).isEqualTo("Bob Hamilton"); + assertThat(it.getLastname()).isEqualTo("Hamilton"); + assertThat(it.getUid()).isEqualTo("bob"); + }); } /** diff --git a/ldap/pom.xml b/ldap/pom.xml index 1b95136f..9ecbd721 100644 --- a/ldap/pom.xml +++ b/ldap/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.examples spring-data-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT ../pom.xml diff --git a/map/pom.xml b/map/pom.xml index 6035174a..6d026fa9 100644 --- a/map/pom.xml +++ b/map/pom.xml @@ -9,7 +9,7 @@ org.springframework.data.examples spring-data-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT diff --git a/map/src/test/java/example/springdata/map/PersonRepositoryIntegrationTest.java b/map/src/test/java/example/springdata/map/PersonRepositoryIntegrationTest.java index 608f7640..d3774ef1 100644 --- a/map/src/test/java/example/springdata/map/PersonRepositoryIntegrationTest.java +++ b/map/src/test/java/example/springdata/map/PersonRepositoryIntegrationTest.java @@ -15,8 +15,7 @@ */ package example.springdata.map; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.List; @@ -48,7 +47,7 @@ public class PersonRepositoryIntegrationTest { Person person = repository.save(new Person("Dave", "Matthews", 47)); - assertThat(repository.findOne(person.getId()), is(person)); + assertThat(repository.findById(person.getId())).hasValue(person); } @Test @@ -59,7 +58,7 @@ public class PersonRepositoryIntegrationTest { List result = repository.findByAgeGreaterThan(18); - assertThat(result, hasItem(dave)); - assertThat(result, not(hasItem(oliver))); + assertThat(result).contains(dave); + assertThat(result).doesNotContain(oliver); } } diff --git a/mongodb/aggregation/pom.xml b/mongodb/aggregation/pom.xml index 58980a3a..ae942055 100644 --- a/mongodb/aggregation/pom.xml +++ b/mongodb/aggregation/pom.xml @@ -9,7 +9,7 @@ org.springframework.data.examples spring-data-mongodb-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT \ No newline at end of file diff --git a/mongodb/aggregation/src/test/java/example/springdata/mongodb/aggregation/SpringBooksIntegrationTests.java b/mongodb/aggregation/src/test/java/example/springdata/mongodb/aggregation/SpringBooksIntegrationTests.java index c1dea3b4..a9579882 100644 --- a/mongodb/aggregation/src/test/java/example/springdata/mongodb/aggregation/SpringBooksIntegrationTests.java +++ b/mongodb/aggregation/src/test/java/example/springdata/mongodb/aggregation/SpringBooksIntegrationTests.java @@ -26,6 +26,7 @@ import java.nio.charset.StandardCharsets; import java.util.List; import org.assertj.core.util.Files; +import org.bson.Document; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -44,7 +45,6 @@ import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.test.context.junit4.SpringRunner; -import com.mongodb.DBObject; import com.mongodb.util.JSON; /** @@ -240,9 +240,9 @@ public class SpringBooksIntegrationTests { .andOutput("author").push().as("authors") // ).as("authors")); - AggregationResults result = operations.aggregate(aggregation, "books", DBObject.class); + AggregationResults result = operations.aggregate(aggregation, "books", Document.class); - DBObject uniqueMappedResult = result.getUniqueMappedResult(); + Document uniqueMappedResult = result.getUniqueMappedResult(); assertThat((List) uniqueMappedResult.get("prices")).hasSize(3); assertThat((List) uniqueMappedResult.get("authors")).hasSize(8); diff --git a/mongodb/example/pom.xml b/mongodb/example/pom.xml index ebda56a2..293fc352 100644 --- a/mongodb/example/pom.xml +++ b/mongodb/example/pom.xml @@ -9,7 +9,7 @@ org.springframework.data.examples spring-data-mongodb-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT diff --git a/mongodb/example/src/main/java/example/springdata/mongodb/advanced/ApplicationConfiguration.java b/mongodb/example/src/main/java/example/springdata/mongodb/advanced/ApplicationConfiguration.java index 23d58f7e..f73bbc8d 100644 --- a/mongodb/example/src/main/java/example/springdata/mongodb/advanced/ApplicationConfiguration.java +++ b/mongodb/example/src/main/java/example/springdata/mongodb/advanced/ApplicationConfiguration.java @@ -18,11 +18,11 @@ package example.springdata.mongodb.advanced; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; +import org.bson.Document; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.data.mongodb.core.MongoOperations; -import com.mongodb.BasicDBObject; import com.mongodb.MongoClient; /** @@ -62,6 +62,6 @@ class ApplicationConfiguration { } private void setProfilingLevel(int level) { - operations.executeCommand(new BasicDBObject("profile", level)); + operations.executeCommand(new Document("profile", level)); } } diff --git a/mongodb/example/src/test/java/example/springdata/mongodb/advanced/AdvancedIntegrationTests.java b/mongodb/example/src/test/java/example/springdata/mongodb/advanced/AdvancedIntegrationTests.java index d3f89a5d..e2a5949c 100644 --- a/mongodb/example/src/test/java/example/springdata/mongodb/advanced/AdvancedIntegrationTests.java +++ b/mongodb/example/src/test/java/example/springdata/mongodb/advanced/AdvancedIntegrationTests.java @@ -15,11 +15,11 @@ */ package example.springdata.mongodb.advanced; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import example.springdata.mongodb.customer.Customer; +import org.bson.Document; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -31,8 +31,7 @@ import org.springframework.data.mongodb.core.query.Meta; import org.springframework.test.context.junit4.SpringRunner; import com.mongodb.BasicDBObject; -import com.mongodb.DBCursor; -import com.mongodb.DBObject; +import com.mongodb.client.FindIterable; /** * @author Christoph Strobl @@ -70,17 +69,15 @@ public class AdvancedIntegrationTests { repository.findByFirstname(dave.getFirstname()); // execute another finder without meta attributes that should not be picked up - repository.findByLastname(dave.getLastname(), new Sort("firstname")); + repository.findByLastname(dave.getLastname(), Sort.by("firstname")); - DBCursor cursor = operations.getCollection(ApplicationConfiguration.SYSTEM_PROFILE_DB) + FindIterable cursor = operations.getCollection(ApplicationConfiguration.SYSTEM_PROFILE_DB) .find(new BasicDBObject("query.$comment", AdvancedRepository.META_COMMENT)); - while (cursor.hasNext()) { + for (Document document : cursor) { - DBObject dbo = cursor.next(); - DBObject query = (DBObject) dbo.get("query"); - - assertThat(query.containsField("$comment"), is(true)); + Document query = (Document) document.get("query"); + assertThat(query).containsKey("foo"); } } } diff --git a/mongodb/example/src/test/java/example/springdata/mongodb/advanced/ServersideScriptTests.java b/mongodb/example/src/test/java/example/springdata/mongodb/advanced/ServersideScriptTests.java index 1c648000..106fd997 100644 --- a/mongodb/example/src/test/java/example/springdata/mongodb/advanced/ServersideScriptTests.java +++ b/mongodb/example/src/test/java/example/springdata/mongodb/advanced/ServersideScriptTests.java @@ -15,15 +15,15 @@ */ package example.springdata.mongodb.advanced; -import static org.hamcrest.core.Is.*; -import static org.hamcrest.core.IsNull.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import example.springdata.mongodb.customer.Customer; import java.util.Map; +import org.bson.Document; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -33,9 +33,6 @@ import org.springframework.data.mongodb.core.script.ExecutableMongoScript; import org.springframework.data.mongodb.core.script.NamedMongoScript; import org.springframework.test.context.junit4.SpringRunner; -import com.mongodb.BasicDBObject; -import com.mongodb.DBObject; - /** * @author Christoph Strobl * @author Oliver Gierke @@ -55,7 +52,7 @@ public class ServersideScriptTests { } // just make sure we remove everything properly - operations.getCollection("system.js").remove(new BasicDBObject()); + operations.getCollection("system.js").deleteMany(new Document()); repository.deleteAll(); } @@ -68,8 +65,7 @@ public class ServersideScriptTests { operations.scriptOps() .register(new NamedMongoScript("echoScript", new ExecutableMongoScript("function(x) { return x; }"))); - Object o = operations.scriptOps().call("echoScript", "Hello echo...!"); - assertThat(o, is((Object) "Hello echo...!")); + assertThat(operations.scriptOps().call("echoScript", "Hello echo...!")).isEqualTo("Hello echo...!"); } /** @@ -77,35 +73,37 @@ public class ServersideScriptTests { * {@link Map#putIfAbsent(Object, Object)} */ @Test + @Ignore public void complexScriptExecutionSimulatingPutIfAbsent() { Customer ned = new Customer("Ned", "Stark"); ned.setId("ned-stark"); // #1: on first insert null has to be returned - assertThat(operations.scriptOps().execute(createExecutablePutIfAbsentScript(ned)), nullValue()); + assertThat(operations.scriptOps().execute(createExecutablePutIfAbsentScript(ned))).isNotNull(); // #2: change the firstname and put the object again, we expect a return value. ned.setFirstname("Eddard"); - assertThat(operations.scriptOps().execute(createExecutablePutIfAbsentScript(ned)), notNullValue()); + assertThat(operations.scriptOps().execute(createExecutablePutIfAbsentScript(ned))).isNotNull(); // #3: make sure the entity has not been altered by #2 - assertThat(repository.findOne(ned.getId()).getFirstname(), is("Ned")); - assertThat(repository.count(), is(1L)); + assertThat(repository.findById(ned.getId())) + .hasValueSatisfying(it -> assertThat(it.getFirstname()).isEqualTo("Ned")); + assertThat(repository.count()).isEqualTo(1L); } private ExecutableMongoScript createExecutablePutIfAbsentScript(Customer customer) { String collectionName = operations.getCollectionName(Customer.class); - Object id = operations.getConverter().getMappingContext().getPersistentEntity(Customer.class) + Object id = operations.getConverter().getMappingContext().getRequiredPersistentEntity(Customer.class) .getIdentifierAccessor(customer).getIdentifier(); - DBObject dbo = new BasicDBObject(); - operations.getConverter().write(customer, dbo); + Document document = new Document(); + operations.getConverter().write(customer, document); String scriptString = String.format( "object = db.%1$s.findOne({\"_id\": \"%2$s\"}); if (object == null) { db.%1s.insert(%3$s); return null; } else { return object; }", - collectionName, id, dbo); + collectionName, id, document); return new ExecutableMongoScript(scriptString); } diff --git a/mongodb/example/src/test/java/example/springdata/mongodb/projections/CustomerRepositoryIntegrationTest.java b/mongodb/example/src/test/java/example/springdata/mongodb/projections/CustomerRepositoryIntegrationTest.java index 439668fe..2b783d62 100644 --- a/mongodb/example/src/test/java/example/springdata/mongodb/projections/CustomerRepositoryIntegrationTest.java +++ b/mongodb/example/src/test/java/example/springdata/mongodb/projections/CustomerRepositoryIntegrationTest.java @@ -113,7 +113,7 @@ public class CustomerRepositoryIntegrationTest { public void supportsProjectionInCombinationWithPagination() { Page page = customers - .findPagedProjectedBy(new PageRequest(0, 1, new Sort(Direction.ASC, "lastname"))); + .findPagedProjectedBy(PageRequest.of(0, 1, Sort.by(Direction.ASC, "lastname"))); assertThat(page.getContent().get(0).getFirstname(), is("Carter")); } diff --git a/mongodb/geo-json/pom.xml b/mongodb/geo-json/pom.xml index ce64e543..478252c2 100644 --- a/mongodb/geo-json/pom.xml +++ b/mongodb/geo-json/pom.xml @@ -5,7 +5,7 @@ org.springframework.data.examples spring-data-mongodb-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT spring-data-mongodb-geojson diff --git a/mongodb/geo-json/src/test/java/example/springdata/mongodb/geojson/StoreRepositoryTests.java b/mongodb/geo-json/src/test/java/example/springdata/mongodb/geojson/StoreRepositoryTests.java index 354e8ba7..2de82e75 100644 --- a/mongodb/geo-json/src/test/java/example/springdata/mongodb/geojson/StoreRepositoryTests.java +++ b/mongodb/geo-json/src/test/java/example/springdata/mongodb/geojson/StoreRepositoryTests.java @@ -15,6 +15,7 @@ */ package example.springdata.mongodb.geojson; +import org.bson.Document; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -29,9 +30,6 @@ import org.springframework.data.mongodb.core.query.BasicQuery; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.test.context.junit4.SpringRunner; -import com.mongodb.BasicDBObject; -import com.mongodb.DBObject; - /** * Integration tests for {@link StoreRepository}. * @@ -116,12 +114,12 @@ public class StoreRepositoryTests { @Test public void findStoresThatIntersectGivenPolygon() { - DBObject geoJsonDbo = new BasicDBObject(); + Document geoJsonDbo = new Document(); operations.getConverter().write(GEO_JSON_POLYGON, geoJsonDbo); BasicQuery bq = new BasicQuery( - new BasicDBObject("location", new BasicDBObject("$geoIntersects", new BasicDBObject("$geometry", geoJsonDbo)))); + new Document("location", new Document("$geoIntersects", new Document("$geometry", geoJsonDbo)))); operations.find(bq, Store.class).forEach(System.out::println); } diff --git a/mongodb/java8/pom.xml b/mongodb/java8/pom.xml index 9a059360..7e1db36a 100644 --- a/mongodb/java8/pom.xml +++ b/mongodb/java8/pom.xml @@ -5,7 +5,7 @@ org.springframework.data.examples spring-data-mongodb-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT spring-data-mongodb-java8 diff --git a/mongodb/pom.xml b/mongodb/pom.xml index 162a84d6..0b7b4857 100644 --- a/mongodb/pom.xml +++ b/mongodb/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.examples spring-data-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT Spring Data MongoDB - Examples diff --git a/mongodb/query-by-example/pom.xml b/mongodb/query-by-example/pom.xml index a0652f4c..45f599ce 100644 --- a/mongodb/query-by-example/pom.xml +++ b/mongodb/query-by-example/pom.xml @@ -5,7 +5,7 @@ org.springframework.data.examples spring-data-mongodb-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT spring-data-mongodb-query-by-example diff --git a/mongodb/reactive/pom.xml b/mongodb/reactive/pom.xml index 3c896f27..a0ff1d31 100644 --- a/mongodb/reactive/pom.xml +++ b/mongodb/reactive/pom.xml @@ -5,54 +5,31 @@ org.springframework.data.examples spring-data-mongodb-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT spring-data-mongodb-reactive Spring Data MongoDB - Reactive features - Kay-M1 - 5.0.0.M3 - 3.0.3.RELEASE - 1.2.1 1.2.0 - 1.3.0 - + - org.springframework.data - spring-data-commons - - - - org.springframework.data - spring-data-mongodb - - - - io.projectreactor - reactor-core - - - - org.mongodb - mongodb-driver-reactivestreams - ${mongodb-driver-reactivestreams.version} + org.springframework.boot + spring-boot-starter-data-mongodb-reactive io.reactivex rxjava - ${rxjava.version} io.reactivex rxjava-reactive-streams - ${rxjava-reactive-streams.version} diff --git a/mongodb/reactive/src/main/java/example/springdata/mongodb/people/ReactivePersonRepository.java b/mongodb/reactive/src/main/java/example/springdata/mongodb/people/ReactivePersonRepository.java index c0500f90..a567dd21 100644 --- a/mongodb/reactive/src/main/java/example/springdata/mongodb/people/ReactivePersonRepository.java +++ b/mongodb/reactive/src/main/java/example/springdata/mongodb/people/ReactivePersonRepository.java @@ -18,8 +18,8 @@ package example.springdata.mongodb.people; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import org.springframework.data.mongodb.repository.InfiniteStream; import org.springframework.data.mongodb.repository.Query; +import org.springframework.data.mongodb.repository.Tailable; import org.springframework.data.repository.reactive.ReactiveCrudRepository; /** @@ -70,6 +70,6 @@ public interface ReactivePersonRepository extends ReactiveCrudRepository findWithTailableCursorBy(); } diff --git a/mongodb/reactive/src/main/java/example/springdata/mongodb/people/RxJava1PersonRepository.java b/mongodb/reactive/src/main/java/example/springdata/mongodb/people/RxJava1PersonRepository.java index d01c829c..69ef0854 100644 --- a/mongodb/reactive/src/main/java/example/springdata/mongodb/people/RxJava1PersonRepository.java +++ b/mongodb/reactive/src/main/java/example/springdata/mongodb/people/RxJava1PersonRepository.java @@ -18,8 +18,8 @@ package example.springdata.mongodb.people; import rx.Observable; import rx.Single; -import org.springframework.data.mongodb.repository.InfiniteStream; import org.springframework.data.mongodb.repository.Query; +import org.springframework.data.mongodb.repository.Tailable; import org.springframework.data.repository.reactive.RxJava1CrudRepository; /** @@ -70,6 +70,6 @@ public interface RxJava1PersonRepository extends RxJava1CrudRepository findWithTailableCursorBy(); } diff --git a/mongodb/reactive/src/test/java/example/springdata/mongodb/people/ReactiveMongoTemplateIntegrationTest.java b/mongodb/reactive/src/test/java/example/springdata/mongodb/people/ReactiveMongoTemplateIntegrationTest.java index be0f264d..51cf961d 100644 --- a/mongodb/reactive/src/test/java/example/springdata/mongodb/people/ReactiveMongoTemplateIntegrationTest.java +++ b/mongodb/reactive/src/test/java/example/springdata/mongodb/people/ReactiveMongoTemplateIntegrationTest.java @@ -78,7 +78,7 @@ public class ReactiveMongoTemplateIntegrationTest { .last() // .flatMap(v -> template.count(new Query(), Person.class)) // .doOnNext(System.out::println) // - .doOnComplete(countDownLatch::countDown) // + .doOnSuccess(it -> countDownLatch.countDown()) // .doOnError(throwable -> countDownLatch.countDown()) // .subscribe(); diff --git a/mongodb/reactive/src/test/java/example/springdata/mongodb/people/ReactivePersonRepositoryIntegrationTest.java b/mongodb/reactive/src/test/java/example/springdata/mongodb/people/ReactivePersonRepositoryIntegrationTest.java index 79774e9f..3483ee5e 100644 --- a/mongodb/reactive/src/test/java/example/springdata/mongodb/people/ReactivePersonRepositoryIntegrationTest.java +++ b/mongodb/reactive/src/test/java/example/springdata/mongodb/people/ReactivePersonRepositoryIntegrationTest.java @@ -17,7 +17,7 @@ package example.springdata.mongodb.people; import static org.assertj.core.api.Assertions.*; -import reactor.core.Cancellation; +import reactor.core.Disposable; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -55,7 +55,7 @@ public class ReactivePersonRepositoryIntegrationTest { .block(); repository - .save(Flux.just(new Person("Walter", "White", 50), // + .saveAll(Flux.just(new Person("Walter", "White", 50), // new Person("Skyler", "White", 45), // new Person("Saul", "Goodman", 42), // new Person("Jesse", "Pinkman", 27))) // @@ -74,12 +74,12 @@ public class ReactivePersonRepositoryIntegrationTest { repository.count() // .doOnNext(System.out::println) // - .thenMany(repository.save(Flux.just(new Person("Hank", "Schrader", 43), // + .thenMany(repository.saveAll(Flux.just(new Person("Hank", "Schrader", 43), // new Person("Mike", "Ehrmantraut", 62)))) // .last() // .flatMap(v -> repository.count()) // .doOnNext(System.out::println) // - .doOnComplete(countDownLatch::countDown) // + .doOnSuccess(it -> countDownLatch.countDown()) // .doOnError(throwable -> countDownLatch.countDown()) // .subscribe(); @@ -109,7 +109,7 @@ public class ReactivePersonRepositoryIntegrationTest { @Test public void shouldStreamDataWithTailableCursor() throws Exception { - Cancellation cancellation = repository.findWithTailableCursorBy() // + Disposable disposable = repository.findWithTailableCursorBy() // .doOnNext(System.out::println) // .doOnComplete(() -> System.out.println("Complete")) // .doOnTerminate(() -> System.out.println("Terminated")) // @@ -123,7 +123,7 @@ public class ReactivePersonRepositoryIntegrationTest { repository.save(new Person("Mike", "Ehrmantraut", 62)).subscribe(); Thread.sleep(100); - cancellation.dispose(); + disposable.dispose(); repository.save(new Person("Gus", "Fring", 53)).subscribe(); Thread.sleep(100); diff --git a/mongodb/reactive/src/test/java/example/springdata/mongodb/people/RxJava1PersonRepositoryIntegrationTest.java b/mongodb/reactive/src/test/java/example/springdata/mongodb/people/RxJava1PersonRepositoryIntegrationTest.java index d62c65b2..997b0c38 100644 --- a/mongodb/reactive/src/test/java/example/springdata/mongodb/people/RxJava1PersonRepositoryIntegrationTest.java +++ b/mongodb/reactive/src/test/java/example/springdata/mongodb/people/RxJava1PersonRepositoryIntegrationTest.java @@ -59,7 +59,7 @@ public class RxJava1PersonRepositoryIntegrationTest { .block(); repository - .save(Observable.just(new Person("Walter", "White", 50), // + .saveAll(Observable.just(new Person("Walter", "White", 50), // new Person("Skyler", "White", 45), // new Person("Saul", "Goodman", 42), // new Person("Jesse", "Pinkman", 27))) // @@ -75,11 +75,13 @@ public class RxJava1PersonRepositoryIntegrationTest { CountDownLatch countDownLatch = new CountDownLatch(1); + Observable people = Observable.just(new Person("Hank", "Schrader", 43), // + new Person("Mike", "Ehrmantraut", 62)); + repository.count() // .doOnSuccess(System.out::println) // .toObservable() // - .switchMap(count -> repository.save(Observable.just(new Person("Hank", "Schrader", 43), // - new Person("Mike", "Ehrmantraut", 62)))) // + .switchMap(count -> repository.saveAll(people)) // .last() // .toSingle() // .flatMap(v -> repository.count()) // diff --git a/mongodb/security/pom.xml b/mongodb/security/pom.xml index 34633d63..5ad58f8e 100644 --- a/mongodb/security/pom.xml +++ b/mongodb/security/pom.xml @@ -5,7 +5,7 @@ org.springframework.data.examples spring-data-mongodb-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT spring-data-mongodb-security diff --git a/mongodb/text-search/pom.xml b/mongodb/text-search/pom.xml index 3e50d2c8..a6e1703a 100644 --- a/mongodb/text-search/pom.xml +++ b/mongodb/text-search/pom.xml @@ -9,7 +9,7 @@ org.springframework.data.examples spring-data-mongodb-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT diff --git a/multi-store/pom.xml b/multi-store/pom.xml index 2c0be962..90f7d0bf 100644 --- a/multi-store/pom.xml +++ b/multi-store/pom.xml @@ -9,7 +9,7 @@ org.springframework.data.examples spring-data-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT diff --git a/neo4j/example/pom.xml b/neo4j/example/pom.xml index 6dc431cf..4102063e 100644 --- a/neo4j/example/pom.xml +++ b/neo4j/example/pom.xml @@ -9,7 +9,7 @@ org.springframework.data.examples spring-data-neo4j-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT ../pom.xml diff --git a/neo4j/example/src/main/java/example/springdata/neo4j/ActorRepository.java b/neo4j/example/src/main/java/example/springdata/neo4j/ActorRepository.java index c1f18ea0..992a7472 100644 --- a/neo4j/example/src/main/java/example/springdata/neo4j/ActorRepository.java +++ b/neo4j/example/src/main/java/example/springdata/neo4j/ActorRepository.java @@ -15,11 +15,11 @@ */ package example.springdata.neo4j; -import org.springframework.data.neo4j.repository.GraphRepository; +import org.springframework.data.neo4j.repository.Neo4jRepository; /** * {@link GraphRepository} for {@link Actor}s. * * @author Luanne Misquitta */ -public interface ActorRepository extends GraphRepository {} +public interface ActorRepository extends Neo4jRepository {} diff --git a/neo4j/example/src/test/java/example/springdata/neo4j/ActorRepositoryIntegrationTest.java b/neo4j/example/src/test/java/example/springdata/neo4j/ActorRepositoryIntegrationTest.java index 2d7963e4..c0de7c6b 100644 --- a/neo4j/example/src/test/java/example/springdata/neo4j/ActorRepositoryIntegrationTest.java +++ b/neo4j/example/src/test/java/example/springdata/neo4j/ActorRepositoryIntegrationTest.java @@ -15,8 +15,7 @@ */ package example.springdata.neo4j; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.junit.runner.RunWith; @@ -55,14 +54,10 @@ public class ActorRepositoryIntegrationTest { actorRepository.save(daniel); // saves the actor and the movie - Actor actor = actorRepository.findOne(daniel.getId()); - - assertThat(actor, is(notNullValue())); - assertThat(actor.getName(), is(daniel.getName())); - assertThat(actor.getRoles(), hasSize(1)); - - Role role = actor.getRoles().iterator().next(); - - assertThat(role.getRole(), is("Harry Potter")); + assertThat(actorRepository.findById(daniel.getId())).hasValueSatisfying(actor -> { + assertThat(actor.getName()).isEqualTo(daniel.getName()); + assertThat(actor.getRoles()).hasSize(1).first() + .satisfies(role -> assertThat(role.getRole()).isEqualTo("Harry Potter")); + }); } } diff --git a/neo4j/pom.xml b/neo4j/pom.xml index 476e01d4..1534387f 100644 --- a/neo4j/pom.xml +++ b/neo4j/pom.xml @@ -12,7 +12,7 @@ org.springframework.data.examples spring-data-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index abc824ba..7b53743f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.springframework.data.examples spring-data-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT pom Spring Data - Examples @@ -12,12 +12,12 @@ org.springframework.boot spring-boot-starter-parent - 1.5.6.RELEASE + 2.0.0.BUILD-SNAPSHOT bom - cassandra + elasticsearch jpa ldap @@ -27,7 +27,7 @@ neo4j rest redis - solr + web @@ -35,6 +35,7 @@ 1.1.3 1.8 + Kay-RELEASE diff --git a/redis/cluster/pom.xml b/redis/cluster/pom.xml index 3acd1689..adb633b4 100644 --- a/redis/cluster/pom.xml +++ b/redis/cluster/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.examples spring-data-redis-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT ../pom.xml diff --git a/redis/example/pom.xml b/redis/example/pom.xml index f6fd316f..65773a84 100644 --- a/redis/example/pom.xml +++ b/redis/example/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.examples spring-data-redis-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT ../pom.xml diff --git a/redis/pom.xml b/redis/pom.xml index caabdfa1..114c98f8 100644 --- a/redis/pom.xml +++ b/redis/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.examples spring-data-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT ../pom.xml @@ -18,7 +18,7 @@ cluster example - reactive + repositories sentinel util diff --git a/redis/repositories/pom.xml b/redis/repositories/pom.xml index 4c929d4a..748e22a5 100644 --- a/redis/repositories/pom.xml +++ b/redis/repositories/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.examples spring-data-redis-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT ../pom.xml diff --git a/redis/repositories/src/test/java/example/springdata/redis/repositories/PersonRepositoryTests.java b/redis/repositories/src/test/java/example/springdata/redis/repositories/PersonRepositoryTests.java index 050577c4..2e70d7ff 100644 --- a/redis/repositories/src/test/java/example/springdata/redis/repositories/PersonRepositoryTests.java +++ b/redis/repositories/src/test/java/example/springdata/redis/repositories/PersonRepositoryTests.java @@ -15,8 +15,10 @@ */ package example.springdata.redis.repositories; +import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.hamcrest.Matchers.not; +import static org.junit.Assert.assertThat; import example.springdata.redis.test.util.EmbeddedRedisServer; import example.springdata.redis.test.util.RequiresRedisServer; @@ -234,8 +236,9 @@ public class PersonRepositoryTests { repository.save(eddard); - Person laoded = repository.findOne(eddard.getId()); - assertThat(laoded.getChildren(), hasItems(jon, robb, sansa, arya, bran, rickon)); + assertThat(repository.findById(eddard.getId())).hasValueSatisfying(it -> { + assertThat(it.getChildren()).contains(jon, robb, sansa, arya, bran, rickon); + }); /* * Deceased: @@ -243,14 +246,15 @@ public class PersonRepositoryTests { * - Robb was killed by Roose Bolton during the Red Wedding. * - Jon was stabbed by brothers or the Night's Watch. */ - repository.delete(Arrays.asList(robb, jon)); + repository.deleteAll(Arrays.asList(robb, jon)); - laoded = repository.findOne(eddard.getId()); - assertThat(laoded.getChildren(), hasItems(sansa, arya, bran, rickon)); - assertThat(laoded.getChildren(), not(hasItems(robb, jon))); + assertThat(repository.findById(eddard.getId())).hasValueSatisfying(it -> { + assertThat(it.getChildren()).contains(sansa, arya, bran, rickon); + assertThat(it.getChildren()).doesNotContain(robb, jon); + }); } private void flushTestUsers() { - repository.save(Arrays.asList(eddard, robb, sansa, arya, bran, rickon, jon)); + repository.saveAll(Arrays.asList(eddard, robb, sansa, arya, bran, rickon, jon)); } } diff --git a/redis/sentinel/pom.xml b/redis/sentinel/pom.xml index 0107d333..47e97320 100644 --- a/redis/sentinel/pom.xml +++ b/redis/sentinel/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.examples spring-data-redis-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT ../pom.xml diff --git a/redis/util/pom.xml b/redis/util/pom.xml index 78f8b556..e4a7b390 100644 --- a/redis/util/pom.xml +++ b/redis/util/pom.xml @@ -5,7 +5,7 @@ org.springframework.data.examples spring-data-redis-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT ../pom.xml diff --git a/rest/headers/pom.xml b/rest/headers/pom.xml index fb42a018..7cde7af0 100644 --- a/rest/headers/pom.xml +++ b/rest/headers/pom.xml @@ -9,7 +9,7 @@ org.springframework.data.examples spring-data-rest-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT diff --git a/rest/multi-store/pom.xml b/rest/multi-store/pom.xml index 2c5deb0f..4aa2a089 100644 --- a/rest/multi-store/pom.xml +++ b/rest/multi-store/pom.xml @@ -11,7 +11,7 @@ org.springframework.data.examples spring-data-rest-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT diff --git a/rest/pom.xml b/rest/pom.xml index 02696b80..658afa66 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.examples spring-data-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT Spring Data REST - Examples diff --git a/rest/projections/pom.xml b/rest/projections/pom.xml index cb4949fd..7f79ff3d 100644 --- a/rest/projections/pom.xml +++ b/rest/projections/pom.xml @@ -9,7 +9,7 @@ org.springframework.data.examples spring-data-rest-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT diff --git a/rest/security/pom.xml b/rest/security/pom.xml index dcc15649..569692af 100644 --- a/rest/security/pom.xml +++ b/rest/security/pom.xml @@ -9,7 +9,7 @@ org.springframework.data.examples spring-data-rest-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT diff --git a/rest/security/src/main/java/example/springdata/rest/security/ItemRepository.java b/rest/security/src/main/java/example/springdata/rest/security/ItemRepository.java index ddc23526..cb4fdcd5 100644 --- a/rest/security/src/main/java/example/springdata/rest/security/ItemRepository.java +++ b/rest/security/src/main/java/example/springdata/rest/security/ItemRepository.java @@ -38,9 +38,9 @@ public interface ItemRepository extends CrudRepository { /* * (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#delete(java.io.Serializable) + * @see org.springframework.data.repository.CrudRepository#deleteById(java.lang.Object) */ @Override @PreAuthorize("hasRole('ROLE_ADMIN')") - void delete(Long aLong); + void deleteById(Long aLong); } diff --git a/rest/security/src/test/java/example/springdata/rest/security/MethodLevelSecurityTests.java b/rest/security/src/test/java/example/springdata/rest/security/MethodLevelSecurityTests.java index 9475687e..58566321 100644 --- a/rest/security/src/test/java/example/springdata/rest/security/MethodLevelSecurityTests.java +++ b/rest/security/src/test/java/example/springdata/rest/security/MethodLevelSecurityTests.java @@ -62,7 +62,7 @@ public class MethodLevelSecurityTests { } try { - itemRepository.delete(1L); + itemRepository.deleteById(1L); fail("Expected a security error"); } catch (AuthenticationCredentialsNotFoundException e) { // expected @@ -83,7 +83,7 @@ public class MethodLevelSecurityTests { // expected } try { - itemRepository.delete(1L); + itemRepository.deleteById(1L); fail("Expected a security error"); } catch (AccessDeniedException e) { // expected @@ -96,7 +96,9 @@ public class MethodLevelSecurityTests { SecurityUtils.runAs("system", "system", "ROLE_USER", "ROLE_ADMIN"); itemRepository.findAll(); - itemRepository.save(new Item("MacBook Pro")); - itemRepository.delete(1L); + + Item item = itemRepository.save(new Item("MacBook Pro")); + + itemRepository.deleteById(item.getId()); } } diff --git a/rest/security/src/test/java/example/springdata/rest/security/UrlLevelSecurityTests.java b/rest/security/src/test/java/example/springdata/rest/security/UrlLevelSecurityTests.java index af3adaef..1ab362e5 100644 --- a/rest/security/src/test/java/example/springdata/rest/security/UrlLevelSecurityTests.java +++ b/rest/security/src/test/java/example/springdata/rest/security/UrlLevelSecurityTests.java @@ -18,7 +18,6 @@ package example.springdata.rest.security; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; @@ -70,8 +69,7 @@ public class UrlLevelSecurityTests { mvc.perform(get("/").// accept(MediaTypes.HAL_JSON)).// andExpect(content().contentTypeCompatibleWith(MediaTypes.HAL_JSON)).// - andExpect(status().isOk()).// - andDo(print()); + andExpect(status().isOk()); } @Test @@ -80,8 +78,7 @@ public class UrlLevelSecurityTests { mvc.perform(post("/employees").// content(PAYLOAD).// accept(MediaTypes.HAL_JSON)).// - andExpect(status().isUnauthorized()).// - andDo(print()); + andExpect(status().isUnauthorized()); } @Test @@ -94,13 +91,11 @@ public class UrlLevelSecurityTests { mvc.perform(get("/employees").// headers(headers)).// andExpect(content().contentTypeCompatibleWith(MediaTypes.HAL_JSON)).// - andExpect(status().isOk()).// - andDo(print()); + andExpect(status().isOk()); mvc.perform(post("/employees").// headers(headers)).// - andExpect(status().isForbidden()).// - andDo(print()); + andExpect(status().isForbidden()); } @Test @@ -113,8 +108,7 @@ public class UrlLevelSecurityTests { mvc.perform(get("/employees").// headers(headers)).// andExpect(content().contentTypeCompatibleWith(MediaTypes.HAL_JSON)).// - andExpect(status().isOk()).// - andDo(print()); + andExpect(status().isOk()); headers.set(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE); @@ -124,7 +118,6 @@ public class UrlLevelSecurityTests { headers(headers)) .// andExpect(status().isCreated()).// - andDo(print()).// andReturn().getResponse().getHeader(HttpHeaders.LOCATION); ObjectMapper mapper = new ObjectMapper(); diff --git a/rest/starbucks/pom.xml b/rest/starbucks/pom.xml index 60d9573b..125b654d 100644 --- a/rest/starbucks/pom.xml +++ b/rest/starbucks/pom.xml @@ -9,7 +9,7 @@ org.springframework.data.examples spring-data-rest-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT @@ -28,7 +28,6 @@ com.querydsl querydsl-mongodb - ${querydsl.version} org.mongodb @@ -120,7 +119,7 @@ process - target/generated-sources/annotations + target/generated-sources/queries org.springframework.data.mongodb.repository.support.MongoAnnotationProcessor true diff --git a/rest/starbucks/src/main/java/example/springdata/rest/stores/StoreInitializer.java b/rest/starbucks/src/main/java/example/springdata/rest/stores/StoreInitializer.java index f3f78ed3..925364b6 100644 --- a/rest/starbucks/src/main/java/example/springdata/rest/stores/StoreInitializer.java +++ b/rest/starbucks/src/main/java/example/springdata/rest/stores/StoreInitializer.java @@ -51,7 +51,7 @@ public class StoreInitializer { List stores = readStores(); log.info("Importing {} stores into MongoDB…", stores.size()); - repository.save(stores); + repository.saveAll(stores); log.info("Successfully imported {} stores.", repository.count()); } diff --git a/rest/starbucks/src/main/java/example/springdata/rest/stores/StoreRepository.java b/rest/starbucks/src/main/java/example/springdata/rest/stores/StoreRepository.java index 7f638309..e71ec35f 100644 --- a/rest/starbucks/src/main/java/example/springdata/rest/stores/StoreRepository.java +++ b/rest/starbucks/src/main/java/example/springdata/rest/stores/StoreRepository.java @@ -21,7 +21,7 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.geo.Distance; import org.springframework.data.geo.Point; -import org.springframework.data.querydsl.QueryDslPredicateExecutor; +import org.springframework.data.querydsl.QuerydslPredicateExecutor; import org.springframework.data.querydsl.binding.QuerydslBindings; import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.data.rest.core.annotation.RestResource; @@ -34,7 +34,7 @@ import com.querydsl.core.types.dsl.StringPath; * * @author Oliver Gierke */ -public interface StoreRepository extends PagingAndSortingRepository, QueryDslPredicateExecutor { +public interface StoreRepository extends PagingAndSortingRepository, QuerydslPredicateExecutor { @RestResource(rel = "by-location") Page findByAddressLocationNear(Point location, Distance distance, Pageable pageable); diff --git a/rest/starbucks/src/test/java/example/springdata/rest/stores/StarbucksClient.java b/rest/starbucks/src/test/java/example/springdata/rest/stores/StarbucksClient.java index 3ea7c729..f75913e3 100644 --- a/rest/starbucks/src/test/java/example/springdata/rest/stores/StarbucksClient.java +++ b/rest/starbucks/src/test/java/example/springdata/rest/stores/StarbucksClient.java @@ -28,9 +28,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.context.embedded.LocalServerPort; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.springframework.boot.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; import org.springframework.hateoas.Link; import org.springframework.hateoas.Links; diff --git a/rest/uri-customization/pom.xml b/rest/uri-customization/pom.xml index 124c6d62..a0073f09 100644 --- a/rest/uri-customization/pom.xml +++ b/rest/uri-customization/pom.xml @@ -9,7 +9,7 @@ org.springframework.data.examples spring-data-rest-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT diff --git a/rest/uri-customization/src/main/java/example/springdata/rest/uris/UserEntityLookup.java b/rest/uri-customization/src/main/java/example/springdata/rest/uris/UserEntityLookup.java index 2985f7f4..59842123 100644 --- a/rest/uri-customization/src/main/java/example/springdata/rest/uris/UserEntityLookup.java +++ b/rest/uri-customization/src/main/java/example/springdata/rest/uris/UserEntityLookup.java @@ -18,9 +18,8 @@ package example.springdata.rest.uris; import lombok.NonNull; import lombok.RequiredArgsConstructor; -import java.io.Serializable; +import java.util.Optional; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.rest.core.support.EntityLookup; import org.springframework.data.rest.core.support.EntityLookupSupport; @@ -33,7 +32,7 @@ import org.springframework.data.rest.core.support.EntityLookupSupport; * @author Oliver Gierke * @see SpringDataRestCustomization#configureRepositoryRestConfiguration(org.springframework.data.rest.core.config.RepositoryRestConfiguration) */ -@RequiredArgsConstructor(onConstructor = @__(@Autowired) ) +@RequiredArgsConstructor public class UserEntityLookup extends EntityLookupSupport { private final @NonNull UserRepository repository; @@ -43,16 +42,16 @@ public class UserEntityLookup extends EntityLookupSupport { * @see org.springframework.data.rest.core.support.EntityLookup#getId(java.lang.Object) */ @Override - public Serializable getResourceIdentifier(User entity) { + public Object getResourceIdentifier(User entity) { return entity.getUsername(); } /* * (non-Javadoc) - * @see org.springframework.data.rest.core.support.EntityLookup#lookupEntity(java.io.Serializable) + * @see org.springframework.data.rest.core.support.EntityLookup#lookupEntity(java.lang.Object) */ @Override - public Object lookupEntity(Serializable id) { + public Optional lookupEntity(Object id) { return repository.findByUsername(id.toString()); } } diff --git a/solr/example/pom.xml b/solr/example/pom.xml index be861407..1028e6d8 100644 --- a/solr/example/pom.xml +++ b/solr/example/pom.xml @@ -5,7 +5,7 @@ org.springframework.data.examples spring-data-solr-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT spring-data-solr-example @@ -20,4 +20,4 @@ - \ No newline at end of file + diff --git a/solr/example/src/test/java/example/springdata/solr/AdvancedSolrRepositoryTests.java b/solr/example/src/test/java/example/springdata/solr/AdvancedSolrRepositoryTests.java index 315e31bc..93e23d7b 100644 --- a/solr/example/src/test/java/example/springdata/solr/AdvancedSolrRepositoryTests.java +++ b/solr/example/src/test/java/example/springdata/solr/AdvancedSolrRepositoryTests.java @@ -65,7 +65,7 @@ public class AdvancedSolrRepositoryTests { Product superNES = Product.builder().id("id-3").name("Super Nintendo").popularity(3).build(); Product nintendo64 = Product.builder().id("id-4").name("N64").description("Nintendo 64").popularity(2).build(); - repository.save(Arrays.asList(playstation, playstation2, superNES, nintendo64)); + repository.saveAll(Arrays.asList(playstation, playstation2, superNES, nintendo64)); } } diff --git a/solr/managed-schema/pom.xml b/solr/managed-schema/pom.xml index 638e7081..11a159d1 100644 --- a/solr/managed-schema/pom.xml +++ b/solr/managed-schema/pom.xml @@ -5,7 +5,7 @@ org.springframework.data.examples spring-data-solr-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT spring-data-solr-managed-schema-example @@ -20,4 +20,4 @@ - \ No newline at end of file + diff --git a/solr/pom.xml b/solr/pom.xml index eed17645..b6e74398 100644 --- a/solr/pom.xml +++ b/solr/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.examples spring-data-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT Spring Data Solr - Examples @@ -40,4 +40,4 @@ - \ No newline at end of file + diff --git a/solr/util/pom.xml b/solr/util/pom.xml index 018d4825..9be802f0 100644 --- a/solr/util/pom.xml +++ b/solr/util/pom.xml @@ -5,7 +5,7 @@ org.springframework.data.examples spring-data-solr-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT spring-data-solr-example-utils @@ -17,4 +17,4 @@ junit - \ No newline at end of file + diff --git a/web/example/pom.xml b/web/example/pom.xml index 79ba55f9..8d3ecefa 100644 --- a/web/example/pom.xml +++ b/web/example/pom.xml @@ -9,7 +9,7 @@ org.springframework.data.examples spring-data-web-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT diff --git a/web/pom.xml b/web/pom.xml index b34feaf2..fbe4fe18 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.examples spring-data-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT Spring Data - Web examples diff --git a/web/projection/pom.xml b/web/projection/pom.xml index 60dff247..578d6dfa 100644 --- a/web/projection/pom.xml +++ b/web/projection/pom.xml @@ -9,7 +9,7 @@ org.springframework.data.examples spring-data-web-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT diff --git a/web/querydsl/pom.xml b/web/querydsl/pom.xml index cce4ff3c..2380381a 100644 --- a/web/querydsl/pom.xml +++ b/web/querydsl/pom.xml @@ -9,7 +9,7 @@ org.springframework.data.examples spring-data-web-examples - 1.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT @@ -27,7 +27,6 @@ com.querydsl querydsl-mongodb - ${querydsl.version} org.mongodb @@ -116,7 +115,7 @@ process - target/generated-sources/annotations + target/generated-sources/queries org.springframework.data.mongodb.repository.support.MongoAnnotationProcessor true diff --git a/web/querydsl/src/main/java/example/users/UserInitializer.java b/web/querydsl/src/main/java/example/users/UserInitializer.java index 04e9686c..47a9bd32 100644 --- a/web/querydsl/src/main/java/example/users/UserInitializer.java +++ b/web/querydsl/src/main/java/example/users/UserInitializer.java @@ -52,7 +52,7 @@ public class UserInitializer { List users = readUsers(new ClassPathResource("randomuser.me.csv")); repository.deleteAll(); - repository.save(users); + repository.saveAll(users); } private static List readUsers(Resource resource) throws Exception { diff --git a/web/querydsl/src/main/java/example/users/UserRepository.java b/web/querydsl/src/main/java/example/users/UserRepository.java index dac59d33..32b95bfb 100644 --- a/web/querydsl/src/main/java/example/users/UserRepository.java +++ b/web/querydsl/src/main/java/example/users/UserRepository.java @@ -15,7 +15,7 @@ */ package example.users; -import org.springframework.data.querydsl.QueryDslPredicateExecutor; +import org.springframework.data.querydsl.QuerydslPredicateExecutor; import org.springframework.data.querydsl.binding.QuerydslBinderCustomizer; import org.springframework.data.querydsl.binding.QuerydslBindings; import org.springframework.data.repository.CrudRepository; @@ -31,7 +31,7 @@ import com.querydsl.core.types.dsl.StringPath; * @author Oliver Gierke */ public interface UserRepository - extends CrudRepository, QueryDslPredicateExecutor, QuerydslBinderCustomizer { + extends CrudRepository, QuerydslPredicateExecutor, QuerydslBinderCustomizer { /* * (non-Javadoc)