From 4bb842343a8b5b19a498eb432e8324ba1f62d282 Mon Sep 17 00:00:00 2001 From: jason <820245630@qq.com> Date: Wed, 14 Aug 2019 13:59:40 +0800 Subject: [PATCH] Simplify some code See gh-17860 --- .../endpoint/web/annotation/RequestPredicateFactory.java | 4 +--- .../org/springframework/boot/actuate/health/Health.java | 2 +- .../actuate/health/HealthWebEndpointResponseMapper.java | 7 ++----- .../org/springframework/boot/actuate/health/Status.java | 2 +- .../java/org/springframework/boot/actuate/info/Info.java | 2 +- .../actuate/management/PlainTextThreadDumpFormatter.java | 4 +--- .../boot/actuate/audit/AuditEventTests.java | 8 ++++---- 7 files changed, 11 insertions(+), 18 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/annotation/RequestPredicateFactory.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/annotation/RequestPredicateFactory.java index b727237d5a..430ebb6c33 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/annotation/RequestPredicateFactory.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/annotation/RequestPredicateFactory.java @@ -123,9 +123,7 @@ class RequestPredicateFactory { } if (WebEndpointResponse.class.isAssignableFrom(method.getReturnType())) { ResolvableType returnType = ResolvableType.forMethodReturnType(method); - if (ResolvableType.forClass(Resource.class).isAssignableFrom(returnType.getGeneric(0))) { - return true; - } + return ResolvableType.forClass(Resource.class).isAssignableFrom(returnType.getGeneric(0)); } return false; } diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/Health.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/Health.java index 0880c76e6d..7dc0641e1c 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/Health.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/Health.java @@ -89,7 +89,7 @@ public final class Health { if (obj == this) { return true; } - if (obj != null && obj instanceof Health) { + if (obj instanceof Health) { Health other = (Health) obj; return this.status.equals(other.status) && this.details.equals(other.details); } diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthWebEndpointResponseMapper.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthWebEndpointResponseMapper.java index 868d828023..e863eb330b 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthWebEndpointResponseMapper.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthWebEndpointResponseMapper.java @@ -97,11 +97,8 @@ public class HealthWebEndpointResponseMapper { } private boolean canSeeDetails(SecurityContext securityContext, ShowDetails showDetails) { - if (showDetails == ShowDetails.NEVER || (showDetails == ShowDetails.WHEN_AUTHORIZED - && (securityContext.getPrincipal() == null || !isUserInRole(securityContext)))) { - return false; - } - return true; + return showDetails != ShowDetails.NEVER && (showDetails != ShowDetails.WHEN_AUTHORIZED + || (securityContext.getPrincipal() != null && isUserInRole(securityContext))); } private boolean isUserInRole(SecurityContext securityContext) { diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/Status.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/Status.java index e9fe86495b..1ee5f47051 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/Status.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/Status.java @@ -107,7 +107,7 @@ public final class Status { if (obj == this) { return true; } - if (obj != null && obj instanceof Status) { + if (obj instanceof Status) { return ObjectUtils.nullSafeEquals(this.code, ((Status) obj).code); } return false; diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/info/Info.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/info/Info.java index b43317c63f..ef7cf60eb7 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/info/Info.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/info/Info.java @@ -71,7 +71,7 @@ public final class Info { if (obj == this) { return true; } - if (obj != null && obj instanceof Info) { + if (obj instanceof Info) { Info other = (Info) obj; return this.details.equals(other.details); } diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/management/PlainTextThreadDumpFormatter.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/management/PlainTextThreadDumpFormatter.java index 96c64b4e18..50e801c249 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/management/PlainTextThreadDumpFormatter.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/management/PlainTextThreadDumpFormatter.java @@ -83,9 +83,7 @@ class PlainTextThreadDumpFormatter { LockInfo lockInfo = info.getLockInfo(); if (firstElement && lockInfo != null) { if (element.getClassName().equals(Object.class.getName()) && element.getMethodName().equals("wait")) { - if (lockInfo != null) { - writer.printf("\t- waiting on %s%n", format(lockInfo)); - } + writer.printf("\t- waiting on %s%n", format(lockInfo)); } else { String lockOwner = info.getLockOwnerName(); diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/AuditEventTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/AuditEventTests.java index 93333bdc3c..2d31dc02fa 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/AuditEventTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/AuditEventTests.java @@ -36,7 +36,7 @@ class AuditEventTests { @Test void nowEvent() { - AuditEvent event = new AuditEvent("phil", "UNKNOWN", Collections.singletonMap("a", (Object) "b")); + AuditEvent event = new AuditEvent("phil", "UNKNOWN", Collections.singletonMap("a", "b")); assertThat(event.getData().get("a")).isEqualTo("b"); assertThat(event.getType()).isEqualTo("UNKNOWN"); assertThat(event.getPrincipal()).isEqualTo("phil"); @@ -52,21 +52,21 @@ class AuditEventTests { @Test void nullPrincipalIsMappedToEmptyString() { - AuditEvent auditEvent = new AuditEvent(null, "UNKNOWN", Collections.singletonMap("a", (Object) "b")); + AuditEvent auditEvent = new AuditEvent(null, "UNKNOWN", Collections.singletonMap("a", "b")); assertThat(auditEvent.getPrincipal()).isEmpty(); } @Test void nullTimestamp() { assertThatIllegalArgumentException() - .isThrownBy(() -> new AuditEvent(null, "phil", "UNKNOWN", Collections.singletonMap("a", (Object) "b"))) + .isThrownBy(() -> new AuditEvent(null, "phil", "UNKNOWN", Collections.singletonMap("a", "b"))) .withMessageContaining("Timestamp must not be null"); } @Test void nullType() { assertThatIllegalArgumentException() - .isThrownBy(() -> new AuditEvent("phil", null, Collections.singletonMap("a", (Object) "b"))) + .isThrownBy(() -> new AuditEvent("phil", null, Collections.singletonMap("a", "b"))) .withMessageContaining("Type must not be null"); }