This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit db93ff862b0e6821df8cf50fc255131c5802e755 Author: iuliana <[email protected]> AuthorDate: Wed May 26 15:22:38 2021 +0100 Added argument for custom summary --- .../camp/brooklyn/spi/creation/CampTypePlanTransformer.java | 2 +- .../apache/brooklyn/core/typereg/AbstractTypePlanTransformer.java | 8 ++++++-- .../brooklyn/core/typereg/JavaClassNameTypePlanTransformer.java | 2 +- .../brooklyn/core/catalog/internal/StaticTypePlanTransformer.java | 4 ++-- .../brooklyn/core/typereg/ExampleXmlTypePlanTransformer.java | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampTypePlanTransformer.java b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampTypePlanTransformer.java index 8dc8508..b76cd19 100644 --- a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampTypePlanTransformer.java +++ b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampTypePlanTransformer.java @@ -106,7 +106,7 @@ public class CampTypePlanTransformer extends AbstractTypePlanTransformer { @Override protected AbstractBrooklynObjectSpec<?, ?> createSpec(RegisteredType type, RegisteredTypeLoadingContext context) throws Exception { try { - return decorateWithHierarchySpecTag(new CampResolver(mgmt, type, context).createSpec(), type, FORMAT); + return decorateWithHierarchySpecTag(new CampResolver(mgmt, type, context).createSpec(), type, FORMAT, null); } catch (Exception e) { Exceptions.propagateIfFatal(e); String message = null; diff --git a/core/src/main/java/org/apache/brooklyn/core/typereg/AbstractTypePlanTransformer.java b/core/src/main/java/org/apache/brooklyn/core/typereg/AbstractTypePlanTransformer.java index 5b051e8..acff741 100644 --- a/core/src/main/java/org/apache/brooklyn/core/typereg/AbstractTypePlanTransformer.java +++ b/core/src/main/java/org/apache/brooklyn/core/typereg/AbstractTypePlanTransformer.java @@ -161,10 +161,14 @@ public abstract class AbstractTypePlanTransformer implements BrooklynTypePlanTra protected abstract Object createBean(RegisteredType type, RegisteredTypeLoadingContext context) throws Exception; - protected AbstractBrooklynObjectSpec<?,?> decorateWithHierarchySpecTag(AbstractBrooklynObjectSpec<?, ?> spec, RegisteredType type, final String format) { + protected AbstractBrooklynObjectSpec<?,?> decorateWithHierarchySpecTag(AbstractBrooklynObjectSpec<?, ?> spec, RegisteredType type, final String format, final String summary) { + final String specSummary = Strings.isBlank(summary) + ? format + " plan for " + (Strings.isNonBlank(type.getSymbolicName())? type.getSymbolicName() : type.getDisplayName()) + : summary; + BrooklynTags.SpecTag currentSpecTag = new BrooklynTags.HierarchySpecTagBuilder() .format(format) - .summary(format + " plan for " + (Strings.isNonBlank(type.getSymbolicName())? type.getSymbolicName() : type.getDisplayName())) + .summary(specSummary) .contents(type.getPlan().getPlanData()) .build(); diff --git a/core/src/main/java/org/apache/brooklyn/core/typereg/JavaClassNameTypePlanTransformer.java b/core/src/main/java/org/apache/brooklyn/core/typereg/JavaClassNameTypePlanTransformer.java index 196a254..6bfe0a7 100644 --- a/core/src/main/java/org/apache/brooklyn/core/typereg/JavaClassNameTypePlanTransformer.java +++ b/core/src/main/java/org/apache/brooklyn/core/typereg/JavaClassNameTypePlanTransformer.java @@ -65,7 +65,7 @@ public class JavaClassNameTypePlanTransformer extends AbstractTypePlanTransforme @SuppressWarnings({ "unchecked" }) @Override protected AbstractBrooklynObjectSpec<?,?> createSpec(RegisteredType type, RegisteredTypeLoadingContext context) throws Exception { - return decorateWithHierarchySpecTag(RegisteredTypes.newSpecInstance(mgmt, (Class<? extends BrooklynObject>) getType(type, context)), type, FORMAT); + return decorateWithHierarchySpecTag(RegisteredTypes.newSpecInstance(mgmt, (Class<? extends BrooklynObject>) getType(type, context)), type, FORMAT, null); } @Override diff --git a/core/src/test/java/org/apache/brooklyn/core/catalog/internal/StaticTypePlanTransformer.java b/core/src/test/java/org/apache/brooklyn/core/catalog/internal/StaticTypePlanTransformer.java index ff3ec69..2524564 100644 --- a/core/src/test/java/org/apache/brooklyn/core/catalog/internal/StaticTypePlanTransformer.java +++ b/core/src/test/java/org/apache/brooklyn/core/catalog/internal/StaticTypePlanTransformer.java @@ -93,9 +93,9 @@ public class StaticTypePlanTransformer extends AbstractTypePlanTransformer { @Override protected AbstractBrooklynObjectSpec<?, ?> createSpec(RegisteredType type, RegisteredTypeLoadingContext context) throws Exception { if (REGISTERED_SPECS.containsKey(type.getSymbolicName())) - return decorateWithHierarchySpecTag(get(type.getSymbolicName()), type, FORMAT); + return decorateWithHierarchySpecTag(get(type.getSymbolicName()), type, FORMAT, null ); if (type.getPlan().getPlanData()!=null && REGISTERED_SPECS.containsKey(type.getPlan().getPlanData())) - return decorateWithHierarchySpecTag(get((String)type.getPlan().getPlanData()), type, FORMAT); + return decorateWithHierarchySpecTag(get((String)type.getPlan().getPlanData()), type, FORMAT, null); return null; } diff --git a/core/src/test/java/org/apache/brooklyn/core/typereg/ExampleXmlTypePlanTransformer.java b/core/src/test/java/org/apache/brooklyn/core/typereg/ExampleXmlTypePlanTransformer.java index b82031c..be3bd54 100644 --- a/core/src/test/java/org/apache/brooklyn/core/typereg/ExampleXmlTypePlanTransformer.java +++ b/core/src/test/java/org/apache/brooklyn/core/typereg/ExampleXmlTypePlanTransformer.java @@ -69,7 +69,7 @@ public class ExampleXmlTypePlanTransformer extends AbstractTypePlanTransformer { @Override protected AbstractBrooklynObjectSpec<?, ?> createSpec(RegisteredType type, RegisteredTypeLoadingContext context) throws Exception { return decorateWithHierarchySpecTag(toEntitySpec(parseXml((String)type.getPlan().getPlanData()), - isApplicationExpected(type, context) ? 0 : 1), type, "example-xml"); + isApplicationExpected(type, context) ? 0 : 1), type, "example-xml", null); } private static boolean isApplicationExpected(RegisteredType type, RegisteredTypeLoadingContext context) {
