Upgraded jerry-core:3.0.0 and removed redundant class

sangupta · Jun 12, 2017 · ff1a319 · ff1a319
1 parent b17d5bf
commit ff1a319
Show file tree

Hide file tree

Showing 12 changed files with 62 additions and 293 deletions.
diff --git a/README.md b/README.md
@@ -1,11 +1,14 @@
 Log-Parser
 ----------
 
-[![Build Status](https://travis-ci.org/sangupta/log-parser.svg?branch=master)](https://travis-ci.org/sangupta/log-parser)
-[![Coverage Status](https://coveralls.io/repos/github/sangupta/log-parser/badge.svg?branch=master)](https://coveralls.io/github/sangupta/log-parser?branch=master)
+[![Travis](https://img.shields.io/travis/sangupta/log-parser.svg)]()
+[![Coveralls](https://img.shields.io/coveralls/sangupta/log-parser.svg)]()
 [![Maven Version](https://maven-badges.herokuapp.com/maven-central/com.sangupta/log-parser/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.sangupta/log-parser)
+[![license](https://img.shields.io/github/license/sangupta/log-parser.svg)]()
 
-A simple Java libary to parse various known log file formats into strongly-typed format-specific Java object. Once data is into a strongly typed object, its easier to run analysis on large files.
+A simple Java libary to parse various known log file formats into strongly-typed 
+format-specific Java object. Once data is into a strongly typed object, its easier 
+to run analysis on large files.
 
 Formats currently supported are:
 
@@ -16,7 +19,7 @@ Formats currently supported are:
 * Adobe Experience Manager Replication logs
 * Adobe Experience Manager Tar Optimization logs
 * Sun/Oracle JDK GC logs
-* Tomcat access logs (default format)
+* Apache Tomcat access logs (default format)
 
 ### RoadMap
 
@@ -41,42 +44,38 @@ $ mvn clean package
 You may include the library in your Maven project by adding the following to the `pom.xml`
 
 ```xml
-	<repositories>
-		<repository>
-		    <id>jitpack.io</id>
-		    <url>https://jitpack.io</url>
-		</repository>
-	</repositories>
-	
-	<dependency>
-	    <groupId>com.github.sangupta</groupId>
-	    <artifactId>log-parser</artifactId>
-	    <version>-SNAPSHOT</version>
-	</dependency>
+<repositories>
+	<repository>
+	    <id>jitpack.io</id>
+	    <url>https://jitpack.io</url>
+	</repository>
+</repositories>
+
+<dependency>
+    <groupId>com.github.sangupta</groupId>
+    <artifactId>log-parser</artifactId>
+    <version>-SNAPSHOT</version>
+</dependency>
 ```
 
 License
 -------
 
 ```
-/**
- *
- * log-parser: Parsers for various log formats
- * Copyright (c) 2015-2016, Sandeep Gupta
- * 
- * http://sangupta.com/projects/log-parser
- * 
- * 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
- * 
- * 		http://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.
- * 
- */
+log-parser: Parsers for various log formats
+Copyright (c) 2015-2016, Sandeep Gupta
+
+https://sangupta.com/projects/log-parser
+
+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
+
+	http://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.
 ```
diff --git a/pom.xml b/pom.xml
@@ -65,12 +65,12 @@
 		<dependency>
 			<groupId>com.sangupta</groupId>
 			<artifactId>jerry-core</artifactId>
-			<version>2.4.0</version>
+			<version>3.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>3.4</version>
+			<version>3.5</version>
 		</dependency>
 	</dependencies>
 

diff --git a/src/main/java/com/sangupta/logparser/aem/audit/AEMAuditLogParser.java b/src/main/java/com/sangupta/logparser/aem/audit/AEMAuditLogParser.java
@@ -3,10 +3,10 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 
+import com.sangupta.jerry.io.AdvancedStringReader;
 import com.sangupta.jerry.util.AssertUtils;
 import com.sangupta.logparser.LogParser;
 import com.sangupta.logparser.LogParserUtils;
-import com.sangupta.logparser.common.StringTokenReader;
 
 public class AEMAuditLogParser implements LogParser {
 
@@ -24,7 +24,7 @@ public AEMAuditLogLine parseLogLine(String logLine) {
         }
 
         AEMAuditLogLine line = new AEMAuditLogLine();
-        StringTokenReader reader = new StringTokenReader(logLine);
+        AdvancedStringReader reader = new AdvancedStringReader(logLine);
         if(reader.hasNext()) {
             line.timestamp = LogParserUtils.parseIntoTime(DATE_PATTERN, reader.readTillNext('['), -1);
         }

diff --git a/src/main/java/com/sangupta/logparser/aem/error/AEMErrorLogParser.java b/src/main/java/com/sangupta/logparser/aem/error/AEMErrorLogParser.java
@@ -24,11 +24,11 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 
+import com.sangupta.jerry.io.AdvancedStringReader;
 import com.sangupta.jerry.util.AssertUtils;
 import com.sangupta.jerry.util.StringUtils;
 import com.sangupta.logparser.LogParser;
 import com.sangupta.logparser.LogParserUtils;
-import com.sangupta.logparser.common.StringTokenReader;
 
 /**
  * A {@link LogParser} implementation to parse <code>error.log</code>
@@ -123,7 +123,7 @@ public AEMErrorLogLine parseLogLine(String logLine) {
 		}
 
 		AEMErrorLogLine line = new AEMErrorLogLine();
-		StringTokenReader reader = new StringTokenReader(logLine);
+		AdvancedStringReader reader = new AdvancedStringReader(logLine);
 		if(reader.hasNext()) {
 			line.timestamp = LogParserUtils.parseIntoTime(DATE_TIME_PATTERN, reader.readTillNext('*'), -1);
 		}
@@ -137,7 +137,7 @@ public AEMErrorLogLine parseLogLine(String logLine) {
 		}
 
 		if(reader.hasNext()) {
-			splitMessageAndStackTrace(line, reader.getRemaining());
+			splitMessageAndStackTrace(line, reader.readRemaining());
 		}
 
 		return line;

diff --git a/src/main/java/com/sangupta/logparser/aem/replication/AEMReplicationLogParser.java b/src/main/java/com/sangupta/logparser/aem/replication/AEMReplicationLogParser.java
@@ -3,10 +3,10 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 
+import com.sangupta.jerry.io.AdvancedStringReader;
 import com.sangupta.jerry.util.AssertUtils;
 import com.sangupta.logparser.LogParser;
 import com.sangupta.logparser.LogParserUtils;
-import com.sangupta.logparser.common.StringTokenReader;
 
 public class AEMReplicationLogParser implements LogParser {
 
@@ -24,7 +24,7 @@ public AEMReplicationLogLine parseLogLine(String logLine) {
         }
 
         AEMReplicationLogLine line = new AEMReplicationLogLine();
-        StringTokenReader reader = new StringTokenReader(logLine);
+        AdvancedStringReader reader = new AdvancedStringReader(logLine);
         if(reader.hasNext()) {
             String date = reader.readTillNext('*');
             line.timestamp = LogParserUtils.parseIntoTime(DATE_PATTERN, date, -1);
@@ -42,7 +42,7 @@ public AEMReplicationLogLine parseLogLine(String logLine) {
             line.clazz = reader.readTillNext(' ', 2).trim();
         }
 
-        line.message = reader.getRemaining();
+        line.message = reader.readRemaining();
         return line;
     }
 

diff --git a/src/main/java/com/sangupta/logparser/aem/request/AEMRequestLogParser.java b/src/main/java/com/sangupta/logparser/aem/request/AEMRequestLogParser.java
@@ -24,12 +24,12 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 
+import com.sangupta.jerry.io.AdvancedStringReader;
 import com.sangupta.jerry.util.AssertUtils;
 import com.sangupta.logparser.LogParser;
 import com.sangupta.logparser.LogParserUtils;
 import com.sangupta.logparser.common.HttpRequest;
 import com.sangupta.logparser.common.HttpVerb;
-import com.sangupta.logparser.common.StringTokenReader;
 
 /**
  * A {@link LogParser} that can be used to parse <code>request.log</code> files
@@ -54,7 +54,7 @@ public AEMRequestLogLine parseLogLine(String logLine) {
 		}
 
 		AEMRequestLogLine line = new AEMRequestLogLine();
-		StringTokenReader reader = new StringTokenReader(logLine);
+		AdvancedStringReader reader = new AdvancedStringReader(logLine);
 		if(reader.hasNext()) {
 			line.timestamp = LogParserUtils.parseIntoTime(DATE_TIME_PATTERN, reader.readTillNext('['), -1);
 		}
@@ -84,7 +84,7 @@ public AEMRequestLogLine parseLogLine(String logLine) {
 			}
 
 			if(reader.hasNext()) {
-				line.request.httpVersion = reader.getRemaining();
+				line.request.httpVersion = reader.readRemaining();
 			}
 		}
 
@@ -93,7 +93,7 @@ public AEMRequestLogLine parseLogLine(String logLine) {
 				line.statusCode = Integer.parseInt(reader.readTillNext(' '));
 			}
 
-			String remain = reader.getRemaining();
+			String remain = reader.readRemaining();
 			int space = remain.lastIndexOf(' ');
 			line.mime = remain.substring(0, space).trim();
 

diff --git a/src/main/java/com/sangupta/logparser/aem/tar/AEMTarOptimizationLogParser.java b/src/main/java/com/sangupta/logparser/aem/tar/AEMTarOptimizationLogParser.java
@@ -3,10 +3,10 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 
+import com.sangupta.jerry.io.AdvancedStringReader;
 import com.sangupta.jerry.util.AssertUtils;
 import com.sangupta.logparser.LogParser;
 import com.sangupta.logparser.LogParserUtils;
-import com.sangupta.logparser.common.StringTokenReader;
 
 public class AEMTarOptimizationLogParser implements LogParser {
 
@@ -24,7 +24,7 @@ public AEMTarOptimizationLogLine parseLogLine(String logLine) {
         }
 
         AEMTarOptimizationLogLine line = new AEMTarOptimizationLogLine();
-        StringTokenReader reader = new StringTokenReader(logLine);
+        AdvancedStringReader reader = new AdvancedStringReader(logLine);
         if(reader.hasNext()) {
             String date = reader.readTillNext('*');
             line.timestamp = LogParserUtils.parseIntoTime(DATE_PATTERN, date, -1);
@@ -64,7 +64,7 @@ public AEMTarOptimizationLogLine parseLogLine(String logLine) {
 
         if(reader.hasNext()) {
             reader.readTillNext("optimize:");
-            line.optimize = LogParserUtils.asLong(reader.getRemaining());
+            line.optimize = LogParserUtils.asLong(reader.readRemaining());
         }
 
         return line;