You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/06/15 09:41:31 UTC
[07/10] incubator-brooklyn git commit: minor toString improvement and
deprecation tidy
minor toString improvement and deprecation tidy
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/4c714ad1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/4c714ad1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/4c714ad1
Branch: refs/heads/master
Commit: 4c714ad13ff2f1561fabe91257b2f8fdde9188d6
Parents: 098b5a0
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Jun 11 22:25:52 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Jun 11 22:25:52 2015 +0100
----------------------------------------------------------------------
.../brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java | 3 ++-
.../common/src/main/java/brooklyn/util/exceptions/Exceptions.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c714ad1/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java
index 108cd98..4c3f40b 100644
--- a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java
+++ b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java
@@ -46,6 +46,7 @@ import brooklyn.util.flags.FlagUtils;
import brooklyn.util.flags.TypeCoercions;
import brooklyn.util.javalang.Reflections;
import brooklyn.util.task.DeferredSupplier;
+import brooklyn.util.text.Strings;
import com.google.common.base.Function;
import com.google.common.collect.Iterables;
@@ -204,7 +205,7 @@ public class BrooklynDslCommon {
@Override
public String toString() {
- return "$brooklyn:formatString("+pattern+")";
+ return "$brooklyn:formatString("+pattern+(args==null || args.length==0 ? "" : ","+Strings.join(args, ","))+")";
}
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c714ad1/utils/common/src/main/java/brooklyn/util/exceptions/Exceptions.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/exceptions/Exceptions.java b/utils/common/src/main/java/brooklyn/util/exceptions/Exceptions.java
index 57dbf54..eaea58c 100644
--- a/utils/common/src/main/java/brooklyn/util/exceptions/Exceptions.java
+++ b/utils/common/src/main/java/brooklyn/util/exceptions/Exceptions.java
@@ -162,7 +162,7 @@ public class Exceptions {
message = collapsed.getMessage();
messageIsFinal = true;
} else if (Strings.isNonBlank(collapsedS)) {
- collapsedS = Strings.removeFromEnd(collapsedS, cause.toString(), stripBoringPrefixes(cause.toString()), cause.getMessage());
+ collapsedS = Strings.removeAllFromEnd(collapsedS, cause.toString(), stripBoringPrefixes(cause.toString()), cause.getMessage());
collapsedS = stripBoringPrefixes(collapsedS);
if (Strings.isNonBlank(collapsedS))
message = appendSeparator(message, collapsedS);