Merge pull request #14

* updated to version 1.2.5
* updated readme and CHANGELOG.txt
* format code

Author: paulrutter

CHANGELOG.txt

@@ -1,3 +1,7 @@
+1.2.5 - 21 Sept 2018
+- Merged pull request https://github.com/blueconic/browscap-java/pull/14.
+  It is now possible to supply your own BrowsCap ZIP file as file input stream in the constructor.
+
 1.2.4 - 15 August 2018
 - Updated to browscap 6000030 
 - Updated unit tests accordingly

README.md

@@ -42,7 +42,7 @@ Add this to the dependencies in your pom.xml.
 <dependency>
   <groupId>com.blueconic</groupId>
   <artifactId>browscap-java</artifactId>
-  <version>1.2.4</version>
+  <version>1.2.5</version>
 </dependency>
 ```
 

pom.xml

@@ -4,7 +4,7 @@
     <groupId>com.blueconic</groupId>
     <artifactId>browscap-java</artifactId>
     <packaging>jar</packaging>
-    <version>1.2.4</version>
+    <version>1.2.5</version>
     <name>browscap-java</name>
     <description>A blazingly fast and memory efficient Java client on top of the BrowsCap CSV source files.</description>
 

src/main/java/com/blueconic/browscap/UserAgentService.java

@@ -41,8 +41,8 @@ public UserAgentService(final String zipFilePath) {
 
     /**
      * Creates a user agent service based on the Browscap CSV file in the given ZIP InputStream
-     * @param zipFileStream the zip InputStream should contain the csv file. It will load
-     *            the given zip InputStream instead of the bundled zip file
+     * @param zipFileStream the zip InputStream should contain the csv file. It will load the given zip InputStream
+     *            instead of the bundled zip file
      */
     public UserAgentService(final InputStream zipFileStream) {
         myZipFileStream = zipFileStream;

src/test/java/com/blueconic/browscap/impl/UserAgentServiceTest.java

@@ -139,8 +139,8 @@ private int processCustomUserAgentFile(final UserAgentParser parser) throws IOEx
                 final Capabilities result = parser.parse(properties[10]); // check the values
 
                 int y = 0;
-               //  System.out.println(result + "===" + properties[10] + "\n");
-               //  System.out.println("Custom Fields" + result.getValues() + "===" + properties[10] + "\n");
+                // System.out.println(result + "===" + properties[10] + "\n");
+                // System.out.println("Custom Fields" + result.getValues() + "===" + properties[10] + "\n");
 
                 assertEquals(properties[y++], result.getBrowser());
                 assertEquals(properties[y++], result.getBrowserType());