You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by mf...@apache.org on 2014/07/21 20:46:19 UTC
[1/4] git commit: STREAMS-132 | Checking content in getMatches to
ensure that it is non-null. Added debug logging statements to indicate when
we hit a null content
Repository: incubator-streams
Updated Branches:
refs/heads/master da3bc91a8 -> 9580fbc7e
STREAMS-132 | Checking content in getMatches to ensure that it is non-null. Added debug logging statements to indicate when we hit a null content
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/c7e7ad6f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/c7e7ad6f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/c7e7ad6f
Branch: refs/heads/master
Commit: c7e7ad6f9ab498e875a2d0f7d56c9c766804580c
Parents: 5c9a531
Author: Robert Douglas <rd...@w2odigital.com>
Authored: Fri Jul 11 16:37:52 2014 -0500
Committer: Robert Douglas <rd...@w2odigital.com>
Committed: Fri Jul 11 16:37:52 2014 -0500
----------------------------------------------------------------------
.../regex/AbstractRegexExtensionExtractor.java | 55 +++++++++++++-------
.../org/apache/streams/regex/RegexUtils.java | 43 +++++++++------
2 files changed, 63 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c7e7ad6f/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/AbstractRegexExtensionExtractor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/AbstractRegexExtensionExtractor.java b/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/AbstractRegexExtensionExtractor.java
index 23d1ad5..4289adf 100644
--- a/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/AbstractRegexExtensionExtractor.java
+++ b/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/AbstractRegexExtensionExtractor.java
@@ -25,6 +25,8 @@ import com.google.common.collect.Sets;
import org.apache.streams.core.StreamsDatum;
import org.apache.streams.core.StreamsProcessor;
import org.apache.streams.pojo.json.Activity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.Collection;
import java.util.List;
@@ -42,6 +44,9 @@ public abstract class AbstractRegexExtensionExtractor<T> implements StreamsProce
private final String extensionKey;
private final String defaultPattern;
+ private final static Logger LOGGER = LoggerFactory.getLogger(AbstractRegexExtensionExtractor.class);
+
+
private String pattern;
protected AbstractRegexExtensionExtractor(String patternConfigKey, String extensionKey, String defaultPattern) {
@@ -56,31 +61,43 @@ public abstract class AbstractRegexExtensionExtractor<T> implements StreamsProce
@Override
public List<StreamsDatum> process(StreamsDatum entry) {
- if(!(entry.getDocument() instanceof Activity)) {
- return Lists.newArrayList();
- }
- if(Strings.isNullOrEmpty(pattern)) {
- prepare(null);
- }
- Activity activity = (Activity)entry.getDocument();
- Map<String, List<Integer>> matches = RegexUtils.extractMatches(pattern, activity.getContent());
- Collection<T> entities = ensureTargetObject(activity);
- for(String key : matches.keySet()) {
- entities.add(prepareObject(key));
+ try {
+ if (!(entry.getDocument() instanceof Activity)) {
+ return Lists.newArrayList();
+ }
+ if (Strings.isNullOrEmpty(pattern)) {
+ prepare(null);
+ }
+ Activity activity = (Activity) entry.getDocument();
+ Map<String, List<Integer>> matches = RegexUtils.extractMatches(pattern, activity.getContent());
+ Collection<T> entities = ensureTargetObject(activity);
+ for (String key : matches.keySet()) {
+ entities.add(prepareObject(key));
+ }
+ return Lists.newArrayList(entry);
+ } catch (Throwable e) {
+ LOGGER.error("Throwable process {}", e);
+ e.printStackTrace();
+ throw new RuntimeException(e);
}
- return Lists.newArrayList(entry);
}
@Override
public void prepare(Object configurationObject) {
- if(configurationObject instanceof Map) {
- if(((Map)configurationObject).containsKey(patternConfigKey)) {
- pattern = (String)((Map)configurationObject).get(patternConfigKey);
+ try {
+ if (configurationObject instanceof Map) {
+ if (((Map) configurationObject).containsKey(patternConfigKey)) {
+ pattern = (String) ((Map) configurationObject).get(patternConfigKey);
+ }
+ } else if (configurationObject instanceof String) {
+ pattern = (String) configurationObject;
+ } else {
+ pattern = defaultPattern;
}
- } else if(configurationObject instanceof String) {
- pattern = (String)configurationObject;
- } else {
- pattern = defaultPattern;
+ } catch (Throwable e) {
+ LOGGER.error("Throwable prepare {}", e);
+ e.printStackTrace();
+ throw new RuntimeException(e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c7e7ad6f/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/RegexUtils.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/RegexUtils.java b/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/RegexUtils.java
index 662fc98..6b4f28a 100644
--- a/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/RegexUtils.java
+++ b/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/RegexUtils.java
@@ -21,6 +21,8 @@ package org.apache.streams.regex;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.List;
import java.util.Map;
@@ -33,6 +35,7 @@ import java.util.regex.Pattern;
public class RegexUtils {
private static final Map<String, Pattern> patternCache = Maps.newConcurrentMap();
+ private final static Logger LOGGER = LoggerFactory.getLogger(RegexUtils.class);
private RegexUtils() {}
@@ -58,22 +61,32 @@ public class RegexUtils {
}
protected static Map<String, List<Integer>> getMatches(String pattern, String content, int capture) {
- Matcher m = getPattern(pattern).matcher(content);
- Map<String, List<Integer>> matches = Maps.newHashMap();
- while(m.find()) {
- String group = capture > 0 ? m.group(capture) : m.group();
- if(group != null && !group.equals("")) {
- List<Integer> indices;
- if(matches.containsKey(group)) {
- indices = matches.get(group);
- } else {
- indices = Lists.newArrayList();
- matches.put(group, indices);
+ try {
+ Map<String, List<Integer>> matches = Maps.newHashMap();
+ if(content == null) {
+ return matches;
+ }
+
+ Matcher m = getPattern(pattern).matcher(content);
+ while (m.find()) {
+ String group = capture > 0 ? m.group(capture) : m.group();
+ if (group != null && !group.equals("")) {
+ List<Integer> indices;
+ if (matches.containsKey(group)) {
+ indices = matches.get(group);
+ } else {
+ indices = Lists.newArrayList();
+ matches.put(group, indices);
+ }
+ indices.add(m.start());
}
- indices.add(m.start());
}
+ return matches;
+ } catch (Throwable e) {
+ LOGGER.error("Throwable process {}", e);
+ e.printStackTrace();
+ throw new RuntimeException(e);
}
- return matches;
}
private static Pattern getPattern(String pattern) {
@@ -86,6 +99,4 @@ public class RegexUtils {
}
return p;
}
-
-
-}
+}
\ No newline at end of file
[4/4] git commit: Merge PR#54 from 'robdouglas/STREAMS-132'
Posted by mf...@apache.org.
Merge PR#54 from 'robdouglas/STREAMS-132'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/9580fbc7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/9580fbc7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/9580fbc7
Branch: refs/heads/master
Commit: 9580fbc7e607e707d4c9bffb5689bbe727e140b8
Parents: da3bc91 b3956f9
Author: mfranklin <mf...@apache.org>
Authored: Mon Jul 21 14:31:38 2014 -0400
Committer: mfranklin <mf...@apache.org>
Committed: Mon Jul 21 14:31:38 2014 -0400
----------------------------------------------------------------------
.../regex/AbstractRegexExtensionExtractor.java | 23 +++++++----
.../org/apache/streams/regex/RegexUtils.java | 43 ++++++++++++--------
2 files changed, 41 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
[3/4] git commit: STREAMS-132 | Removed unnecessary try/catch loop
from process method
Posted by mf...@apache.org.
STREAMS-132 | Removed unnecessary try/catch loop from process method
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/b3956f96
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/b3956f96
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/b3956f96
Branch: refs/heads/master
Commit: b3956f963d1f87ce2b5d1e04e9c9637ca5c3ad67
Parents: 8cc3d69
Author: Robert Douglas <rd...@w2odigital.com>
Authored: Tue Jul 15 11:58:02 2014 -0500
Committer: Robert Douglas <rd...@w2odigital.com>
Committed: Tue Jul 15 11:58:02 2014 -0500
----------------------------------------------------------------------
.../regex/AbstractRegexExtensionExtractor.java | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b3956f96/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/AbstractRegexExtensionExtractor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/AbstractRegexExtensionExtractor.java b/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/AbstractRegexExtensionExtractor.java
index 0b45cf2..afd4972 100644
--- a/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/AbstractRegexExtensionExtractor.java
+++ b/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/AbstractRegexExtensionExtractor.java
@@ -78,20 +78,14 @@ public abstract class AbstractRegexExtensionExtractor<T> implements StreamsProce
@Override
public void prepare(Object configurationObject) {
- try {
- if (configurationObject instanceof Map) {
- if (((Map) configurationObject).containsKey(patternConfigKey)) {
- pattern = (String) ((Map) configurationObject).get(patternConfigKey);
- }
- } else if (configurationObject instanceof String) {
- pattern = (String) configurationObject;
- } else {
- pattern = defaultPattern;
+ if (configurationObject instanceof Map) {
+ if (((Map) configurationObject).containsKey(patternConfigKey)) {
+ pattern = (String) ((Map) configurationObject).get(patternConfigKey);
}
- } catch (Throwable e) {
- LOGGER.error("Throwable prepare {}", e);
- e.printStackTrace();
- throw new RuntimeException(e);
+ } else if (configurationObject instanceof String) {
+ pattern = (String) configurationObject;
+ } else {
+ pattern = defaultPattern;
}
}
[2/4] git commit: STREAMS-132 | Code review feedback
Posted by mf...@apache.org.
STREAMS-132 | Code review feedback
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/8cc3d699
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/8cc3d699
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/8cc3d699
Branch: refs/heads/master
Commit: 8cc3d69992d6f3754cccd6da7697782740aa6830
Parents: c7e7ad6
Author: Robert Douglas <rd...@w2odigital.com>
Authored: Mon Jul 14 14:47:35 2014 -0500
Committer: Robert Douglas <rd...@w2odigital.com>
Committed: Mon Jul 14 14:55:44 2014 -0500
----------------------------------------------------------------------
.../regex/AbstractRegexExtensionExtractor.java | 30 ++++++++------------
1 file changed, 12 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/8cc3d699/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/AbstractRegexExtensionExtractor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/AbstractRegexExtensionExtractor.java b/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/AbstractRegexExtensionExtractor.java
index 4289adf..0b45cf2 100644
--- a/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/AbstractRegexExtensionExtractor.java
+++ b/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/AbstractRegexExtensionExtractor.java
@@ -61,25 +61,19 @@ public abstract class AbstractRegexExtensionExtractor<T> implements StreamsProce
@Override
public List<StreamsDatum> process(StreamsDatum entry) {
- try {
- if (!(entry.getDocument() instanceof Activity)) {
- return Lists.newArrayList();
- }
- if (Strings.isNullOrEmpty(pattern)) {
- prepare(null);
- }
- Activity activity = (Activity) entry.getDocument();
- Map<String, List<Integer>> matches = RegexUtils.extractMatches(pattern, activity.getContent());
- Collection<T> entities = ensureTargetObject(activity);
- for (String key : matches.keySet()) {
- entities.add(prepareObject(key));
- }
- return Lists.newArrayList(entry);
- } catch (Throwable e) {
- LOGGER.error("Throwable process {}", e);
- e.printStackTrace();
- throw new RuntimeException(e);
+ if (!(entry.getDocument() instanceof Activity)) {
+ return Lists.newArrayList();
+ }
+ if (Strings.isNullOrEmpty(pattern)) {
+ prepare(null);
+ }
+ Activity activity = (Activity) entry.getDocument();
+ Map<String, List<Integer>> matches = RegexUtils.extractMatches(pattern, activity.getContent());
+ Collection<T> entities = ensureTargetObject(activity);
+ for (String key : matches.keySet()) {
+ entities.add(prepareObject(key));
}
+ return Lists.newArrayList(entry);
}
@Override