From 1be92f82af0e8a63edc7fcb9f16a1b14961f5ac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Tue, 11 Jun 2024 11:58:19 +0200 Subject: [PATCH] Polish --- .../context/bean/override/OverrideMetadata.java | 8 ++++---- .../override/mockito/MockitoOverrideMetadata.java | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/test/context/bean/override/OverrideMetadata.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/OverrideMetadata.java index 6ff6f47e92..70510fa379 100644 --- a/spring-test/src/main/java/org/springframework/test/context/bean/override/OverrideMetadata.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/OverrideMetadata.java @@ -159,14 +159,14 @@ public abstract class OverrideMetadata { } @Override - public boolean equals(Object obj) { - if (obj == this) { + public boolean equals(Object other) { + if (other == this) { return true; } - if (obj == null || !getClass().isAssignableFrom(obj.getClass())) { + if (other == null || !getClass().isAssignableFrom(other.getClass())) { return false; } - OverrideMetadata that = (OverrideMetadata) obj; + OverrideMetadata that = (OverrideMetadata) other; if (!Objects.equals(this.beanType.getType(), that.beanType.getType()) || !Objects.equals(this.beanName, that.beanName) || !Objects.equals(this.strategy, that.strategy)) { diff --git a/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoOverrideMetadata.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoOverrideMetadata.java index d024a105b5..974966f006 100644 --- a/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoOverrideMetadata.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoOverrideMetadata.java @@ -83,17 +83,17 @@ abstract class MockitoOverrideMetadata extends OverrideMetadata { } @Override - public boolean equals(@Nullable Object obj) { - if (obj == this) { + public boolean equals(@Nullable Object other) { + if (other == this) { return true; } - if (obj == null || !getClass().isAssignableFrom(obj.getClass())) { + if (other == null || !getClass().isAssignableFrom(other.getClass())) { return false; } - MockitoOverrideMetadata other = (MockitoOverrideMetadata) obj; - boolean result = super.equals(obj); - result = result && ObjectUtils.nullSafeEquals(this.reset, other.reset); - result = result && ObjectUtils.nullSafeEquals(this.proxyTargetAware, other.proxyTargetAware); + MockitoOverrideMetadata that = (MockitoOverrideMetadata) other; + boolean result = super.equals(that); + result = result && ObjectUtils.nullSafeEquals(this.reset, that.reset); + result = result && ObjectUtils.nullSafeEquals(this.proxyTargetAware, that.proxyTargetAware); return result; }