8000 Update Javadoc to stop mentioning 5.3.x as the status quo · spring-projects/spring-framework@cd987fc · GitHub
[go: up one dir, main page]
Skip to content

Commit cd987fc

Browse files
sbrannensbrannen
committed
Update Javadoc to stop mentioning 5.3.x as the status quo
Closes gh-34740
1 parent 3f9402a commit cd987fc

File tree

38 files changed

+129
-168
lines changed

38 files changed

+129
-168
lines changed

‎spring-core/src/main/java/org/springframework/core/io/DefaultResourceLoader.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2022 the original author or authors.
2+
* Copyright 2002-2025 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.
@@ -59,7 +59,7 @@ public class DefaultResourceLoader implements ResourceLoader {
5959
/**
6060
* Create a new DefaultResourceLoader.
6161
* <p>ClassLoader access will happen using the thread context class loader
62-
* at the time of actual resource access (since 5.3). For more control, pass
62+
* at the time of actual resource access. For more control, pass
6363
* a specific ClassLoader to {@link #DefaultResourceLoader(ClassLoader)}.
6464
* @see java.lang.Thread#getContextClassLoader()
6565
*/
@@ -80,7 +80,7 @@ public DefaultResourceLoader(@Nullable ClassLoader classLoader) {
8080
* Specify the ClassLoader to load class path resources with, or {@code null}
8181
* for using the thread context class loader at the time of actual resource access.
8282
* <p>The default is that ClassLoader access will happen using the thread context
83-
* class loader at the time of actual resource access (since 5.3).
83+
* class loader at the time of actual resource access.
8484
*/
8585
public void setClassLoader(@Nullable ClassLoader classLoader) {
8686
this.classLoader = classLoader;

‎spring-core/src/main/java/org/springframework/core/io/support/SpringFactoriesLoader.java

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2025 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.
@@ -126,13 +126,12 @@ protected SpringFactoriesLoader(@Nullable ClassLoader classLoader, Map<String, L
126126
* Load and instantiate the factory implementations of the given type from
127127
* {@value #FACTORIES_RESOURCE_LOCATION}, using the configured class loader
128128
* and a default argument resolver that expects a no-arg constructor.
129-
* <p>The returned factories are sorted through {@link AnnotationAwareOrderComparator}.
129+
* <p>The returned factories are sorted using {@link AnnotationAwareOrderComparator}.
130130
* <p>If a custom instantiation strategy is required, use {@code load(...)}
131131
* with a custom {@link ArgumentResolver ArgumentResolver} and/or
132132
* {@link FailureHandler FailureHandler}.
133-
* <p>As of Spring Framework 5.3, if duplicate implementation class names are
134-
* discovered for a given factory type, only one instance of the duplicated
135-
* implementation type will be instantiated.
133+
* <p>If duplicate implementation class names are discovered for a given factory
134+
* type, only one instance of the duplicated implementation type will be instantiated.
136135
* @param factoryType the interface or abstract class representing the factory
137136
* @throws IllegalArgumentException if any factory implementation class cannot
138137
* be loaded or if an error occurs while instantiating any factory
@@ -146,10 +145,9 @@ public <T> List<T> load(Class<T> factoryType) {
146145
* Load and instantiate the factory implementations of the given type from
147146
* {@value #FACTORIES_RESOURCE_LOCATION}, using the configured class loader
148147
* and the given argument resolver.
149-
* <p>The returned factories are sorted through {@link AnnotationAwareOrderComparator}.
150-
* <p>As of Spring Framework 5.3, if duplicate implementation class names are
151-
* discovered for a given factory type, only one instance of the duplicated
152-
* implementation type will be instantiated.
148+
* <p>The returned factories are sorted using {@link AnnotationAwareOrderComparator}.
149+
* <p>If duplicate implementation class names are discovered for a given factory
150+
* type, only one instance of the duplicated implementation type will be instantiated.
153151
* @param factoryType the interface or abstract class representing the factory
154152
* @param argumentResolver strategy used to resolve constructor arguments by their type
155153
* @throws IllegalArgumentException if any factory implementation class cannot
@@ -164,10 +162,9 @@ public <T> List<T> load(Class<T> factoryType, @Nullable ArgumentResolver argumen
164162
* Load and instantiate the factory implementations of the given type from
165163
* {@value #FACTORIES_RESOURCE_LOCATION}, using the configured class loader
166164
* with custom failure handling provided by the given failure handler.
167-
* <p>The returned factories are sorted through {@link AnnotationAwareOrderComparator}.
168-
* <p>As of Spring Framework 5.3, if duplicate implementation class names are
169-
* discovered for a given factory type, only one instance of the duplicated
170-
* implementation type will be instantiated.
165+
* <p>The returned factories are sorted using {@link AnnotationAwareOrderComparator}.
166+
* <p>If duplicate implementation class names are discovered for a given factory
167+
* type, only one instance of the duplicated implementation type will be instantiated.
171168
* <p>For any factory implementation class that cannot be loaded or error that
172169
* occurs while instantiating it, the given failure handler is called.
173170
* @param factoryType the interface or abstract class representing the factory
@@ -183,10 +180,9 @@ public <T> List<T> load(Class<T> factoryType, @Nullable FailureHandler failureHa
183180
* {@value #FACTORIES_RESOURCE_LOCATION}, using the configured class loader,
184181
* the given argument resolver, and custom failure handling provided by the given
185182
* failure handler.
186-
* <p>The returned factories are sorted through {@link AnnotationAwareOrderComparator}.
187-
* <p>As of Spring Framework 5.3, if duplicate implementation class names are
188-
* discovered for a given factory type, only one instance of the duplicated
189-
* implementation type will be instantiated.
183+
* <p>The returned factories are sorted using {@link AnnotationAwareOrderComparator}.
184+
* <p>If duplicate implementation class names are discovered for a given factory
185+
* type, only one instance of the duplicated implementation type will be instantiated.
190186
* <p>For any factory implementation class that cannot be loaded or error that
191187
* occurs while instantiating it, the given failure handler is called.
192188
* @param factoryType the interface or abstract class representing the factory
@@ -237,12 +233,11 @@ protected <T> T instantiateFactory(String implementationName, Class<T> type,
237233
/**
238234
* Load and instantiate the factory implementations of the given type from
239235
* {@value #FACTORIES_RESOURCE_LOCATION}, using the given class loader.
240-
* <p>The returned factories are sorted through {@link AnnotationAwareOrderComparator}.
241-
* <p>As of Spring Framework 5.3, if duplicate implementation class names are
242-
* discovered for a given factory type, only one instance of the duplicated
243-
* implementation type will be instantiated.
236+
* <p>The returned factories are sorted using {@link AnnotationAwareOrderComparator}.
237+
* <p>If duplicate implementation class names are discovered for a given factory
238+
* type, only one instance of the duplicated implementation type will be instantiated.
244239
* <p>For more advanced factory loading with {@link ArgumentResolver} or
245-
* {@link FailureHandler} support use {@link #forDefaultResourceLocation(ClassLoader)}
240+
* {@link FailureHandler} support, use {@link #forDefaultResourceLocation(ClassLoader)}
246241
* to obtain a {@link SpringFactoriesLoader} instance.
247242
* @param factoryType the interface or abstract class representing the factory
248243
* @param classLoader the ClassLoader to use for loading (can be {@code null}
@@ -258,9 +253,8 @@ public static <T> List<T> loadFactories(Class<T> factoryType, @Nullable ClassLoa
258253
* Load the fully qualified class names of factory implementations of the
259254
* given type from {@value #FACTORIES_RESOURCE_LOCATION}, using the given
260255
* class loader.
261-
* <p>As of Spring Framework 5.3, if a particular implementation class name
262-
* is discovered more than once for the given factory type, duplicates will
263-
* be ignored.
256+
* <p>If a particular implementation class name is discovered more than once
257+
* for the given factory type, duplicates will be ignored.
264258
* @param factoryType the interface or abstract class representing the factory
265259
* @param classLoader the ClassLoader to use for loading resources; can be
266260
* {@code null} to use the default

‎spring-core/src/main/java/org/springframework/util/CollectionUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2024 the original author or authors.
2+
* Copyright 2002-2025 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.
@@ -102,7 +102,7 @@ public static <K, V> HashMap<K, V> newHashMap(int expectedSize) {
102102
* <p>This differs from the regular {@link LinkedHashMap} constructor
103103
* which takes an initial capacity relative to a load factor but is
104104
* aligned with Spring's own {@link LinkedCaseInsensitiveMap} and
105-
* {@link LinkedMultiValueMap} constructor semantics as of 5.3.
105+
* {@link LinkedMultiValueMap} constructor semantics.
106106
* @param expectedSize the expected number of elements (with a corresponding
107107
* capacity to be derived so that no resize/rehash operations are needed)
108108
* @since 5.3

‎spring-core/src/main/java/org/springframework/util/LinkedMultiValueMap.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2020 the original author or authors.
2+
* Copyright 2002-2025 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.
@@ -35,8 +35,7 @@
3535
* @param <K> the key type
3636
* @param <V> the value element type
3737
*/
38-
public class LinkedMultiValueMap<K, V> extends MultiValueMapAdapter<K, V> // new public base class in 5.3
39-
implements Serializable, Cloneable {
38+
public class LinkedMultiValueMap<K, V> extends MultiValueMapAdapter<K, V> implements Serializable, Cloneable {
4039

4140
private static final long serialVersionUID = 3801124242820219131L;
4241

‎spring-test/src/main/java/org/springframework/test/annotation/Commit.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2022 the original author or authors.
2+
* Copyright 2002-2025 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.
@@ -44,8 +44,7 @@
4444
* {@code @Commit} and {@code @Rollback} on the same test method or on the
4545
* same test class is unsupported and may lead to unpredictable results.
4646
*
47-
* <p>As of Spring Framework 5.3, this annotation will be inherited from an
48-
* enclosing test class by default. See
47+
* <p>This annotation will be inherited from an enclosing test class by default. See
4948
* {@link org.springframework.test.context.NestedTestConfiguration @NestedTestConfiguration}
5049
* for details.
5150
*

‎spring-test/src/main/java/org/springframework/test/annotation/DirtiesContext.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2024 the original author or authors.
2+
* Copyright 2002-2025 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.
@@ -76,8 +76,7 @@
7676
* <p>This annotation may be used as a <em>meta-annotation</em> to create custom
7777
* <em>composed annotations</em>.
7878
*
79-
* <p>As of Spring Framework 5.3, this annotation will be inherited from an
80-
* enclosing test class by default. See
79+
* <p>This annotation will be inherited from an enclosing test class by default. See
8180
* {@link org.springframework.test.context.NestedTestConfiguration @NestedTestConfiguration}
8281
* for details.
8382
*

‎spring-test/src/main/java/org/springframework/test/annotation/Rollback.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2024 the original author or authors.
2+
* Copyright 2002-2025 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.
@@ -48,8 +48,7 @@
4848
* custom <em>composed annotations</em>. Consult the source code for
4949
* {@link Commit @Commit} for a concrete example.
5050
*
51-
* <p>As of Spring Framework 5.3, this annotation will be inherited from an
52-
* enclosing test class by default. See
51+
* <p>This annotation will be inherited from an enclosing test class by default. See
5352
* {@link org.springframework.test.context.NestedTestConfiguration @NestedTestConfiguration}
5453
* for details.
5554
*

‎spring-test/src/main/java/org/springframework/test/context/ActiveProfiles.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2024 the original author or authors.
2+
* Copyright 2002-2025 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.
@@ -34,9 +34,8 @@
3434
* <p>This annotation may be used as a <em>meta-annotation</em> to create custom
3535
* <em>composed annotations</em>.
3636
*
37-
* <p>As of Spring Framework 5.3, this annotation will be inherited from an
38-
* enclosing test class by default. See
39-
* {@link NestedTestConfiguration @NestedTestConfiguration} for details.
37+
* <p>This annotation will be inherited from an enclosing test class by default.
38+
* See {@link NestedTestConfiguration @NestedTestConfiguration} for details.
4039
*
4140
* @author Sam Brannen
4241
* @since 3.1

‎spring-test/src/main/java/org/springframework/test/context/BootstrapWith.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@
3434
* present</em> on the current test class) will override any meta-present
3535
* declarations of {@code @BootstrapWith}.
3636
*
37-
* <p>As of Spring Framework 5.3, this annotation will be inherited from an
38-
* enclosing test class by default. See
39-
* {@link NestedTestConfiguration @NestedTestConfiguration} for details.
37+
* <p>This annotation will be inherited from an enclosing test class by default.
38+
* See {@link NestedTestConfiguration @NestedTestConfiguration} for details.
4039
*
4140
* @author Sam Brannen
4241
* @since 4.1

‎spring-test/src/main/java/org/springframework/test/context/ContextConfiguration.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,8 @@
7575
* <p>This annotation may be used as a <em>meta-annotation</em> to create custom
7676
* <em>composed annotations</em>.
7777
*
78-
* <p>As of Spring Framework 5.3, this annotation will be inherited from an
79-
* enclosing test class by default. See
80-
* {@link NestedTestConfiguration @NestedTestConfiguration} for details.
78+
* <p>This annotation will be inherited from an enclosing test class by default.
79+
* See {@link NestedTestConfiguration @NestedTestConfiguration} for details.
8180
*
8281
* @author Sam Brannen
8382
* @since 2.5

0 commit comments

Comments
 (0)
0