Remove correlationId from PseudoFuncConfigs

statisticsnorway · Feb 6, 2024 · 27ab978 · 27ab978
1 parent cdfa6b6
commit 27ab978
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 17 deletions.
diff --git a/src/main/java/no/ssb/dlp/pseudo/core/field/FieldPseudonymizer.java b/src/main/java/no/ssb/dlp/pseudo/core/field/FieldPseudonymizer.java
@@ -73,8 +73,6 @@ public static class Builder {
 
         private Collection<PseudoKeyset> keysets;
 
-        private String correlationId;
-
         public Builder secrets(Collection<PseudoSecret> secrets) {
             this.secrets = secrets;
             return this;
@@ -90,15 +88,10 @@ public Builder keysets(Collection<PseudoKeyset> keysets) {
             return this;
         }
 
-        public Builder correlationId(String correlationId) {
-            this.correlationId = correlationId;
-            return this;
-        }
-
         public FieldPseudonymizer build() {
             Objects.requireNonNull(secrets, "PseudoSecrets can't be null");
             Objects.requireNonNull(rules, "PseudoFuncRule collection can't be null");
-            return new FieldPseudonymizer(new PseudoFuncs(rules, secrets, keysets, correlationId));
+            return new FieldPseudonymizer(new PseudoFuncs(rules, secrets, keysets));
         }
     }
 }
diff --git a/src/main/java/no/ssb/dlp/pseudo/core/func/PseudoFuncs.java b/src/main/java/no/ssb/dlp/pseudo/core/func/PseudoFuncs.java
@@ -33,16 +33,15 @@ public class PseudoFuncs {
 
     //TODO: Validate that all required secrets are available
     public PseudoFuncs(Collection<PseudoFuncRule> rules, Collection<PseudoSecret> pseudoSecrets,
-                       Collection<PseudoKeyset> keysets, String correlationId) {
-        Map<PseudoFuncRule, PseudoFuncConfig> ruleToPseudoFuncConfigs = initPseudoFuncConfigs(rules, pseudoSecrets, keysets, correlationId);
+                       Collection<PseudoKeyset> keysets) {
+        Map<PseudoFuncRule, PseudoFuncConfig> ruleToPseudoFuncConfigs = initPseudoFuncConfigs(rules, pseudoSecrets, keysets);
         rules.forEach(rule -> ruleToFuncMap.put(rule, PseudoFuncFactory.create(ruleToPseudoFuncConfigs.get(rule))));
     }
 
     // TODO: Move these init functions elsewhere?
     static Map<PseudoFuncRule, PseudoFuncConfig> initPseudoFuncConfigs(Collection<PseudoFuncRule> pseudoRules,
                                                                        Collection<PseudoSecret> pseudoSecrets,
-                                                                       Collection<PseudoKeyset> pseudoKeysets,
-                                                                       String correlationId) {
+                                                                       Collection<PseudoKeyset> pseudoKeysets) {
 
         Map<String, PseudoSecret> pseudoSecretsMap = pseudoSecrets.stream().collect(
           Collectors.toMap(PseudoSecret::getName, Function.identity()));
@@ -54,7 +53,6 @@ static Map<PseudoFuncRule, PseudoFuncConfig> initPseudoFuncConfigs(Collection<Ps
           Function.identity(),
           rule -> {
               PseudoFuncConfig funcConfig = PseudoFuncConfigFactory.get(rule.getFunc());
-              funcConfig.add(Param.CORRELATION_ID, correlationId);
 
               if (FpeFunc.class.getName().equals(funcConfig.getFuncImpl())) {
                   enrichLegacyFpeFuncConfig(funcConfig, pseudoSecretsMap);
@@ -173,8 +171,4 @@ public PseudoFuncConfigException(String message, Exception e) {
             super(message, e);
         }
     }
-
-    public static final class Param {
-        public static final String CORRELATION_ID = "correlationId";
-    }
 }