Browse Source

Polish "Use Object.equals() where feasible"

See gh-31916
pull/31920/head
Stéphane Nicoll 2 years ago
parent
commit
adcf236a3d
  1. 10
      spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/Pet.java
  2. 6
      spring-core/src/main/java/org/springframework/cglib/beans/BeanMap.java
  3. 5
      spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java
  4. 2
      spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DispatcherHandlerIntegrationTests.java
  5. 2
      spring-webflux/src/test/java/org/springframework/web/reactive/function/server/PublisherHandlerFunctionIntegrationTests.java
  6. 2
      spring-webflux/src/test/java/org/springframework/web/reactive/function/server/SseHandlerFunctionIntegrationTests.java
  7. 2
      spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/JacksonStreamingIntegrationTests.java
  8. 2
      spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java
  9. 2
      spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java

10
spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/Pet.java

@ -49,14 +49,8 @@ public class Pet {
if (o == null || getClass() != o.getClass()) { if (o == null || getClass() != o.getClass()) {
return false; return false;
} }
Pet pet = (Pet) o;
final Pet pet = (Pet) o; return Objects.equals(this.name, pet.name);
if (!Objects.equals(name, pet.name)) {
return false;
}
return true;
} }
@Override @Override

6
spring-core/src/main/java/org/springframework/cglib/beans/BeanMap.java

@ -1,13 +1,13 @@
/* /*
* Copyright 2003,2004 The Apache Software Foundation * Copyright 2002-2023 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* https://www.apache.org/licenses/LICENSE-2.0 * https://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and

5
spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java

@ -286,10 +286,7 @@ class MappingJackson2MessageConverterTests {
return false; return false;
} }
MyBean bean = (MyBean) o; MyBean bean = (MyBean) o;
if (!Objects.equals(foo, bean.foo)) { return Objects.equals(this.foo, bean.foo);
return false;
}
return true;
} }
@Override @Override

2
spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DispatcherHandlerIntegrationTests.java

@ -276,7 +276,7 @@ class DispatcherHandlerIntegrationTests extends AbstractHttpHandlerIntegrationTe
return false; return false;
} }
Person person = (Person) o; Person person = (Person) o;
return !(!Objects.equals(this.name, person.name)); return Objects.equals(this.name, person.name);
} }
@Override @Override

2
spring-webflux/src/test/java/org/springframework/web/reactive/function/server/PublisherHandlerFunctionIntegrationTests.java

@ -147,7 +147,7 @@ class PublisherHandlerFunctionIntegrationTests extends AbstractRouterFunctionInt
return false; return false;
} }
Person person = (Person) o; Person person = (Person) o;
return !(!Objects.equals(this.name, person.name)); return Objects.equals(this.name, person.name);
} }
@Override @Override

2
spring-webflux/src/test/java/org/springframework/web/reactive/function/server/SseHandlerFunctionIntegrationTests.java

@ -176,7 +176,7 @@ class SseHandlerFunctionIntegrationTests extends AbstractRouterFunctionIntegrati
return false; return false;
} }
Person person = (Person) o; Person person = (Person) o;
return !(!Objects.equals(this.name, person.name)); return Objects.equals(this.name, person.name);
} }
@Override @Override

2
spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/JacksonStreamingIntegrationTests.java

@ -154,7 +154,7 @@ class JacksonStreamingIntegrationTests extends AbstractHttpHandlerIntegrationTes
return false; return false;
} }
Person person = (Person) o; Person person = (Person) o;
return !(!Objects.equals(this.name, person.name)); return Objects.equals(this.name, person.name);
} }
@Override @Override

2
spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java

@ -713,7 +713,7 @@ class RequestMappingMessageConversionIntegrationTests extends AbstractRequestMap
return false; return false;
} }
Person person = (Person) o; Person person = (Person) o;
return !(!Objects.equals(this.name, person.name)); return Objects.equals(this.name, person.name);
} }
@Override @Override

2
spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java

@ -278,7 +278,7 @@ class SseIntegrationTests extends AbstractHttpHandlerIntegrationTests {
return false; return false;
} }
Person person = (Person) o; Person person = (Person) o;
return !(!Objects.equals(this.name, person.name)); return Objects.equals(this.name, person.name);
} }
@Override @Override

Loading…
Cancel
Save