Merge pull request #17860 from guanbiaoHuang

* pr/17860:
  Polish "Simplify some code"
  Simplify some code

Closes gh-17860

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 ResolvableType.forClass(Resource.class).isAssignableFrom(returnType.getGeneric(0));
-				return true;
-			}
 		}
 		return false;
 	}

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);
 		}

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;

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);
 		}

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/management/PlainTextThreadDumpFormatter.java

@@ -83,10 +83,8 @@ 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));
 			}
-			}
 			else {
 				String lockOwner = info.getLockOwnerName();
 				if (lockOwner != null) {

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");
 	}