The default implementation delegates to {@link JmxUtils#isMBean}, * which checks for {@link javax.management.DynamicMBean} classes as well * as classes with corresponding "*MBean" interface (Standard MBeans) - * or corresponding "*MXBean" interface (Java 6 MXBeans). + * or corresponding "*MXBean" interface (Java MXBeans). * @param beanClass the bean class to analyze * @return whether the class qualifies as an MBean * @see org.springframework.jmx.support.JmxUtils#isMBean(Class) diff --git a/spring-context/src/main/java/org/springframework/jmx/support/JmxUtils.java b/spring-context/src/main/java/org/springframework/jmx/support/JmxUtils.java index 26c91b1ab7..23b45e3f7c 100644 --- a/spring-context/src/main/java/org/springframework/jmx/support/JmxUtils.java +++ b/spring-context/src/main/java/org/springframework/jmx/support/JmxUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2022 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. @@ -255,7 +255,7 @@ public abstract class JmxUtils { * Determine whether the given bean class qualifies as an MBean as-is. *
This implementation checks for {@link javax.management.DynamicMBean} * classes as well as classes with corresponding "*MBean" interface - * (Standard MBeans) or corresponding "*MXBean" interface (Java 6 MXBeans). + * (Standard MBeans) or corresponding "*MXBean" interface (Java MXBeans). * @param clazz the bean class to analyze * @return whether the class qualifies as an MBean * @see org.springframework.jmx.export.MBeanExporter#isMBean(Class) @@ -289,7 +289,7 @@ public abstract class JmxUtils { } /** - * Return the Java 6 MXBean interface exists for the given class, if any + * Return the Java MXBean interface for the given class, if any * (that is, an interface whose name ends with "MXBean" and/or * carries an appropriate MXBean annotation). * @param clazz the class to check diff --git a/spring-context/src/main/java/org/springframework/scripting/support/StandardScriptFactory.java b/spring-context/src/main/java/org/springframework/scripting/support/StandardScriptFactory.java index 80a1a8fb6f..ef76657a61 100644 --- a/spring-context/src/main/java/org/springframework/scripting/support/StandardScriptFactory.java +++ b/spring-context/src/main/java/org/springframework/scripting/support/StandardScriptFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 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. @@ -36,7 +36,7 @@ import org.springframework.util.StringUtils; /** * {@link org.springframework.scripting.ScriptFactory} implementation based - * on the JSR-223 script engine abstraction (as included in Java 6+). + * on the JSR-223 script engine abstraction (as included in Java). * Supports JavaScript, Groovy, JRuby, and other JSR-223 compliant engines. * *
Typically used in combination with a diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/StringToLocaleConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToLocaleConverter.java index d68fe562b6..2b5bf654b8 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/support/StringToLocaleConverter.java +++ b/spring-core/src/main/java/org/springframework/core/convert/support/StringToLocaleConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2022 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. @@ -26,7 +26,7 @@ import org.springframework.util.StringUtils; * Converts from a String to a {@link java.util.Locale}. * *
Accepts the classic {@link Locale} String format ({@link Locale#toString()}) - * as well as BCP 47 language tags ({@link Locale#forLanguageTag} on Java 7+). + * as well as BCP 47 language tags ({@link Locale#forLanguageTag}. * * @author Keith Donald * @author Juergen Hoeller diff --git a/spring-core/src/main/java/org/springframework/util/DefaultPropertiesPersister.java b/spring-core/src/main/java/org/springframework/util/DefaultPropertiesPersister.java index a369e3366d..d0f3bc296f 100644 --- a/spring-core/src/main/java/org/springframework/util/DefaultPropertiesPersister.java +++ b/spring-core/src/main/java/org/springframework/util/DefaultPropertiesPersister.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 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. @@ -35,8 +35,8 @@ import java.util.Properties; *
Loading from and storing to a stream delegates to {@code Properties.load} * and {@code Properties.store}, respectively, to be fully compatible with * the Unicode conversion as implemented by the JDK Properties class. As of JDK 6, - * {@code Properties.load/store} will also be used for readers/writers, - * effectively turning this class into a plain backwards compatibility adapter. + * {@code Properties.load/store} is also used for readers/writers, effectively + * turning this class into a plain backwards compatibility adapter. * *
The persistence code that works with Reader/Writer follows the JDK's parsing * strategy but does not implement Unicode conversion, because the Reader/Writer diff --git a/spring-core/src/main/java/org/springframework/util/StringUtils.java b/spring-core/src/main/java/org/springframework/util/StringUtils.java index fd70a8acea..ef6e215a38 100644 --- a/spring-core/src/main/java/org/springframework/util/StringUtils.java +++ b/spring-core/src/main/java/org/springframework/util/StringUtils.java @@ -804,11 +804,11 @@ public abstract class StringUtils { /** * Parse the given {@code String} value into a {@link Locale}, accepting - * the {@link Locale#toString} format as well as BCP 47 language tags. + * the {@link Locale#toString} format as well as BCP 47 language tags as + * specified by {@link Locale#forLanguageTag}. * @param localeValue the locale value: following either {@code Locale's} * {@code toString()} format ("en", "en_UK", etc), also accepting spaces as * separators (as an alternative to underscores), or BCP 47 (e.g. "en-UK") - * as specified by {@link Locale#forLanguageTag} on Java 7+ * @return a corresponding {@code Locale} instance, or {@code null} if none * @throws IllegalArgumentException in case of an invalid locale specification * @since 5.0.4 diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java index f50380fcde..80f8979604 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 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. @@ -50,9 +50,9 @@ import org.springframework.util.function.SupplierUtils; * by default. This factory loads a "sql-error-codes.xml" file from the class path, * defining error code mappings for database names from database meta-data. *
The default implementation calls {@link Locale#toString()} - * or JDK 7's {@link Locale#toLanguageTag()}, depending on the + * or {@link Locale#toLanguageTag()}, depending on the * {@link #setLanguageTagCompliant "languageTagCompliant"} configuration property. - * @param locale the locale to stringify + * @param locale the locale to convert to a string * @return a String representation for the given locale * @since 4.3 * @see #isLanguageTagCompliant()