You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/11/06 22:50:59 UTC
[1/3] storm git commit: [STORM-1182] - Removing and wrapping some
exceptions in ConfigValidation to make code cleaner
Repository: storm
Updated Branches:
refs/heads/master 2ef095e2b -> 14c7defd5
[STORM-1182] - Removing and wrapping some exceptions in ConfigValidation to make code cleaner
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/34c7eb26
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/34c7eb26
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/34c7eb26
Branch: refs/heads/master
Commit: 34c7eb26e06db3d3fbcf7ded6664944c25a46a9e
Parents: 90edd94
Author: Boyang Jerry Peng <je...@yahoo-inc.com>
Authored: Thu Nov 5 15:57:38 2015 -0600
Committer: Boyang Jerry Peng <je...@yahoo-inc.com>
Committed: Thu Nov 5 16:12:34 2015 -0600
----------------------------------------------------------------------
.../storm/validation/ConfigValidation.java | 30 ++++++++++++--------
1 file changed, 18 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/34c7eb26/storm-core/src/jvm/backtype/storm/validation/ConfigValidation.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/validation/ConfigValidation.java b/storm-core/src/jvm/backtype/storm/validation/ConfigValidation.java
index 0190799..4e4a4f4 100644
--- a/storm-core/src/jvm/backtype/storm/validation/ConfigValidation.java
+++ b/storm-core/src/jvm/backtype/storm/validation/ConfigValidation.java
@@ -43,7 +43,7 @@ public class ConfigValidation {
public static abstract class Validator {
public Validator(Map<String, Object> params) {}
public Validator() {}
- public abstract void validateField(String name, Object o) throws InstantiationException, IllegalAccessException, NoSuchMethodException, InvocationTargetException;
+ public abstract void validateField(String name, Object o);
}
/**
@@ -172,11 +172,10 @@ public class ConfigValidation {
public static class ImpersonationAclUserEntryValidator extends Validator {
@Override
- public void validateField(String name, Object o) throws InstantiationException, IllegalAccessException, NoSuchMethodException, InvocationTargetException {
+ public void validateField(String name, Object o) {
if (o == null) {
return;
}
- LOG.info("object: {}", o);
ConfigValidationUtils.NestableFieldValidator validator = ConfigValidationUtils.mapFv(ConfigValidationUtils.fv(String.class, false),
ConfigValidationUtils.listFv(String.class, false), false);
validator.validateField(name, o);
@@ -319,9 +318,12 @@ public class ConfigValidation {
}
@Override
- public void validateField(String name, Object o) throws InstantiationException, IllegalAccessException, NoSuchMethodException, InvocationTargetException {
-
- validateField(name, this.entryValidators, o);
+ public void validateField(String name, Object o) {
+ try {
+ validateField(name, this.entryValidators, o);
+ } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException | InstantiationException e) {
+ throw new RuntimeException(e);
+ }
}
public static void validateField(String name, Class[] validators, Object o) throws IllegalAccessException, InstantiationException, NoSuchMethodException, InvocationTargetException {
@@ -381,8 +383,12 @@ public class ConfigValidation {
}
@Override
- public void validateField(String name, Object o) throws InstantiationException, IllegalAccessException, NoSuchMethodException, InvocationTargetException {
- validateField(name, this.keyValidators, this.valueValidators, o);
+ public void validateField(String name, Object o) {
+ try {
+ validateField(name, this.keyValidators, this.valueValidators, o);
+ } catch (IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e) {
+ throw new RuntimeException(e);
+ }
}
public static void validateField(String name, Class[] keyValidators, Class[] valueValidators, Object o) throws IllegalAccessException, InstantiationException, NoSuchMethodException, InvocationTargetException {
@@ -454,16 +460,16 @@ public class ConfigValidation {
public static class MetricRegistryValidator extends Validator {
@Override
- public void validateField(String name, Object o) throws IllegalAccessException {
+ public void validateField(String name, Object o) {
if(o == null) {
return;
}
SimpleTypeValidator.validateField(name, Map.class, o);
if(!((Map) o).containsKey("class") ) {
- throw new IllegalAccessException("Field " + name + " must have map entry with key: class");
+ throw new IllegalArgumentException( "Field " + name + " must have map entry with key: class");
}
if(!((Map) o).containsKey("parallelism.hint") ) {
- throw new IllegalAccessException("Field " + name + " must have map entry with key: parallelism.hint");
+ throw new IllegalArgumentException("Field " + name + " must have map entry with key: parallelism.hint");
}
SimpleTypeValidator.validateField(name, String.class, ((Map) o).get("class"));
@@ -619,4 +625,4 @@ public class ConfigValidation {
}
return true;
}
-}
+}
\ No newline at end of file
[2/3] storm git commit: Merge branch 'STORM-1182' of
https://github.com/jerrypeng/storm into STORM-1182
Posted by bo...@apache.org.
Merge branch 'STORM-1182' of https://github.com/jerrypeng/storm into STORM-1182
STORM-1182: Removing and wrapping some exceptions in ConfigValidation to make code cleaner
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6a0d13bc
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6a0d13bc
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6a0d13bc
Branch: refs/heads/master
Commit: 6a0d13bc7c95bf1cd61583057b0d4e3eda6c20f0
Parents: 2ef095e 34c7eb2
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Nov 6 15:40:36 2015 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Nov 6 15:40:36 2015 -0600
----------------------------------------------------------------------
.../storm/validation/ConfigValidation.java | 30 ++++++++++++--------
1 file changed, 18 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
[3/3] storm git commit: Added STORM-1182 to Changelog
Posted by bo...@apache.org.
Added STORM-1182 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/14c7defd
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/14c7defd
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/14c7defd
Branch: refs/heads/master
Commit: 14c7defd57e7be4de69b861a09d9a7c8c5417888
Parents: 6a0d13b
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Nov 6 15:41:05 2015 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Nov 6 15:41:05 2015 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/14c7defd/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff01289..a8cc1bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-1182: Removing and wrapping some exceptions in ConfigValidation to make code cleaner
* STORM-1134. Windows: Fix log4j config.
* STORM-1127: allow for boolean arguments (Flux)
* STORM-1180: FLUX logo wasn't appearing quite right