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

#297 - Upgraded to Boot 2.0 and Spring Data Kay.

Browse Source 
Bumped version number to 2.0. Upgraded to Spring Boot 2.0.

Stuff disabled in the meantime:

- Cassandra: needs API adaptions in configuration
- JPA > Security: test fails with weird Hibernate error
- Redis > Reactive: API updates needed
- Solr: configration updates necessary

adjust versions

Updated elastic search to the new version.

Fixed the reactor version to Bismuth-BUILD-SNAPSHOT. This probably should be undone when boot references the proper bom.
This commit is contained in:
Oliver Gierke
2017-05-04 19:28:40 +02:00
parent 90546357c7
commit 4164bc4607
98 changed files with 319 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cassandra/example/pom.xml
View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-cassandra-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

6
cassandra/example/src/main/java/example/springdata/cassandra/convert/ConverterConfiguration.java
View File

@@ -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<Converter<?, ?>> converters = new ArrayList<>();
converters.add(new PersonWriteConverter());
converters.add(new PersonReadConverter());
converters.add(new CustomAddressbookReadConverter());
return new CustomConversions(converters);
return new CassandraCustomConversions(converters);
}
/**

2
cassandra/example/src/test/java/example/springdata/cassandra/basic/BasicUserRepositoryTests.java
View File

@@ -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));
}
/**

2
cassandra/java8/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-cassandra-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
cassandra/pom.xml
View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<name>Spring Data Cassandra - Examples</name>

2
cassandra/reactive/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-cassandra-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<artifactId>spring-data-cassandra-reactive</artifactId>

2
cassandra/util/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-cassandra-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
elasticsearch/example/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-elasticsearch-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
</project>

4
elasticsearch/pom.xml
View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<name>Spring Data Elasticsearch - Examples</name>
@@ -16,7 +16,7 @@
<url>https://github.com/spring-projects/spring-data-elasticsearch</url>
<properties>
<elasticsearch.version>2.2.0</elasticsearch.version>
<elasticsearch.version>5.4.0</elasticsearch.version>
</properties>
<modules>

2
jpa/eclipselink/pom.xml
View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-jpa-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

5
jpa/eclipselink/src/test/java/example/springdata/jpa/eclipselink/CustomerRepositoryIntegrationTests.java
View File

@@ -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);
}
}

2
jpa/example/pom.xml
View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-jpa-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

8
jpa/example/src/main/java/example/springdata/jpa/auditing/AuditorAwareImpl.java
View File

@@ -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<AuditableUser> {
private AuditableUser auditor;
private Optional<AuditableUser> 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<AuditableUser> getCurrentAuditor() {
return auditor;
}
}

14
jpa/example/src/test/java/example/springdata/jpa/basics/BasicFactorySetup.java
View File

@@ -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);
}
}

14
jpa/example/src/test/java/example/springdata/jpa/basics/BasicSample.java
View File

@@ -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<User, Long> userRepository;
private EntityManager em;
CrudRepository<User, Long> 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);
}
}

10
jpa/example/src/test/java/example/springdata/jpa/caching/CachingRepositoryTests.java
View File

@@ -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);
}
}

14
jpa/example/src/test/java/example/springdata/jpa/custom/UserRepositoryCustomizationTests.java
View File

@@ -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<User> 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<User> users = repository.myCustomBatchOperation();
assertNotNull(users);
assertTrue(users.contains(user));
assertThat(users).contains(user);
}
}

5
jpa/example/src/test/java/example/springdata/jpa/customall/UserRepositoryCustomizationTests.java
View File

@@ -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);
}
}

51
jpa/example/src/test/java/example/springdata/jpa/projections/CustomerRepositoryIntegrationTest.java
View File

@@ -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<CustomerProjection> 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<CustomerProjection> 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<CustomerDto> 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<CustomerProjection> 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<CustomerDto> 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<CustomerProjection> 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();
}
}

36
jpa/example/src/test/java/example/springdata/jpa/simple/SimpleUserRepositoryTests.java
View File

@@ -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<User> 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<User> 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<User> users = repository.findByLastnameOrderByUsernameAsc(this.user.getLastname(), new PageRequest(1, 5));
Slice<User> 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<User> 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<User> 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");

2
jpa/interceptors/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-jpa-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
jpa/java8/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-jpa-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<artifactId>spring-data-jpa-java8</artifactId>

2
jpa/java8/src/main/java/example/springdata/jpa/java8/CustomerRepository.java
View File

@@ -39,7 +39,7 @@ public interface CustomerRepository extends Repository<Customer, Long> {
* @param id
* @return
*/
Optional<Customer> findOne(Long id);
Optional<Customer> findById(Long id);
/**
* Saves the given {@link Customer}.

20
jpa/java8/src/test/java/example/springdata/jpa/java8/Java8IntegrationTests.java
View File

@@ -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.<Customer> 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<Customer> 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<Customer> 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<Customer> 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<Void> future = repository.readAllBy().thenAccept(customers -> {
assertThat(customers, hasSize(2));
assertThat(customers).hasSize(2);
customers.forEach(customer -> log.info(customer.toString()));
log.info("Completed!");
});

2
jpa/javaslang/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-jpa-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<artifactId>spring-data-jpa-javaslang</artifactId>

2
jpa/jpa21/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-jpa-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<artifactId>spring-data-jpa-jpa21</artifactId>

2
jpa/multiple-datasources/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-jpa-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<artifactId>spring-data-jpa-multiple-datasources</artifactId>

4
jpa/pom.xml
View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<name>Spring Data JPA - Examples</name>
@@ -23,7 +23,7 @@
<module>java8</module>
<module>javaslang</module>
<module>jpa21</module>
<module>security</module>
<!--<module>security</module>-->
<module>multiple-datasources</module>
<module>eclipselink</module>
<module>query-by-example</module>

2
jpa/query-by-example/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-jpa-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<artifactId>spring-data-jpa-query-by-example</artifactId>

2
jpa/showcase/pom.xml
View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-jpa-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

16
jpa/showcase/src/snippets/java/example/springdata/jpa/showcase/snippets/AccountRepository.java
View File

@@ -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<Account, Long>, AccountRepositoryCustom,
QueryDslPredicateExecutor<Account> {
public interface AccountRepository
extends CrudRepository<Account, Long>, AccountRepositoryCustom, QuerydslPredicateExecutor<Account> {
/**
* Returns all accounts belonging to the given {@link Customer}.

17
jpa/showcase/src/test-snippets/java/example/springdata/jpa/showcase/snippets/test/AccountRepositoryIntegrationTest.java
View File

@@ -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<Account> expired = accountRepository.findById(1L);
Optional<Account> valid = accountRepository.findById(2L);
Iterable<Account> 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());
}
}

20
jpa/showcase/src/test-snippets/java/example/springdata/jpa/showcase/snippets/test/CustomerRepositoryIntegrationTest.java
View File

@@ -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<Customer> dave = repository.findById(1L);
LocalDate expiryLimit = new LocalDate(2011, 3, 1);
List<Customer> 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));
}
}

26
jpa/showcase/src/test/java/example/springdata/jpa/showcase/after/AccountRepositoryIntegrationTest.java
View File

@@ -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<Account> accounts = accountRepository.findByCustomer(customer);
Optional<Customer> customer = customerRepository.findById(1L);
List<Account> 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));
}
}

36
jpa/showcase/src/test/java/example/springdata/jpa/showcase/after/CustomerRepositoryIntegrationTest.java
View File

@@ -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<Customer> result = repository.findAll();
assertThat(result, is(notNullValue()));
assertTrue(result.iterator().hasNext());
assertThat(repository.findAll()).isNotEmpty();
}
@Test
public void findsFirstPageOfMatthews() throws Exception {
Page<Customer> customers = repository.findByLastname("Matthews", new PageRequest(0, 2));
Page<Customer> 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<Customer> dave = repository.findById(1L);
LocalDate expiryLimit = new LocalDate(2011, 3, 1);
List<Customer> 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));
}
}

2
ldap/example/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-ldap-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

12
ldap/example/src/test/java/example/springdata/ldap/PersonRepositoryIntegrationTests.java
View File

@@ -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> 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");
});
}
/**

2
ldap/pom.xml
View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
map/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>

9
map/src/test/java/example/springdata/map/PersonRepositoryIntegrationTest.java
View File

@@ -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<Person> result = repository.findByAgeGreaterThan(18);
assertThat(result, hasItem(dave));
assertThat(result, not(hasItem(oliver)));
assertThat(result).contains(dave);
assertThat(result).doesNotContain(oliver);
}
}

2
mongodb/aggregation/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-mongodb-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
</project>

6
mongodb/aggregation/src/test/java/example/springdata/mongodb/aggregation/SpringBooksIntegrationTests.java
View File

@@ -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<DBObject> result = operations.aggregate(aggregation, "books", DBObject.class);
AggregationResults<Document> result = operations.aggregate(aggregation, "books", Document.class);
DBObject uniqueMappedResult = result.getUniqueMappedResult();
Document uniqueMappedResult = result.getUniqueMappedResult();
assertThat((List<Object>) uniqueMappedResult.get("prices")).hasSize(3);
assertThat((List<Object>) uniqueMappedResult.get("authors")).hasSize(8);

2
mongodb/example/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-mongodb-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<build>

4
mongodb/example/src/main/java/example/springdata/mongodb/advanced/ApplicationConfiguration.java
View File

@@ -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));
}
}

19
mongodb/example/src/test/java/example/springdata/mongodb/advanced/AdvancedIntegrationTests.java
View File

@@ -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<Document> 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");
}
}
}

32
mongodb/example/src/test/java/example/springdata/mongodb/advanced/ServersideScriptTests.java
View File

@@ -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);
}

2
mongodb/example/src/test/java/example/springdata/mongodb/projections/CustomerRepositoryIntegrationTest.java
View File

@@ -113,7 +113,7 @@ public class CustomerRepositoryIntegrationTest {
public void supportsProjectionInCombinationWithPagination() {
Page<CustomerProjection> 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"));
}

2
mongodb/geo-json/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-mongodb-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<artifactId>spring-data-mongodb-geojson</artifactId>

8
mongodb/geo-json/src/test/java/example/springdata/mongodb/geojson/StoreRepositoryTests.java
View File

@@ -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);
}

2
mongodb/java8/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-mongodb-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<artifactId>spring-data-mongodb-java8</artifactId>

2
mongodb/pom.xml
View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<name>Spring Data MongoDB - Examples</name>

2
mongodb/query-by-example/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-mongodb-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<artifactId>spring-data-mongodb-query-by-example</artifactId>

31
mongodb/reactive/pom.xml
View File

@@ -5,54 +5,31 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-mongodb-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<artifactId>spring-data-mongodb-reactive</artifactId>
<name>Spring Data MongoDB - Reactive features</name>
<properties>
<spring-data-releasetrain.version>Kay-M1</spring-data-releasetrain.version>
<spring.version>5.0.0.M3</spring.version>
<reactor.version>3.0.3.RELEASE</reactor.version>
<rxjava.version>1.2.1</rxjava.version>
<rxjava-reactive-streams.version>1.2.0</rxjava-reactive-streams.version>
<mongodb-driver-reactivestreams.version>1.3.0</mongodb-driver-reactivestreams.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-mongodb</artifactId>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongodb-driver-reactivestreams</artifactId>
<version>${mongodb-driver-reactivestreams.version}</version>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb-reactive</artifactId>
</dependency>
<dependency>
<groupId>io.reactivex</groupId>
<artifactId>rxjava</artifactId>
<version>${rxjava.version}</version>
</dependency>
<dependency>
<groupId>io.reactivex</groupId>
<artifactId>rxjava-reactive-streams</artifactId>
<version>${rxjava-reactive-streams.version}</version>
</dependency>
</dependencies>

4
mongodb/reactive/src/main/java/example/springdata/mongodb/people/ReactivePersonRepository.java
View File

@@ -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<Person,
*
* @return
*/
@InfiniteStream
@Tailable
Flux<Person> findWithTailableCursorBy();
}

4
mongodb/reactive/src/main/java/example/springdata/mongodb/people/RxJava1PersonRepository.java
View File

@@ -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<Person, S
*
* @return
*/
@InfiniteStream
@Tailable
Observable<Person> findWithTailableCursorBy();
}

2
mongodb/reactive/src/test/java/example/springdata/mongodb/people/ReactiveMongoTemplateIntegrationTest.java
View File

@@ -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();

12
mongodb/reactive/src/test/java/example/springdata/mongodb/people/ReactivePersonRepositoryIntegrationTest.java
View File

@@ -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);

8
mongodb/reactive/src/test/java/example/springdata/mongodb/people/RxJava1PersonRepositoryIntegrationTest.java
View File

@@ -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<Person> 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()) //

2
mongodb/security/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-mongodb-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<artifactId>spring-data-mongodb-security</artifactId>

2
mongodb/text-search/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-mongodb-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>

2
multi-store/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>

2
neo4j/example/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-neo4j-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

4
neo4j/example/src/main/java/example/springdata/neo4j/ActorRepository.java
View File

@@ -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<Actor> {}
public interface ActorRepository extends Neo4jRepository<Actor, Long> {}

17
neo4j/example/src/test/java/example/springdata/neo4j/ActorRepositoryIntegrationTest.java
View File

@@ -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"));
});
}
}

2
neo4j/pom.xml
View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

9
pom.xml
View File

@@ -4,7 +4,7 @@
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Spring Data - Examples</name>
@@ -12,12 +12,12 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.6.RELEASE</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<modules>
<module>bom</module>
<module>cassandra</module>
<!--<module>cassandra</module>-->
<module>elasticsearch</module>
<module>jpa</module>
<module>ldap</module>
@@ -27,7 +27,7 @@
<module>neo4j</module>
<module>rest</module>
<module>redis</module>
<module>solr</module>
<!--<module>solr</module>-->
<module>web</module>
</modules>
@@ -35,6 +35,7 @@
<apt.version>1.1.3</apt.version>
<java.version>1.8</java.version>
<spring-data-releasetrain.version>Kay-RELEASE</spring-data-releasetrain.version>
</properties>

2
redis/cluster/pom.xml
View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-redis-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
redis/example/pom.xml
View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-redis-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

4
redis/pom.xml
View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -18,7 +18,7 @@
<modules>
<module>cluster</module>
<module>example</module>
<module>reactive</module>
<!--<module>reactive</module>-->
<module>repositories</module>
<module>sentinel</module>
<module>util</module>

2
redis/repositories/pom.xml
View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-redis-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

20
redis/repositories/src/test/java/example/springdata/redis/repositories/PersonRepositoryTests.java
View File

@@ -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<K, V> {
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<K, V> {
* - 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));
}
}

2
redis/sentinel/pom.xml
View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-redis-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
redis/util/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-redis-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
rest/headers/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-rest-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>

2
rest/multi-store/pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-rest-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>

2
rest/pom.xml
View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<name>Spring Data REST - Examples</name>

2
rest/projections/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-rest-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>

2
rest/security/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-rest-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<properties>

4
rest/security/src/main/java/example/springdata/rest/security/ItemRepository.java
View File

@@ -38,9 +38,9 @@ public interface ItemRepository extends CrudRepository<Item, Long> {
/*
* (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);
}

10
rest/security/src/test/java/example/springdata/rest/security/MethodLevelSecurityTests.java
View File

@@ -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());
}
}

17
rest/security/src/test/java/example/springdata/rest/security/UrlLevelSecurityTests.java
View File

@@ -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();

5
rest/starbucks/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-rest-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
@@ -28,7 +28,6 @@
<dependency>
<groupId>com.querydsl</groupId>
<artifactId>querydsl-mongodb</artifactId>
<version>${querydsl.version}</version>
<exclusions>
<exclusion>
<groupId>org.mongodb</groupId>
@@ -120,7 +119,7 @@
<goal>process</goal>
</goals>
<configuration>
<outputDirectory>target/generated-sources/annotations</outputDirectory>
<outputDirectory>target/generated-sources/queries</outputDirectory>
<processor>org.springframework.data.mongodb.repository.support.MongoAnnotationProcessor</processor>
<logOnlyOnError>true</logOnlyOnError>
</configuration>

2
rest/starbucks/src/main/java/example/springdata/rest/stores/StoreInitializer.java
View File

@@ -51,7 +51,7 @@ public class StoreInitializer {
List<Store> stores = readStores();
log.info("Importing {} stores into MongoDB…", stores.size());
repository.save(stores);
repository.saveAll(stores);
log.info("Successfully imported {} stores.", repository.count());
}

4
rest/starbucks/src/main/java/example/springdata/rest/stores/StoreRepository.java
View File

@@ -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<Store, UUID>, QueryDslPredicateExecutor<Store> {
public interface StoreRepository extends PagingAndSortingRepository<Store, UUID>, QuerydslPredicateExecutor<Store> {
@RestResource(rel = "by-location")
Page<Store> findByAddressLocationNear(Point location, Distance distance, Pageable pageable);

2
rest/starbucks/src/test/java/example/springdata/rest/stores/StarbucksClient.java
View File

@@ -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;

2
rest/uri-customization/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-rest-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>

11
rest/uri-customization/src/main/java/example/springdata/rest/uris/UserEntityLookup.java
View File

@@ -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<User> {
private final @NonNull UserRepository repository;
@@ -43,16 +42,16 @@ public class UserEntityLookup extends EntityLookupSupport<User> {
* @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<User> lookupEntity(Object id) {
return repository.findByUsername(id.toString());
}
}

4
solr/example/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-solr-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<artifactId>spring-data-solr-example</artifactId>
@@ -20,4 +20,4 @@
</dependency>
</dependencies>
</project>
</project>

2
solr/example/src/test/java/example/springdata/solr/AdvancedSolrRepositoryTests.java
View File

@@ -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));
}
}

4
solr/managed-schema/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-solr-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<artifactId>spring-data-solr-managed-schema-example</artifactId>
@@ -20,4 +20,4 @@
</dependency>
</dependencies>
</project>
</project>

4
solr/pom.xml
View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<name>Spring Data Solr - Examples</name>
@@ -40,4 +40,4 @@
</dependency>
</dependencies>
</project>
</project>

4
solr/util/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-solr-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<artifactId>spring-data-solr-example-utils</artifactId>
@@ -17,4 +17,4 @@
<artifactId>junit</artifactId>
</dependency>
</dependencies>
</project>
</project>

2
web/example/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-web-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>

2
web/pom.xml
View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<name>Spring Data - Web examples</name>

2
web/projection/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-web-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>

5
web/querydsl/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-web-examples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
@@ -27,7 +27,6 @@
<dependency>
<groupId>com.querydsl</groupId>
<artifactId>querydsl-mongodb</artifactId>
<version>${querydsl.version}</version>
<exclusions>
<exclusion>
<groupId>org.mongodb</groupId>
@@ -116,7 +115,7 @@
<goal>process</goal>
</goals>
<configuration>
<outputDirectory>target/generated-sources/annotations</outputDirectory>
<outputDirectory>target/generated-sources/queries</outputDirectory>
<processor>org.springframework.data.mongodb.repository.support.MongoAnnotationProcessor</processor>
<logOnlyOnError>true</logOnlyOnError>
</configuration>

2
web/querydsl/src/main/java/example/users/UserInitializer.java
View File

@@ -52,7 +52,7 @@ public class UserInitializer {
List<User> users = readUsers(new ClassPathResource("randomuser.me.csv"));
repository.deleteAll();
repository.save(users);
repository.saveAll(users);
}
private static List<User> readUsers(Resource resource) throws Exception {

4
web/querydsl/src/main/java/example/users/UserRepository.java
View File

@@ -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<User, String>, QueryDslPredicateExecutor<User>, QuerydslBinderCustomizer<QUser> {
extends CrudRepository<User, String>, QuerydslPredicateExecutor<User>, QuerydslBinderCustomizer<QUser> {
/*
* (non-Javadoc)