From efc54665787f6a33589754d2a16270480cde0455 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 8 Jan 2025 15:07:46 +0100 Subject: [PATCH] Adopt to changes in Spring Framework 7. See #2449 --- .../rest/webmvc/RepositorySearchControllerIntegrationTests.java | 2 +- .../springframework/data/rest/webmvc/support/ETagUnitTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/RepositorySearchControllerIntegrationTests.java b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/RepositorySearchControllerIntegrationTests.java index 840f4214c..afbe9098f 100755 --- a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/RepositorySearchControllerIntegrationTests.java +++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/RepositorySearchControllerIntegrationTests.java @@ -235,6 +235,6 @@ class RepositorySearchControllerIntegrationTests extends AbstractControllerInteg "findCreatedDateByLastName", PAGEABLE, Sort.unsorted(), new HttpHeaders(), assembler); assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK); - assertThat(entity.getHeaders()).isEmpty(); + assertThat(entity.getHeaders().isEmpty()).isTrue(); } } diff --git a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/support/ETagUnitTests.java b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/support/ETagUnitTests.java index ce398e7b7..eeb4a387d 100755 --- a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/support/ETagUnitTests.java +++ b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/support/ETagUnitTests.java @@ -135,7 +135,7 @@ class ETagUnitTests { HttpHeaders headers = ETag.NO_ETAG.addTo(new HttpHeaders()); - assertThat(headers.containsKey("ETag")).isFalse(); + assertThat(headers.getFirst("ETag")).isNull(); } // tag::versioned-sample[]