streams-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sblack...@apache.org
Subject [3/6] incubator-streams git commit: update for changes since branch
Date Tue, 31 Mar 2015 23:19:11 GMT
update for changes since branch


Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/083c5ab4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/083c5ab4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/083c5ab4

Branch: refs/heads/master
Commit: 083c5ab47522b405babfa6776ec8718324644964
Parents: 70a58d0
Author: Steve Blackmon (@steveblackmon) <sblackmon@apache.org>
Authored: Sun Mar 29 15:37:29 2015 -0500
Committer: Steve Blackmon (@steveblackmon) <sblackmon@apache.org>
Committed: Sun Mar 29 15:37:29 2015 -0500

----------------------------------------------------------------------
 streams-components/streams-filters/pom.xml                    | 2 +-
 .../java/org/apache/streams/filters/VerbDefinitionFilter.java | 6 +++++-
 .../apache/streams/filters/test/VerbDefinitionFilterTest.java | 2 +-
 streams-verbs/pom.xml                                         | 2 +-
 .../java/org/apache/streams/verbs/VerbDefinitionResolver.java | 7 +------
 .../org/apache/streams/verbs/VerbDefinitionResolverTest.java  | 2 +-
 6 files changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/083c5ab4/streams-components/streams-filters/pom.xml
----------------------------------------------------------------------
diff --git a/streams-components/streams-filters/pom.xml b/streams-components/streams-filters/pom.xml
index 47f5d6d..45169f6 100644
--- a/streams-components/streams-filters/pom.xml
+++ b/streams-components/streams-filters/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.streams</groupId>
         <artifactId>streams-components</artifactId>
-        <version>0.2-SNAPSHOT</version>
+        <version>0.2-incubating-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/083c5ab4/streams-components/streams-filters/src/main/java/org/apache/streams/filters/VerbDefinitionFilter.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-filters/src/main/java/org/apache/streams/filters/VerbDefinitionFilter.java
b/streams-components/streams-filters/src/main/java/org/apache/streams/filters/VerbDefinitionFilter.java
index 3bd0cc4..50ef30d 100644
--- a/streams-components/streams-filters/src/main/java/org/apache/streams/filters/VerbDefinitionFilter.java
+++ b/streams-components/streams-filters/src/main/java/org/apache/streams/filters/VerbDefinitionFilter.java
@@ -36,9 +36,13 @@ import org.slf4j.LoggerFactory;
 
 import java.util.*;
 
+/**
+ * Checks one or more verb definitions against a stream of Activity documents, and drops
any activities
+ * which do not match the filter criteria.
+ */
 public class VerbDefinitionFilter implements StreamsProcessor {
 
-    private static final String STREAMS_ID = "LinkResolverProcessor";
+    private static final String STREAMS_ID = "VerbDefinitionFilter";
     private static final Logger LOGGER = LoggerFactory.getLogger(VerbDefinitionFilter.class);
 
     protected Set<VerbDefinition> verbDefinitionSet;

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/083c5ab4/streams-components/streams-filters/src/test/java/org/apache/streams/filters/test/VerbDefinitionFilterTest.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-filters/src/test/java/org/apache/streams/filters/test/VerbDefinitionFilterTest.java
b/streams-components/streams-filters/src/test/java/org/apache/streams/filters/test/VerbDefinitionFilterTest.java
index 235fd7d..edaebcd 100644
--- a/streams-components/streams-filters/src/test/java/org/apache/streams/filters/test/VerbDefinitionFilterTest.java
+++ b/streams-components/streams-filters/src/test/java/org/apache/streams/filters/test/VerbDefinitionFilterTest.java
@@ -18,7 +18,7 @@ import java.util.List;
  */
 public class VerbDefinitionFilterTest {
 
-    ObjectMapper mapper = new StreamsJacksonMapper();
+    ObjectMapper mapper = StreamsJacksonMapper.getInstance();
 
     /**
      * Test verb match filter alone

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/083c5ab4/streams-verbs/pom.xml
----------------------------------------------------------------------
diff --git a/streams-verbs/pom.xml b/streams-verbs/pom.xml
index 60bbc64..fc47f1e 100644
--- a/streams-verbs/pom.xml
+++ b/streams-verbs/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.streams</groupId>
         <artifactId>streams-project</artifactId>
-        <version>0.2-SNAPSHOT</version>
+        <version>0.2-incubating-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/083c5ab4/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionResolver.java
----------------------------------------------------------------------
diff --git a/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionResolver.java
b/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionResolver.java
index 4a9b079..c5aa140 100644
--- a/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionResolver.java
+++ b/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionResolver.java
@@ -18,15 +18,10 @@
 
 package org.apache.streams.verbs;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import org.apache.streams.jackson.StreamsJacksonMapper;
 import org.apache.streams.pojo.json.Activity;
 import org.apache.streams.pojo.json.ActivityObject;
-import org.apache.streams.verbs.ObjectCombination;
-import org.apache.streams.verbs.VerbDefinition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -84,7 +79,7 @@ public class VerbDefinitionResolver {
             }
         }
 
-        results.sort(new ObjectCombinationSpecificOrdering(activity));
+        Collections.sort(results, new ObjectCombinationSpecificOrdering(activity));
 
         return results;
     }

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/083c5ab4/streams-verbs/src/test/java/org/apache/streams/verbs/VerbDefinitionResolverTest.java
----------------------------------------------------------------------
diff --git a/streams-verbs/src/test/java/org/apache/streams/verbs/VerbDefinitionResolverTest.java
b/streams-verbs/src/test/java/org/apache/streams/verbs/VerbDefinitionResolverTest.java
index 1edcc31..4ef85a4 100644
--- a/streams-verbs/src/test/java/org/apache/streams/verbs/VerbDefinitionResolverTest.java
+++ b/streams-verbs/src/test/java/org/apache/streams/verbs/VerbDefinitionResolverTest.java
@@ -13,7 +13,7 @@ import java.util.List;
  */
 public class VerbDefinitionResolverTest {
 
-    ObjectMapper mapper = new StreamsJacksonMapper();
+    ObjectMapper mapper = StreamsJacksonMapper.getInstance();
 
     /**
      * Test of matchingVerbDefinitions


Mime
View raw message