Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-lang.git

Author: garydgregory

.github/workflows/codeql-analysis.yml

@@ -57,7 +57,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f    # 3.28.18
+      uses: github/codeql-action/init@fca7ace96b7d713c7035871441bd52efbe39e27e    # 3.28.19
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -68,7 +68,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@ff0a06e83cb2de871e5a09832bc6a81e7276941f    # 3.28.18
+      uses: github/codeql-action/autobuild@fca7ace96b7d713c7035871441bd52efbe39e27e    # 3.28.19
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -82,4 +82,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f    # 3.28.18
+      uses: github/codeql-action/analyze@fca7ace96b7d713c7035871441bd52efbe39e27e    # 3.28.19

.github/workflows/scorecards-analysis.yml

@@ -45,7 +45,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186    # 2.4.1
+        uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde    # 2.4.2
         with:
           results_file: results.sarif
           results_format: sarif
@@ -64,6 +64,6 @@ jobs:
           retention-days: 5
 
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f    # 3.28.18
+        uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e    # 3.28.19
         with:
           sarif_file: results.sarif

src/main/java/org/apache/commons/lang3/time/AbstractFormatCache.java

@@ -89,7 +89,14 @@ public int hashCode() {
      */
     static final int NONE = -1;
 
-    private static final ConcurrentMap<ArrayKey, String> cDateTimeInstanceCache = new ConcurrentHashMap<>(7);
+    private static final ConcurrentMap<ArrayKey, String> dateTimeInstanceCache = new ConcurrentHashMap<>(7);
+
+    /**
+     * Clears the cache.
+     */
+    static void clear() {
+        dateTimeInstanceCache.clear();
+    }
 
     /**
      * Gets a date/time format for the specified styles and locale.
@@ -104,7 +111,7 @@ public int hashCode() {
     static String getPatternForStyle(final Integer dateStyle, final Integer timeStyle, final Locale locale) {
         final Locale safeLocale = LocaleUtils.toLocale(locale);
         final ArrayKey key = new ArrayKey(dateStyle, timeStyle, safeLocale);
-        return cDateTimeInstanceCache.computeIfAbsent(key, k -> {
+        return dateTimeInstanceCache.computeIfAbsent(key, k -> {
             try {
                 final DateFormat formatter;
                 if (dateStyle == null) {
@@ -121,7 +128,14 @@ static String getPatternForStyle(final Integer dateStyle, final Integer timeStyl
         });
     }
 
-    private final ConcurrentMap<ArrayKey, F> cInstanceCache = new ConcurrentHashMap<>(7);
+    private final ConcurrentMap<ArrayKey, F> instanceCache = new ConcurrentHashMap<>(7);
+
+    /**
+     * Clears the cache.
+     */
+    void clearInstance() {
+        instanceCache.clear();
+    }
 
     /**
      * Create a format instance using the specified pattern, time zone
@@ -218,7 +232,7 @@ public F getInstance(final String pattern, final TimeZone timeZone, final Locale
         final TimeZone actualTimeZone = TimeZones.toTimeZone(timeZone);
         final Locale actualLocale = LocaleUtils.toLocale(locale);
         final ArrayKey key = new ArrayKey(pattern, actualTimeZone, actualLocale);
-        return cInstanceCache.computeIfAbsent(key, k -> createInstance(pattern, actualTimeZone, actualLocale));
+        return instanceCache.computeIfAbsent(key, k -> createInstance(pattern, actualTimeZone, actualLocale));
     }
 
     /**

src/main/java/org/apache/commons/lang3/time/FastDateFormat.java

@@ -101,13 +101,21 @@ public class FastDateFormat extends Format implements DateParser, DatePrinter {
      */
     public static final int SHORT = DateFormat.SHORT;
 
-    private static final AbstractFormatCache<FastDateFormat> cache = new AbstractFormatCache<FastDateFormat>() {
+    private static final AbstractFormatCache<FastDateFormat> CACHE = new AbstractFormatCache<FastDateFormat>() {
         @Override
         protected FastDateFormat createInstance(final String pattern, final TimeZone timeZone, final Locale locale) {
             return new FastDateFormat(pattern, timeZone, locale);
         }
     };
 
+    /**
+     * Clears the cache.
+     */
+    static void clear() {
+        AbstractFormatCache.clear();
+        CACHE.clearInstance();
+    }
+
     /**
      * Gets a date formatter instance using the specified style in the
      * default time zone and locale.
@@ -119,7 +127,7 @@ protected FastDateFormat createInstance(final String pattern, final TimeZone tim
      * @since 2.1
      */
     public static FastDateFormat getDateInstance(final int style) {
-        return cache.getDateInstance(style, null, null);
+        return CACHE.getDateInstance(style, null, null);
     }
 
     /**
@@ -134,7 +142,7 @@ public static FastDateFormat getDateInstance(final int style) {
      * @since 2.1
      */
     public static FastDateFormat getDateInstance(final int style, final Locale locale) {
-        return cache.getDateInstance(style, null, locale);
+        return CACHE.getDateInstance(style, null, locale);
     }
 
     /**
@@ -150,7 +158,7 @@ public static FastDateFormat getDateInstance(final int style, final Locale local
      * @since 2.1
      */
     public static FastDateFormat getDateInstance(final int style, final TimeZone timeZone) {
-        return cache.getDateInstance(style, timeZone, null);
+        return CACHE.getDateInstance(style, timeZone, null);
     }
 
     /**
@@ -166,7 +174,7 @@ public static FastDateFormat getDateInstance(final int style, final TimeZone tim
      *  pattern defined
      */
     public static FastDateFormat getDateInstance(final int style, final TimeZone timeZone, final Locale locale) {
-        return cache.getDateInstance(style, timeZone, locale);
+        return CACHE.getDateInstance(style, timeZone, locale);
     }
 
     /**
@@ -181,7 +189,7 @@ public static FastDateFormat getDateInstance(final int style, final TimeZone tim
      * @since 2.1
      */
     public static FastDateFormat getDateTimeInstance(final int dateStyle, final int timeStyle) {
-        return cache.getDateTimeInstance(dateStyle, timeStyle, null, null);
+        return CACHE.getDateTimeInstance(dateStyle, timeStyle, null, null);
     }
 
     /**
@@ -197,7 +205,7 @@ public static FastDateFormat getDateTimeInstance(final int dateStyle, final int
      * @since 2.1
      */
     public static FastDateFormat getDateTimeInstance(final int dateStyle, final int timeStyle, final Locale locale) {
-        return cache.getDateTimeInstance(dateStyle, timeStyle, null, locale);
+        return CACHE.getDateTimeInstance(dateStyle, timeStyle, null, locale);
     }
 
     /**
@@ -232,7 +240,7 @@ public static FastDateFormat getDateTimeInstance(final int dateStyle, final int
      */
     public static FastDateFormat getDateTimeInstance(
             final int dateStyle, final int timeStyle, final TimeZone timeZone, final Locale locale) {
-        return cache.getDateTimeInstance(dateStyle, timeStyle, timeZone, locale);
+        return CACHE.getDateTimeInstance(dateStyle, timeStyle, timeZone, locale);
     }
 
     /**
@@ -242,7 +250,7 @@ public static FastDateFormat getDateTimeInstance(
      * @return a date/time formatter
      */
     public static FastDateFormat getInstance() {
-        return cache.getInstance();
+        return CACHE.getInstance();
     }
 
     /**
@@ -255,7 +263,7 @@ public static FastDateFormat getInstance() {
      * @throws IllegalArgumentException if pattern is invalid
      */
     public static FastDateFormat getInstance(final String pattern) {
-        return cache.getInstance(pattern, null, null);
+        return CACHE.getInstance(pattern, null, null);
     }
 
     /**
@@ -269,7 +277,7 @@ public static FastDateFormat getInstance(final String pattern) {
      * @throws IllegalArgumentException if pattern is invalid
      */
     public static FastDateFormat getInstance(final String pattern, final Locale locale) {
-        return cache.getInstance(pattern, null, locale);
+        return CACHE.getInstance(pattern, null, locale);
     }
 
     /**
@@ -284,7 +292,7 @@ public static FastDateFormat getInstance(final String pattern, final Locale loca
      * @throws IllegalArgumentException if pattern is invalid
      */
     public static FastDateFormat getInstance(final String pattern, final TimeZone timeZone) {
-        return cache.getInstance(pattern, timeZone, null);
+        return CACHE.getInstance(pattern, timeZone, null);
     }
 
     /**
@@ -301,7 +309,7 @@ public static FastDateFormat getInstance(final String pattern, final TimeZone ti
      *  or {@code null}
      */
     public static FastDateFormat getInstance(final String pattern, final TimeZone timeZone, final Locale locale) {
-        return cache.getInstance(pattern, timeZone, locale);
+        return CACHE.getInstance(pattern, timeZone, locale);
     }
 
     /**
@@ -315,7 +323,7 @@ public static FastDateFormat getInstance(final String pattern, final TimeZone ti
      * @since 2.1
      */
     public static FastDateFormat getTimeInstance(final int style) {
-        return cache.getTimeInstance(style, null, null);
+        return CACHE.getTimeInstance(style, null, null);
     }
 
     /**
@@ -330,7 +338,7 @@ public static FastDateFormat getTimeInstance(final int style) {
      * @since 2.1
      */
     public static FastDateFormat getTimeInstance(final int style, final Locale locale) {
-        return cache.getTimeInstance(style, null, locale);
+        return CACHE.getTimeInstance(style, null, locale);
     }
 
     /**
@@ -346,7 +354,7 @@ public static FastDateFormat getTimeInstance(final int style, final Locale local
      * @since 2.1
      */
     public static FastDateFormat getTimeInstance(final int style, final TimeZone timeZone) {
-        return cache.getTimeInstance(style, timeZone, null);
+        return CACHE.getTimeInstance(style, timeZone, null);
     }
 
     /**
@@ -362,7 +370,7 @@ public static FastDateFormat getTimeInstance(final int style, final TimeZone tim
      *  pattern defined
      */
     public static FastDateFormat getTimeInstance(final int style, final TimeZone timeZone, final Locale locale) {
-        return cache.getTimeInstance(style, timeZone, locale);
+        return CACHE.getTimeInstance(style, timeZone, locale);
     }
 
     /** Our fast printer. */

src/main/java/org/apache/commons/lang3/time/FastDateParser.java

@@ -42,6 +42,7 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Stream;
 
 import org.apache.commons.lang3.ArraySorter;
 import org.apache.commons.lang3.LocaleUtils;
@@ -630,7 +631,7 @@ public String toString() {
     // helper classes to parse the format string
 
     @SuppressWarnings("unchecked") // OK because we are creating an array with no entries
-    private static final ConcurrentMap<Locale, Strategy>[] caches = new ConcurrentMap[Calendar.FIELD_COUNT];
+    private static final ConcurrentMap<Locale, Strategy>[] CACHES = new ConcurrentMap[Calendar.FIELD_COUNT];
 
     private static final Strategy ABBREVIATED_YEAR_STRATEGY = new NumberStrategy(Calendar.YEAR) {
         /**
@@ -717,18 +718,25 @@ private static Map<String, Integer> appendDisplayNames(final Calendar calendar,
         return values;
     }
 
+    /**
+     * Clears the cache.
+     */
+    static void clear() {
+        Stream.of(CACHES).filter(Objects::nonNull).forEach(ConcurrentMap::clear);
+    }
+
     /**
      * Gets a cache of Strategies for a particular field
      *
      * @param field The Calendar field
      * @return a cache of Locale to Strategy
      */
     private static ConcurrentMap<Locale, Strategy> getCache(final int field) {
-        synchronized (caches) {
-            if (caches[field] == null) {
-                caches[field] = new ConcurrentHashMap<>(3);
+        synchronized (CACHES) {
+            if (CACHES[field] == null) {
+                CACHES[field] = new ConcurrentHashMap<>(3);
             }
-            return caches[field];
+            return CACHES[field];
         }
     }
 
@@ -786,7 +794,6 @@ private static StringBuilder simpleQuote(final StringBuilder sb, final String va
 
     /** Initialized from Calendar. */
     private transient List<StrategyAndWidth> patterns;
-
     /**
      * Constructs a new FastDateParser.
      *

src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java

@@ -899,8 +899,7 @@ public int estimateLength() {
 
     private static final int MAX_DIGITS = 10; // log10(Integer.MAX_VALUE) ~= 9.3
 
-    private static final ConcurrentMap<TimeZoneDisplayKey, String> cTimeZoneDisplayCache =
-        new ConcurrentHashMap<>(7);
+    private static final ConcurrentMap<TimeZoneDisplayKey, String> timeZoneDisplayCache = new ConcurrentHashMap<>(7);
 
     /**
      * Appends two digits to the given buffer.
@@ -991,6 +990,10 @@ private static void appendFullDigits(final Appendable buffer, int value, int min
         }
     }
 
+    static void clear() {
+        timeZoneDisplayCache.clear();
+    }
+
     /**
      * Gets the time zone display name, using a cache for performance.
      *
@@ -1003,7 +1006,7 @@ private static void appendFullDigits(final Appendable buffer, int value, int min
     static String getTimeZoneDisplay(final TimeZone tz, final boolean daylight, final int style, final Locale locale) {
         final TimeZoneDisplayKey key = new TimeZoneDisplayKey(tz, daylight, style, locale);
         // This is a very slow call, so cache the results.
-        return cTimeZoneDisplayCache.computeIfAbsent(key, k -> tz.getDisplayName(daylight, style, locale));
+        return timeZoneDisplayCache.computeIfAbsent(key, k -> tz.getDisplayName(daylight, style, locale));
     }
 
     /**