Move whitelist to separate class

Author: michalsvec

src/main/java/net/lightbody/bmp/proxy/WhitelistEntry.java

@@ -0,0 +1,25 @@
+package net.lightbody.bmp.proxy;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.regex.Pattern;
+
+public class WhitelistEntry {
+    private List<Pattern> patterns = new CopyOnWriteArrayList<Pattern>();
+    private int responseCode;
+
+    public WhitelistEntry(String[] patterns, int responseCode) {
+        for (String pattern : patterns) {
+            this.patterns.add(Pattern.compile(pattern));
+        }
+        this.responseCode = responseCode;
+    }
+
+    public List<Pattern> getPatterns() {
+        return this.patterns;
+    }
+
+    public int getResponseCode() {
+        return this.responseCode;
+    }
+}

src/main/java/net/lightbody/bmp/proxy/bricks/ProxyResource.java

@@ -182,13 +182,13 @@ public Reply<?> whitelist(@Named("port") int port, Request request) {
     @Delete
     @At("/:port/whitelist")
     public Reply<?> clearWhitelist(@Named("port") int port, Request request) {
-    	ProxyServer proxy = proxyManager.get(port);
+        ProxyServer proxy = proxyManager.get(port);
         if (proxy == null) {
             return Reply.saying().notFound();
         }
 
-    	proxy.clearWhitelist();
-    	return Reply.saying().ok();
+        proxy.clearWhitelist();
+        return Reply.saying().ok();
     }
 
     @Post

src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpClient.java

@@ -2,6 +2,7 @@
 
 import net.lightbody.bmp.core.har.*;
 import net.lightbody.bmp.proxy.BlacklistEntry;
+import net.lightbody.bmp.proxy.WhitelistEntry;
 import net.lightbody.bmp.proxy.util.*;
 import net.sf.uadetector.ReadableUserAgent;
 import net.sf.uadetector.UserAgentStringParser;
@@ -477,15 +478,15 @@ private BrowserMobHttpResponse execute(BrowserMobHttpRequest req, int depth) {
             // guard against concurrent modification of whitelistEntry
             if (whitelistEntry != null) {
                 boolean found = false;
-                for (Pattern pattern : whitelistEntry.patterns) {
+                for (Pattern pattern : whitelistEntry.getPatterns()) {
                     if (pattern.matcher(url).matches()) {
                         found = true;
                         break;
                     }
                 }
 
                 if (!found) {
-                    mockResponseCode = whitelistEntry.responseCode;
+                    mockResponseCode = whitelistEntry.getResponseCode();
                 }
             }
         }
@@ -979,8 +980,8 @@ public synchronized void whitelistRequests(String[] patterns, int responseCode)
     }
 
     public synchronized void clearWhitelist() {
-    	// synchronized to guard against concurrent modification
-    	whitelistEntry = null;
+        // synchronized to guard against concurrent modification
+        whitelistEntry = null;
     }
 
     public void addHeader(String name, String value) {
@@ -1104,17 +1105,6 @@ public void abort() {
         }
     }
 
-    private class WhitelistEntry {
-        private List<Pattern> patterns = new CopyOnWriteArrayList<Pattern>();
-        private int responseCode;
-
-        private WhitelistEntry(String[] patterns, int responseCode) {
-            for (String pattern : patterns) {
-                this.patterns.add(Pattern.compile(pattern));
-            }
-            this.responseCode = responseCode;
-        }
-    }
 
     private class RewriteRule {
         private Pattern match;