Merge branch 'develop'

Author: charphi

.github/dependabot.yml

@@ -4,8 +4,8 @@ updates:
     target-branch: "develop"
     directory: "/"
     schedule:
-      interval: daily
-      time: "04:00"
+      interval: "weekly"
+      day: "saturday"
     open-pull-requests-limit: 10
   - package-ecosystem: "github-actions"
     target-branch: "develop"

.github/workflows/codeql-analysis.yml

@@ -35,7 +35,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/java-ea-maven.yml

@@ -11,15 +11,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ '-ea' ]
+        java: [ 20 ]
         os: [ ubuntu-latest ]
 
     name: JDK${{ matrix.java }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
           fetch-depth: 0

.github/workflows/java8-maven.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
           fetch-depth: 0
@@ -46,7 +46,7 @@ jobs:
 
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
           fetch-depth: 0
@@ -96,7 +96,7 @@ jobs:
 
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
           fetch-depth: 0

CHANGELOG.md

@@ -7,6 +7,16 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [0.0.26] - 2023-09-20
+
+### Added
+
+- Add http module
+
+### Fixed
+
+- Fix AM/PM prefix compatibility in DateFormat
+
 ## [0.0.25] - 2023-07-18
 
 ### Fixed
@@ -230,7 +240,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 - Initial release
 
-[Unreleased]: https://github.com/nbbrd/java-io-util/compare/v0.0.25...HEAD
+[Unreleased]: https://github.com/nbbrd/java-io-util/compare/v0.0.26...HEAD
+[0.0.26]: https://github.com/nbbrd/java-io-util/compare/v0.0.25...v0.0.26
 [0.0.25]: https://github.com/nbbrd/java-io-util/compare/v0.0.24...v0.0.25
 [0.0.24]: https://github.com/nbbrd/java-io-util/compare/v0.0.23...v0.0.24
 [0.0.23]: https://github.com/nbbrd/java-io-util/compare/v0.0.22...v0.0.23

java-io-base/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.nbbrd.java-io-util</groupId>
         <artifactId>java-io-parent</artifactId>
-        <version>0.0.25</version>
+        <version>0.0.26</version>
     </parent>
 
     <artifactId>java-io-base</artifactId>

java-io-base/src/main/java/internal/io/text/DateFormats.java

@@ -0,0 +1,91 @@
+package internal.io.text;
+
+import lombok.NonNull;
+import nbbrd.design.VisibleForTesting;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+import java.text.DateFormat;
+import java.text.DateFormatSymbols;
+import java.text.ParsePosition;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * Set of tools to overcome {@link DateFormat} pitfalls.
+ *
+ * @author Philippe Charles
+ */
+public final class DateFormats {
+
+    private DateFormats() {
+        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
+    }
+
+    /**
+     * Same as {@link DateFormat#parse(String)} but without throwing an exception.
+     *
+     * @param format the format used to parse
+     * @param input  the string to parse
+     * @return null if parsing failed, a {@link Date} otherwise
+     */
+    public static @Nullable Date parseOrNull(@NonNull DateFormat format, @NonNull CharSequence input) {
+        String source = input.toString();
+        ParsePosition pos = new ParsePosition(0);
+        Date result = format.parse(source, pos);
+        return pos.getIndex() == input.length() ? result : null;
+    }
+
+    public static @NonNull CharSequence normalize(@NonNull DateFormat format, @NonNull CharSequence input) {
+        return format instanceof SimpleDateFormat
+                ? normalizeSimpleDateFormat((SimpleDateFormat) format, input)
+                : input;
+    }
+
+    private static CharSequence normalizeSimpleDateFormat(SimpleDateFormat format, CharSequence input) {
+        char amPmPrefix = getAmPmPrefix(format);
+        return Character.isSpaceChar(amPmPrefix)
+                ? replaceAmPmPrefixSpaceChar(format, input, amPmPrefix)
+                : input;
+    }
+
+    private static CharSequence replaceAmPmPrefixSpaceChar(SimpleDateFormat format, CharSequence input, char amPmPrefix) {
+        int amPmIndex = indexOfAmPm(format.getDateFormatSymbols(), input);
+        if (amPmIndex <= 0 || !hasAmPmPrefix(input, amPmIndex)) {
+            return input;
+        }
+        return new StringBuilder()
+                .append(input, 0, amPmIndex - 1)
+                .append(amPmPrefix)
+                .append(input, amPmIndex, input.length())
+                .toString();
+    }
+
+    @VisibleForTesting
+    static char getAmPmPrefix(SimpleDateFormat format) {
+        String pattern = format.toPattern();
+        for (int i = 0; i < pattern.length() - 1; i++) {
+            char c = pattern.charAt(i);
+            if (Character.isSpaceChar(c) && pattern.charAt(i + 1) == 'a') {
+                return c;
+            }
+        }
+        return '\0';
+    }
+
+    private static final int NO_INDEX = -1;
+
+    private static int indexOfAmPm(DateFormatSymbols symbols, CharSequence input) {
+        String inputAsString = input.toString();
+        for (String amPmString : symbols.getAmPmStrings()) {
+            int index = inputAsString.indexOf(amPmString);
+            if (index != NO_INDEX) {
+                return index;
+            }
+        }
+        return NO_INDEX;
+    }
+
+    private static boolean hasAmPmPrefix(CharSequence input, int amPmIndex) {
+        return Character.isSpaceChar(input.charAt(amPmIndex - 1));
+    }
+}

java-io-base/src/main/java/internal/io/text/InternalParser.java

@@ -24,7 +24,6 @@
 import java.nio.charset.Charset;
 import java.text.DateFormat;
 import java.text.NumberFormat;
-import java.text.ParsePosition;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
 import java.time.temporal.TemporalQuery;
@@ -43,25 +42,6 @@
 @lombok.experimental.UtilityClass
 public class InternalParser {
 
-    @SuppressWarnings("unchecked")
-    public <T> T parseTemporalAccessor(DateTimeFormatter formatter, TemporalQuery<T>[] queries, CharSequence input) {
-        if (input != null) {
-            try {
-                switch (queries.length) {
-                    case 0:
-                        throw new IllegalArgumentException("At least one query must be specified");
-                    case 1:
-                        return formatter.parse(input, queries[0]);
-                    default:
-                        return (T) formatter.parseBest(input, queries);
-                }
-            } catch (DateTimeParseException ex) {
-                doNothing(ex);
-            }
-        }
-        return null;
-    }
-
     public Boolean parseBoolean(CharSequence input) {
         if (input != null) {
             switch (input.toString()) {
@@ -174,18 +154,31 @@ public File parseFile(CharSequence input) {
         return input != null ? new File(input.toString()) : null;
     }
 
-    public Date parseDate(DateFormat dateFormat, CharSequence input) {
+    @SuppressWarnings("unchecked")
+    public <T> T parseTemporalAccessor(DateTimeFormatter formatter, TemporalQuery<T>[] queries, CharSequence input) {
         if (input != null) {
-            String source = input.toString();
-            ParsePosition pos = new ParsePosition(0);
-            Date result = dateFormat.parse(source, pos);
-            return pos.getIndex() == input.length() ? result : null;
+            try {
+                switch (queries.length) {
+                    case 0:
+                        throw new IllegalArgumentException("At least one query must be specified");
+                    case 1:
+                        return formatter.parse(input, queries[0]);
+                    default:
+                        return (T) formatter.parseBest(input, queries);
+                }
+            } catch (DateTimeParseException ex) {
+                doNothing(ex);
+            }
         }
         return null;
     }
 
-    public Number parseNumber(NumberFormat numberFormat, CharSequence input) {
-        return input != null ? NumberFormats.parseAll(numberFormat, NumberFormats.simplify(numberFormat, input)) : null;
+    public Date parseDate(DateFormat format, CharSequence input) {
+        return input != null ? DateFormats.parseOrNull(format, DateFormats.normalize(format, input)) : null;
+    }
+
+    public Number parseNumber(NumberFormat format, CharSequence input) {
+        return input != null ? NumberFormats.parseOrNull(format, NumberFormats.normalize(format, input)) : null;
     }
 
     public <T extends Enum<T>> T parseEnum(Class<T> enumClass, CharSequence input) {

java-io-base/src/main/java/internal/io/text/NumberFormats.java

@@ -20,41 +20,52 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
 import java.text.NumberFormat;
 import java.text.ParsePosition;
 
 /**
+ * Set of tools to overcome {@link NumberFormat} pitfalls.
+ *
  * @author Philippe Charles
  */
-@lombok.experimental.UtilityClass
 final class NumberFormats {
 
-    @Nullable
-    public Number parseAll(@NonNull NumberFormat numberFormat, @NonNull CharSequence input) {
+    private NumberFormats() {
+        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
+    }
+
+    /**
+     * Same as {@link NumberFormat#parse(String)} but without throwing an exception.
+     *
+     * @param format the format used to parse
+     * @param input  the string to parse
+     * @return null if parsing failed, a {@link Number} otherwise
+     */
+    public static @Nullable Number parseOrNull(@NonNull NumberFormat format, @NonNull CharSequence input) {
         String source = input.toString();
         ParsePosition pos = new ParsePosition(0);
-        Number result = numberFormat.parse(source, pos);
+        Number result = format.parse(source, pos);
         return pos.getIndex() == input.length() ? result : null;
     }
 
-    @NonNull
-    public CharSequence simplify(@NonNull NumberFormat numberFormat, @NonNull CharSequence input) {
-        return NumberFormats.hasGroupingSpaceChar(numberFormat)
-                ? NumberFormats.removeGroupingSpaceChars(input)
+    public static @NonNull CharSequence normalize(@NonNull NumberFormat format, @NonNull CharSequence input) {
+        return format instanceof DecimalFormat
+                ? normalizeDecimalFormat((DecimalFormat) format, input)
                 : input;
     }
 
-    private boolean hasGroupingSpaceChar(NumberFormat format) {
-        return format instanceof DecimalFormat
-                && hasGroupingSpaceChar(((DecimalFormat) format).getDecimalFormatSymbols());
+    private static CharSequence normalizeDecimalFormat(DecimalFormat format, CharSequence input) {
+        char groupingSeparator = getGroupingSeparator(format);
+        return Character.isSpaceChar(groupingSeparator)
+                ? removeGroupingSpaceChars(input)
+                : input;
     }
 
-    private boolean hasGroupingSpaceChar(DecimalFormatSymbols symbols) {
-        return Character.isSpaceChar(symbols.getGroupingSeparator());
+    private static char getGroupingSeparator(DecimalFormat format) {
+        return format.getDecimalFormatSymbols().getGroupingSeparator();
     }
 
-    private CharSequence removeGroupingSpaceChars(CharSequence input) {
+    private static CharSequence removeGroupingSpaceChars(CharSequence input) {
         if (input.length() < 2) {
             return input;
         }
@@ -69,9 +80,9 @@ private CharSequence removeGroupingSpaceChars(CharSequence input) {
         return result.length() != input.length() ? result.toString() : input;
     }
 
-    private boolean isGroupingSpaceChar(CharSequence array, int index) {
-        return Character.isSpaceChar(array.charAt(index))
-                && Character.isDigit(array.charAt(index - 1))
-                && Character.isDigit(array.charAt(index + 1));
+    private static boolean isGroupingSpaceChar(CharSequence input, int index) {
+        return Character.isSpaceChar(input.charAt(index))
+                && Character.isDigit(input.charAt(index - 1))
+                && Character.isDigit(input.charAt(index + 1));
     }
 }