fix selfservice stuff

OpenTOSCA · Dec 4, 2023 · 9f96ab3 · 9f96ab3
1 parent d7ea8d7
commit 9f96ab3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 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
@@ -706,7 +706,7 @@ public static ServiceTemplateId completeModelBasedOnReqs(ServiceTemplateId incom
                         }
                     }
                     if (suitableIPKey != null && suitablePortKey != null) {
-                        String targetPropertyRef = "concat('http://', " + nt.getId() + ".Properties." + suitableIPKey + ", ':', " + nt.getId() + ".Properties." + suitablePortKey + "')";
+                        String targetPropertyRef = "concat('http://', " + nt.getId() + ".Properties." + suitableIPKey + ", ':', " + nt.getId() + ".Properties." + suitablePortKey + ")";
                         TPropertyMapping selfserviceProperty = new TPropertyMapping("/*[local-name()='selfserviceApplicationUrl']", nt, targetPropertyRef);
                         propertyMappings.add(selfserviceProperty);
                         properties.setPropertyMappings(propertyMappings);
@@ -743,13 +743,15 @@ public static ServiceTemplateId completeModelBasedOnReqs(ServiceTemplateId incom
      * @param topology topology of the servicetemplate to check for equivalency
      * @return
      */
-    public static List<ServiceTemplateId> checkServiceTemplateForEquivalency(ServiceTemplateId serviceTemplateId, TTopologyTemplate topology) {
+    public static List<ServiceTemplateId> checkServiceTemplateForEquivalency(ServiceTemplateId serviceTemplateId, TTopologyTemplate topology, Boolean includeSelf) {
         List<TNodeTemplate> nodeTemplates = topology.getNodeTemplates();
         List<TRelationshipTemplate> relationshipTemplates = topology.getRelationshipTemplates();
+        Set<ServiceTemplateId> serviceTemplateIds = RepositoryFactory.getRepository().getAllDefinitionsChildIds(ServiceTemplateId.class);
+        if (!includeSelf) {
+            serviceTemplateIds = serviceTemplateIds.stream().filter(id -> !id.equals(serviceTemplateId)).collect(Collectors.toSet());
+        }
 
-        return RepositoryFactory.getRepository().getAllDefinitionsChildIds(ServiceTemplateId.class).stream()
-            // remove self
-            .filter(id -> !id.equals(serviceTemplateId))
+        return serviceTemplateIds.stream()
             // remove topologies that contain different nodetemplates/relationshiptemplates 
             .filter(id -> {
                 TServiceTemplate serviceTemplateFilter = RepositoryFactory.getRepository().getElement(id);

diff --git a/...el.tosca.canonical/src/main/java/org/eclipse/winery/model/tosca/TBoundaryDefinitions.java b/...el.tosca.canonical/src/main/java/org/eclipse/winery/model/tosca/TBoundaryDefinitions.java
@@ -160,7 +160,7 @@ public static class Properties implements Serializable {
         @XmlElementWrapper(name = "PropertyMappings")
         @XmlElement(name = "PropertyMapping", required = true)
         protected List<TPropertyMapping> propertyMappings;
-        @XmlElement(name = "SelfServiceApplicationUrl")
+        @XmlElement(name = "selfserviceApplicationUrl")
         protected TSelfServiceApplicationUrl selfServiceApplicationUrl;
 
         @Nullable

diff --git a/...del.tosca.xml/src/main/java/org/eclipse/winery/model/tosca/xml/XTBoundaryDefinitions.java b/...del.tosca.xml/src/main/java/org/eclipse/winery/model/tosca/xml/XTBoundaryDefinitions.java
@@ -160,7 +160,7 @@ public static class Properties implements Serializable {
         @XmlElementWrapper(name = "PropertyMappings")
         @XmlElement(name = "PropertyMapping", required = true)
         protected List<XTPropertyMapping> propertyMappings;
-        @XmlElement(name = "SelfServiceApplicationUrl")
+        @XmlElement(name = "selfserviceApplicationUrl")
         protected XTSelfServiceApplicationUrl selfServiceApplicationUrl;
 
         @Nullable

diff --git a/...epository/rest/resources/servicetemplates/topologytemplates/TopologyTemplateResource.java b/...epository/rest/resources/servicetemplates/topologytemplates/TopologyTemplateResource.java
@@ -27,6 +27,7 @@
 import java.util.stream.Collectors;
 
 import javax.ws.rs.Consumes;
+import javax.ws.rs.DefaultValue;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.PUT;
@@ -619,10 +620,12 @@ public Response completeModel(@Context UriInfo uriInfo, CompletionInputData comp
     @POST
     @Path("checkforequivalentcsars")
     @Produces(MediaType.APPLICATION_JSON)
-    public Response checkEquivalency(@Context UriInfo uriInfo) {
+    public Response checkEquivalency(@Context UriInfo uriInfo,
+                                     @DefaultValue("false")
+                                     @QueryParam(value = "includeSelf") Boolean includeSelf) {
         try {
             List<ServiceTemplateId> equivalentTemplateIds =
-                PlacementUtils.checkServiceTemplateForEquivalency((ServiceTemplateId) this.parent.getId(), this.topologyTemplate);
+                PlacementUtils.checkServiceTemplateForEquivalency((ServiceTemplateId) this.parent.getId(), this.topologyTemplate, includeSelf);
             List<URI> urls = equivalentTemplateIds.stream().map( id -> uriInfo.getBaseUri().resolve(RestUtils.getAbsoluteURL(id))).toList();
             return Response.ok(urls).build();
         } catch (InvalidParameterException e) {