Skip to content

Commit 3900ac8

Browse files
committed
Javadoc refinements
1 parent 72b52d4 commit 3900ac8

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2017 the original author or authors.
2+
* Copyright 2002-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -29,8 +29,8 @@
2929
*
3030
* <p>Conditions must follow the same restrictions as {@link BeanFactoryPostProcessor}
3131
* and take care to never interact with bean instances. For more fine-grained control
32-
* of conditions that interact with {@code @Configuration} beans consider the
33-
* {@link ConfigurationCondition} interface.
32+
* of conditions that interact with {@code @Configuration} beans consider implementing
33+
* the {@link ConfigurationCondition} interface.
3434
*
3535
* @author Phillip Webb
3636
* @since 4.0
@@ -44,7 +44,7 @@ public interface Condition {
4444
/**
4545
* Determine if the condition matches.
4646
* @param context the condition context
47-
* @param metadata metadata of the {@link org.springframework.core.type.AnnotationMetadata class}
47+
* @param metadata the metadata of the {@link org.springframework.core.type.AnnotationMetadata class}
4848
* or {@link org.springframework.core.type.MethodMetadata method} being checked
4949
* @return {@code true} if the condition matches and the component can be registered,
5050
* or {@code false} to veto the annotated component's registration

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2018 the original author or authors.
2+
* Copyright 2002-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
2323
import org.springframework.lang.Nullable;
2424

2525
/**
26-
* Context information for use by {@link Condition}s.
26+
* Context information for use by {@link Condition} implementations.
2727
*
2828
* @author Phillip Webb
2929
* @author Juergen Hoeller

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2017 the original author or authors.
2+
* Copyright 2002-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -62,7 +62,7 @@
6262
public @interface Conditional {
6363

6464
/**
65-
* All {@link Condition}s that must {@linkplain Condition#matches match}
65+
* All {@link Condition} classes that must {@linkplain Condition#matches match}
6666
* in order for the component to be registered.
6767
*/
6868
Class<? extends Condition>[] value();

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2019 the original author or authors.
2+
* Copyright 2002-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -704,7 +704,7 @@ SourceClass asSourceClass(@Nullable Class<?> classType) throws IOException {
704704
}
705705

706706
/**
707-
* Factory method to obtain {@link SourceClass SourceClasss} from class names.
707+
* Factory method to obtain a {@link SourceClass} collection from class names.
708708
*/
709709
private Collection<SourceClass> asSourceClasses(String... classNames) throws IOException {
710710
List<SourceClass> annotatedClasses = new ArrayList<>(classNames.length);

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2016 the original author or authors.
2+
* Copyright 2002-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
1818

1919
/**
2020
* A {@link Condition} that offers more fine-grained control when used with
21-
* {@code @Configuration}. Allows certain {@link Condition}s to adapt when they match
21+
* {@code @Configuration}. Allows certain conditions to adapt when they match
2222
* based on the configuration phase. For example, a condition that checks if a bean
2323
* has already been registered might choose to only be evaluated during the
2424
* {@link ConfigurationPhase#REGISTER_BEAN REGISTER_BEAN} {@link ConfigurationPhase}.
@@ -52,8 +52,8 @@ enum ConfigurationPhase {
5252
* The {@link Condition} should be evaluated when adding a regular
5353
* (non {@code @Configuration}) bean. The condition will not prevent
5454
* {@code @Configuration} classes from being added.
55-
* <p>At the time that the condition is evaluated, all {@code @Configuration}s
56-
* will have been parsed.
55+
* <p>At the time that the condition is evaluated, all {@code @Configuration}
56+
* classes will have been parsed.
5757
*/
5858
REGISTER_BEAN
5959
}

0 commit comments

Comments
 (0)