re-use matcher set creation

Author: chetan

src/main/java/cz/mallat/uasparser/MultithreadedUASparser.java

@@ -2,13 +2,11 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
 import jregex.Matcher;
-import jregex.Pattern;
 
 /**
  * This parser creates a Matcher set per-Thread using a ThreadLocal<Map>. It is faster than
@@ -22,9 +20,7 @@
 public class MultithreadedUASparser extends SingleThreadedUASparser {
 
     private ThreadLocal<Map<Matcher, Long>> compiledBrowserMatcherMapT;
-
     private ThreadLocal<Map<Matcher, Long>> compiledOsMatcherMapT;
-
     private ThreadLocal<Map<Matcher, Long>> compiledDeviceMatcherMapT;
 
     public MultithreadedUASparser(InputStream inputStreamToDefinitionFile) throws IOException {
@@ -40,12 +36,7 @@ protected void preCompileBrowserRegMap() {
         compiledBrowserMatcherMapT = new ThreadLocal<Map<Matcher, Long>>() {
             @Override
             protected Map<Matcher, Long> initialValue() {
-                LinkedHashMap<Matcher, Long> tmpMap = new LinkedHashMap<Matcher, Long>(browserRegMap.size());
-                for (Map.Entry<String, Long> entry : browserRegMap.entrySet()) {
-                    Pattern pattern = new Pattern(entry.getKey(), Pattern.IGNORE_CASE | Pattern.DOTALL);
-                    tmpMap.put(pattern.matcher(), entry.getValue());
-                }
-                return tmpMap;
+                return preCompileBrowserMatcherMap();
             }
         };
     }
@@ -55,13 +46,7 @@ protected void preCompileOsRegMap() {
         compiledOsMatcherMapT = new ThreadLocal<Map<Matcher, Long>>() {
             @Override
             protected Map<Matcher, Long> initialValue() {
-                LinkedHashMap<Matcher, Long> tmpMap = new LinkedHashMap<Matcher, Long>(osRegMap.size());
-                for (Map.Entry<String, Long> entry : osRegMap.entrySet()) {
-                    Pattern pattern = new Pattern(entry.getKey(), Pattern.IGNORE_CASE | Pattern.DOTALL);
-                    tmpMap.put(pattern.matcher(), entry.getValue());
-                }
-
-                return tmpMap;
+                return preCompileOsMatcherMap();
             }
         };
     }
@@ -71,17 +56,7 @@ protected void preCompileDeviceRegMap() {
         compiledDeviceMatcherMapT = new ThreadLocal<Map<Matcher,Long>>() {
             @Override
             protected Map<Matcher, Long> initialValue() {
-                if (deviceRegMap == null) {
-                    return null; // skip for older ini files
-                }
-                LinkedHashMap<Matcher, Long> compiledDeviceMatcherMap =
-                        new LinkedHashMap<Matcher, Long>(deviceRegMap.size());
-
-                for (Map.Entry<String, Long> entry : deviceRegMap.entrySet()) {
-                    Pattern pattern = new Pattern(entry.getKey(), Pattern.IGNORE_CASE | Pattern.DOTALL);
-                    compiledDeviceMatcherMap.put(pattern.matcher(), entry.getValue());
-                }
-                return compiledDeviceMatcherMap;
+                return preCompileDeviceMatcherMap();
             }
         };
     }

src/main/java/cz/mallat/uasparser/SingleThreadedUASparser.java

@@ -38,38 +38,50 @@ public SingleThreadedUASparser(String localDefinitionFilename) throws IOExceptio
      */
     @Override
     protected void preCompileBrowserRegMap() {
+        this.compiledBrowserMatcherMap = preCompileBrowserMatcherMap();
+    }
+
+    protected LinkedHashMap<Matcher, Long> preCompileBrowserMatcherMap() {
         LinkedHashMap<Matcher, Long> compiledBrowserMatcherMap =
                 new LinkedHashMap<Matcher, Long>(browserRegMap.size());
 
         for (Map.Entry<String, Long> entry : browserRegMap.entrySet()) {
             Pattern pattern = new Pattern(entry.getKey(), Pattern.IGNORE_CASE | Pattern.DOTALL);
             compiledBrowserMatcherMap.put(pattern.matcher(), entry.getValue());
         }
-        this.compiledBrowserMatcherMap = compiledBrowserMatcherMap;
+        return compiledBrowserMatcherMap;
     }
 
     /**
      * Precompile OS regexes
      */
     @Override
     protected void preCompileOsRegMap() {
+        this.compiledOsMatcherMap = preCompileOsMatcherMap();
+    }
+
+    protected LinkedHashMap<Matcher, Long> preCompileOsMatcherMap() {
         LinkedHashMap<Matcher, Long> compiledOsMatcherMap =
                 new LinkedHashMap<Matcher, Long>(osRegMap.size());
 
         for (Map.Entry<String, Long> entry : osRegMap.entrySet()) {
             Pattern pattern = new Pattern(entry.getKey(), Pattern.IGNORE_CASE | Pattern.DOTALL);
             compiledOsMatcherMap.put(pattern.matcher(), entry.getValue());
         }
-        this.compiledOsMatcherMap = compiledOsMatcherMap;
+        return compiledOsMatcherMap;
     }
 
     /**
      * Precompile device regexes
      */
     @Override
     protected void preCompileDeviceRegMap() {
+        this.compiledDeviceMatcherMap = preCompileDeviceMatcherMap();
+    }
+
+    protected LinkedHashMap<Matcher, Long> preCompileDeviceMatcherMap() {
         if (deviceRegMap == null) {
-            return; // skip for older ini files
+            return null; // skip for older ini files
         }
         LinkedHashMap<Matcher, Long> compiledDeviceMatcherMap =
                 new LinkedHashMap<Matcher, Long>(deviceRegMap.size());
@@ -78,7 +90,7 @@ protected void preCompileDeviceRegMap() {
             Pattern pattern = new Pattern(entry.getKey(), Pattern.IGNORE_CASE | Pattern.DOTALL);
             compiledDeviceMatcherMap.put(pattern.matcher(), entry.getValue());
         }
-        this.compiledDeviceMatcherMap = compiledDeviceMatcherMap;
+        return compiledDeviceMatcherMap;
     }
 
     /**