From d665977787a31230c2a908fe695fb8fa3af254ee Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 15 Dec 2021 21:50:30 +0100 Subject: [PATCH 1/2] Polishing --- .../annotation/AbstractCachingConfiguration.java | 6 +++--- .../context/annotation/AnnotationConfigUtils.java | 8 ++++---- .../annotation/AbstractAsyncConfiguration.java | 12 ++++++------ .../AbstractTransactionManagementConfiguration.java | 4 ++-- 4 files changed, 15 insertions(+), 15 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 403c6e9dce..d6473e28e6 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 @@ -67,7 +67,7 @@ public abstract class AbstractCachingConfiguration implements ImportAware { @Override public void setImportMetadata(AnnotationMetadata importMetadata) { this.enableCaching = AnnotationAttributes.fromMap( - importMetadata.getAnnotationAttributes(EnableCaching.class.getName(), false)); + importMetadata.getAnnotationAttributes(EnableCaching.class.getName())); if (this.enableCaching == null) { throw new IllegalArgumentException( "@EnableCaching is not present on importing class " + importMetadata.getClassName()); @@ -76,7 +76,7 @@ public abstract class AbstractCachingConfiguration implements ImportAware { @Autowired void setConfigurers(ObjectProvider configurers) { - Supplier cachingConfigurer = () -> { + Supplier configurer = () -> { List candidates = configurers.stream().collect(Collectors.toList()); if (CollectionUtils.isEmpty(candidates)) { return null; @@ -89,7 +89,7 @@ public abstract class AbstractCachingConfiguration implements ImportAware { } return candidates.get(0); }; - useCachingConfigurer(new CachingConfigurerSupplier(cachingConfigurer)); + useCachingConfigurer(new CachingConfigurerSupplier(configurer)); } /** diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java index 91b1719b70..0c6e556709 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 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. @@ -282,7 +282,7 @@ public abstract class AnnotationConfigUtils { @Nullable static AnnotationAttributes attributesFor(AnnotatedTypeMetadata metadata, String annotationClassName) { - return AnnotationAttributes.fromMap(metadata.getAnnotationAttributes(annotationClassName, false)); + return AnnotationAttributes.fromMap(metadata.getAnnotationAttributes(annotationClassName)); } static Set attributesForRepeatable(AnnotationMetadata metadata, @@ -298,10 +298,10 @@ public abstract class AnnotationConfigUtils { Set result = new LinkedHashSet<>(); // Direct annotation present? - addAttributesIfNotNull(result, metadata.getAnnotationAttributes(annotationClassName, false)); + addAttributesIfNotNull(result, metadata.getAnnotationAttributes(annotationClassName)); // Container annotation present? - Map container = metadata.getAnnotationAttributes(containerClassName, false); + Map container = metadata.getAnnotationAttributes(containerClassName); if (container != null && container.containsKey("value")) { for (Map containedAttributes : (Map[]) container.get("value")) { addAttributesIfNotNull(result, containedAttributes); diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java index 2558ab5684..53d7749982 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java +++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java @@ -59,7 +59,7 @@ public abstract class AbstractAsyncConfiguration implements ImportAware { @Override public void setImportMetadata(AnnotationMetadata importMetadata) { this.enableAsync = AnnotationAttributes.fromMap( - importMetadata.getAnnotationAttributes(EnableAsync.class.getName(), false)); + importMetadata.getAnnotationAttributes(EnableAsync.class.getName())); if (this.enableAsync == null) { throw new IllegalArgumentException( "@EnableAsync is not present on importing class " + importMetadata.getClassName()); @@ -71,7 +71,7 @@ public abstract class AbstractAsyncConfiguration implements ImportAware { */ @Autowired void setConfigurers(ObjectProvider configurers) { - Supplier asyncConfigurer = SingletonSupplier.of(() -> { + Supplier configurer = SingletonSupplier.of(() -> { List candidates = configurers.stream().collect(Collectors.toList()); if (CollectionUtils.isEmpty(candidates)) { return null; @@ -81,14 +81,14 @@ public abstract class AbstractAsyncConfiguration implements ImportAware { } return candidates.get(0); }); - this.executor = adapt(asyncConfigurer, AsyncConfigurer::getAsyncExecutor); - this.exceptionHandler = adapt(asyncConfigurer, AsyncConfigurer::getAsyncUncaughtExceptionHandler); + this.executor = adapt(configurer, AsyncConfigurer::getAsyncExecutor); + this.exceptionHandler = adapt(configurer, AsyncConfigurer::getAsyncUncaughtExceptionHandler); } private Supplier adapt(Supplier supplier, Function provider) { return () -> { - AsyncConfigurer asyncConfigurer = supplier.get(); - return (asyncConfigurer != null) ? provider.apply(asyncConfigurer) : null; + AsyncConfigurer configurer = supplier.get(); + return (configurer != null ? provider.apply(configurer) : null); }; } diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.java index 460105d9ea..0e885081fa 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.java +++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.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. @@ -57,7 +57,7 @@ public abstract class AbstractTransactionManagementConfiguration implements Impo @Override public void setImportMetadata(AnnotationMetadata importMetadata) { this.enableTx = AnnotationAttributes.fromMap( - importMetadata.getAnnotationAttributes(EnableTransactionManagement.class.getName(), false)); + importMetadata.getAnnotationAttributes(EnableTransactionManagement.class.getName())); if (this.enableTx == null) { throw new IllegalArgumentException( "@EnableTransactionManagement is not present on importing class " + importMetadata.getClassName()); From 31a4c274b7f34cc4fd66bb5c90864ce3ae45fe8e Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 15 Dec 2021 21:51:05 +0100 Subject: [PATCH 2/2] Upgrade to SnakeYAML 1.30, MockK 1.12.1, Jetty Reactive HttpClient 1.1.10 --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 23057804e4..5144dbccf8 100644 --- a/build.gradle +++ b/build.gradle @@ -92,7 +92,7 @@ configure(allprojects) { project -> entry 'jibx-run' } dependency "org.ogce:xpp3:1.1.6" - dependency "org.yaml:snakeyaml:1.29" + dependency "org.yaml:snakeyaml:1.30" dependency "com.h2database:h2:1.4.200" dependency "com.github.ben-manes.caffeine:caffeine:2.9.3" @@ -150,7 +150,7 @@ configure(allprojects) { project -> } } - dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.9" + dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.10" dependency 'org.apache.httpcomponents.client5:httpclient5:5.1.2' dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.1.2' dependency("org.apache.httpcomponents:httpclient:4.5.13") { @@ -204,7 +204,7 @@ configure(allprojects) { project -> } entry 'mockito-junit-jupiter' } - dependency "io.mockk:mockk:1.12.0" + dependency "io.mockk:mockk:1.12.1" dependency("net.sourceforge.htmlunit:htmlunit:2.55.0") { exclude group: "commons-logging", name: "commons-logging"