Removed named-regexp dependency and java version 1.6 to 1.7 (#53)

Author: hayatbehlim

pom.xml

@@ -67,7 +67,7 @@
 		<common.version>3.1</common.version>
 		<gson.version>2.2.2</gson.version>
 		<!-- maven -->
-		<java.version>1.6</java.version>
+		<java.version>1.7</java.version>
 	</properties>
 
 	<dependencies>
@@ -78,12 +78,12 @@
 			<scope>test</scope>
 		</dependency>
 
-		<dependency>
+		<!-- <dependency>
 			<groupId>com.github.tony19</groupId>
 			<artifactId>named-regexp</artifactId>
 			<version>${named.regex.version}</version>
 			<scope>compile</scope>
-		</dependency>
+		</dependency> -->
 
 		<dependency>
 			<groupId>org.apache.commons</groupId>

src/main/java/oi/thekraken/grok/api/Discovery.java

@@ -24,12 +24,11 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TreeMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.google.code.regexp.Matcher;
-import com.google.code.regexp.Pattern;
-
 import oi.thekraken.grok.api.exception.GrokException;
 
 /**

src/main/java/oi/thekraken/grok/api/Grok.java

@@ -26,13 +26,14 @@
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.code.regexp.Matcher;
-import com.google.code.regexp.Pattern;
 
 import oi.thekraken.grok.api.exception.GrokException;
 
@@ -359,10 +360,10 @@ public void compile(String pattern, boolean namedOnly) throws GrokException {
 
       Matcher m = GrokUtils.GROK_PATTERN.matcher(namedRegex);
       // Match %{Foo:bar} -> pattern name and subname
-      // Match %{Foo=regex} -> add new regex definition
+      // Match %{Foo=regex} -> add new regex definition 
       if (m.find()) {
         continueIteration = true;
-        Map<String, String> group = m.namedGroups();
+        Map<String, String> group = GrokUtils.namedGroups(m, m.group());
         if (group.get("definition") != null) {
           try {
             addPattern(group.get("pattern"), group.get("definition"));

src/main/java/oi/thekraken/grok/api/GrokUtils.java

@@ -1,6 +1,12 @@
 package oi.thekraken.grok.api;
 
-import com.google.code.regexp.Pattern;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 
 /**
  * {@code GrokUtils} contain set of useful tools or methods.
@@ -26,5 +32,30 @@ public class GrokUtils {
             ")" +
       ")?" +
       "\\}");
+  
+  public static final Pattern NAMED_REGEX = Pattern
+      .compile("\\(\\?<([a-zA-Z][a-zA-Z0-9]*)>");
+
+  private static Set<String> getNameGroups(String regex) {
+    Set<String> namedGroups = new LinkedHashSet<String>();
+    Matcher m = NAMED_REGEX.matcher(regex);
+    while (m.find()) {
+      namedGroups.add(m.group(1));
+    }
+    return namedGroups;
+  }
 
+  public static Map<String, String> namedGroups(Matcher matcher,
+      String namedRegex) {
+    Set<String> groupNames = getNameGroups(matcher.pattern().pattern());
+    Matcher localMatcher = matcher.pattern().matcher(namedRegex);
+    Map<String, String> namedGroups = new LinkedHashMap<String, String>();
+    if (localMatcher.find()) {
+      for (String groupName : groupNames) {
+        String groupValue = localMatcher.group(groupName);
+        namedGroups.put(groupName, groupValue);
+      }
+    }
+    return namedGroups;
+  }
 }

src/main/java/oi/thekraken/grok/api/Match.java

@@ -22,8 +22,8 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TreeMap;
+import java.util.regex.Matcher;
 
-import com.google.code.regexp.Matcher;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
@@ -152,7 +152,7 @@ public void captures() {
     // _capture.put("LINE", this.line);
     // _capture.put("LENGTH", this.line.length() +"");
 
-    Map<String, String> mappedw = this.match.namedGroups();
+    Map<String, String> mappedw = GrokUtils.namedGroups(this.match,this.subject);
     Iterator<Entry<String, String>> it = mappedw.entrySet().iterator();
     while (it.hasNext()) {