From 1d3ad675c216d277812323d5a15bf52ebbd4b718 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Tue, 8 Nov 2022 14:39:23 +0100 Subject: [PATCH 1/2] Prepare issue branch. --- pom.xml | 2 +- spring-data-rest-core/pom.xml | 2 +- spring-data-rest-distribution/pom.xml | 2 +- spring-data-rest-hal-explorer/pom.xml | 2 +- spring-data-rest-tests/pom.xml | 2 +- spring-data-rest-tests/spring-data-rest-tests-core/pom.xml | 4 ++-- spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml | 4 ++-- spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml | 4 ++-- .../spring-data-rest-tests-security/pom.xml | 4 ++-- spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml | 2 +- spring-data-rest-webmvc/pom.xml | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index d6e8ee434..a8b8db4f7 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-parent - 4.0.0-SNAPSHOT + 4.0.x-GH-2196-SNAPSHOT pom Spring Data REST diff --git a/spring-data-rest-core/pom.xml b/spring-data-rest-core/pom.xml index b7d22ab3e..56a8904c2 100644 --- a/spring-data-rest-core/pom.xml +++ b/spring-data-rest-core/pom.xml @@ -11,7 +11,7 @@ org.springframework.data spring-data-rest-parent - 4.0.0-SNAPSHOT + 4.0.x-GH-2196-SNAPSHOT ../pom.xml diff --git a/spring-data-rest-distribution/pom.xml b/spring-data-rest-distribution/pom.xml index efcd73e6b..5f4303fa6 100644 --- a/spring-data-rest-distribution/pom.xml +++ b/spring-data-rest-distribution/pom.xml @@ -13,7 +13,7 @@ org.springframework.data spring-data-rest-parent - 4.0.0-SNAPSHOT + 4.0.x-GH-2196-SNAPSHOT ../pom.xml diff --git a/spring-data-rest-hal-explorer/pom.xml b/spring-data-rest-hal-explorer/pom.xml index 5f8679bd3..331fc8565 100644 --- a/spring-data-rest-hal-explorer/pom.xml +++ b/spring-data-rest-hal-explorer/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-parent - 4.0.0-SNAPSHOT + 4.0.x-GH-2196-SNAPSHOT spring-data-rest-hal-explorer diff --git a/spring-data-rest-tests/pom.xml b/spring-data-rest-tests/pom.xml index 8d79ec200..1f74a8751 100644 --- a/spring-data-rest-tests/pom.xml +++ b/spring-data-rest-tests/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-parent - 4.0.0-SNAPSHOT + 4.0.x-GH-2196-SNAPSHOT ../pom.xml diff --git a/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml index ae7ce0d1d..a7531f170 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-core/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-tests - 4.0.0-SNAPSHOT + 4.0.x-GH-2196-SNAPSHOT ../pom.xml @@ -21,7 +21,7 @@ org.springframework.data spring-data-rest-webmvc - 4.0.0-SNAPSHOT + 4.0.x-GH-2196-SNAPSHOT diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml index 71e9fe635..d2e8c344e 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-tests - 4.0.0-SNAPSHOT + 4.0.x-GH-2196-SNAPSHOT ../pom.xml @@ -22,7 +22,7 @@ org.springframework.data spring-data-rest-tests-core - 4.0.0-SNAPSHOT + 4.0.x-GH-2196-SNAPSHOT test-jar diff --git a/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml index c695c157a..7ea1e773c 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-tests - 4.0.0-SNAPSHOT + 4.0.x-GH-2196-SNAPSHOT ../pom.xml @@ -21,7 +21,7 @@ org.springframework.data spring-data-rest-tests-core - 4.0.0-SNAPSHOT + 4.0.x-GH-2196-SNAPSHOT test-jar diff --git a/spring-data-rest-tests/spring-data-rest-tests-security/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-security/pom.xml index 05825f2b1..cc8e16f36 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-security/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-security/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-tests - 4.0.0-SNAPSHOT + 4.0.x-GH-2196-SNAPSHOT ../pom.xml @@ -22,7 +22,7 @@ org.springframework.data spring-data-rest-tests-core - 4.0.0-SNAPSHOT + 4.0.x-GH-2196-SNAPSHOT test-jar diff --git a/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml index fa269497f..8f6db1ea0 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-rest-tests - 4.0.0-SNAPSHOT + 4.0.x-GH-2196-SNAPSHOT Spring Data REST Tests - Shop diff --git a/spring-data-rest-webmvc/pom.xml b/spring-data-rest-webmvc/pom.xml index 6b5fa8545..ba6c67dd9 100644 --- a/spring-data-rest-webmvc/pom.xml +++ b/spring-data-rest-webmvc/pom.xml @@ -12,7 +12,7 @@ org.springframework.data spring-data-rest-parent - 4.0.0-SNAPSHOT + 4.0.x-GH-2196-SNAPSHOT ../pom.xml From ab101629f471a9b24a1ba72f7742b2d41a8a8380 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Tue, 8 Nov 2022 14:40:19 +0100 Subject: [PATCH 2/2] Add Nullable annotation to parameter of overridden equals method Closes: #2196 --- .../java/org/springframework/data/rest/core/Path.java | 3 ++- .../rest/core/config/EntityLookupConfiguration.java | 3 ++- .../core/config/ProjectionDefinitionConfiguration.java | 3 ++- .../rest/core/event/AnnotatedEventHandlerInvoker.java | 3 ++- .../data/rest/core/mapping/ParameterMetadata.java | 3 ++- .../rest/webmvc/config/DelegatingHandlerMapping.java | 2 +- .../data/rest/webmvc/json/patch/SpelPath.java | 10 +++++----- .../data/rest/webmvc/support/DefaultedPageable.java | 3 ++- .../springframework/data/rest/webmvc/support/ETag.java | 3 ++- .../RepositoryConstraintViolationExceptionMessage.java | 2 +- 10 files changed, 21 insertions(+), 14 deletions(-) diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/Path.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/Path.java index c02161bbc..a0532b089 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/Path.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/Path.java @@ -17,6 +17,7 @@ import java.util.regex.Pattern; +import org.springframework.lang.Nullable; import org.springframework.util.StringUtils; /** @@ -103,7 +104,7 @@ public String toString() { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) { return true; diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/config/EntityLookupConfiguration.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/config/EntityLookupConfiguration.java index a743a219c..ddd5887ae 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/config/EntityLookupConfiguration.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/config/EntityLookupConfiguration.java @@ -29,6 +29,7 @@ import org.springframework.data.rest.core.support.EntityLookup; import org.springframework.data.util.MethodInvocationRecorder; import org.springframework.data.util.StreamUtils; +import org.springframework.lang.Nullable; import org.springframework.util.Assert; /** @@ -238,7 +239,7 @@ public Lookup getLookup() { } @Override - public boolean equals(final java.lang.Object o) { + public boolean equals(@Nullable final java.lang.Object o) { if (o == this) { return true; diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/config/ProjectionDefinitionConfiguration.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/config/ProjectionDefinitionConfiguration.java index 488658a5a..81df2d46f 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/config/ProjectionDefinitionConfiguration.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/config/ProjectionDefinitionConfiguration.java @@ -24,6 +24,7 @@ import org.springframework.core.annotation.AnnotationUtils; import org.springframework.data.rest.core.projection.ProjectionDefinitions; import org.springframework.data.util.ProxyUtils; +import org.springframework.lang.Nullable; import org.springframework.util.Assert; import org.springframework.util.StringUtils; @@ -225,7 +226,7 @@ public String getName() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/event/AnnotatedEventHandlerInvoker.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/event/AnnotatedEventHandlerInvoker.java index e48409db5..9112115c8 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/event/AnnotatedEventHandlerInvoker.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/event/AnnotatedEventHandlerInvoker.java @@ -33,6 +33,7 @@ import org.springframework.core.annotation.AnnotationUtils; import org.springframework.data.rest.core.annotation.*; import org.springframework.data.util.ProxyUtils; +import org.springframework.lang.Nullable; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.util.LinkedMultiValueMap; @@ -191,7 +192,7 @@ public int compareTo(EventHandlerMethod o) { } @Override - public boolean equals(final java.lang.Object o) { + public boolean equals(@Nullable final java.lang.Object o) { if (o == this) { return true; diff --git a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/ParameterMetadata.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/ParameterMetadata.java index 1af7609e5..01f8bbfd3 100644 --- a/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/ParameterMetadata.java +++ b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/mapping/ParameterMetadata.java @@ -18,6 +18,7 @@ import org.springframework.core.MethodParameter; import org.springframework.data.rest.core.annotation.Description; import org.springframework.hateoas.LinkRelation; +import org.springframework.lang.Nullable; import org.springframework.util.Assert; /** @@ -71,7 +72,7 @@ public ResourceDescription getDescription() { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) { return true; diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/DelegatingHandlerMapping.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/DelegatingHandlerMapping.java index bc81bb0a7..2723908b1 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/DelegatingHandlerMapping.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/DelegatingHandlerMapping.java @@ -173,7 +173,7 @@ public HandlerSelectionResult(HttpServletRequest request, HandlerMapping mapping } @Override - public boolean equals(final java.lang.Object o) { + public boolean equals(@Nullable final java.lang.Object o) { if (o == this) { return true; diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/SpelPath.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/SpelPath.java index f580203ce..be9d765e7 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/SpelPath.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/SpelPath.java @@ -93,7 +93,7 @@ public String toString() { } @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (this == obj) { return true; @@ -173,7 +173,7 @@ public static CacheKey of(Class type, UntypedSpelPath path, BindContext conte } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; @@ -529,7 +529,7 @@ public SkippedPropertyPath nested(String segment) { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; @@ -691,7 +691,7 @@ public SpelExpressionBuilder next(String segment) { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; @@ -721,7 +721,7 @@ public java.lang.String toString() { } @Override - public boolean equals(final java.lang.Object o) { + public boolean equals(@Nullable final java.lang.Object o) { if (o == this) { return true; diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/DefaultedPageable.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/DefaultedPageable.java index 266c62f81..8f810ba74 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/DefaultedPageable.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/DefaultedPageable.java @@ -18,6 +18,7 @@ import java.util.Objects; import org.springframework.data.domain.Pageable; +import org.springframework.lang.Nullable; import org.springframework.util.Assert; /** @@ -67,7 +68,7 @@ public Pageable unpagedIfDefault() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/ETag.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/ETag.java index df25e1079..15536692e 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/ETag.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/ETag.java @@ -25,6 +25,7 @@ import org.springframework.data.mapping.PersistentPropertyAccessor; import org.springframework.data.rest.webmvc.PersistentEntityResource; import org.springframework.http.HttpHeaders; +import org.springframework.lang.Nullable; import org.springframework.util.Assert; /** @@ -170,7 +171,7 @@ private static Optional getVersionInformation(PersistentEntity