You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2014/12/11 21:25:50 UTC
[49/50] [abbrv] incubator-streams git commit: fix PR feedback bug
fix PR feedback bug
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/a9358f9c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/a9358f9c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/a9358f9c
Branch: refs/heads/master
Commit: a9358f9c33b653e09adecb4107cf83cf994a60f6
Parents: 5a65dc5
Author: sblackmon <sb...@w2odigital.com>
Authored: Thu Dec 11 14:01:00 2014 -0600
Committer: sblackmon <sb...@w2odigital.com>
Committed: Thu Dec 11 14:16:14 2014 -0600
----------------------------------------------------------------------
.../converter/ActivityConverterProcessor.java | 22 ++++++++------------
1 file changed, 9 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/a9358f9c/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityConverterProcessor.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityConverterProcessor.java b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityConverterProcessor.java
index 81d83ca..4ce6111 100644
--- a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityConverterProcessor.java
+++ b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityConverterProcessor.java
@@ -114,12 +114,12 @@ public class ActivityConverterProcessor implements StreamsProcessor {
List<Activity> activities = applyConverter(converter, typedDoc);
- }
-
- for (Activity activity : activities) {
- StreamsDatum datum = DatumUtils.cloneDatum(entry);
- datum.setId(activity.getId());
- result.add(datum);
+ for (Activity activity : activities) {
+ StreamsDatum datum = DatumUtils.cloneDatum(entry);
+ datum.setId(activity.getId());
+ datum.setDocument(activity);
+ result.add(datum);
+ }
}
} catch( Exception e ) {
@@ -132,23 +132,19 @@ public class ActivityConverterProcessor implements StreamsProcessor {
protected List<Activity> applyConverter(ActivityConverter converter, Object typedDoc) {
+ List<Activity> activities = Lists.newArrayList();
// if the document can be typed as the required class
if( typedDoc != null ) {
// let the converter create activities if it can
- List<Activity> activities;
try {
activities = convertToActivity(converter, typedDoc);
-
- if( activities != null && activities.size() > 0) {
-
-
- }
} catch( Exception e ) {
LOGGER.debug("convertToActivity caught exception " + e.getMessage());
}
}
+ return activities;
}
protected List<Activity> convertToActivity(ActivityConverter converter, Object document) {
@@ -216,7 +212,7 @@ public class ActivityConverterProcessor implements StreamsProcessor {
@Override
public void prepare(Object configurationObject) {
Reflections reflections = new Reflections(new ConfigurationBuilder()
- .setUrls(ClasspathHelper.forPackage("org.apache.streams.data"))
+ .setUrls(ClasspathHelper.forPackage("org.apache.streams"))
.setScanners(new SubTypesScanner()));
if (configuration.getClassifiers().size() > 0) {
for( DocumentClassifier classifier : configuration.getClassifiers()) {