From 55d07566ac4bd25ba386c99fbbf5c78759483a02 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 7 Sep 2020 19:15:03 +0200 Subject: [PATCH] Javadoc refinements --- .../org/springframework/context/annotation/Condition.java | 8 ++++---- .../context/annotation/ConditionContext.java | 4 ++-- .../springframework/context/annotation/Conditional.java | 4 ++-- .../context/annotation/ConfigurationClassParser.java | 2 +- .../context/annotation/ConfigurationCondition.java | 8 ++++---- 5 files changed, 13 insertions(+), 13 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 3d0f17d95d7..c38fffc33e2 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 @@ -44,7 +44,7 @@ public interface Condition { /** * Determine if the condition matches. * @param context the condition context - * @param metadata metadata of the {@link org.springframework.core.type.AnnotationMetadata class} + * @param metadata the metadata of the {@link org.springframework.core.type.AnnotationMetadata class} * or {@link org.springframework.core.type.MethodMetadata method} being checked * @return {@code true} if the condition matches and the component can be registered, * or {@code false} to veto the annotated component's registration 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 91974273711..e28dfda7a30 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 d18cf37ebc0..80e5f5cca54 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 686e8ab3dce..59d805851f0 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 @@ -654,7 +654,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) 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 ab4fede15eb..e14e0304f71 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 }