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 2018/04/02 14:28:11 UTC
[1/5] storm git commit: STORM-2649 More detailed check of config
serialization
Repository: storm
Updated Branches:
refs/heads/master 76af86b58 -> 402a371cc
STORM-2649 More detailed check of config serialization
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/840c6c96
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/840c6c96
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/840c6c96
Branch: refs/heads/master
Commit: 840c6c969f0fda0292c4fe3c07a3126ab1072d18
Parents: a38f0c5
Author: Gergely Hajos <ro...@gmail.com>
Authored: Sun Feb 25 19:32:45 2018 +0100
Committer: Gergely Hajos <ro...@gmail.com>
Committed: Fri Mar 2 15:42:50 2018 +0100
----------------------------------------------------------------------
.../src/jvm/org/apache/storm/utils/Utils.java | 34 ++++++++++++++++++--
.../jvm/org/apache/storm/utils/UtilsTest.java | 24 +++++++++++++-
2 files changed, 55 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/840c6c96/storm-client/src/jvm/org/apache/storm/utils/Utils.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/utils/Utils.java b/storm-client/src/jvm/org/apache/storm/utils/Utils.java
index 26d267e..222b6c2 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/Utils.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/Utils.java
@@ -65,6 +65,10 @@ import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;
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;
@@ -1030,8 +1034,34 @@ public class Utils {
return ret;
}
- public static boolean isValidConf(Map<String, Object> topoConf) {
- return normalizeConf(topoConf).equals(normalizeConf((Map<String, Object>) JSONValue.parse(JSONValue.toJSONString(topoConf))));
+ @SuppressWarnings("unchecked")
+ public static boolean isValidConf(Map<String, Object> topoConfIn) {
+ Map<String, Object> origTopoConf = normalizeConf(topoConfIn);
+ Map<String, Object> deserTopoConf = normalizeConf(
+ (Map<String, Object>) JSONValue.parse(JSONValue.toJSONString(topoConfIn)));
+ return confMapDiff(origTopoConf, deserTopoConf);
+ }
+
+ @VisibleForTesting
+ static boolean confMapDiff(Map<String, Object> orig, Map<String, Object> deser) {
+ MapDifference<String, Object> diff = Maps.difference(orig, deser);
+ if (diff.areEqual()) {
+ return true;
+ }
+ for (Map.Entry<String, Object> entryOnLeft : diff.entriesOnlyOnLeft().entrySet()) {
+ LOG.warn("Config property not serializable. Name: {} - Value: {}", entryOnLeft.getKey(), entryOnLeft.getValue());
+ }
+ for (Map.Entry<String, Object> entryOnRight : diff.entriesOnlyOnRight().entrySet()) {
+ LOG.warn("Some config property changed during serialization. Changed Name: {} - Value: {}", entryOnRight.getKey(),
+ entryOnRight.getValue());
+ }
+ for (Map.Entry<String, ValueDifference<Object>> entryDiffers : diff.entriesDiffering().entrySet()) {
+ Object leftValue = entryDiffers.getValue().leftValue();
+ Object rightValue = entryDiffers.getValue().rightValue();
+ LOG.warn("Config value differs after json serialization. Name: {} - Original Value: {} - DeSer. Value: {}",
+ entryDiffers.getKey(), leftValue, rightValue);
+ }
+ return false;
}
public static TopologyInfo getTopologyInfo(String name, String asUser, Map<String, Object> topoConf) {
http://git-wip-us.apache.org/repos/asf/storm/blob/840c6c96/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java b/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java
index c8499e9..f595d80 100644
--- a/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java
+++ b/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java
@@ -18,16 +18,19 @@
package org.apache.storm.utils;
+import org.apache.curator.shaded.com.google.common.collect.ImmutableList;
+import org.apache.curator.shaded.com.google.common.collect.ImmutableSet;
import org.apache.storm.Config;
import org.apache.thrift.transport.TTransportException;
import org.junit.Assert;
import org.junit.Test;
+import com.google.common.collect.ImmutableMap;
+
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.ArrayList;
public class UtilsTest {
@@ -173,4 +176,23 @@ public class UtilsTest {
}
}
}
+
+ @Test
+ public void testMapDiff() {
+ Map<String, Object> map0 = ImmutableMap.of();
+ Assert.assertTrue("case0", Utils.confMapDiff(map0, map0));
+ Map<String, Object> map1 = ImmutableMap.of("k0", ImmutableList.of(1L, 2L), "k1", ImmutableSet.of('s', 'f'),
+ "k2", "as");
+ Assert.assertTrue("case1", Utils.confMapDiff(map1, map1));
+ Map<String, Object> map2 = ImmutableMap.of("k0", ImmutableList.of(1L, 2L), "k1", ImmutableSet.of('s', 'f'),
+ "k2", "as");
+ Assert.assertTrue("case2", Utils.confMapDiff(map2, map2));
+ Map<String, Object> map3 = ImmutableMap.of("k0", ImmutableList.of(1L, 2L), "k1", ImmutableSet.of('s', 't'),
+ "k2", "as");
+ Assert.assertFalse("case3", Utils.confMapDiff(map1, map3));
+ Map<String, Object> map4 = ImmutableMap.of("k0", 2L);
+ Map<String, Object> map5 = ImmutableMap.of("k0", 3L);
+ Assert.assertFalse("case4", Utils.confMapDiff(map4, map5));
+ Assert.assertFalse("case5", Utils.confMapDiff(map0, map5));
+ }
}
[2/5] storm git commit: STORM-2649 More detailed check of config
serialization
Posted by bo...@apache.org.
STORM-2649 More detailed check of config serialization
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8d8bed80
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8d8bed80
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8d8bed80
Branch: refs/heads/master
Commit: 8d8bed80ad2d3edc561214271aa26f1cd87292a5
Parents: 840c6c9
Author: Gergely Hajos <ro...@gmail.com>
Authored: Sat Mar 3 12:50:55 2018 +0100
Committer: Gergely Hajos <ro...@gmail.com>
Committed: Sat Mar 3 12:50:55 2018 +0100
----------------------------------------------------------------------
.../src/jvm/org/apache/storm/utils/Utils.java | 13 ++---
.../jvm/org/apache/storm/utils/UtilsTest.java | 56 ++++++++++++++------
2 files changed, 48 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/8d8bed80/storm-client/src/jvm/org/apache/storm/utils/Utils.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/utils/Utils.java b/storm-client/src/jvm/org/apache/storm/utils/Utils.java
index 222b6c2..4ba527b 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/Utils.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/Utils.java
@@ -1039,27 +1039,28 @@ public class Utils {
Map<String, Object> origTopoConf = normalizeConf(topoConfIn);
Map<String, Object> deserTopoConf = normalizeConf(
(Map<String, Object>) JSONValue.parse(JSONValue.toJSONString(topoConfIn)));
- return confMapDiff(origTopoConf, deserTopoConf);
+ return checkMapEquality(origTopoConf, deserTopoConf);
}
@VisibleForTesting
- static boolean confMapDiff(Map<String, Object> orig, Map<String, Object> deser) {
+ static boolean checkMapEquality(Map<String, Object> orig, Map<String, Object> deser) {
MapDifference<String, Object> diff = Maps.difference(orig, deser);
if (diff.areEqual()) {
return true;
}
for (Map.Entry<String, Object> entryOnLeft : diff.entriesOnlyOnLeft().entrySet()) {
- LOG.warn("Config property not serializable. Name: {} - Value: {}", entryOnLeft.getKey(), entryOnLeft.getValue());
+ LOG.warn("Config property not serializable. Name: {} - Value: {}", entryOnLeft.getKey(),
+ entryOnLeft.getValue());
}
for (Map.Entry<String, Object> entryOnRight : diff.entriesOnlyOnRight().entrySet()) {
- LOG.warn("Some config property changed during serialization. Changed Name: {} - Value: {}", entryOnRight.getKey(),
- entryOnRight.getValue());
+ LOG.warn("Some config property changed during serialization. Changed Name: {} - Value: {}",
+ entryOnRight.getKey(), entryOnRight.getValue());
}
for (Map.Entry<String, ValueDifference<Object>> entryDiffers : diff.entriesDiffering().entrySet()) {
Object leftValue = entryDiffers.getValue().leftValue();
Object rightValue = entryDiffers.getValue().rightValue();
LOG.warn("Config value differs after json serialization. Name: {} - Original Value: {} - DeSer. Value: {}",
- entryDiffers.getKey(), leftValue, rightValue);
+ entryDiffers.getKey(), leftValue, rightValue);
}
return false;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/8d8bed80/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java b/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java
index f595d80..afd8b8d 100644
--- a/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java
+++ b/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java
@@ -178,21 +178,47 @@ public class UtilsTest {
}
@Test
- public void testMapDiff() {
- Map<String, Object> map0 = ImmutableMap.of();
- Assert.assertTrue("case0", Utils.confMapDiff(map0, map0));
- Map<String, Object> map1 = ImmutableMap.of("k0", ImmutableList.of(1L, 2L), "k1", ImmutableSet.of('s', 'f'),
- "k2", "as");
- Assert.assertTrue("case1", Utils.confMapDiff(map1, map1));
+ public void testCheckMapEqualityEmpty() {
+ Map<String, Object> map0 = ImmutableMap.of();
+ Assert.assertTrue(Utils.checkMapEquality(map0, map0));
+ }
+
+ @Test
+ public void testCheckMapEqualityIdentical() {
+ Map<String, Object> map1 = ImmutableMap.of("k0", ImmutableList.of(1L, 2L), "k1", ImmutableSet.of('s', 'f'),
+ "k2", "as");
+ Assert.assertTrue(Utils.checkMapEquality(map1, map1));
+ }
+
+ @Test
+ public void testCheckMapEqualityEqual() {
+ Map<String, Object> map1 = ImmutableMap.of("k0", ImmutableList.of(1L, 2L), "k1", ImmutableSet.of('s', 'f'),
+ "k2", "as");
Map<String, Object> map2 = ImmutableMap.of("k0", ImmutableList.of(1L, 2L), "k1", ImmutableSet.of('s', 'f'),
- "k2", "as");
- Assert.assertTrue("case2", Utils.confMapDiff(map2, map2));
- Map<String, Object> map3 = ImmutableMap.of("k0", ImmutableList.of(1L, 2L), "k1", ImmutableSet.of('s', 't'),
- "k2", "as");
- Assert.assertFalse("case3", Utils.confMapDiff(map1, map3));
- Map<String, Object> map4 = ImmutableMap.of("k0", 2L);
- Map<String, Object> map5 = ImmutableMap.of("k0", 3L);
- Assert.assertFalse("case4", Utils.confMapDiff(map4, map5));
- Assert.assertFalse("case5", Utils.confMapDiff(map0, map5));
+ "k2", "as");
+ Assert.assertTrue(Utils.checkMapEquality(map1, map2)); // test deep equal
+ }
+
+ @Test
+ public void testCheckMapEqualityNotEqual() {
+ Map<String, Object> map1 = ImmutableMap.of("k0", ImmutableList.of(1L, 2L), "k1", ImmutableSet.of('s', 'f'),
+ "k2", "as");
+ Map<String, Object> map3 = ImmutableMap.of("k0", ImmutableList.of(1L, 2L), "k1", ImmutableSet.of('s', 't'),
+ "k2", "as");
+ Assert.assertFalse(Utils.checkMapEquality(map1, map3));
+ }
+
+ @Test
+ public void testCheckMapEqualityPrimitiveNotEqual() {
+ Map<String, Object> map4 = ImmutableMap.of("k0", 2L);
+ Map<String, Object> map5 = ImmutableMap.of("k0", 3L);
+ Assert.assertFalse(Utils.checkMapEquality(map4, map5));
+ }
+
+ @Test
+ public void testCheckMapEqualityEmptyNotEqual() {
+ Map<String, Object> map0 = ImmutableMap.of();
+ Map<String, Object> map5 = ImmutableMap.of("k0", 3L);
+ Assert.assertFalse(Utils.checkMapEquality(map0, map5));
}
}
[5/5] storm git commit: Merge branch 'STORM-2649' of
https://github.com/ghajos/storm into STORM-2649
Posted by bo...@apache.org.
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 <ev...@yahoo-inc.com>
Authored: Mon Apr 2 09:07:28 2018 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
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
----------------------------------------------------------------------
[4/5] storm git commit: STORM-2649 More detailed check of config
serialization
Posted by bo...@apache.org.
STORM-2649 More detailed check of config serialization
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0a48fd9d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0a48fd9d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0a48fd9d
Branch: refs/heads/master
Commit: 0a48fd9ded9a9afbc08ef17d59292891d4aff2fc
Parents: b99d80c
Author: Hajós Gergely <gh...@adverticum.com>
Authored: Mon Apr 2 12:47:24 2018 +0200
Committer: Hajós Gergely <gh...@adverticum.com>
Committed: Mon Apr 2 12:47:24 2018 +0200
----------------------------------------------------------------------
.../src/jvm/org/apache/storm/utils/Utils.java | 25 +++++++++++++-------
.../org/apache/storm/TestConfigValidate.java | 19 ++++++++++++++-
.../jvm/org/apache/storm/utils/UtilsTest.java | 24 +++++++++----------
3 files changed, 47 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/0a48fd9d/storm-client/src/jvm/org/apache/storm/utils/Utils.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/utils/Utils.java b/storm-client/src/jvm/org/apache/storm/utils/Utils.java
index 4ba527b..d6eddfc 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/Utils.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/Utils.java
@@ -1037,24 +1037,33 @@ public class Utils {
@SuppressWarnings("unchecked")
public static boolean isValidConf(Map<String, Object> topoConfIn) {
Map<String, Object> origTopoConf = normalizeConf(topoConfIn);
- Map<String, Object> deserTopoConf = normalizeConf(
- (Map<String, Object>) JSONValue.parse(JSONValue.toJSONString(topoConfIn)));
- return checkMapEquality(origTopoConf, deserTopoConf);
+ try {
+ Map<String, Object> deserTopoConf = normalizeConf(
+ (Map<String, Object>) JSONValue.parseWithException(JSONValue.toJSONString(topoConfIn)));
+ return isValidConf(origTopoConf, deserTopoConf);
+ } catch (ParseException e) {
+ LOG.error("Json serialized config could not be deserialized", e);
+ }
+ return false;
}
@VisibleForTesting
- static boolean checkMapEquality(Map<String, Object> orig, Map<String, Object> deser) {
+ static boolean isValidConf(Map<String, Object> orig, Map<String, Object> deser) {
MapDifference<String, Object> diff = Maps.difference(orig, deser);
if (diff.areEqual()) {
return true;
}
for (Map.Entry<String, Object> entryOnLeft : diff.entriesOnlyOnLeft().entrySet()) {
- LOG.warn("Config property not serializable. Name: {} - Value: {}", entryOnLeft.getKey(),
- entryOnLeft.getValue());
+ LOG.warn("Config property ({}) is found in original config, but missing from the "
+ + "serialized-deserialized config. This is due to an internal error in "
+ + "serialization. Name: {} - Value: {}",
+ entryOnLeft.getKey(), entryOnLeft.getKey(), entryOnLeft.getValue());
}
for (Map.Entry<String, Object> entryOnRight : diff.entriesOnlyOnRight().entrySet()) {
- LOG.warn("Some config property changed during serialization. Changed Name: {} - Value: {}",
- entryOnRight.getKey(), entryOnRight.getValue());
+ LOG.warn("Config property ({}) is not found in original config, but present in "
+ + "serialized-deserialized config. This is due to an internal error in "
+ + "serialization. Name: {} - Value: {}",
+ entryOnRight.getKey(), entryOnRight.getKey(), entryOnRight.getValue());
}
for (Map.Entry<String, ValueDifference<Object>> entryDiffers : diff.entriesDiffering().entrySet()) {
Object leftValue = entryDiffers.getValue().leftValue();
http://git-wip-us.apache.org/repos/asf/storm/blob/0a48fd9d/storm-client/test/jvm/org/apache/storm/TestConfigValidate.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/TestConfigValidate.java b/storm-client/test/jvm/org/apache/storm/TestConfigValidate.java
index b3e25c1..0911900 100644
--- a/storm-client/test/jvm/org/apache/storm/TestConfigValidate.java
+++ b/storm-client/test/jvm/org/apache/storm/TestConfigValidate.java
@@ -212,8 +212,25 @@ public class TestConfigValidate {
testList.add(2);
testList.add(new Integer("3"));
testList.add(new Long("4"));
+ testList.add(new Float("3"));
+ testList.add(new Double("4"));
+ testList.add(ImmutableList.of("asdf", 3));
conf.put("eee", testList);
- Utils.isValidConf(conf);
+ Assert.assertTrue(Utils.isValidConf(conf));
+ }
+
+ @Test
+ public void testNonValidConfigChar() {
+ Map<String, Object> conf = new HashMap<String, Object>();
+ conf.put("q", ImmutableList.of("asdf", 'c'));
+ Assert.assertFalse(Utils.isValidConf(conf));
+ }
+
+ @Test
+ public void testNonValidConfigRandomObject() {
+ Map<String, Object> conf = new HashMap<String, Object>();
+ conf.put("q", ImmutableList.of("asdf", new TestConfigValidate()));
+ Assert.assertFalse(Utils.isValidConf(conf));
}
@Test
http://git-wip-us.apache.org/repos/asf/storm/blob/0a48fd9d/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java b/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java
index 7f06f9a..664364b 100644
--- a/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java
+++ b/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java
@@ -178,47 +178,47 @@ public class UtilsTest {
}
@Test
- public void testCheckMapEqualityEmpty() {
+ public void testIsValidConfEmpty() {
Map<String, Object> map0 = ImmutableMap.of();
- Assert.assertTrue(Utils.checkMapEquality(map0, map0));
+ Assert.assertTrue(Utils.isValidConf(map0, map0));
}
@Test
- public void testCheckMapEqualityIdentical() {
+ public void testIsValidConfIdentical() {
Map<String, Object> map1 = ImmutableMap.of("k0", ImmutableList.of(1L, 2L), "k1", ImmutableSet.of('s', 'f'),
"k2", "as");
- Assert.assertTrue(Utils.checkMapEquality(map1, map1));
+ Assert.assertTrue(Utils.isValidConf(map1, map1));
}
@Test
- public void testCheckMapEqualityEqual() {
+ public void testIsValidConfEqual() {
Map<String, Object> map1 = ImmutableMap.of("k0", ImmutableList.of(1L, 2L), "k1", ImmutableSet.of('s', 'f'),
"k2", "as");
Map<String, Object> map2 = ImmutableMap.of("k0", ImmutableList.of(1L, 2L), "k1", ImmutableSet.of('s', 'f'),
"k2", "as");
- Assert.assertTrue(Utils.checkMapEquality(map1, map2)); // test deep equal
+ Assert.assertTrue(Utils.isValidConf(map1, map2)); // test deep equal
}
@Test
- public void testCheckMapEqualityNotEqual() {
+ public void testIsValidConfNotEqual() {
Map<String, Object> map1 = ImmutableMap.of("k0", ImmutableList.of(1L, 2L), "k1", ImmutableSet.of('s', 'f'),
"k2", "as");
Map<String, Object> map3 = ImmutableMap.of("k0", ImmutableList.of(1L, 2L), "k1", ImmutableSet.of('s', 't'),
"k2", "as");
- Assert.assertFalse(Utils.checkMapEquality(map1, map3));
+ Assert.assertFalse(Utils.isValidConf(map1, map3));
}
@Test
- public void testCheckMapEqualityPrimitiveNotEqual() {
+ public void testIsValidConfPrimitiveNotEqual() {
Map<String, Object> map4 = ImmutableMap.of("k0", 2L);
Map<String, Object> map5 = ImmutableMap.of("k0", 3L);
- Assert.assertFalse(Utils.checkMapEquality(map4, map5));
+ Assert.assertFalse(Utils.isValidConf(map4, map5));
}
@Test
- public void testCheckMapEqualityEmptyNotEqual() {
+ public void testIsValidConfEmptyNotEqual() {
Map<String, Object> map0 = ImmutableMap.of();
Map<String, Object> map5 = ImmutableMap.of("k0", 3L);
- Assert.assertFalse(Utils.checkMapEquality(map0, map5));
+ Assert.assertFalse(Utils.isValidConf(map0, map5));
}
}
[3/5] storm git commit: STORM-2649 More detailed check of config
serialization
Posted by bo...@apache.org.
STORM-2649 More detailed check of config serialization
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b99d80ce
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b99d80ce
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b99d80ce
Branch: refs/heads/master
Commit: b99d80ce60132b5a731ff54cdd5601fbd8295b24
Parents: 8d8bed8
Author: Gergely Hajos <ro...@gmail.com>
Authored: Tue Mar 6 18:34:36 2018 +0100
Committer: Gergely Hajos <ro...@gmail.com>
Committed: Tue Mar 6 18:34:36 2018 +0100
----------------------------------------------------------------------
storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/b99d80ce/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java b/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java
index afd8b8d..7f06f9a 100644
--- a/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java
+++ b/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java
@@ -18,14 +18,14 @@
package org.apache.storm.utils;
-import org.apache.curator.shaded.com.google.common.collect.ImmutableList;
-import org.apache.curator.shaded.com.google.common.collect.ImmutableSet;
import org.apache.storm.Config;
import org.apache.thrift.transport.TTransportException;
import org.junit.Assert;
import org.junit.Test;
+import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
import java.util.Arrays;
import java.util.HashMap;