diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..0e50242
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,19 @@
+name: CI
+on: [push, pull_request]
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ submodules: 'true'
+ - name: Set up JDK
+ uses: actions/setup-java@v2
+ with:
+ java-version: 8
+ distribution: 'zulu'
+ - name: print Java version
+ run: java -version
+ - name: Build
+ run: ./gradlew clean build
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
new file mode 100644
index 0000000..0bde8ae
--- /dev/null
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -0,0 +1,10 @@
+name: "Validate Gradle Wrapper"
+on: [push, pull_request]
+
+jobs:
+ validation:
+ name: "Gradle wrapper validation"
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - uses: gradle/wrapper-validation-action@v1
diff --git a/.gitignore b/.gitignore
index 4574a2a..90fd87d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,39 @@
-target
+.gradle
+build/
+bin/
+target/
+
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+# IDE metadata
.classpath
.project
.vscode
.settings
.idea
*.iml
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!/gradle/wrapper/gradle-wrapper.jar
\ No newline at end of file
diff --git a/README.md b/README.md
index b4c3d7d..ff74195 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,9 @@
ua_parser Java Library
======================
+> **Note**
+> This project is a fork of [uap-java](https://github.com/ua-parser/uap-java) to get a release based on the work presented in PR [ua-parser/uap-java/#83](https://github.com/ua-parser/uap-java/pull/83).
+
This is the Java implementation of [ua-parser](https://github.com/ua-parser).
The implementation uses the shared regex patterns and overrides from [regexes.yaml](https://github.com/ua-parser/uap-core/blob/master/regexes.yaml).
@@ -9,20 +12,20 @@ Import Dependency:
Maven
```xml
- com.github.ua-parser
+ com.unblu.ua-parser
uap-java
- 1.5.4
+ 2.0.0
```
Gradle (Kotlin)
```gradle
-implementation("com.github.ua-parser:uap-java:1.5.4")
+implementation("com.unblu.ua-parser:uap-java:2.0.0")
```
SBT
```sbt
-"com.github.ua-parser" % "uap-java" % "1.5.4"
+"com.unblu.ua-parser" % "uap-java" % "2.0.0"
```
Build:
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..a82ba61
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,151 @@
+plugins {
+ id 'java-library'
+ id 'signing'
+ id 'maven-publish'
+ id 'de.marcphilipp.nexus-publish' version '0.4.0'
+ id 'net.researchgate.release' version '3.0.2'
+ id 'io.codearte.nexus-staging' version '0.22.0'
+}
+
+wrapper {
+ gradleVersion = '7.3.3'
+}
+
+repositories {
+ mavenCentral()
+}
+
+dependencies {
+ implementation 'org.apache.commons:commons-collections4:4.4'
+ testImplementation 'org.yaml:snakeyaml:2.0'
+ testImplementation 'junit:junit:4.13.2'
+ testImplementation 'org.hamcrest:hamcrest-all:1.3'
+}
+
+def testResourcesOutputDir = file("${buildDir}/resources/test/ua_parser")
+task copyTestResourcesFromCore(type: Copy) {
+ destinationDir testResourcesOutputDir
+ from("${projectDir}/uap-core") {
+ include "regexes.yaml"
+ }
+ from("${projectDir}/uap-core/test_resources") {
+ include "*.yaml"
+ }
+ from("${projectDir}/uap-core/tests") {
+ include "*.yaml"
+ }
+}
+sourceSets.test.output.dir testResourcesOutputDir, builtBy: copyTestResourcesFromCore
+
+group = 'com.unblu.ua-parser'
+
+publishing {
+ publications {
+ mavenJava(MavenPublication) {
+ pom {
+ name = 'User Agent Parser for Java'
+ description = 'Java implementation of the UA Parser library. Derives operating system, browser and device metadata from a user-agent string. This library consumes the regular expression rules defined in https://github.com/ua-parser/uap-core.'
+ packaging = 'jar'
+ url = 'https://' + "$githubRepositoryOwner" + '.github.io/' + "$githubRepositoryName" + '/'
+ licenses {
+ license {
+ name = 'Apache 2.0 License'
+ url = 'http://www.apache.org/licenses/LICENSE-2.0'
+ }
+ }
+ developers {
+ developer {
+ url = 'https://github.com/orgs/' + "$githubRepositoryOwner" + '/people'
+ }
+ }
+ scm {
+ connection = 'scm:git:https://github.com/' + "$githubRepositoryOwner" + '/' + "$githubRepositoryName" + '.git'
+ developerConnection = 'scm:git:https://github.com/' + "$githubRepositoryOwner" + '/' + "$githubRepositoryName" + '.git'
+ url = 'https://github.com/' + "$githubRepositoryOwner" + '/' + "$githubRepositoryName" + '/'
+ }
+ }
+ from components.java
+ }
+ }
+}
+
+signing {
+ useGpgCmd()
+ sign(publishing.publications)
+}
+
+tasks.withType(Sign) {
+ onlyIf {
+ project.hasProperty('signing.gnupg.keyName')
+ }
+}
+
+java {
+ withJavadocJar()
+ withSourcesJar()
+
+ compileJava.options.encoding = "UTF-8"
+ toolchain {
+ languageVersion = JavaLanguageVersion.of(8)
+ }
+}
+
+nexusPublishing {
+ repositories {
+ sonatype {
+ nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
+ username = project.findProperty('sonatypeUser') ?: ''
+ password = project.findProperty('sonatypePassword') ?: ''
+ }
+ }
+}
+
+nexusStaging {
+ serverUrl = "https://s01.oss.sonatype.org/service/local/"
+ packageGroup = 'com.unblu'
+ username = project.findProperty('sonatypeUser') ?: ''
+ password = project.findProperty('sonatypePassword') ?: ''
+}
+
+
+release {
+ buildTasks = ['releaseBuild']
+ git {
+ requireBranch.set('master')
+ }
+}
+
+task releaseBuild {
+ dependsOn(
+ 'checkLastVersionValue',
+ 'clean',
+ 'build',
+ 'publishToSonatype'
+ )
+}
+
+tasks.register('checkLastVersionValue') {
+ doLast {
+ if(version.endsWith('SNAPSHOT')) {
+ throw new GradleException("version '$version' ends with SNAPSHOT, this is not a release build!")
+ }
+ if(lastVersion != version) {
+ throw new GradleException("lastVersion '$lastVersion' does not match version '$version', fix it in the 'gradle.properties' file.")
+ }
+ }
+}
+
+def updateLastVersionValueTask = tasks.register('updateLastVersionValue') {
+ doLast {
+ def propertiesFile = file('gradle.properties')
+ def content = propertiesFile.text
+ content = content.replaceAll("lastVersion=[0-9\\.]+", "lastVersion=" + version.replace('-SNAPSHOT', ''))
+ propertiesFile.text = content
+ }
+}
+
+model {
+ tasks.unSnapshotVersion {
+ dependsOn updateLastVersionValueTask
+ }
+}
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..12ae673
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,5 @@
+version=2.0.1-SNAPSHOT
+lastVersion=2.0.0
+
+githubRepositoryOwner=unblu
+githubRepositoryName=uap-java
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..7454180
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..2e6e589
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..1b6c787
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,234 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+# Gradle start up script for POSIX generated by Gradle.
+#
+# Important for running:
+#
+# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+# noncompliant, but you have some other compliant shell such as ksh or
+# bash, then to run this script, type that shell name before the whole
+# command line, like:
+#
+# ksh Gradle
+#
+# Busybox and similar reduced shells will NOT work, because this script
+# requires all of these POSIX shell features:
+# * functions;
+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+# * compound commands having a testable exit status, especially «case»;
+# * various built-in commands including «command», «set», and «ulimit».
+#
+# Important for patching:
+#
+# (2) This script targets any POSIX shell, so it avoids extensions provided
+# by Bash, Ksh, etc; in particular arrays are avoided.
+#
+# The "traditional" practice of packing multiple parameters into a
+# space-separated string is a well documented source of bugs and security
+# problems, so this is (mostly) avoided, by progressively accumulating
+# options in "$@", and eventually passing that to Java.
+#
+# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+# see the in-line comments for details.
+#
+# There are tweaks for specific operating systems such as AIX, CygWin,
+# Darwin, MinGW, and NonStop.
+#
+# (3) This script is generated from the Groovy template
+# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# within the Gradle project.
+#
+# You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ case $link in #(
+ /*) app_path=$link ;; #(
+ *) app_path=$APP_HOME$link ;;
+ esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+ echo "$*"
+} >&2
+
+die () {
+ echo
+ echo "$*"
+ echo
+ exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) darwin=true ;; #(
+ MSYS* | MINGW* ) msys=true ;; #(
+ NONSTOP* ) nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD=$JAVA_HOME/jre/sh/java
+ else
+ JAVACMD=$JAVA_HOME/bin/java
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD=java
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ ulimit -n "$MAX_FD" ||
+ warn "Could not set maximum file descriptor limit to $MAX_FD"
+ esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+# * args from the command line
+# * the main class name
+# * -classpath
+# * -D...appname settings
+# * --module-path (only if needed)
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ for arg do
+ if
+ case $arg in #(
+ -*) false ;; # don't mess with options #(
+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
+ [ -e "$t" ] ;; #(
+ *) false ;;
+ esac
+ then
+ arg=$( cygpath --path --ignore --mixed "$arg" )
+ fi
+ # Roll the args list around exactly as many times as the number of
+ # args, so each arg winds up back in the position where it started, but
+ # possibly modified.
+ #
+ # NB: a `for` loop captures its iteration list before it begins, so
+ # changing the positional parameters here affects neither the number of
+ # iterations, nor the values presented in `arg`.
+ shift # remove old arg
+ set -- "$@" "$arg" # push replacement arg
+ done
+fi
+
+# Collect all arguments for the java command;
+# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# shell script including quotes and variable substitutions, so put them in
+# double quotes to make sure that they get re-expanded; and
+# * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+# set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+ printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+ xargs -n1 |
+ sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+ tr '\n' ' '
+ )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..107acd3
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 30688a7..0000000
--- a/pom.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-
-
- 4.0.0
- com.github.ua-parser
- uap-java
- jar
- 1.5.5-SNAPSHOT
- User Agent Parser for Java
-
-
- Java implementation of the UA Parser library. Derives operating system, browser and device
- metadata from a user-agent string. This library consumes the regular expression
- rules defined in https://github.com/ua-parser/uap-core.
-
-
-
-
- The Apache License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
-
-
-
-
-
- Benjamin Possolo
- bpossolo@gmail.com
- UA Parser
- https://github.com/ua-parser
-
-
-
- https://github.com/ua-parser/uap-java
-
-
- scm:git:git://github.com/ua-parser/uap-java.git
- scm:git:ssh://github.com:ua-parser/uap-java.git
- http://github.com/ua-parser/uap-java/tree/master
-
-
-
-
- ossrh
- https://oss.sonatype.org/content/repositories/snapshots
-
-
- ossrh
- https://oss.sonatype.org/service/local/staging/deploy/maven2/
-
-
-
-
- UTF-8
-
-
-
-
-
- ua_parser
- ${basedir}/uap-core
-
- regexes.yaml
-
-
-
-
-
-
- ua_parser
- ${basedir}/uap-core/test_resources
-
- *.yaml
-
-
-
- ua_parser
- ${basedir}/uap-core/tests
-
- *.yaml
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.10.1
-
- 1.8
- 1.8
-
-
-
-
-
-
-
- ossrh
-
-
-
- org.apache.maven.plugins
- maven-source-plugin
- 3.2.1
-
-
- attach-sources
- package
-
- jar-no-fork
-
-
-
-
-
- org.apache.maven.plugins
- maven-javadoc-plugin
- 3.4.1
-
- 1.8
-
-
-
- attach-javadocs
- package
-
- jar
-
-
-
-
-
- org.apache.maven.plugins
- maven-gpg-plugin
- 3.0.1
-
-
- sign-artifacts
- verify
-
- sign
-
-
-
-
-
-
-
-
-
-
-
- org.yaml
- snakeyaml
- 1.33
-
-
- org.apache.commons
- commons-collections4
- 4.4
-
-
- junit
- junit
- 4.13.2
- test
-
-
- org.hamcrest
- hamcrest-all
- 1.3
- test
-
-
-
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..7f76489
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'uap-java'
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