Better replacements

Author: ablx

src/main/java/ml/anon/docmgmt/AppDocumentManagement.java

@@ -3,9 +3,11 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @EnableAutoConfiguration
+@EnableScheduling
 public class AppDocumentManagement {
 
     public static void main(String[] args) {

src/main/java/ml/anon/docmgmt/controller/ReplacementController.java

@@ -3,6 +3,7 @@
 import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
 import com.google.common.collect.Lists;
+import lombok.extern.java.Log;
 import ml.anon.model.anonymization.Label;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.RandomUtils;
@@ -12,7 +13,9 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.util.UriUtils;
 
+import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -22,20 +25,24 @@
  * Created by mirco on 12.07.17.
  */
 @RestController
-
+@Log
 public class ReplacementController {
 
 
     private Map<String, String> replacements = new HashMap<>();
 
+
     @GetMapping(path = "/replacement", params = {"original", "label"})
-    public ResponseEntity<String> getReplacement(@RequestParam String original, @RequestParam String label) {
-        String lookupKey = original+"_"+label;
+    public ResponseEntity<String> getReplacement(@RequestParam String original, @RequestParam String label) throws UnsupportedEncodingException {
+        String str = UriUtils.decode(original, "UTF-8");
+        String lookupKey = str + "_" + label;
+
         String existing = replacements.get(lookupKey);
         String replacement = existing;
-        while(replacement == null) {
-            String generate = generate(original, Label.valueOf(label));
-            if(!replacements.values().contains(generate)) {
+
+        while (replacement == null) {
+            String generate = generate(str, Label.valueOf(label));
+            if (!replacements.values().contains(generate)) {
                 replacement = generate;
             }
         }
@@ -72,8 +79,9 @@ private String doGenerate(String original, int count, boolean split) {
     }
 
 
-    @Scheduled(fixedRate = 60000, initialDelay = 10000)
+    @Scheduled(fixedRate = 120000, initialDelay = 10000)
     private void clearMap() {
+        log.info("clearing replacements");
         replacements.clear();
     }