From 4b211fb18c5ea57fa1f6d3dba0553b8e8d21489e Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 7 Sep 2020 19:20:26 +0200 Subject: [PATCH 1/2] Javadoc refinements --- .../org/springframework/context/annotation/Condition.java | 6 +++--- .../context/annotation/ConditionContext.java | 4 ++-- .../springframework/context/annotation/Conditional.java | 4 ++-- .../context/annotation/ConfigurationClassParser.java | 2 +- .../context/annotation/ConfigurationCondition.java | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Condition.java b/spring-context/src/main/java/org/springframework/context/annotation/Condition.java index 68d4b96f74..c38fffc33e 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/Condition.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/Condition.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2020 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. @@ -29,8 +29,8 @@ import org.springframework.core.type.AnnotatedTypeMetadata; * *

Conditions must follow the same restrictions as {@link BeanFactoryPostProcessor} * and take care to never interact with bean instances. For more fine-grained control - * of conditions that interact with {@code @Configuration} beans consider the - * {@link ConfigurationCondition} interface. + * of conditions that interact with {@code @Configuration} beans consider implementing + * the {@link ConfigurationCondition} interface. * * @author Phillip Webb * @since 4.0 diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConditionContext.java b/spring-context/src/main/java/org/springframework/context/annotation/ConditionContext.java index 9197427371..e28dfda7a3 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/ConditionContext.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/ConditionContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2020 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. @@ -23,7 +23,7 @@ import org.springframework.core.io.ResourceLoader; import org.springframework.lang.Nullable; /** - * Context information for use by {@link Condition Conditions}. + * Context information for use by {@link Condition} implementations. * * @author Phillip Webb * @author Juergen Hoeller diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Conditional.java b/spring-context/src/main/java/org/springframework/context/annotation/Conditional.java index d18cf37ebc..80e5f5cca5 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/Conditional.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/Conditional.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2020 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. @@ -62,7 +62,7 @@ import java.lang.annotation.Target; public @interface Conditional { /** - * All {@link Condition Conditions} that must {@linkplain Condition#matches match} + * All {@link Condition} classes that must {@linkplain Condition#matches match} * in order for the component to be registered. */ Class[] value(); diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java index 3adec23443..423078625f 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java @@ -667,7 +667,7 @@ class ConfigurationClassParser { } /** - * Factory method to obtain {@link SourceClass SourceClasss} from class names. + * Factory method to obtain a {@link SourceClass} collection from class names. */ private Collection asSourceClasses(String[] classNames, Predicate filter) throws IOException { List annotatedClasses = new ArrayList<>(classNames.length); diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationCondition.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationCondition.java index ab4fede15e..e14e0304f7 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationCondition.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationCondition.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2020 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. @@ -18,7 +18,7 @@ package org.springframework.context.annotation; /** * A {@link Condition} that offers more fine-grained control when used with - * {@code @Configuration}. Allows certain {@link Condition Conditions} to adapt when they match + * {@code @Configuration}. Allows certain conditions to adapt when they match * based on the configuration phase. For example, a condition that checks if a bean * has already been registered might choose to only be evaluated during the * {@link ConfigurationPhase#REGISTER_BEAN REGISTER_BEAN} {@link ConfigurationPhase}. @@ -52,8 +52,8 @@ public interface ConfigurationCondition extends Condition { * The {@link Condition} should be evaluated when adding a regular * (non {@code @Configuration}) bean. The condition will not prevent * {@code @Configuration} classes from being added. - *

At the time that the condition is evaluated, all {@code @Configuration}s - * will have been parsed. + *

At the time that the condition is evaluated, all {@code @Configuration} + * classes will have been parsed. */ REGISTER_BEAN } From 4f0f29880fa48ee4550acde51a8a0fc1269209ef Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 7 Sep 2020 19:25:46 +0200 Subject: [PATCH 2/2] Upgrade to AssertJ 3.17.2 and Undertow 2.0.31 --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 7ba5312e97..d38d9744b6 100644 --- a/build.gradle +++ b/build.gradle @@ -131,7 +131,7 @@ configure(allprojects) { project -> entry 'tomcat-embed-core' entry 'tomcat-embed-websocket' } - dependencySet(group: 'io.undertow', version: '2.0.30.Final') { + dependencySet(group: 'io.undertow', version: '2.0.31.Final') { entry 'undertow-core' entry('undertow-websockets-jsr') { exclude group: "org.jboss.spec.javax.websocket", name: "jboss-websocket-api_1.1_spec" @@ -179,7 +179,7 @@ configure(allprojects) { project -> dependency "org.testng:testng:6.14.3" dependency "org.hamcrest:hamcrest:2.1" dependency "org.awaitility:awaitility:3.1.6" - dependency "org.assertj:assertj-core:3.17.1" + dependency "org.assertj:assertj-core:3.17.2" dependencySet(group: 'org.xmlunit', version: '2.6.2') { entry 'xmlunit-assertj' entry('xmlunit-matchers') {