From 0adab8a2be9967d180f3f8ee675e07cc92ef9d70 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Mon, 6 Feb 2017 11:01:18 +0900 Subject: [PATCH] Use logical 'and' instead of bitwise 'and' Closes gh-8198 --- .../actuate/audit/InMemoryAuditEventRepository.java | 6 +++--- .../springframework/boot/actuate/metrics/Metric.java | 6 +++--- .../embedded/EmbeddedMongoAutoConfiguration.java | 4 ++-- .../boot/cli/compiler/dependencies/Dependency.java | 12 ++++++------ .../boot/devtools/filewatch/FileSnapshot.java | 6 +++--- .../AnnotationCustomizableTypeExcludeFilter.java | 10 +++++----- .../boot/test/mock/mockito/Definition.java | 8 ++++---- .../boot/test/mock/mockito/MockDefinition.java | 8 ++++---- .../boot/test/mock/mockito/SpyDefinition.java | 2 +- .../boot/logging/LoggerConfiguration.java | 6 +++--- .../springframework/boot/web/servlet/ErrorPage.java | 6 +++--- 11 files changed, 37 insertions(+), 37 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepository.java index e2677470441..2cf1a5df166 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepository.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepository.java @@ -95,9 +95,9 @@ public class InMemoryAuditEventRepository implements AuditEventRepository { private boolean isMatch(String principal, Date after, String type, AuditEvent event) { boolean match = true; - match &= (principal == null || event.getPrincipal().equals(principal)); - match &= (after == null || event.getTimestamp().compareTo(after) >= 0); - match &= (type == null || event.getType().equals(type)); + match = match && (principal == null || event.getPrincipal().equals(principal)); + match = match && (after == null || event.getTimestamp().compareTo(after) >= 0); + match = match && (type == null || event.getType().equals(type)); return match; } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/Metric.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/Metric.java index f9b8421aa86..20430d45940 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/Metric.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/Metric.java @@ -126,9 +126,9 @@ public class Metric { if (obj instanceof Metric) { Metric other = (Metric) obj; boolean rtn = true; - rtn &= ObjectUtils.nullSafeEquals(this.name, other.name); - rtn &= ObjectUtils.nullSafeEquals(this.timestamp, other.timestamp); - rtn &= ObjectUtils.nullSafeEquals(this.value, other.value); + rtn = rtn && ObjectUtils.nullSafeEquals(this.name, other.name); + rtn = rtn && ObjectUtils.nullSafeEquals(this.timestamp, other.timestamp); + rtn = rtn && ObjectUtils.nullSafeEquals(this.value, other.value); return rtn; } return super.equals(obj); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java index 3f8665fcab6..d63391cdded 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java @@ -280,8 +280,8 @@ public class EmbeddedMongoAutoConfiguration { if (getClass() == obj.getClass()) { ToStringFriendlyFeatureAwareVersion other = (ToStringFriendlyFeatureAwareVersion) obj; boolean equals = true; - equals &= this.features.equals(other.features); - equals &= this.version.equals(other.version); + equals = equals && this.features.equals(other.features); + equals = equals && this.version.equals(other.version); return equals; } return super.equals(obj); diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/Dependency.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/Dependency.java index a13703e24a9..069024c00ab 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/Dependency.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/Dependency.java @@ -125,10 +125,10 @@ public final class Dependency { if (getClass() == obj.getClass()) { Dependency other = (Dependency) obj; boolean result = true; - result &= this.groupId.equals(other.groupId); - result &= this.artifactId.equals(other.artifactId); - result &= this.version.equals(other.version); - result &= this.exclusions.equals(other.exclusions); + result = result && this.groupId.equals(other.groupId); + result = result && this.artifactId.equals(other.artifactId); + result = result && this.version.equals(other.version); + result = result && this.exclusions.equals(other.exclusions); return result; } return false; @@ -187,8 +187,8 @@ public final class Dependency { if (getClass() == obj.getClass()) { Exclusion other = (Exclusion) obj; boolean result = true; - result &= this.groupId.equals(other.groupId); - result &= this.artifactId.equals(other.artifactId); + result = result && this.groupId.equals(other.groupId); + result = result && this.artifactId.equals(other.artifactId); return result; } return false; diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSnapshot.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSnapshot.java index 2759b63fd7c..bc2835df1a0 100644 --- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSnapshot.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSnapshot.java @@ -59,9 +59,9 @@ class FileSnapshot { if (obj instanceof FileSnapshot) { FileSnapshot other = (FileSnapshot) obj; boolean equals = this.file.equals(other.file); - equals &= this.exists == other.exists; - equals &= this.length == other.length; - equals &= this.lastModified == other.lastModified; + equals = equals && this.exists == other.exists; + equals = equals && this.length == other.length; + equals = equals && this.lastModified == other.lastModified; return equals; } return super.equals(obj); diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/AnnotationCustomizableTypeExcludeFilter.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/AnnotationCustomizableTypeExcludeFilter.java index ceff15ab5c4..fdacaaf74ec 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/AnnotationCustomizableTypeExcludeFilter.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/AnnotationCustomizableTypeExcludeFilter.java @@ -142,17 +142,17 @@ public abstract class AnnotationCustomizableTypeExcludeFilter extends TypeExclud } AnnotationCustomizableTypeExcludeFilter other = (AnnotationCustomizableTypeExcludeFilter) obj; boolean result = true; - result &= hasAnnotation() == other.hasAnnotation(); + result = result && hasAnnotation() == other.hasAnnotation(); for (FilterType filterType : FilterType.values()) { result &= ObjectUtils.nullSafeEquals(getFilters(filterType), other.getFilters(filterType)); } - result &= isUseDefaultFilters() == other.isUseDefaultFilters(); - result &= ObjectUtils.nullSafeEquals(getDefaultIncludes(), + result = result && isUseDefaultFilters() == other.isUseDefaultFilters(); + result = result && ObjectUtils.nullSafeEquals(getDefaultIncludes(), other.getDefaultIncludes()); - result &= ObjectUtils.nullSafeEquals(getComponentIncludes(), + result = result && ObjectUtils.nullSafeEquals(getComponentIncludes(), other.getComponentIncludes()); return result; - }; + } } diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/Definition.java b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/Definition.java index 1a6c641de7f..76cc82260b0 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/Definition.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/Definition.java @@ -97,11 +97,11 @@ abstract class Definition { } Definition other = (Definition) obj; boolean result = true; - result &= ObjectUtils.nullSafeEquals(this.name, other.name); - result &= ObjectUtils.nullSafeEquals(this.reset, other.reset); - result &= ObjectUtils.nullSafeEquals(this.proxyTargetAware, + result = result && ObjectUtils.nullSafeEquals(this.name, other.name); + result = result && ObjectUtils.nullSafeEquals(this.reset, other.reset); + result = result && ObjectUtils.nullSafeEquals(this.proxyTargetAware, other.proxyTargetAware); - result &= ObjectUtils.nullSafeEquals(this.qualifier, other.qualifier); + result = result && ObjectUtils.nullSafeEquals(this.qualifier, other.qualifier); return result; } diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockDefinition.java b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockDefinition.java index 07df1db3fa8..0c9159afad3 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockDefinition.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockDefinition.java @@ -120,10 +120,10 @@ class MockDefinition extends Definition { } MockDefinition other = (MockDefinition) obj; boolean result = super.equals(obj); - result &= ObjectUtils.nullSafeEquals(this.typeToMock, other.typeToMock); - result &= ObjectUtils.nullSafeEquals(this.extraInterfaces, other.extraInterfaces); - result &= ObjectUtils.nullSafeEquals(this.answer, other.answer); - result &= this.serializable == other.serializable; + result = result && ObjectUtils.nullSafeEquals(this.typeToMock, other.typeToMock); + result = result && ObjectUtils.nullSafeEquals(this.extraInterfaces, other.extraInterfaces); + result = result && ObjectUtils.nullSafeEquals(this.answer, other.answer); + result = result && this.serializable == other.serializable; return result; } diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpyDefinition.java b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpyDefinition.java index 172b05aed21..6d17a2ec5e7 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpyDefinition.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpyDefinition.java @@ -65,7 +65,7 @@ class SpyDefinition extends Definition { } SpyDefinition other = (SpyDefinition) obj; boolean result = super.equals(obj); - result &= ObjectUtils.nullSafeEquals(this.typeToSpy, other.typeToSpy); + result = result && ObjectUtils.nullSafeEquals(this.typeToSpy, other.typeToSpy); return result; } diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/LoggerConfiguration.java b/spring-boot/src/main/java/org/springframework/boot/logging/LoggerConfiguration.java index 55098562bb0..9ea1cb6c93f 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/LoggerConfiguration.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/LoggerConfiguration.java @@ -99,10 +99,10 @@ public final class LoggerConfiguration { if (obj instanceof LoggerConfiguration) { LoggerConfiguration other = (LoggerConfiguration) obj; boolean rtn = true; - rtn &= ObjectUtils.nullSafeEquals(this.name, other.name); - rtn &= ObjectUtils.nullSafeEquals(this.configuredLevel, + rtn = rtn && ObjectUtils.nullSafeEquals(this.name, other.name); + rtn = rtn && ObjectUtils.nullSafeEquals(this.configuredLevel, other.configuredLevel); - rtn &= ObjectUtils.nullSafeEquals(this.effectiveLevel, other.effectiveLevel); + rtn = rtn && ObjectUtils.nullSafeEquals(this.effectiveLevel, other.effectiveLevel); return rtn; } return super.equals(obj); diff --git a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ErrorPage.java b/spring-boot/src/main/java/org/springframework/boot/web/servlet/ErrorPage.java index b9c15047de9..c30fdcd5a49 100644 --- a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ErrorPage.java +++ b/spring-boot/src/main/java/org/springframework/boot/web/servlet/ErrorPage.java @@ -125,10 +125,10 @@ public class ErrorPage { if (obj instanceof ErrorPage) { ErrorPage other = (ErrorPage) obj; boolean rtn = true; - rtn &= ObjectUtils.nullSafeEquals(getExceptionName(), + rtn = rtn && ObjectUtils.nullSafeEquals(getExceptionName(), other.getExceptionName()); - rtn &= ObjectUtils.nullSafeEquals(this.path, other.path); - rtn &= this.status == other.status; + rtn = rtn && ObjectUtils.nullSafeEquals(this.path, other.path); + rtn = rtn && this.status == other.status; return rtn; } return false;