include tags

OpenTOSCA · Jan 11, 2024 · 88b64e3 · 88b64e3
1 parent 93b373e
commit 88b64e3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/...daptation/src/main/java/org/eclipse/winery/model/adaptation/placement/PlacementUtils.java b/...daptation/src/main/java/org/eclipse/winery/model/adaptation/placement/PlacementUtils.java
@@ -667,6 +667,7 @@ public static ServiceTemplateId completeModelBasedOnReqs(ServiceTemplateId incom
                 .setName(placementId.getXmlId().getDecoded())
                 .setTargetNamespace(incompleteServiceTemplateId.getNamespace().getDecoded())
 //                .setBoundaryDefinitions(incompleteServiceTemplate.getBoundaryDefinitions())
+                .setTags(incompleteServiceTemplate.getTags())
                 .build();
 
             // resolve open requirements until the topology is completed

diff --git a/....model.tosca.canonical/src/main/java/org/eclipse/winery/model/tosca/TServiceTemplate.java b/....model.tosca.canonical/src/main/java/org/eclipse/winery/model/tosca/TServiceTemplate.java
@@ -215,6 +215,11 @@ public Builder setSubstitutableNodeType(QName substitutableNodeType) {
             return this;
         }
 
+        public Builder setTags(List<TTag> tags) {
+            super.addTags(tags);
+            return this;
+        }
+
         @Override
         public Builder self() {
             return this;

diff --git a/...se.winery.repository/src/main/java/org/eclipse/winery/repository/splitting/Splitting.java b/...se.winery.repository/src/main/java/org/eclipse/winery/repository/splitting/Splitting.java
@@ -1745,6 +1745,7 @@ public ServiceTemplateId completeNextRequirement(ServiceTemplateId id, List<QNam
         matchedServiceTemplate.setId(matchedServiceTemplate.getName());
         matchedServiceTemplate.setTargetNamespace(id.getNamespace().getDecoded());
         matchedServiceTemplate.setTags(serviceTemplate.getTags());
+        assert topologyTemplate != null;
         topologyTemplate.getNodeTemplates().forEach(t -> ModelUtilities.setTargetLabel(t, "*"));
         matchedServiceTemplate.setTopologyTemplate(getMatchingTopology(BackendUtils.clone(matchedServiceTemplate), blacklist, policies));