You are viewing a plain text version of this content. The canonical link for it is here.
Posted to s4-commits@incubator.apache.org by mm...@apache.org on 2012/11/22 17:28:57 UTC
[2/2] git commit: Remove internal method with incorrect implementation
Remove internal method with incorrect implementation
Project: http://git-wip-us.apache.org/repos/asf/incubator-s4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s4/commit/6dd0ed0b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/6dd0ed0b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/6dd0ed0b
Branch: refs/heads/dev
Commit: 6dd0ed0b6669f5b843c29ee3a3f899de7b72a579
Parents: a7f86ac
Author: Matthieu Morel <mm...@apache.org>
Authored: Fri Oct 26 15:47:38 2012 +0200
Committer: Matthieu Morel <mm...@apache.org>
Committed: Fri Oct 26 16:41:34 2012 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/s4/core/Stream.java | 23 +++-----------
.../main/java/org/apache/s4/edsl/AppBuilder.java | 2 +-
2 files changed, 6 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/6dd0ed0b/subprojects/s4-core/src/main/java/org/apache/s4/core/Stream.java
----------------------------------------------------------------------
diff --git a/subprojects/s4-core/src/main/java/org/apache/s4/core/Stream.java b/subprojects/s4-core/src/main/java/org/apache/s4/core/Stream.java
index aa54dfc..e5ef775 100644
--- a/subprojects/s4-core/src/main/java/org/apache/s4/core/Stream.java
+++ b/subprojects/s4-core/src/main/java/org/apache/s4/core/Stream.java
@@ -46,7 +46,6 @@ public class Stream<T extends Event> implements Runnable, Streamable {
final static private String DEFAULT_SEPARATOR = "^";
final static private int CAPACITY = 1000;
- private static int idCounter = 0;
private String name;
protected Key<T> key;
private ProcessingElement[] targetPEs;
@@ -139,27 +138,15 @@ public class Stream<T extends Event> implements Runnable, Streamable {
}
/**
- * Send events from this stream to a PE.
- *
- * @param pe
- * a target PE.
- *
- * @return the stream object
- */
- public Stream<T> setPE(ProcessingElement pe) {
- app.addStream(this);
- return this;
- }
-
- /**
- * Send events from this stream to various PEs.
+ * Send events from this stream to one or more PEs.
*
* @param pes
- * a target PE array.
+ * one or more target prototypes
+ *
*
* @return the stream object
*/
- public Stream<T> setPEs(ProcessingElement[] pes) {
+ public Stream<T> setPEs(ProcessingElement... pes) {
this.targetPEs = pes;
return this;
}
@@ -320,7 +307,7 @@ public class Stream<T extends Event> implements Runnable, Streamable {
}
}
- public Stream<T> register() {
+ Stream<T> register() {
app.addStream(this);
return this;
}
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/6dd0ed0b/subprojects/s4-edsl/src/main/java/org/apache/s4/edsl/AppBuilder.java
----------------------------------------------------------------------
diff --git a/subprojects/s4-edsl/src/main/java/org/apache/s4/edsl/AppBuilder.java b/subprojects/s4-edsl/src/main/java/org/apache/s4/edsl/AppBuilder.java
index fb40b43..4e007b0 100644
--- a/subprojects/s4-edsl/src/main/java/org/apache/s4/edsl/AppBuilder.java
+++ b/subprojects/s4-edsl/src/main/java/org/apache/s4/edsl/AppBuilder.java
@@ -123,7 +123,7 @@ public class AppBuilder extends App {
for (StreamBuilder<? extends Event> sb : streamBuilders) {
for (String peName : sb.pes) {
ProcessingElement pe = getPE(peName);
- sb.stream.setPE(pe);
+ sb.stream.setPEs(pe);
}
}