fix matching in non-hierarchy case

Worklytics · Dec 4, 2023 · 04cebad · 04cebad
1 parent 6401709
commit 04cebad
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/java/core/src/main/java/co/worklytics/psoxy/storage/StorageHandler.java b/java/core/src/main/java/co/worklytics/psoxy/storage/StorageHandler.java
@@ -213,7 +213,7 @@ public Optional<BulkDataRules> getApplicableRules(RuleSet rules, String sourceOb
             Optional<Match<BulkDataRules>> match =
                 pathTemplateUtils.matchVerbose(((MultiTypeBulkDataRules) rules).getFileRules(), sourceObjectPath);
 
-            if (match.isPresent())
+            if (match.isPresent()) {
                 if (match.get().getMatch() instanceof MultiTypeBulkDataRules) {
                     String subPath = match.get().getCapturedParams().get(match.get().getCapturedParams().size() - 1);
                     BulkDataRules nextMatch = pathTemplateUtils.match(((MultiTypeBulkDataRules) match.get().getMatch()).getFileRules(), subPath)
@@ -222,6 +222,9 @@ public Optional<BulkDataRules> getApplicableRules(RuleSet rules, String sourceOb
                         throw new RuntimeException("MultiTypeBulkDataRules cannot be nested more than 1 level");
                     }
                     applicableRules = nextMatch;
+                } else {
+                    applicableRules = match.get().getMatch();
+                }
             } else {
                 applicableRules = null;
             }