Merge branch 'STORM-2649' of https://github.com/ghajos/storm into STORM-2649
STORM-2649: More detailed check of config serialization This closes #2583 Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/402a371c Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/402a371c Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/402a371c Branch: refs/heads/master Commit: 402a371ccdb39ccd7146fe9743e91ca36fee6d15 Parents: 76af86b 0a48fd9 Author: Robert Evans <[email protected]> Authored: Mon Apr 2 09:07:28 2018 -0500 Committer: Robert Evans <[email protected]> Committed: Mon Apr 2 09:07:28 2018 -0500 ---------------------------------------------------------------------- .../src/jvm/org/apache/storm/utils/Utils.java | 44 ++++++++++++++++- .../org/apache/storm/TestConfigValidate.java | 19 +++++++- .../jvm/org/apache/storm/utils/UtilsTest.java | 50 +++++++++++++++++++- 3 files changed, 109 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/402a371c/storm-client/src/jvm/org/apache/storm/utils/Utils.java ---------------------------------------------------------------------- diff --cc storm-client/src/jvm/org/apache/storm/utils/Utils.java index ba2ed74,d6eddfc..780d55b --- a/storm-client/src/jvm/org/apache/storm/utils/Utils.java +++ b/storm-client/src/jvm/org/apache/storm/utils/Utils.java @@@ -63,10 -63,12 +63,14 @@@ import java.util.regex.Matcher import java.util.regex.Pattern; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; import com.google.common.collect.Lists; + import com.google.common.collect.MapDifference; + import com.google.common.collect.MapDifference.ValueDifference; + import com.google.common.collect.Maps; + import org.apache.commons.io.FileUtils; import org.apache.commons.io.input.ClassLoaderObjectInputStream; import org.apache.storm.Config; http://git-wip-us.apache.org/repos/asf/storm/blob/402a371c/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java ----------------------------------------------------------------------
