Repository: samza Updated Branches: refs/heads/master c3db20483 -> 90f3ff622
SAMZA-1307 - Fix ZkKeyBuilder null checks for pathPrefix Author: Navina Ramesh <nav...@apache.org> Reviewers: Jagadish V <jagad...@apache.org> Closes #202 from navina/SAMZA-1307 Project: http://git-wip-us.apache.org/repos/asf/samza/repo Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/90f3ff62 Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/90f3ff62 Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/90f3ff62 Branch: refs/heads/master Commit: 90f3ff6228355e27dfbc783b0beb96e3a430954f Parents: c3db204 Author: Navina Ramesh <nav...@apache.org> Authored: Tue May 23 23:33:09 2017 -0700 Committer: nramesh <nram...@linkedin.com> Committed: Tue May 23 23:33:09 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/samza/zk/ZkKeyBuilder.java | 10 +++++----- .../org/apache/samza/zk/TestZkKeyBuilder.java | 20 ++++++++------------ 2 files changed, 13 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/samza/blob/90f3ff62/samza-core/src/main/java/org/apache/samza/zk/ZkKeyBuilder.java ---------------------------------------------------------------------- diff --git a/samza-core/src/main/java/org/apache/samza/zk/ZkKeyBuilder.java b/samza-core/src/main/java/org/apache/samza/zk/ZkKeyBuilder.java index 7452a97..7e4e0d6 100644 --- a/samza-core/src/main/java/org/apache/samza/zk/ZkKeyBuilder.java +++ b/samza-core/src/main/java/org/apache/samza/zk/ZkKeyBuilder.java @@ -19,7 +19,6 @@ package org.apache.samza.zk; -import org.apache.samza.SamzaException; import com.google.common.base.Strings; /** @@ -53,10 +52,11 @@ public class ZkKeyBuilder { static final String JOBMODEL_GENERATION_PATH = "JobModelGeneration"; public ZkKeyBuilder(String pathPrefix) { - if (Strings.isNullOrEmpty(pathPrefix)) { - throw new SamzaException("Zk PathPrefix cannot be null or empty!"); + if (pathPrefix != null && !pathPrefix.trim().isEmpty()) { + this.pathPrefix = pathPrefix.trim(); + } else { + throw new IllegalArgumentException("Zk PathPrefix cannot be null or empty!"); } - this.pathPrefix = pathPrefix.trim(); } public String getRootPath() { @@ -87,7 +87,7 @@ public class ZkKeyBuilder { } public String getJobModelPathPrefix() { - return String.format("%s/%s/jobModels", getRootPath(), JOBMODEL_GENERATION_PATH, pathPrefix); + return String.format("%s/%s/jobModels", getRootPath(), JOBMODEL_GENERATION_PATH); } public String getJobModelPath(String jobModelVersion) { http://git-wip-us.apache.org/repos/asf/samza/blob/90f3ff62/samza-core/src/test/java/org/apache/samza/zk/TestZkKeyBuilder.java ---------------------------------------------------------------------- diff --git a/samza-core/src/test/java/org/apache/samza/zk/TestZkKeyBuilder.java b/samza-core/src/test/java/org/apache/samza/zk/TestZkKeyBuilder.java index 3134cfa..6d0bc0b 100644 --- a/samza-core/src/test/java/org/apache/samza/zk/TestZkKeyBuilder.java +++ b/samza-core/src/test/java/org/apache/samza/zk/TestZkKeyBuilder.java @@ -18,22 +18,19 @@ */ package org.apache.samza.zk; -import org.apache.samza.SamzaException; import org.junit.Assert; import org.junit.Test; public class TestZkKeyBuilder { - @Test - public void pathPrefixCannotBeNullOrEmpty() { - try { - new ZkKeyBuilder(""); - Assert.fail("Key Builder was created with empty path prefix!"); - new ZkKeyBuilder(null); - Assert.fail("Key Builder was created with null path prefix!"); - } catch (SamzaException e) { - // Expected - } + @Test(expected = IllegalArgumentException.class) + public void pathPrefixCannotBeNull() { + new ZkKeyBuilder(null); + } + + @Test(expected = IllegalArgumentException.class) + public void pathPrefixCannotBeEmpty() { + new ZkKeyBuilder(" "); } @Test @@ -53,7 +50,6 @@ public class TestZkKeyBuilder { @Test public void testJobModelPath() { - ZkKeyBuilder builder = new ZkKeyBuilder("test"); Assert.assertEquals("/test/" + ZkKeyBuilder.JOBMODEL_GENERATION_PATH + "/jobModelVersion", builder.getJobModelVersionPath());
