From 1885ab3e07eba47d19e6e8505abda721bb692417 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 15 Dec 2021 17:58:28 +0100 Subject: [PATCH 1/2] 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); From 0b6a54dcc77ea09a4dafc0dd7a04c34553f1a317 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 15 Dec 2021 17:58:59 +0100 Subject: [PATCH 2/2] Upgrade to R2DBC Arabba-SR11, Kotlin 1.5.32, Jackson 2.12.6 --- build.gradle | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index f1ba25cf678..23057804e45 100644 --- a/build.gradle +++ b/build.gradle @@ -3,8 +3,8 @@ plugins { id 'io.spring.nohttp' version '0.0.10' id "io.freefair.aspectj" version '6.2.0' apply false id 'org.jetbrains.dokka' version '1.5.0' apply false - id 'org.jetbrains.kotlin.jvm' version '1.5.31' apply false - id "org.jetbrains.kotlin.plugin.serialization" version "1.5.31" apply false + id 'org.jetbrains.kotlin.jvm' version '1.5.32' apply false + id "org.jetbrains.kotlin.plugin.serialization" version "1.5.32" apply false id 'org.asciidoctor.jvm.convert' version '3.3.2' id 'org.asciidoctor.jvm.pdf' version '3.3.2' id "org.unbroken-dome.xjc" version '2.0.0' apply false @@ -27,13 +27,13 @@ configure(allprojects) { project -> dependencyManagement { imports { - mavenBom "com.fasterxml.jackson:jackson-bom:2.12.5" + mavenBom "com.fasterxml.jackson:jackson-bom:2.12.6" mavenBom "io.netty:netty-bom:4.1.72.Final" mavenBom "io.projectreactor:reactor-bom:2020.0.14" - mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10" + mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR11" mavenBom "io.rsocket:rsocket-bom:1.1.1" mavenBom "org.eclipse.jetty:jetty-bom:9.4.44.v20210927" - mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.31" + mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.32" mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.2" mavenBom "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.2.2" mavenBom "org.junit:junit-bom:5.8.2" @@ -353,12 +353,12 @@ configure([rootProject] + javaProjects) { project -> testImplementation("io.mockk:mockk") testImplementation("org.assertj:assertj-core") // Pull in the latest JUnit 5 Launcher API to ensure proper support in IDEs. - testRuntimeOnly("org.junit.platform:junit-platform-launcher") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") testRuntimeOnly("org.junit.platform:junit-platform-suite-engine") testRuntimeOnly("org.apache.logging.log4j:log4j-core") - testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl") testRuntimeOnly("org.apache.logging.log4j:log4j-jul") + testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl") // JSR-305 only used for non-required meta-annotations compileOnly("com.google.code.findbugs:jsr305") testCompileOnly("com.google.code.findbugs:jsr305")