You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2015/10/24 03:30:47 UTC
[2/5] storm git commit: delete unneccessary annotations
delete unneccessary annotations
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b57c8305
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b57c8305
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b57c8305
Branch: refs/heads/master
Commit: b57c8305460f4de46d92129c961ed46a53a216db
Parents: 80df44b
Author: Boyang Jerry Peng <je...@yahoo-inc.com>
Authored: Mon Oct 19 12:44:41 2015 -0500
Committer: Boyang Jerry Peng <je...@yahoo-inc.com>
Committed: Thu Oct 22 11:27:56 2015 -0500
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/Config.java | 7 +++----
.../storm/validation/ConfigValidationAnnotations.java | 6 ------
2 files changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/b57c8305/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/Config.java b/storm-core/src/jvm/backtype/storm/Config.java
index ea58538..5f5fdec 100644
--- a/storm-core/src/jvm/backtype/storm/Config.java
+++ b/storm-core/src/jvm/backtype/storm/Config.java
@@ -253,7 +253,6 @@ public class Config extends HashMap<String, Object> {
*
* Defaults to false.
*/
- @Deprecated
@isBoolean
public static final String STORM_LOCAL_MODE_ZMQ = "storm.local.mode.zmq";
@@ -1254,8 +1253,8 @@ public class Config extends HashMap<String, Object> {
* to be equal to the number of workers configured for this topology. If this variable is set to 0,
* event logging will be disabled.</p>
*/
- @isPositiveNumber
@isInteger
+ @isPositiveNumber
public static final String TOPOLOGY_EVENTLOGGER_EXECUTORS = "topology.eventlogger.executors";
/**
@@ -1579,8 +1578,8 @@ public class Config extends HashMap<String, Object> {
* The port to use to connect to the transactional zookeeper servers. If null (which is default),
* will use storm.zookeeper.port
*/
- @isPositiveNumber
@isInteger
+ @isPositiveNumber
public static final String TRANSACTIONAL_ZOOKEEPER_PORT="transactional.zookeeper.port";
/**
@@ -1648,8 +1647,8 @@ public class Config extends HashMap<String, Object> {
* The number of machines that should be used by this topology to isolate it from all others. Set storm.scheduler
* to backtype.storm.scheduler.multitenant.MultitenantScheduler
*/
- @isPositiveNumber
@isInteger
+ @isPositiveNumber
public static final String TOPOLOGY_ISOLATED_MACHINES = "topology.isolate.machines";
/**
http://git-wip-us.apache.org/repos/asf/storm/blob/b57c8305/storm-core/src/jvm/backtype/storm/validation/ConfigValidationAnnotations.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/validation/ConfigValidationAnnotations.java b/storm-core/src/jvm/backtype/storm/validation/ConfigValidationAnnotations.java
index 44d9c51..ed93370 100644
--- a/storm-core/src/jvm/backtype/storm/validation/ConfigValidationAnnotations.java
+++ b/storm-core/src/jvm/backtype/storm/validation/ConfigValidationAnnotations.java
@@ -185,12 +185,6 @@ public class ConfigValidationAnnotations {
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
- public @interface isImpersonationAcl {
- Class validatorClass() default ConfigValidation.ImpersonationAclValidator.class;
- }
-
- @Retention(RetentionPolicy.RUNTIME)
- @Target(ElementType.FIELD)
public @interface isStringOrStringList {
Class validatorClass() default ConfigValidation.StringOrStringListValidator.class;
}