From 1885ab3e07eba47d19e6e8505abda721bb692417 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 15 Dec 2021 17:58:28 +0100 Subject: [PATCH] Polishing --- .../annotation/AbstractCachingConfiguration.java | 2 +- .../core/type/StandardAnnotationMetadata.java | 2 +- .../type/classreading/SimpleAnnotationMetadata.java | 11 ++++++----- .../SimpleAnnotationMetadataReadingVisitor.java | 5 ++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java b/spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java index 740ad3096b2..403c6e9dcee 100644 --- a/spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java +++ b/spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java @@ -124,7 +124,7 @@ public abstract class AbstractCachingConfiguration implements ImportAware { public Supplier adapt(Function provider) { return () -> { CachingConfigurer cachingConfigurer = this.supplier.get(); - return (cachingConfigurer != null) ? provider.apply(cachingConfigurer) : null; + return (cachingConfigurer != null ? provider.apply(cachingConfigurer) : null); }; } diff --git a/spring-core/src/main/java/org/springframework/core/type/StandardAnnotationMetadata.java b/spring-core/src/main/java/org/springframework/core/type/StandardAnnotationMetadata.java index 60f0a26ff40..fddd853af52 100644 --- a/spring-core/src/main/java/org/springframework/core/type/StandardAnnotationMetadata.java +++ b/spring-core/src/main/java/org/springframework/core/type/StandardAnnotationMetadata.java @@ -162,7 +162,7 @@ public class StandardAnnotationMetadata extends StandardClassMetadata implements throw new IllegalStateException("Failed to introspect annotated methods on " + getIntrospectedClass(), ex); } } - return annotatedMethods != null ? annotatedMethods : Collections.emptySet(); + return (annotatedMethods != null ? annotatedMethods : Collections.emptySet()); } diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadata.java b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadata.java index 5f1ebf4bb51..c80bc172a27 100644 --- a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadata.java +++ b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadata.java @@ -127,6 +127,11 @@ final class SimpleAnnotationMetadata implements AnnotationMetadata { return this.memberClassNames.clone(); } + @Override + public MergedAnnotations getAnnotations() { + return this.annotations; + } + @Override public Set getAnnotationTypes() { Set annotationTypes = this.annotationTypes; @@ -149,13 +154,9 @@ final class SimpleAnnotationMetadata implements AnnotationMetadata { 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) { diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadataReadingVisitor.java b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadataReadingVisitor.java index 6422cda9910..a951194ae7d 100644 --- a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadataReadingVisitor.java +++ b/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 @@ final class SimpleAnnotationMetadataReadingVisitor extends ClassVisitor { } @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);