You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2015/11/24 20:57:41 UTC
[1/4] storm git commit: allow for configMethods with no args;
Repository: storm
Updated Branches:
refs/heads/master 8eac4aadc -> f8a2d65a6
allow for configMethods with no args;
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/aff24fd1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/aff24fd1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/aff24fd1
Branch: refs/heads/master
Commit: aff24fd1c087dda6ee4055f990d1632097e6c574
Parents: a8d253a
Author: Chuck Burgess <cb...@progressrail.com>
Authored: Thu Oct 29 16:46:52 2015 -0500
Committer: Chuck Burgess <cb...@progressrail.com>
Committed: Fri Nov 20 19:04:17 2015 -0600
----------------------------------------------------------------------
.../src/main/java/org/apache/storm/flux/FluxBuilder.java | 11 ++++++++++-
.../test/java/org/apache/storm/flux/test/TestBolt.java | 4 ++++
.../src/test/resources/configs/config-methods-test.yaml | 1 +
3 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/aff24fd1/external/flux/flux-core/src/main/java/org/apache/storm/flux/FluxBuilder.java
----------------------------------------------------------------------
diff --git a/external/flux/flux-core/src/main/java/org/apache/storm/flux/FluxBuilder.java b/external/flux/flux-core/src/main/java/org/apache/storm/flux/FluxBuilder.java
index f7c2575..56c90e2 100644
--- a/external/flux/flux-core/src/main/java/org/apache/storm/flux/FluxBuilder.java
+++ b/external/flux/flux-core/src/main/java/org/apache/storm/flux/FluxBuilder.java
@@ -417,6 +417,9 @@ public class FluxBuilder {
Class clazz = instance.getClass();
for(ConfigMethodDef methodDef : methodDefs){
List<Object> args = methodDef.getArgs();
+ if (args == null){
+ args = new ArrayList();
+ }
if(methodDef.hasReferences()){
args = resolveReferences(args, context);
}
@@ -444,7 +447,13 @@ public class FluxBuilder {
Class[] paramClasses = method.getParameterTypes();
if (paramClasses.length == args.size() && method.getName().equals(methodName)) {
LOG.debug("found constructor with same number of args..");
- boolean invokable = canInvokeWithArgs(args, method.getParameterTypes());
+ boolean invokable = false;
+ if (args.size() == 0){
+ // it's a method with zero args
+ invokable = true;
+ } else {
+ invokable = canInvokeWithArgs(args, method.getParameterTypes());
+ }
if (invokable) {
retval = method;
eligibleCount++;
http://git-wip-us.apache.org/repos/asf/storm/blob/aff24fd1/external/flux/flux-core/src/test/java/org/apache/storm/flux/test/TestBolt.java
----------------------------------------------------------------------
diff --git a/external/flux/flux-core/src/test/java/org/apache/storm/flux/test/TestBolt.java b/external/flux/flux-core/src/test/java/org/apache/storm/flux/test/TestBolt.java
index 40fa841..f9f28c5 100644
--- a/external/flux/flux-core/src/test/java/org/apache/storm/flux/test/TestBolt.java
+++ b/external/flux/flux-core/src/test/java/org/apache/storm/flux/test/TestBolt.java
@@ -31,6 +31,7 @@ public class TestBolt extends BaseBasicBolt {
private String foo;
private String bar;
private String fooBar;
+ private String none;
public static enum TestEnum {
FOO,
@@ -63,6 +64,9 @@ public class TestBolt extends BaseBasicBolt {
public void withFoo(String foo){
this.foo = foo;
}
+ public void withNone(){
+ this.none = "hit";
+ }
public void withBar(String bar){
this.bar = bar;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/aff24fd1/external/flux/flux-core/src/test/resources/configs/config-methods-test.yaml
----------------------------------------------------------------------
diff --git a/external/flux/flux-core/src/test/resources/configs/config-methods-test.yaml b/external/flux/flux-core/src/test/resources/configs/config-methods-test.yaml
index 5563193..cda151e 100644
--- a/external/flux/flux-core/src/test/resources/configs/config-methods-test.yaml
+++ b/external/flux/flux-core/src/test/resources/configs/config-methods-test.yaml
@@ -41,6 +41,7 @@ bolts:
- name: "withFoo"
args:
- "foo"
+ - name: "withNone"
- name: "withBar"
args:
- "bar"
[2/4] storm git commit: update docs to show zero-arg config method
Posted by pt...@apache.org.
update docs to show zero-arg config method
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8cb3dc3d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8cb3dc3d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8cb3dc3d
Branch: refs/heads/master
Commit: 8cb3dc3d2625b35172861a8c8cffc21d53403686
Parents: aff24fd
Author: Chuck Burgess <cb...@progressrail.com>
Authored: Fri Oct 30 08:17:34 2015 -0500
Committer: Chuck Burgess <cb...@progressrail.com>
Committed: Fri Nov 20 19:04:18 2015 -0600
----------------------------------------------------------------------
external/flux/README.md | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/8cb3dc3d/external/flux/README.md
----------------------------------------------------------------------
diff --git a/external/flux/README.md b/external/flux/README.md
index c9b6ba0..c4ef145 100644
--- a/external/flux/README.md
+++ b/external/flux/README.md
@@ -433,6 +433,8 @@ bolts:
- name: "withFoo"
args:
- "foo"
+ - name: "withNone"
+ # no args needed, so no "args" line
- name: "withBar"
args:
- "bar"
@@ -446,6 +448,7 @@ The signatures of the corresponding methods are as follows:
```java
public void withFoo(String foo);
+ public void withNone(); // method with zero arguments
public void withBar(String bar);
public void withFooBar(String foo, String bar);
```
[4/4] storm git commit: add STORM-1126 to changelog
Posted by pt...@apache.org.
add STORM-1126 to changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f8a2d65a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f8a2d65a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f8a2d65a
Branch: refs/heads/master
Commit: f8a2d65a64f5648abed48d1ba94ea2c572ea8826
Parents: 6ebf247
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue Nov 24 14:57:34 2015 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue Nov 24 14:57:34 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/f8a2d65a/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b45afb1..ccae7d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
+## 0.11.0
+ * STORM-1126: Allow a configMethod that takes no arguments (Flux)
* STORM-1203: worker metadata file creation doesn't use storm.log.dir config
* STORM-1349: [Flux] Allow constructorArgs to take Maps as arguments
* STORM-126: Add Lifecycle support API for worker nodes
[3/4] storm git commit: Merge branch 'noArgs' of
https://github.com/ashnazg/storm
Posted by pt...@apache.org.
Merge branch 'noArgs' of https://github.com/ashnazg/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6ebf2477
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6ebf2477
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6ebf2477
Branch: refs/heads/master
Commit: 6ebf24779b963bb52a7653d8d9d8ec04ed3e557b
Parents: 8eac4aa 8cb3dc3
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue Nov 24 14:56:01 2015 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue Nov 24 14:56:01 2015 -0500
----------------------------------------------------------------------
external/flux/README.md | 3 +++
.../src/main/java/org/apache/storm/flux/FluxBuilder.java | 11 ++++++++++-
.../test/java/org/apache/storm/flux/test/TestBolt.java | 4 ++++
.../src/test/resources/configs/config-methods-test.yaml | 1 +
4 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------