From e9f7d79f3e5d7b3c6b1ab213e4b1da079dd3f6db Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Thu, 14 Mar 2019 14:33:00 +0100 Subject: [PATCH] DATAGRAPH-1206 - Move off deprecations in Spring Data Commons. Related ticket: DATACMNS-1496. --- .../data/neo4j/examples/galaxy/GalaxyServiceTests.java | 10 +++++----- .../data/neo4j/queries/DerivedQueryTests.java | 8 ++++---- .../data/neo4j/queries/Java8SupportTests.java | 2 +- .../data/neo4j/queries/PagedQueryTests.java | 4 ++-- .../repository/query/GraphQueryExecutionTests.java | 3 +-- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/examples/galaxy/GalaxyServiceTests.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/examples/galaxy/GalaxyServiceTests.java index 295708984..2cb3b0b6d 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/examples/galaxy/GalaxyServiceTests.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/examples/galaxy/GalaxyServiceTests.java @@ -181,7 +181,7 @@ public class GalaxyServiceTests { assertEquals(count, 13); - Pageable pageable = new PageRequest(2, 3); + Pageable pageable = PageRequest.of(2, 3); Page worlds = galaxyService.findAllWorlds(pageable); assertTrue(worlds.hasNext()); @@ -194,7 +194,7 @@ public class GalaxyServiceTests { assertEquals(count, 13); - Pageable pageable = new PageRequest(4, 3); + Pageable pageable = PageRequest.of(4, 3); Page worlds = galaxyService.findAllWorlds(pageable); assertFalse(worlds.hasNext()); @@ -211,7 +211,7 @@ public class GalaxyServiceTests { // note: this doesn't work, because deleted node ids are not reclaimed // long sum = (size * size - size) / 2; // 0-based node ids - Pageable pageable = new PageRequest(0, 3); + Pageable pageable = PageRequest.of(0, 3); for (;;) { Page page = galaxyService.findAllWorlds(pageable); @@ -236,7 +236,7 @@ public class GalaxyServiceTests { String[] sortedNames = getNamesSorted(worlds); - Pageable pageable = new PageRequest(0, 3, Sort.Direction.ASC, "name"); + Pageable pageable = PageRequest.of(0, 3, Sort.Direction.ASC, "name"); int i = 0; for (;;) { @@ -264,7 +264,7 @@ public class GalaxyServiceTests { String[] sortedNames = getNamesSorted(worlds); - Sort sort = new Sort(Sort.Direction.ASC, "name"); + Sort sort = Sort.by(Sort.Direction.ASC, "name"); int i = 0; for (World world : galaxyService.findAllWorlds(sort)) { assertEquals(sortedNames[i], world.getName()); diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/queries/DerivedQueryTests.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/queries/DerivedQueryTests.java index 94c680a5b..ae7db5ff2 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/queries/DerivedQueryTests.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/queries/DerivedQueryTests.java @@ -549,7 +549,7 @@ public class DerivedQueryTests { } userRepository.save(new User("A", "C")); - Pageable pageable = new PageRequest(0, 4); + Pageable pageable = PageRequest.of(0, 4); Page page = userRepository.findByNameAndSurname("A", "B", pageable); assertEquals(4, page.getNumberOfElements()); assertEquals(10, page.getTotalElements()); @@ -574,7 +574,7 @@ public class DerivedQueryTests { assertTrue(page.isLast()); assertFalse(page.hasNext()); - page = userRepository.findByNameAndSurname("A", "B", new PageRequest(0, 10)); + page = userRepository.findByNameAndSurname("A", "B", PageRequest.of(0, 10)); assertEquals(10, page.getNumberOfElements()); assertEquals(10, page.getTotalElements()); assertEquals(0, page.getNumber()); @@ -593,7 +593,7 @@ public class DerivedQueryTests { } userRepository.save(new User("A", "C")); - Pageable pageable = new PageRequest(0, 4); + Pageable pageable = PageRequest.of(0, 4); Slice page = userRepository.findByNameAndRatingsStars("A", 5, pageable); assertEquals(4, page.getNumberOfElements()); assertTrue(page.hasNext()); @@ -606,7 +606,7 @@ public class DerivedQueryTests { assertEquals(2, page.getNumberOfElements()); assertFalse(page.hasNext()); - page = userRepository.findByNameAndRatingsStars("A", 5, new PageRequest(0, 10)); + page = userRepository.findByNameAndRatingsStars("A", 5, PageRequest.of(0, 10)); assertEquals(10, page.getNumberOfElements()); assertFalse(page.hasNext()); } diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/queries/Java8SupportTests.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/queries/Java8SupportTests.java index a22104db1..bb86dabcb 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/queries/Java8SupportTests.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/queries/Java8SupportTests.java @@ -79,7 +79,7 @@ public class Java8SupportTests { @Test public void shouldStreamCinemasWithSort() { - Collection allCinemas = cinemaRepository.getCinemasSortedByName(new Sort("n.name")) + Collection allCinemas = cinemaRepository.getCinemasSortedByName(Sort.by("n.name")) .collect(Collectors.toList()); assertEquals(10, allCinemas.size()); diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/queries/PagedQueryTests.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/queries/PagedQueryTests.java index 176cad018..e0723e6fd 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/queries/PagedQueryTests.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/queries/PagedQueryTests.java @@ -339,7 +339,7 @@ public class PagedQueryTests { @Transactional public void shouldFindSortedCinemas() { setup(); - Sort sort = new Sort(Sort.Direction.ASC, "name"); + Sort sort = Sort.by(Sort.Direction.ASC, "name"); List cinemas = cinemaRepository.findByLocation("London", sort); assertEquals(10, cinemas.size()); assertEquals("Cineplex", cinemas.get(0).getName()); @@ -451,7 +451,7 @@ public class PagedQueryTests { @Transactional public void shouldFindCinemasSortedByNameWithCustomQuery() { setup(); - Sort sort = new Sort(Sort.Direction.ASC, "n.name"); + Sort sort = Sort.by(Sort.Direction.ASC, "n.name"); List cinemas = cinemaRepository.getCinemasSortedByName(sort); assertEquals(10, cinemas.size()); assertEquals("Cineplex", cinemas.get(0).getName()); diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/GraphQueryExecutionTests.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/GraphQueryExecutionTests.java index 79f3fda9f..efc331b03 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/GraphQueryExecutionTests.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/GraphQueryExecutionTests.java @@ -50,7 +50,6 @@ public class GraphQueryExecutionTests { private ProjectionFactory factory = new SpelAwareProxyProjectionFactory(); @Test - @SuppressWarnings("unchecked") public void pagedExecutionShouldNotGenerateCountQueryIfQueryReportedNoResults() { when(sessionMock.query(eq(User.class), anyString(), anyMap())).thenReturn(Collections. emptyList()); @@ -58,7 +57,7 @@ public class GraphQueryExecutionTests { GraphQueryMethod queryMethod = new GraphQueryMethod(method, new DefaultRepositoryMetadata(UserRepository.class), factory); GraphParameterAccessor accessor = new GraphParametersParameterAccessor(queryMethod, - new Object[] { "", new PageRequest(0, 1) }); + new Object[] { "", PageRequest.of(0, 1) }); GraphQueryExecution.PagedExecution execution = new GraphQueryExecution.PagedExecution(sessionMock, accessor); Query query = new Query("", "noop", new HashMap<>()); execution.execute(query, User.class);