refactor selfServiceApplicationUrl

OpenTOSCA · Dec 8, 2023 · 93b373e · 93b373e
1 parent f0318ce
commit 93b373e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 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
@@ -729,14 +729,14 @@ public static ServiceTemplateId completeModelBasedOnReqs(ServiceTemplateId incom
                         properties.setBoundaryXML(boundaryXML);
 
 
-//                        String xmlString = "<PropertiesNS><selfserviceApplicationUrl xmlns=\"http://www.eclipse.org/winery/model/selfservice\"/><qprovUrl xmlns=\"http://www.eclipse.org/winery/model/selfservice\"/></PropertiesNS>";
+//                        String xmlString = "<PropertiesNS><selfServiceApplicationUrl xmlns=\"http://www.eclipse.org/winery/model/selfservice\"/><qprovUrl xmlns=\"http://www.eclipse.org/winery/model/selfservice\"/></PropertiesNS>";
 //
 //                        XmlMapper xmlMapper = new XmlMapper();
 //                        PropertiesNS props = xmlMapper.readValue(xmlString, PropertiesNS.class);
 //                        props.setQprovUrl("http://www.eclipse.org/winery/model/selfservice");
 //                        props.setSelfserviceApplicationUrl("http://www.eclipse.org/winery/model/selfservice");
 //
-//                        System.out.println("selfserviceApplicationUrl: " + props.getSelfserviceApplicationUrl());
+//                        System.out.println("selfServiceApplicationUrl: " + props.getSelfserviceApplicationUrl());
 //                        System.out.println("qprovUrl: " + props.getQprovUrl());
 //                        properties.setAny(props);
 

diff --git a/...nery.model.tosca.canonical/src/main/java/org/eclipse/winery/model/tosca/TBoundaryXML.java b/...nery.model.tosca.canonical/src/main/java/org/eclipse/winery/model/tosca/TBoundaryXML.java
@@ -30,7 +30,7 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
     "qProvUrl",
-    "selfserviceApplicationUrl"
+    "selfServiceApplicationUrl"
 })
 public class TBoundaryXML implements Serializable {
     @XmlAttribute(name = "xmlns")
@@ -39,15 +39,15 @@ public class TBoundaryXML implements Serializable {
     @XmlElement(name = "qProvUrl")
     protected TQProvUrl qProvUrl;
 
-    @XmlElement(name = "selfserviceApplicationUrl")
-    protected TSelfServiceApplicationUrl selfserviceApplicationUrl;
+    @XmlElement(name = "selfServiceApplicationUrl")
+    protected TSelfServiceApplicationUrl selfServiceApplicationUrl;
 
     public TSelfServiceApplicationUrl getSelfserviceApplicationUrl() {
-        return selfserviceApplicationUrl;
+        return selfServiceApplicationUrl;
     }
 
-    public void setSelfserviceApplicationUrl(TSelfServiceApplicationUrl selfserviceApplicationUrl) {
-        this.selfserviceApplicationUrl = selfserviceApplicationUrl;
+    public void setSelfserviceApplicationUrl(TSelfServiceApplicationUrl selfServiceApplicationUrl) {
+        this.selfServiceApplicationUrl = selfServiceApplicationUrl;
     }
 
     public TQProvUrl getQProvUrl() {
@@ -72,7 +72,7 @@ public TBoundaryXML() {
 
     public TBoundaryXML(@NonNull TSelfServiceApplicationUrl selfServiceApplicationUrl, @NonNull TQProvUrl qProvUrl, @NonNull String namespace) {
         this.qProvUrl = qProvUrl;
-        this.selfserviceApplicationUrl = selfServiceApplicationUrl;
+        this.selfServiceApplicationUrl = selfServiceApplicationUrl;
         this.namespace = namespace;
     }
 

diff --git a/...inery.model.tosca.xml/src/main/java/org/eclipse/winery/model/tosca/xml/XTBoundaryXML.java b/...inery.model.tosca.xml/src/main/java/org/eclipse/winery/model/tosca/xml/XTBoundaryXML.java
@@ -29,23 +29,23 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
     "qProvUrl",
-    "selfserviceApplicationUrl"
+    "selfServiceApplicationUrl"
 })
 public class XTBoundaryXML implements Serializable {
     @XmlAttribute(name = "xmlns")
     protected String namespace;
     @XmlElement(name = "qProvUrl")
     protected XTQProvUrl qProvUrl;
 
-    @XmlElement(name = "selfserviceApplicationUrl")
-    protected XTSelfServiceApplicationUrl selfserviceApplicationUrl;
+    @XmlElement(name = "selfServiceApplicationUrl")
+    protected XTSelfServiceApplicationUrl selfServiceApplicationUrl;
 
     public XTSelfServiceApplicationUrl getSelfserviceApplicationUrl() {
-        return selfserviceApplicationUrl;
+        return selfServiceApplicationUrl;
     }
 
-    public void setSelfserviceApplicationUrl(XTSelfServiceApplicationUrl selfserviceApplicationUrl) {
-        this.selfserviceApplicationUrl = selfserviceApplicationUrl;
+    public void setSelfserviceApplicationUrl(XTSelfServiceApplicationUrl selfServiceApplicationUrl) {
+        this.selfServiceApplicationUrl = selfServiceApplicationUrl;
     }
 
     public XTQProvUrl getQProvUrl() {
@@ -70,7 +70,7 @@ public XTBoundaryXML() {
 
     public XTBoundaryXML(Builder builder) {
         this.qProvUrl = builder.qProvUrl;
-        this.selfserviceApplicationUrl = builder.selfServiceApplicationUrl;
+        this.selfServiceApplicationUrl = builder.selfServiceApplicationUrl;
         this.namespace = builder.namespace;
     }
 
@@ -84,7 +84,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(selfserviceApplicationUrl, qProvUrl, namespace);
+        return Objects.hash(selfServiceApplicationUrl, qProvUrl, namespace);
     }
 
 
@@ -94,9 +94,9 @@ public static class Builder {
         private final XTQProvUrl qProvUrl;
         private final String namespace;
 
-        public Builder(XTSelfServiceApplicationUrl selfserviceApplicationUrl, XTQProvUrl qProvUrl, String namespace) {
+        public Builder(XTSelfServiceApplicationUrl selfServiceApplicationUrl, XTQProvUrl qProvUrl, String namespace) {
             this.qProvUrl = qProvUrl;
-            this.selfServiceApplicationUrl = selfserviceApplicationUrl;
+            this.selfServiceApplicationUrl = selfServiceApplicationUrl;
             this.namespace = namespace;
         }