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