fix StringFunctions.formatterForIterable for null input
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b9c52232 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b9c52232 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b9c52232 Branch: refs/heads/master Commit: b9c5223241c1322704ee158da17ae08ed515ed15 Parents: 0f59c13 Author: Robert Moss <[email protected]> Authored: Fri Oct 9 09:20:43 2015 +0100 Committer: Robert Moss <[email protected]> Committed: Fri Oct 9 09:20:43 2015 +0100 ---------------------------------------------------------------------- .../apache/brooklyn/enricher/stock/reducer/ReducerTest.java | 6 ++++-- .../java/org/apache/brooklyn/util/text/StringFunctions.java | 8 ++------ 2 files changed, 6 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b9c52232/core/src/test/java/org/apache/brooklyn/enricher/stock/reducer/ReducerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/enricher/stock/reducer/ReducerTest.java b/core/src/test/java/org/apache/brooklyn/enricher/stock/reducer/ReducerTest.java index d14f78c..2b9f32b 100644 --- a/core/src/test/java/org/apache/brooklyn/enricher/stock/reducer/ReducerTest.java +++ b/core/src/test/java/org/apache/brooklyn/enricher/stock/reducer/ReducerTest.java @@ -33,6 +33,7 @@ import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.text.StringFunctions; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -202,8 +203,9 @@ public class ReducerTest extends BrooklynAppUnitTestSupport { ); Asserts.fail("Expected exception when adding reducing enricher with unknown named function"); } catch (Exception e) { - Throwable t = Exceptions.getFirstThrowableOfType(e, IllegalStateException.class); - Assert.assertNotNull(t); + if (Exceptions.getFirstThrowableOfType(e, IllegalStateException.class) == null) { + throw e; + } } } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b9c52232/utils/common/src/main/java/org/apache/brooklyn/util/text/StringFunctions.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/text/StringFunctions.java b/utils/common/src/main/java/org/apache/brooklyn/util/text/StringFunctions.java index d9f8fce..8ac249d 100644 --- a/utils/common/src/main/java/org/apache/brooklyn/util/text/StringFunctions.java +++ b/utils/common/src/main/java/org/apache/brooklyn/util/text/StringFunctions.java @@ -75,7 +75,8 @@ public class StringFunctions { public static Function<Iterable<?>, String> formatterForIterable(final String pattern) { return new Function<Iterable<?>, String>() { public String apply(@Nullable Iterable<?> input) { - return String.format(pattern, Iterables.toArray(input, Object.class)); + Object[] arr = (input == null) ? null : Iterables.toArray(input, Object.class); + return String.format(pattern, arr); } }; } @@ -165,9 +166,4 @@ public class StringFunctions { } }; } - - - - - }
