From 6f68fe814f3bebfea594d4371940be6d8569a07d Mon Sep 17 00:00:00 2001
From: Christoph Strobl <cstrobl@vmware.com>
Date: Tue, 8 Nov 2022 14:40:19 +0100
Subject: [PATCH] Add Nullable annotation to parameter of overridden equals
 method.

Closes: #2196
Original pull request: #2197
---
 .../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 @@ package org.springframework.data.rest.core;
 
 import java.util.regex.Pattern;
 
+import org.springframework.lang.Nullable;
 import org.springframework.util.StringUtils;
 
 /**
@@ -103,7 +104,7 @@ public class Path {
 	}
 
 	@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.config.EntityLookupRegistrar.LookupReg
 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 @@ class EntityLookupConfiguration implements EntityLookupRegistrar {
 		}
 
 		@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 java.util.Set;
 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 class ProjectionDefinitionConfiguration implements ProjectionDefinitions
 		}
 
 		@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.AnnotationAwareOrderComparator;
 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 class AnnotatedEventHandlerInvoker implements ApplicationListener<Reposit
 		}
 
 		@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 @@ package org.springframework.data.rest.core.mapping;
 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 final class ParameterMetadata {
 	}
 
 	@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 @@ class DelegatingHandlerMapping implements MatchableHandlerMapping, Iterable<Hand
 		}
 
 		@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 @@ class SpelPath {
 	}
 
 	@Override
-	public boolean equals(Object obj) {
+	public boolean equals(@Nullable Object obj) {
 
 		if (this == obj) {
 			return true;
@@ -173,7 +173,7 @@ class SpelPath {
 			}
 
 			@Override
-			public boolean equals(Object o) {
+			public boolean equals(@Nullable Object o) {
 
 				if (o == this) {
 					return true;
@@ -529,7 +529,7 @@ class SpelPath {
 			}
 
 			@Override
-			public boolean equals(Object o) {
+			public boolean equals(@Nullable Object o) {
 
 				if (o == this) {
 					return true;
@@ -691,7 +691,7 @@ class SpelPath {
 			}
 
 			@Override
-			public boolean equals(Object o) {
+			public boolean equals(@Nullable Object o) {
 
 				if (o == this) {
 					return true;
@@ -721,7 +721,7 @@ class SpelPath {
 		}
 
 		@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 @@ package org.springframework.data.rest.webmvc.support;
 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 final class DefaultedPageable {
 	}
 
 	@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.PersistentProperty;
 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 @@ public final class ETag {
 	}
 
 	@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/RepositoryConstraintViolationExceptionMessage.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/RepositoryConstraintViolationExceptionMessage.java
index 648ec2830..c36e93a97 100644
--- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/RepositoryConstraintViolationExceptionMessage.java
+++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/RepositoryConstraintViolationExceptionMessage.java
@@ -100,7 +100,7 @@ public class RepositoryConstraintViolationExceptionMessage {
 		}
 
 		@Override
-		public boolean equals(Object o) {
+		public boolean equals(@Nullable Object o) {
 
 			if (o == this) {
 				return true;