Allowing for using own implementation of Random in anonymization services (#282)

* Allowing for using own implementation of Random in anonymization services.

* Adding random to the constructors.

* Cleaning up unused imports.

Author: jzonthemtn

src/main/java/ai/philterd/phileas/services/FilterPolicyLoader.java

@@ -16,13 +16,52 @@
 package ai.philterd.phileas.services.anonymization;
 
 import ai.philterd.phileas.services.context.ContextService;
+import org.apache.commons.text.RandomStringGenerator;
+
+import java.security.SecureRandom;
+import java.util.Random;
 
 public abstract class AbstractAnonymizationService implements AnonymizationService {
 
-    protected final ContextService contextService;
+    protected ContextService contextService;
+    protected Random random;
 
     public AbstractAnonymizationService(final ContextService contextService) {
         this.contextService = contextService;
+        this.random = new SecureRandom();
+    }
+
+    protected AbstractAnonymizationService(final ContextService contextService, final Random random) {
+        this.contextService = contextService;
+        this.random = random;
+    }
+
+    protected int generateInteger(final int min, final int max) {
+        return random.nextInt((max - min) + 1) + min;
+    }
+
+    protected String generateNumeric(final int length) {
+
+        final RandomStringGenerator randomStringGenerator = new RandomStringGenerator.Builder()
+                .withinRange('0', '0')
+                .filteredBy(Character::isDigit)
+                .usingRandom(random::nextInt)
+                .get();
+
+        return randomStringGenerator.generate(length);
+
+    }
+
+    protected String generateAlphanumeric(final int length) {
+
+        final RandomStringGenerator randomStringGenerator = new RandomStringGenerator.Builder()
+                .withinRange('0', 'z')
+                .filteredBy(Character::isLetterOrDigit)
+                .usingRandom(random::nextInt)
+                .get();
+
+        return randomStringGenerator.generate(length);
+
     }
 
 }

src/main/java/ai/philterd/phileas/services/anonymization/AbstractAnonymizationService.java

@@ -22,7 +22,10 @@
 
 public class AgeAnonymizationService extends AbstractAnonymizationService {
 
-    private final Random random;
+    public AgeAnonymizationService(final ContextService contextService, final Random random) {
+        super(contextService);
+        this.random = random;
+    }
 
     public AgeAnonymizationService(final ContextService contextService) {
         super(contextService);

src/main/java/ai/philterd/phileas/services/anonymization/AgeAnonymizationService.java

@@ -18,16 +18,17 @@
 import ai.philterd.phileas.services.context.ContextService;
 import org.apache.commons.lang3.RandomStringUtils;
 
-import java.security.SecureRandom;
 import java.util.Random;
 
 public class AlphanumericAnonymizationService extends AbstractAnonymizationService {
 
-    private final Random random;
+    public AlphanumericAnonymizationService(final ContextService contextService, final Random random) {
+        super(contextService);
+        this.random = random;
+    }
 
     public AlphanumericAnonymizationService(final ContextService contextService) {
         super(contextService);
-        this.random = new SecureRandom();
     }
 
     @Override

src/main/java/ai/philterd/phileas/services/anonymization/AlphanumericAnonymizationService.java

@@ -16,10 +16,15 @@
 package ai.philterd.phileas.services.anonymization;
 
 import ai.philterd.phileas.services.context.ContextService;
-import org.apache.commons.lang3.RandomStringUtils;
+
+import java.util.Random;
 
 public class BitcoinAddressAnonymizationService extends AbstractAnonymizationService {
 
+    public BitcoinAddressAnonymizationService(final ContextService contextService, final Random random) {
+        super(contextService, random);
+    }
+
     public BitcoinAddressAnonymizationService(final ContextService contextService) {
         super(contextService);
     }
@@ -32,8 +37,7 @@ public ContextService getContextService() {
     @Override
     public String anonymize(String token) {
 
-        // See PHL-117: Just generating a random alphanumeric string.
-        return RandomStringUtils.secure().nextAlphanumeric(32);
+        return generateAlphanumeric(32);
 
     }
 

src/main/java/ai/philterd/phileas/services/anonymization/BitcoinAddressAnonymizationService.java

@@ -15,16 +15,23 @@
  */
 package ai.philterd.phileas.services.anonymization;
 
-import ai.philterd.phileas.services.context.ContextService;
 import ai.philterd.phileas.services.anonymization.faker.Faker;
+import ai.philterd.phileas.services.context.ContextService;
+
+import java.util.Random;
 
 public class CityAnonymizationService extends AbstractAnonymizationService {
 
     private final transient Faker faker;
 
+    public CityAnonymizationService(final ContextService contextService, final Random random) {
+        super(contextService, random);
+        this.faker = new Faker(random);
+    }
+
     public CityAnonymizationService(final ContextService contextService) {
         super(contextService);
-        this.faker = new Faker();
+        this.faker = new Faker(random);
     }
 
     @Override
@@ -33,8 +40,10 @@ public ContextService getContextService() {
     }
 
     @Override
-    public String anonymize(String token) {
+    public String anonymize(final String token) {
+
         return faker.address().cityName();
+
     }
 
 }