Polishing

Author: jhoeller

spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java

@@ -124,7 +124,7 @@ public CachingConfigurerSupplier(Supplier<CachingConfigurer> supplier) {
 		public <T> Supplier<T> adapt(Function<CachingConfigurer, T> provider) {
 			return () -> {
 				CachingConfigurer cachingConfigurer = this.supplier.get();
-				return (cachingConfigurer != null) ? provider.apply(cachingConfigurer) : null;
+				return (cachingConfigurer != null ? provider.apply(cachingConfigurer) : null);
 			};
 		}
 

spring-core/src/main/java/org/springframework/core/type/StandardAnnotationMetadata.java

@@ -162,7 +162,7 @@ public Set<MethodMetadata> getAnnotatedMethods(String annotationName) {
 				throw new IllegalStateException("Failed to introspect annotated methods on " + getIntrospectedClass(), ex);
 			}
 		}
-		return annotatedMethods != null ? annotatedMethods : Collections.emptySet();
+		return (annotatedMethods != null ? annotatedMethods : Collections.emptySet());
 	}
 
 

spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadata.java

@@ -127,6 +127,11 @@ public String[] getMemberClassNames() {
 		return this.memberClassNames.clone();
 	}
 
+	@Override
+	public MergedAnnotations getAnnotations() {
+		return this.annotations;
+	}
+
 	@Override
 	public Set<String> getAnnotationTypes() {
 		Set<String> annotationTypes = this.annotationTypes;
@@ -149,13 +154,9 @@ public Set<MethodMetadata> getAnnotatedMethods(String annotationName) {
 				annotatedMethods.add(annotatedMethod);
 			}
 		}
-		return annotatedMethods != null ? annotatedMethods : Collections.emptySet();
+		return (annotatedMethods != null ? annotatedMethods : Collections.emptySet());
 	}
 
-	@Override
-	public MergedAnnotations getAnnotations() {
-		return this.annotations;
-	}
 
 	@Override
 	public boolean equals(@Nullable Object obj) {

spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadataReadingVisitor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -99,8 +99,7 @@ public void visitOuterClass(String owner, String name, String desc) {
 	}
 
 	@Override
-	public void visitInnerClass(String name, @Nullable String outerName, String innerName,
-			int access) {
+	public void visitInnerClass(String name, @Nullable String outerName, String innerName, int access) {
 		if (outerName != null) {
 			String className = toClassName(name);
 			String outerClassName = toClassName(outerName);