From 93b373e48dcba68591d900fa5bbc0748b665cc22 Mon Sep 17 00:00:00 2001 From: mbeisel Date: Fri, 8 Dec 2023 19:07:47 +0100 Subject: [PATCH] refactor selfServiceApplicationUrl --- .../adaptation/placement/PlacementUtils.java | 4 ++-- .../winery/model/tosca/TBoundaryXML.java | 14 ++++++------- .../winery/model/tosca/xml/XTBoundaryXML.java | 20 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/org.eclipse.winery.model.adaptation/src/main/java/org/eclipse/winery/model/adaptation/placement/PlacementUtils.java b/org.eclipse.winery.model.adaptation/src/main/java/org/eclipse/winery/model/adaptation/placement/PlacementUtils.java index 1f2eaa76d1..25e2c1601e 100644 --- a/org.eclipse.winery.model.adaptation/src/main/java/org/eclipse/winery/model/adaptation/placement/PlacementUtils.java +++ b/org.eclipse.winery.model.adaptation/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 = ""; +// String xmlString = ""; // // 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/org.eclipse.winery.model/org.eclipse.winery.model.tosca.canonical/src/main/java/org/eclipse/winery/model/tosca/TBoundaryXML.java b/org.eclipse.winery.model/org.eclipse.winery.model.tosca.canonical/src/main/java/org/eclipse/winery/model/tosca/TBoundaryXML.java index f44116d6e9..696665d755 100644 --- a/org.eclipse.winery.model/org.eclipse.winery.model.tosca.canonical/src/main/java/org/eclipse/winery/model/tosca/TBoundaryXML.java +++ b/org.eclipse.winery.model/org.eclipse.winery.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/org.eclipse.winery.model/org.eclipse.winery.model.tosca.xml/src/main/java/org/eclipse/winery/model/tosca/xml/XTBoundaryXML.java b/org.eclipse.winery.model/org.eclipse.winery.model.tosca.xml/src/main/java/org/eclipse/winery/model/tosca/xml/XTBoundaryXML.java index 2815a13142..67480d43e8 100644 --- a/org.eclipse.winery.model/org.eclipse.winery.model.tosca.xml/src/main/java/org/eclipse/winery/model/tosca/xml/XTBoundaryXML.java +++ b/org.eclipse.winery.model/org.eclipse.winery.model.tosca.xml/src/main/java/org/eclipse/winery/model/tosca/xml/XTBoundaryXML.java @@ -29,7 +29,7 @@ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { "qProvUrl", - "selfserviceApplicationUrl" + "selfServiceApplicationUrl" }) public class XTBoundaryXML implements Serializable { @XmlAttribute(name = "xmlns") @@ -37,15 +37,15 @@ public class XTBoundaryXML implements Serializable { @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; }