diff --git a/pom.xml b/pom.xml
index 30688a7..ab88102 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
com.github.ua-parser
uap-java
jar
- 1.5.5-SNAPSHOT
+ 2.0.0-SNAPSHOT
User Agent Parser for Java
@@ -56,17 +56,14 @@
-
-
+
+
ua_parser
${basedir}/uap-core
regexes.yaml
-
-
-
-
+
ua_parser
${basedir}/uap-core/test_resources
@@ -152,16 +149,17 @@
-
- org.yaml
- snakeyaml
- 1.33
-
org.apache.commons
commons-collections4
4.4
+
+ org.yaml
+ snakeyaml
+ 2.0
+ test
+
junit
junit
diff --git a/src/main/java/ua_parser/CachingParser.java b/src/main/java/ua_parser/CachingParser.java
index 7147d4a..a2a1267 100644
--- a/src/main/java/ua_parser/CachingParser.java
+++ b/src/main/java/ua_parser/CachingParser.java
@@ -1,6 +1,5 @@
package ua_parser;
-import java.io.InputStream;
import java.util.Map;
import org.apache.commons.collections4.map.LRUMap;
@@ -38,23 +37,12 @@ public CachingParser() {
super();
}
- public CachingParser(InputStream regexYaml) {
- super(regexYaml);
- }
-
public CachingParser(int cacheSize) {
super();
assert cacheSize > 0: INVALID_CACHE_SIZE_ERROR_MESSAGE;
this.cacheSize = cacheSize;
}
- public CachingParser(InputStream regexYaml, int cacheSize) {
- super(regexYaml);
- assert cacheSize > 0: INVALID_CACHE_SIZE_ERROR_MESSAGE;
- this.cacheSize = cacheSize;
- }
-
-
// ------------------------------------------
@Override
diff --git a/src/main/java/ua_parser/DeviceParser.java b/src/main/java/ua_parser/DeviceParser.java
index 72ed6ff..9b3067b 100644
--- a/src/main/java/ua_parser/DeviceParser.java
+++ b/src/main/java/ua_parser/DeviceParser.java
@@ -18,8 +18,6 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CopyOnWriteArrayList;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -32,8 +30,8 @@ public class DeviceParser {
private final List patterns;
- public DeviceParser(List patterns) {
- this.patterns = patterns;
+ public DeviceParser() {
+ this.patterns = Regexes.getDevicePatterns();
}
public Device parse(String agentString) {
@@ -50,29 +48,6 @@ public Device parse(String agentString) {
return Device.OTHER;
}
- /**
- * Constructs a thread-safe DeviceParser.
- * @param configList configure a device parser from a list of regexp hashmaps
- * @return a device parser
- */
- public static DeviceParser fromList(List