Merge pull request #114 from statisticsnorway/regex-indices

Regex replace name indices when validating glob
statisticsnorway · Jun 25, 2024 · b82894c · b82894c
2 parents 88b4db6 + 38a5b7f
commit b82894c
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/src/main/java/no/ssb/dlp/pseudo/service/pseudo/PseudoField.java b/src/main/java/no/ssb/dlp/pseudo/service/pseudo/PseudoField.java
@@ -59,10 +59,15 @@ public PseudoField(String name, String pattern, String pseudoFunc, EncryptedKeys
         if (keyset != null) {
             pseudoConfig.getKeysets().add(keyset);
         }
-        final boolean validPattern = new FieldDescriptor(name).globMatches(pattern);
-        if (!validPattern) {
-            throw new IllegalArgumentException(String.format("The pattern '%s' will not match the field name '%s'. " +
-                    "Are you sure you didn't mean to use '/%s'?", pattern, name, pattern));
+
+        if (name != null) {
+            // Regex replace such that "path[9]/thing" -> "path/thing"
+            String nameNoIndices = name.replaceAll("\\[.*?]", "");
+            final boolean validPattern = new FieldDescriptor(nameNoIndices).globMatches(pattern);
+            if (!validPattern) {
+                throw new IllegalArgumentException(String.format("The pattern '%s' will not match the field name '%s'. " +
+                        "Are you sure you didn't mean to use '/%s'?", pattern, name, pattern));
+            }
         }
         pseudoConfig.getRules().add(new PseudoFuncRule(name, pattern, pseudoFunc));
     }

diff --git a/src/test/java/no/ssb/dlp/pseudo/service/pseudo/PseudoFieldTest.java b/src/test/java/no/ssb/dlp/pseudo/service/pseudo/PseudoFieldTest.java
@@ -166,4 +166,21 @@ void preprocessorWithNullValues() {
         verify(recordMapProcessor, times(2)).init(any());
     }
 
+    @Test
+    void nameWithIndices() {
+        setUpProcessorMocks();
+
+        when(recordMapProcessor.hasPreprocessors()).thenReturn(true);
+        when(recordMapProcessor.init(any())).thenReturn(Collections.singletonMap("testField", "initializedValue"));
+
+        PseudoField pseudoField = new PseudoField("path[9]/thing", "**/path/thing", null, null);
+        List<String> values = Arrays.asList("v1", null, "v2");
+
+        Completable result = pseudoField.getPreprocessor(values, recordMapProcessor);
+
+        TestObserver<Void> testObserver = result.test();
+        testObserver.assertComplete();
+        testObserver.assertNoErrors();
+    }
+
 }