From a9a31107cfb9cbe07a1b9e069e27b60bd83c2dea Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 24 Mar 2017 11:26:27 +0000 Subject: [PATCH] Align with API changes in latest Spring Data Kay snapshots See gh-7461 --- .../data/mongo/MongoDataAutoConfigurationTests.java | 13 ++++++++++--- .../jpa/service/CityRepositoryIntegrationTests.java | 2 +- .../service/HotelRepositoryIntegrationTests.java | 5 ++--- .../service/CityRepositoryIntegrationTests.java | 4 ++-- .../secure/oauth2/resource/FlightRepository.java | 4 +++- .../java/sample/secure/oauth2/FlightRepository.java | 4 +++- 6 files changed, 21 insertions(+), 11 deletions(-) diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java index 07ee35fea2..56e356ae75 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java @@ -18,6 +18,7 @@ package org.springframework.boot.autoconfigure.data.mongo; import java.time.LocalDateTime; import java.util.Arrays; +import java.util.Optional; import java.util.Set; import com.mongodb.Mongo; @@ -44,8 +45,9 @@ import org.springframework.data.mapping.model.FieldNamingStrategy; import org.springframework.data.mapping.model.PropertyNameFieldNamingStrategy; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.convert.CustomConversions; +import org.springframework.data.mongodb.core.mapping.BasicMongoPersistentEntity; import org.springframework.data.mongodb.core.mapping.MongoMappingContext; -import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity; +import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty; import org.springframework.data.mongodb.gridfs.GridFsTemplate; import org.springframework.test.util.ReflectionTestUtils; @@ -165,8 +167,13 @@ public class MongoDataAutoConfigurationTests { MongoDataAutoConfiguration.class); this.context.refresh(); MongoMappingContext context = this.context.getBean(MongoMappingContext.class); - MongoPersistentEntity entity = context.getPersistentEntity(Sample.class); - assertThat(entity.getPersistentProperty("date").isEntity()).isFalse(); + Optional> entity = context + .getPersistentEntity(Sample.class); + assertThat(entity).isPresent(); + Optional dateProperty = entity.get() + .getPersistentProperty("date"); + assertThat(dateProperty).isPresent(); + assertThat(dateProperty.get().isEntity()).isFalse(); } public void testFieldNamingStrategy(String strategy, diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/CityRepositoryIntegrationTests.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/CityRepositoryIntegrationTests.java index 1e492c9572..a3e14949a1 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/CityRepositoryIntegrationTests.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/CityRepositoryIntegrationTests.java @@ -42,7 +42,7 @@ public class CityRepositoryIntegrationTests { @Test public void findsFirstPageOfCities() { - Page cities = this.repository.findAll(new PageRequest(0, 10)); + Page cities = this.repository.findAll(PageRequest.of(0, 10)); assertThat(cities.getTotalElements()).isGreaterThan(20L); } } diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/HotelRepositoryIntegrationTests.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/HotelRepositoryIntegrationTests.java index ead0f9955e..b353ba9d4c 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/HotelRepositoryIntegrationTests.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/HotelRepositoryIntegrationTests.java @@ -51,12 +51,11 @@ public class HotelRepositoryIntegrationTests { @Test public void executesQueryMethodsCorrectly() { City city = this.cityRepository - .findAll(new PageRequest(0, 1, Direction.ASC, "name")).getContent() - .get(0); + .findAll(PageRequest.of(0, 1, Direction.ASC, "name")).getContent().get(0); assertThat(city.getName()).isEqualTo("Atlanta"); Page hotels = this.repository.findByCity(city, - new PageRequest(0, 10, Direction.ASC, "name")); + PageRequest.of(0, 10, Direction.ASC, "name")); Hotel hotel = this.repository.findByCityAndName(city, hotels.getContent().get(0).getName()); assertThat(hotel.getName()).isEqualTo("Doubletree"); diff --git a/spring-boot-samples/spring-boot-sample-data-rest/src/test/java/sample/data/rest/service/CityRepositoryIntegrationTests.java b/spring-boot-samples/spring-boot-sample-data-rest/src/test/java/sample/data/rest/service/CityRepositoryIntegrationTests.java index 0dfc3361c3..7d55c3775f 100644 --- a/spring-boot-samples/spring-boot-sample-data-rest/src/test/java/sample/data/rest/service/CityRepositoryIntegrationTests.java +++ b/spring-boot-samples/spring-boot-sample-data-rest/src/test/java/sample/data/rest/service/CityRepositoryIntegrationTests.java @@ -44,7 +44,7 @@ public class CityRepositoryIntegrationTests { @Test public void findsFirstPageOfCities() { - Page cities = this.repository.findAll(new PageRequest(0, 10)); + Page cities = this.repository.findAll(PageRequest.of(0, 10)); assertThat(cities.getTotalElements()).isGreaterThan(20L); } @@ -60,7 +60,7 @@ public class CityRepositoryIntegrationTests { public void findContaining() { Page cities = this.repository .findByNameContainingAndCountryContainingAllIgnoringCase("", "UK", - new PageRequest(0, 10)); + PageRequest.of(0, 10)); assertThat(cities.getTotalElements()).isEqualTo(3L); } } diff --git a/spring-boot-samples/spring-boot-sample-secure-oauth2-resource/src/main/java/sample/secure/oauth2/resource/FlightRepository.java b/spring-boot-samples/spring-boot-sample-secure-oauth2-resource/src/main/java/sample/secure/oauth2/resource/FlightRepository.java index 9c94301679..f7b72ed922 100644 --- a/spring-boot-samples/spring-boot-sample-secure-oauth2-resource/src/main/java/sample/secure/oauth2/resource/FlightRepository.java +++ b/spring-boot-samples/spring-boot-sample-secure-oauth2-resource/src/main/java/sample/secure/oauth2/resource/FlightRepository.java @@ -16,6 +16,8 @@ package sample.secure.oauth2.resource; +import java.util.Optional; + import org.springframework.data.repository.CrudRepository; /** @@ -30,7 +32,7 @@ public interface FlightRepository extends CrudRepository { Iterable findAll(); @Override - Flight findOne(Long aLong); + Optional findOne(Long aLong); @Override S save(S entity); diff --git a/spring-boot-samples/spring-boot-sample-secure-oauth2/src/main/java/sample/secure/oauth2/FlightRepository.java b/spring-boot-samples/spring-boot-sample-secure-oauth2/src/main/java/sample/secure/oauth2/FlightRepository.java index 96390d7c20..a9d0b3adbc 100644 --- a/spring-boot-samples/spring-boot-sample-secure-oauth2/src/main/java/sample/secure/oauth2/FlightRepository.java +++ b/spring-boot-samples/spring-boot-sample-secure-oauth2/src/main/java/sample/secure/oauth2/FlightRepository.java @@ -16,6 +16,8 @@ package sample.secure.oauth2; +import java.util.Optional; + import org.springframework.data.repository.CrudRepository; import org.springframework.security.access.prepost.PreAuthorize; @@ -33,7 +35,7 @@ public interface FlightRepository extends CrudRepository { @Override @PreAuthorize("#oauth2.hasScope('read')") - Flight findOne(Long aLong); + Optional findOne(Long aLong); @Override @PreAuthorize("#oauth2.hasScope('write')")