From 664f018461de9a481312584422e5999d2140b05f Mon Sep 17 00:00:00 2001 From: JensBuehring Date: Fri, 3 Jun 2022 14:57:40 +0200 Subject: [PATCH] =?UTF-8?q?Kardinalit=C3=A4t=20f=C3=BCr=20Konvertierungsm?= =?UTF-8?q?=C3=B6glichkeit=20und=20Konvertierungsplan=20auf=201=20reduzier?= =?UTF-8?q?t.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/ConversionProposalRequest.java | 49 ++++++++--------- .../common/ConversionScopeResponse.java | 53 ++++++++----------- .../r1_8_0/service/OmdsService.java | 8 +-- .../r1_8_0/service/OmdsServicePortImpl.java | 2 +- .../r1_8_0/service/OmdsServicePortType.java | 2 +- ...ervicePortType_OmdsServicePort_Client.java | 2 +- .../r1_8_0/service/ServiceFaultMsg.java | 2 +- .../def/r1_8_0/omds3_ON2_Antrag_Common.xsd | 8 +-- 8 files changed, 56 insertions(+), 70 deletions(-) diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ConversionProposalRequest.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ConversionProposalRequest.java index 4281a01f..5cb8e74d 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ConversionProposalRequest.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ConversionProposalRequest.java @@ -1,8 +1,6 @@ package at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common; -import java.util.ArrayList; -import java.util.List; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; @@ -21,7 +19,7 @@ import at.vvo.omds.types.omds3Types.r1_8_0.common.CommonRequestType; * <complexContent> * <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonRequest_Type"> * <sequence> - * <element name="Konvertierungsplan" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}Konvertierungsumfang_Type" maxOccurs="unbounded"/> + * <element name="Konvertierungsplan" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}Konvertierungsumfang_Type"/> * </sequence> * </extension> * </complexContent> @@ -40,35 +38,30 @@ public class ConversionProposalRequest { @XmlElement(name = "Konvertierungsplan", required = true) - protected List konvertierungsplan; + protected KonvertierungsumfangType konvertierungsplan; /** - * Gets the value of the konvertierungsplan property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the konvertierungsplan property. - * - *

- * For example, to add a new item, do as follows: - * 

-     *    getKonvertierungsplan().add(newItem);
-     *
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link KonvertierungsumfangType } - * + * Ruft den Wert der konvertierungsplan-Eigenschaft ab. * + * @return + * possible object is + * {@link KonvertierungsumfangType } + * */ - public List getKonvertierungsplan() { - if (konvertierungsplan == null) { - konvertierungsplan = new ArrayList(); - } - return this.konvertierungsplan; + public KonvertierungsumfangType getKonvertierungsplan() { + return konvertierungsplan; + } + + /** + * Legt den Wert der konvertierungsplan-Eigenschaft fest. + * + * @param value + * allowed object is + * {@link KonvertierungsumfangType } + * + */ + public void setKonvertierungsplan(KonvertierungsumfangType value) { + this.konvertierungsplan = value; } } diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ConversionScopeResponse.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ConversionScopeResponse.java index 238c7df7..a8c5818b 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ConversionScopeResponse.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ConversionScopeResponse.java @@ -1,8 +1,6 @@ package at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common; -import java.util.ArrayList; -import java.util.List; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; @@ -21,7 +19,7 @@ import at.vvo.omds.types.omds3Types.r1_8_0.common.CommonResponseType; * <complexContent> * <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonResponse_Type"> * <sequence> - * <element name="Scope" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}Konvertierungsumfang_Type" maxOccurs="unbounded"/> + * <element name="Konvertierungsmoeglichkeit" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}Konvertierungsumfang_Type"/> * </sequence> * </extension> * </complexContent> @@ -32,43 +30,38 @@ import at.vvo.omds.types.omds3Types.r1_8_0.common.CommonResponseType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { - "scope" + "konvertierungsmoeglichkeit" }) @XmlRootElement(name = "ConversionScopeResponse") public class ConversionScopeResponse extends CommonResponseType { - @XmlElement(name = "Scope", required = true) - protected List scope; + @XmlElement(name = "Konvertierungsmoeglichkeit", required = true) + protected KonvertierungsumfangType konvertierungsmoeglichkeit; /** - * Gets the value of the scope property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the scope property. - * - *

- * For example, to add a new item, do as follows: - * 

-     *    getScope().add(newItem);
-     *
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link KonvertierungsumfangType } - * + * Ruft den Wert der konvertierungsmoeglichkeit-Eigenschaft ab. * + * @return + * possible object is + * {@link KonvertierungsumfangType } + * */ - public List getScope() { - if (scope == null) { - scope = new ArrayList(); - } - return this.scope; + public KonvertierungsumfangType getKonvertierungsmoeglichkeit() { + return konvertierungsmoeglichkeit; + } + + /** + * Legt den Wert der konvertierungsmoeglichkeit-Eigenschaft fest. + * + * @param value + * allowed object is + * {@link KonvertierungsumfangType } + * + */ + public void setKonvertierungsmoeglichkeit(KonvertierungsumfangType value) { + this.konvertierungsmoeglichkeit = value; } } diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsService.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsService.java index b3237e96..809d44bf 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsService.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsService.java @@ -10,12 +10,12 @@ import javax.xml.ws.Service; /** * This class was generated by Apache CXF 3.5.0 - * 2022-05-13T13:48:10.802+02:00 + * 2022-06-03T14:46:49.877+02:00 * Generated source version: 3.5.0 * */ @WebServiceClient(name = "omdsService", - wsdlLocation = "file:/C:/Users/jensb/git/omdsservicedefinitions2/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3Services.wsdl", + wsdlLocation = "file:/C:/Users/jensb/git/omdsservicedefinitions_master/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3Services.wsdl", targetNamespace = "urn:omds3Services-1-4-0") public class OmdsService extends Service { @@ -26,11 +26,11 @@ public class OmdsService extends Service { static { URL url = null; try { - url = new URL("file:/C:/Users/jensb/git/omdsservicedefinitions2/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3Services.wsdl"); + url = new URL("file:/C:/Users/jensb/git/omdsservicedefinitions_master/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3Services.wsdl"); } catch (MalformedURLException e) { java.util.logging.Logger.getLogger(OmdsService.class.getName()) .log(java.util.logging.Level.INFO, - "Can not initialize the default wsdl from {0}", "file:/C:/Users/jensb/git/omdsservicedefinitions2/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3Services.wsdl"); + "Can not initialize the default wsdl from {0}", "file:/C:/Users/jensb/git/omdsservicedefinitions_master/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3Services.wsdl"); } WSDL_LOCATION = url; } diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsServicePortImpl.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsServicePortImpl.java index 7029ca8f..1acb9e6b 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsServicePortImpl.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsServicePortImpl.java @@ -16,7 +16,7 @@ import javax.xml.bind.annotation.XmlSeeAlso; /** * This class was generated by Apache CXF 3.5.0 - * 2022-06-02T16:53:58.058+02:00 + * 2022-06-03T14:46:49.846+02:00 * Generated source version: 3.5.0 * */ diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsServicePortType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsServicePortType.java index 192b6911..4cef3b21 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsServicePortType.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsServicePortType.java @@ -9,7 +9,7 @@ import javax.xml.bind.annotation.XmlSeeAlso; /** * This class was generated by Apache CXF 3.5.0 - * 2022-06-02T16:53:58.086+02:00 + * 2022-06-03T14:46:49.862+02:00 * Generated source version: 3.5.0 * */ diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsServicePortType_OmdsServicePort_Client.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsServicePortType_OmdsServicePort_Client.java index 8749b634..e88e23dc 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsServicePortType_OmdsServicePort_Client.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsServicePortType_OmdsServicePort_Client.java @@ -19,7 +19,7 @@ import javax.xml.bind.annotation.XmlSeeAlso; /** * This class was generated by Apache CXF 3.5.0 - * 2022-06-02T16:53:57.984+02:00 + * 2022-06-03T14:46:49.774+02:00 * Generated source version: 3.5.0 * */ diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/ServiceFaultMsg.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/ServiceFaultMsg.java index 4aed7a34..67b7cec3 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/ServiceFaultMsg.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/ServiceFaultMsg.java @@ -6,7 +6,7 @@ import javax.xml.ws.WebFault; /** * This class was generated by Apache CXF 3.5.0 - * 2022-06-02T16:53:58.053+02:00 + * 2022-06-03T14:46:49.846+02:00 * Generated source version: 3.5.0 */ diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3_ON2_Antrag_Common.xsd b/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3_ON2_Antrag_Common.xsd index 87d0c034..ee6fe341 100644 --- a/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3_ON2_Antrag_Common.xsd +++ b/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3_ON2_Antrag_Common.xsd @@ -537,9 +537,9 @@ - + - Konvertierungsmöglichkeiten + Eine Konvertierungsmöglichkeit oder mehrere Möglichkeiten. @@ -555,9 +555,9 @@ - + - Angabe auf welchem Vertrag oder welchen Verträgen der neue Vertrag aufgebaut werden soll + Angabe auf welchem Vertrag oder welchen Verträgen der neue Vertrag aufgebaut werden soll.