(commons-configuration) 03/03: Inline pre-Java 5 internal utility method

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git

commit 860d17b62801d3d6ba77aeb37ee30afbee8e8938
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Mar 17 15:56:49 2024 -0400

    Inline pre-Java 5 internal utility method
---
 .../org/apache/commons/configuration2/DataConfiguration.java  |  2 +-
 .../commons/configuration2/convert/PropertyConverter.java     | 11 ++---------
 .../commons/configuration2/resolver/CatalogResolver.java      |  2 +-
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git 
a/src/main/java/org/apache/commons/configuration2/DataConfiguration.java 
b/src/main/java/org/apache/commons/configuration2/DataConfiguration.java
index 318b2333..574256f6 100644
--- a/src/main/java/org/apache/commons/configuration2/DataConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/DataConfiguration.java
@@ -47,7 +47,7 @@ import org.apache.commons.lang3.StringUtils;
  * <li>{@link java.net.InetAddress}</li>
  * <li>{@code javax.mail.internet.InternetAddress} (requires Javamail in the 
classpath)</li>
  * <li>{@code jakarta.mail.internet.InternetAddress} (requires Javamail 2.+ in 
the classpath)</li>
- * <li>{@link Enum} (Java 5 enumeration types)</li>
+ * <li>{@link Enum}</li>
  * </ul>
  *
  * Lists and arrays are available for all types.<br>
diff --git 
a/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
 
b/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
index 38cc965f..b45a1d90 100644
--- 
a/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
+++ 
b/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
@@ -147,7 +147,7 @@ public final class PropertyConverter {
             return toPattern(value);
         } else if (Locale.class.equals(cls)) {
             return toLocale(value);
-        } else if (isEnum(cls)) {
+        } else if (cls.isEnum()) {
             return convertToEnum(cls, value);
         } else if (Color.class.equals(cls)) {
             return toColor(value);
@@ -628,14 +628,7 @@ public final class PropertyConverter {
     }
 
     /**
-     * Calls Class.isEnum() on Java 5, returns false on older JRE.
-     */
-    static boolean isEnum(final Class<?> cls) {
-        return cls.isEnum();
-    }
-
-    /**
-     * Converts the specified value into a Java 5 enum.
+     * Converts the specified value into an {@link Enum}.
      *
      * @param value the value to convert
      * @param cls the type of the enumeration
diff --git 
a/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java 
b/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java
index 2cf89664..d08cc68e 100644
--- 
a/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java
+++ 
b/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java
@@ -163,7 +163,7 @@ public class CatalogResolver implements EntityResolver {
             final String badFilePrefix = "file://";
             final String correctFilePrefix = "file:///";
 
-            // Java 5 has a bug when constructing file URLS
+            // Java 5 has a bug when constructing file URLs
             if (resolved.startsWith(badFilePrefix) && 
!resolved.startsWith(correctFilePrefix)) {
                 resolved = correctFilePrefix + 
resolved.substring(badFilePrefix.length());
             }