Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite26d883

Browse files
committed
Stop referring to features as Java 6/7 features where unnecessary
1 parenta1c7380 commite26d883

File tree

11 files changed

+26
-26
lines changed

11 files changed

+26
-26
lines changed

‎spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/package-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Support package for the Java6ServiceLoader facility.
2+
* Support package for the Java{@link java.util.ServiceLoader} facility.
33
*/
44
@NonNullApi
55
@NonNullFields

‎spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2021 the original author or authors.
2+
* Copyright 2002-2022 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.
@@ -985,7 +985,7 @@ public void storeCache(RootBeanDefinition mbd, Executable constructorOrFactoryMe
985985

986986

987987
/**
988-
* Delegate for checking Java 6's {@link ConstructorProperties} annotation.
988+
* Delegate for checking Java's {@link ConstructorProperties} annotation.
989989
*/
990990
privatestaticclassConstructorPropertiesChecker {
991991

‎spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java‎

Lines changed: 2 additions & 2 deletions
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-2022 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.
@@ -762,7 +762,7 @@ protected ObjectName getObjectName(Object bean, @Nullable String beanKey) throws
762762
* <p>The default implementation delegates to {@link JmxUtils#isMBean},
763763
* which checks for {@link javax.management.DynamicMBean} classes as well
764764
* as classes with corresponding "*MBean" interface (Standard MBeans)
765-
* or corresponding "*MXBean" interface (Java6MXBeans).
765+
* or corresponding "*MXBean" interface (Java MXBeans).
766766
* @param beanClass the bean class to analyze
767767
* @return whether the class qualifies as an MBean
768768
* @see org.springframework.jmx.support.JmxUtils#isMBean(Class)

‎spring-context/src/main/java/org/springframework/jmx/support/JmxUtils.java‎

Lines changed: 3 additions & 3 deletions
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-2022 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.
@@ -255,7 +255,7 @@ public static Class<?> getClassToExpose(Class<?> clazz) {
255255
* Determine whether the given bean class qualifies as an MBean as-is.
256256
* <p>This implementation checks for {@link javax.management.DynamicMBean}
257257
* classes as well as classes with corresponding "*MBean" interface
258-
* (Standard MBeans) or corresponding "*MXBean" interface (Java6MXBeans).
258+
* (Standard MBeans) or corresponding "*MXBean" interface (Java MXBeans).
259259
* @param clazz the bean class to analyze
260260
* @return whether the class qualifies as an MBean
261261
* @see org.springframework.jmx.export.MBeanExporter#isMBean(Class)
@@ -289,7 +289,7 @@ public static Class<?> getMBeanInterface(@Nullable Class<?> clazz) {
289289
}
290290

291291
/**
292-
* Return the Java6MXBean interface exists for the given class, if any
292+
* Return the Java MXBean interface for the given class, if any
293293
* (that is, an interface whose name ends with "MXBean" and/or
294294
* carries an appropriate MXBean annotation).
295295
* @param clazz the class to check

‎spring-context/src/main/java/org/springframework/scripting/support/StandardScriptFactory.java‎

Lines changed: 2 additions & 2 deletions
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-2022 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.
@@ -36,7 +36,7 @@
3636

3737
/**
3838
* {@link org.springframework.scripting.ScriptFactory} implementation based
39-
* on the JSR-223 script engine abstraction (as included in Java 6+).
39+
* on the JSR-223 script engine abstraction (as included in Java).
4040
* Supports JavaScript, Groovy, JRuby, and other JSR-223 compliant engines.
4141
*
4242
* <p>Typically used in combination with a

‎spring-core/src/main/java/org/springframework/core/convert/support/StringToLocaleConverter.java‎

Lines changed: 2 additions & 2 deletions
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-2022 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.
@@ -26,7 +26,7 @@
2626
* Converts from a String to a {@link java.util.Locale}.
2727
*
2828
* <p>Accepts the classic {@link Locale} String format ({@link Locale#toString()})
29-
* as well as BCP 47 language tags ({@link Locale#forLanguageTag} on Java 7+).
29+
* as well as BCP 47 language tags ({@link Locale#forLanguageTag}.
3030
*
3131
* @author Keith Donald
3232
* @author Juergen Hoeller

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

Lines changed: 3 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-2022 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,8 @@
3535
* <p>Loading from and storing to a stream delegates to {@code Properties.load}
3636
* and {@code Properties.store}, respectively, to be fully compatible with
3737
* the Unicode conversion as implemented by the JDK Properties class. As of JDK 6,
38-
* {@code Properties.load/store}will alsobeused for readers/writers,
39-
*effectivelyturning this class into a plain backwards compatibility adapter.
38+
* {@code Properties.load/store}is also used for readers/writers, effectively
39+
* turning this class into a plain backwards compatibility adapter.
4040
*
4141
* <p>The persistence code that works with Reader/Writer follows the JDK's parsing
4242
* strategy but does not implement Unicode conversion, because the Reader/Writer

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -804,11 +804,11 @@ public static String uriDecode(String source, Charset charset) {
804804

805805
/**
806806
* Parse the given {@code String} value into a {@link Locale}, accepting
807-
* the {@link Locale#toString} format as well as BCP 47 language tags.
807+
* the {@link Locale#toString} format as well as BCP 47 language tags as
808+
* specified by {@link Locale#forLanguageTag}.
808809
* @param localeValue the locale value: following either {@code Locale's}
809810
* {@code toString()} format ("en", "en_UK", etc), also accepting spaces as
810811
* separators (as an alternative to underscores), or BCP 47 (e.g. "en-UK")
811-
* as specified by {@link Locale#forLanguageTag} on Java 7+
812812
* @return a corresponding {@code Locale} instance, or {@code null} if none
813813
* @throws IllegalArgumentException in case of an invalid locale specification
814814
* @since 5.0.4

‎spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java‎

Lines changed: 4 additions & 4 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-2022 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.
@@ -50,9 +50,9 @@
5050
* by default. This factory loads a "sql-error-codes.xml" file from the class path,
5151
* defining error code mappings for database names from database meta-data.
5252
* <li>Fallback to a fallback translator. {@link SQLStateSQLExceptionTranslator} is the
53-
* default fallback translator, analyzing the exception's SQL state only.On Java 6
54-
* which introduces its own {@code SQLException} subclass hierarchy, wewill
55-
*use{@link SQLExceptionSubclassTranslator} by default, which in turns falls back
53+
* default fallback translator, analyzing the exception's SQL state only.Since Java 6
54+
* which introduces its own {@code SQLException} subclass hierarchy, weuse
55+
* {@link SQLExceptionSubclassTranslator} by default, which in turns falls back
5656
* to Spring's own SQL state translation when not encountering specific subclasses.
5757
* </ul>
5858
*

‎spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLExceptionSubclassFactory.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2008 the original author or authors.
2+
* Copyright 2002-2022 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,7 +29,7 @@
2929
importjava.sql.SQLTransientConnectionException;
3030

3131
/**
32-
* Class to generateJava 6SQLException subclasses for testing purposes.
32+
* Class to generate{@linkSQLException} subclasses for testing purposes.
3333
*
3434
* @author Thomas Risberg
3535
*/

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp