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 1a2be8d1a1dd6f4cfbd795ac93d276065e750951 Author: iuliana <[email protected]> AuthorDate: Tue May 25 17:19:36 2021 +0100 Made sure there are not plans with duplicate summaries --- .../apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java | 2 ++ .../org/apache/brooklyn/core/typereg/AbstractTypePlanTransformer.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java index 57e18ad..96e91f6 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java @@ -266,6 +266,8 @@ public class CatalogYamlEntityTest extends AbstractYamlTest { // tests that the plan tag was set assertTrue(entity.tags().getTags().stream().anyMatch(tag -> tag instanceof BrooklynTags.SpecTag)); + BrooklynTags.SpecTag specTag = (BrooklynTags.SpecTag) entity.tags().getTags().stream().filter(tag -> tag instanceof BrooklynTags.SpecTag).findAny().orElse(null); + assertEquals(specTag.getSpecList().size(), 2); deleteCatalogRegisteredType(referencedSymbolicName); deleteCatalogRegisteredType(referrerSymbolicName); 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 3a28a87..5b051e8 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 @@ -164,7 +164,7 @@ public abstract class AbstractTypePlanTransformer implements BrooklynTypePlanTra protected AbstractBrooklynObjectSpec<?,?> decorateWithHierarchySpecTag(AbstractBrooklynObjectSpec<?, ?> spec, RegisteredType type, final String format) { BrooklynTags.SpecTag currentSpecTag = new BrooklynTags.HierarchySpecTagBuilder() .format(format) - .summary(format + " plan for " + (Strings.isNonBlank(type.getDisplayName())? type.getDisplayName() : spec.getDisplayName())) + .summary(format + " plan for " + (Strings.isNonBlank(type.getSymbolicName())? type.getSymbolicName() : type.getDisplayName())) .contents(type.getPlan().getPlanData()) .build();
