Browse Source

Javadoc refinements

pull/25798/head
Juergen Hoeller 4 years ago
parent
commit
4b211fb18c
  1. 6
      spring-context/src/main/java/org/springframework/context/annotation/Condition.java
  2. 4
      spring-context/src/main/java/org/springframework/context/annotation/ConditionContext.java
  3. 4
      spring-context/src/main/java/org/springframework/context/annotation/Conditional.java
  4. 2
      spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
  5. 8
      spring-context/src/main/java/org/springframework/context/annotation/ConfigurationCondition.java

6
spring-context/src/main/java/org/springframework/context/annotation/Condition.java

@ -1,5 +1,5 @@ @@ -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; @@ -29,8 +29,8 @@ import org.springframework.core.type.AnnotatedTypeMetadata;
*
* <p>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

4
spring-context/src/main/java/org/springframework/context/annotation/ConditionContext.java

@ -1,5 +1,5 @@ @@ -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; @@ -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

4
spring-context/src/main/java/org/springframework/context/annotation/Conditional.java

@ -1,5 +1,5 @@ @@ -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; @@ -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<? extends Condition>[] value();

2
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java

@ -667,7 +667,7 @@ class ConfigurationClassParser { @@ -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<SourceClass> asSourceClasses(String[] classNames, Predicate<String> filter) throws IOException {
List<SourceClass> annotatedClasses = new ArrayList<>(classNames.length);

8
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationCondition.java

@ -1,5 +1,5 @@ @@ -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; @@ -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 { @@ -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.
* <p>At the time that the condition is evaluated, all {@code @Configuration}s
* will have been parsed.
* <p>At the time that the condition is evaluated, all {@code @Configuration}
* classes will have been parsed.
*/
REGISTER_BEAN
}

Loading…
Cancel
Save