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