Merge pull request #41 from rayokota/minor=fix

Minor fixes. Fix #42
dashjoin · May 28, 2024 · 9f36688 · 9f36688
2 parents 9c0ba79 + 9bfd9e6
commit 9f36688
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/com/dashjoin/jsonata/Functions.java b/src/main/java/com/dashjoin/jsonata/Functions.java
@@ -710,7 +710,7 @@ public static Boolean contains(String str, Object token) {
      * @param {Integer} [limit] - max number of matches to return
      * @returns {Array} The array of match objects
      */
-    public static List<RegexpMatch> match(String str, Pattern regex, Integer limit) {
+    public static List<Map> match(String str, Pattern regex, Integer limit) {
         // undefined inputs always return undefined
         if (str == null) {
             return null;

diff --git a/src/main/java/com/dashjoin/jsonata/utils/DateTimeUtils.java b/src/main/java/com/dashjoin/jsonata/utils/DateTimeUtils.java
@@ -714,7 +714,7 @@ private static PictureFormat analyseDateTimePicture(String picture) {
                     }
                 } else if ("YMDdFWwXxHhmsf".indexOf(def.component) != -1) {
                     String integerPattern = def.presentation1;
-                    if (def.presentation2 == null) {
+                    if (def.presentation2 != null) {
                         integerPattern += ";" + def.presentation2;
                     }
                     def.integerFormat = analyseIntegerPicture(integerPattern);