Better replacements

Author: ablx

src/main/java/ml/anon/recognition/rulebased/api/AnnotationService.java

@@ -3,7 +3,7 @@
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
 import lombok.extern.java.Log;
-import ml.anon.annotation.ReplacementGenerator;
+import ml.anon.annotation.ReplacementAccess;
 import ml.anon.model.anonymization.Anonymization;
 import ml.anon.model.anonymization.Label;
 import ml.anon.model.docmgmt.Document;
@@ -38,7 +38,7 @@ private void refreshRules() {
 
     }
 
-    public List<Anonymization> annotate(Document doc) {
+    public List<Anonymization> annotate(Document doc) throws Exception {
         refreshRules();
         List<Anonymization> results = new ArrayList<>();
         for (Map.Entry<Label, Collection<AbstractRule>> entry : rules.asMap().entrySet()) {
@@ -53,13 +53,13 @@ public List<Anonymization> annotate(Document doc) {
 
             for (Double key : keys) {
                 if (ruleResults.isEmpty()) {
-                    weights.get(key).forEach(r -> {
+                    for (AbstractRule r : weights.get(key)) {
                         if (r.isActive()) {
-                            List<Anonymization> apply = r.apply(doc, new ReplacementGenerator());
+                            List<Anonymization> apply = r.apply(doc, new ReplacementAccess());
                             log.info("Rule " + r.getName() + " (" + r.getLabel() + "): " + apply.toString());
                             ruleResults.addAll(apply);
                         }
-                    });
+                    }
                 }
             }
             results.addAll(ruleResults);

src/main/java/ml/anon/recognition/rulebased/api/RuleApiController.java

@@ -24,7 +24,7 @@ public class RuleApiController {
 
 
     @PostMapping("/rules/annotate/{id}")
-    public List<Anonymization> annotate(@PathVariable String id) {
+    public List<Anonymization> annotate(@PathVariable String id) throws Exception {
         ResponseEntity<Document> resp = documentAccess.getDocument(id);
         Document doc = resp.getBody();
 

src/main/java/ml/anon/recognition/rulebased/api/model/IBANRule.java

@@ -2,7 +2,7 @@
 
 import com.google.common.collect.Lists;
 import lombok.Builder;
-import ml.anon.annotation.ReplacementGenerator;
+import ml.anon.annotation.ReplacementAccess;
 import ml.anon.model.anonymization.Anonymization;
 import ml.anon.model.anonymization.Label;
 import ml.anon.model.docmgmt.Document;
@@ -31,7 +31,7 @@ public IBANRule() {
     }
 
     @Override
-    public List<Anonymization> apply(Document doc, ReplacementGenerator repl) {
+    public List<Anonymization> apply(Document doc, ReplacementAccess repl) throws Exception {
         List<Anonymization> apply = iban.apply(doc, repl);
         return applyConstrains(apply);
 

src/main/java/ml/anon/recognition/rulebased/api/model/LicencePlateRule.java

@@ -2,7 +2,7 @@
 
 import com.google.common.collect.Lists;
 import lombok.Builder;
-import ml.anon.annotation.ReplacementGenerator;
+import ml.anon.annotation.ReplacementAccess;
 import ml.anon.model.anonymization.Anonymization;
 import ml.anon.model.anonymization.Label;
 import ml.anon.model.docmgmt.Document;
@@ -33,7 +33,7 @@ public LicencePlateRule() {
     }
 
     @Override
-    public List<Anonymization> apply(Document doc, ReplacementGenerator repl) {
+    public List<Anonymization> apply(Document doc, ReplacementAccess repl) throws Exception {
         List<Anonymization> regExp = wrapped.apply(doc, repl);
         return applyConstrains(regExp);
     }

src/main/java/ml/anon/recognition/rulebased/api/model/RegExpRule.java

@@ -2,7 +2,7 @@
 
 import lombok.Builder;
 import lombok.Data;
-import ml.anon.annotation.ReplacementGenerator;
+import ml.anon.annotation.ReplacementAccess;
 import ml.anon.model.anonymization.Anonymization;
 import ml.anon.model.anonymization.Label;
 import ml.anon.model.anonymization.Producer;
@@ -34,7 +34,7 @@ public RegExpRule() {
 
 
     @Override
-    public List<Anonymization> apply(ml.anon.model.docmgmt.Document doc, ReplacementGenerator repl) {
+    public List<Anonymization> apply(ml.anon.model.docmgmt.Document doc, ReplacementAccess repl) throws Exception {
         Matcher matcher = Pattern.compile(regExp).matcher(doc.getFullText());
         List<Anonymization> results = new ArrayList<>();
 

src/main/java/ml/anon/recognition/rulebased/api/model/Rule.java

@@ -1,6 +1,6 @@
 package ml.anon.recognition.rulebased.api.model;
 
-import ml.anon.annotation.ReplacementGenerator;
+import ml.anon.annotation.ReplacementAccess;
 import ml.anon.model.anonymization.Anonymization;
 import ml.anon.model.docmgmt.Document;
 
@@ -11,6 +11,6 @@
  */
 public interface Rule {
 
-    List<Anonymization> apply(Document doc, ReplacementGenerator repl);
+    List<Anonymization> apply(Document doc, ReplacementAccess repl) throws Exception;
 
 }

src/test/java/ml/anon/recognition/rulebased/api/model/IBANRuleTest.java

@@ -1,7 +1,7 @@
 package ml.anon.recognition.rulebased.api.model;
 
 import com.google.common.collect.Lists;
-import ml.anon.annotation.ReplacementGenerator;
+import ml.anon.annotation.ReplacementAccess;
 import ml.anon.model.anonymization.Anonymization;
 import ml.anon.model.docmgmt.Document;
 import ml.anon.model.docmgmt.FileType;
@@ -27,7 +27,7 @@ public class IBANRuleTest {
 
     @Test
     public void apply() throws Exception {
-        List<Anonymization> apply = ibanRule.apply(iban, new ReplacementGenerator());
+        List<Anonymization> apply = ibanRule.apply(iban, new ReplacementAccess());
         assertThat(apply.size(), is(1));
         assertThat(apply.get(0), is("AD1400080001001234567890"));
 

src/test/java/ml/anon/recognition/rulebased/api/model/LicencePlateRuleTest.java

@@ -1,6 +1,6 @@
 package ml.anon.recognition.rulebased.api.model;
 
-import ml.anon.annotation.ReplacementGenerator;
+import ml.anon.annotation.ReplacementAccess;
 import ml.anon.model.anonymization.Anonymization;
 import ml.anon.model.docmgmt.Document;
 import ml.anon.model.docmgmt.FileType;
@@ -23,10 +23,10 @@ public class LicencePlateRuleTest {
             "Das ist ein String mit Nummernschildern: HH AA 123 oder AA BB 2. Das hier ist kein valides Nummernschild: AAA BBBB 12. Das auch nicht: HH AA 012")).
             originalFileType(FileType.PDF).build();
     public Rule lpRule = new LicencePlateRule();
-    public ReplacementGenerator gen = new ReplacementGenerator();
+    public ReplacementAccess gen = new ReplacementAccess();
 
     @Test
-    public void shouldFindValidLicencePlate() {
+    public void shouldFindValidLicencePlate() throws Exception {
         List<Anonymization> apply = lpRule.apply(text, gen);
         assertThat(apply.size(), is(2));
         assertThat(apply.get(0).getOriginal(), is("HH AA 123"));