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 7157f7fb163624e25707257ddc2742c43f8f3ef8 Author: iuliana <[email protected]> AuthorDate: Wed Jun 2 11:17:35 2021 +0100 Fixed implementation to re-order spec tag values --- .../org/apache/brooklyn/rest/transform/TypeTransformer.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TypeTransformer.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TypeTransformer.java index 683d9d2..a047a85 100644 --- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TypeTransformer.java +++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TypeTransformer.java @@ -101,7 +101,7 @@ public class TypeTransformer { } } - // adding tag type spec hierarchy using hierarchy tag + // create summary tag for the current plan SpecSummary currentSpec = SpecSummary.builder() .format(StringUtils.isBlank(item.getPlan().getPlanFormat()) ? CampTypePlanTransformer.FORMAT : item.getPlan().getPlanFormat()) // the default type implementation is camp in this location, but hierarchy tag provides the original implementation, so it takes precedence. @@ -110,14 +110,13 @@ public class TypeTransformer { .build(); List<SpecSummary> specTag = BrooklynTags.findSpecHierarchyTag(item.getTags()); + List<SpecSummary> specList = MutableList.of(currentSpec); if(specTag!= null){ - SpecSummary.modifyHeadSummary(specTag, s -> "Converted to "+s); - SpecSummary.pushToList(specTag, currentSpec); - } else { - specTag = MutableList.of(currentSpec); + // put the original spec tags first + SpecSummary.modifyHeadSummary(specList, s -> "Converted to "+s); + SpecSummary.pushToList(specList, specTag); } - - result.setExtraField("specList", specTag); + result.setExtraField("specList", specList); if (detail) { if (RegisteredTypes.isSubtypeOf(item, Entity.class)) {
