From 7a6564b8af410e3885df8b4080dfdbacc1e885c9 Mon Sep 17 00:00:00 2001
From: JensBuehring <jens.buehring@kapdion.com>
Date: Mon, 9 May 2022 11:25:41 +0200
Subject: [PATCH] =?UTF-8?q?Generierung=20Java=20Klassen=20f=C3=BCr=20Commo?=
 =?UTF-8?q?nServicesTypes=20angepasst,=20so=20dass=20die=20Bausteinlisten?=
 =?UTF-8?q?=20im=20Plural=20benannt=20sind.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../r1_8_0/common/KombinationType.java        | 19 ++++++++++---------
 .../r1_8_0/common/KombinationenType.java      | 19 ++++++++++---------
 .../common/KonvertierungBausteinType.java     | 18 +++++++++---------
 .../r1_8_0/omdsCommonServiceTypes_binding.xml | 17 +++++++++++++++++
 4 files changed, 46 insertions(+), 27 deletions(-)

diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KombinationType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KombinationType.java
index 0390882b..78f3e430 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KombinationType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KombinationType.java
@@ -32,26 +32,27 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "Kombination_Type", propOrder = {
-    "id"
+    "ids"
 })
 public class KombinationType {
 
     @XmlElement(name = "Id", required = true)
-    protected List<String> id;
+    protected List<String> ids;
 
     /**
-     * Gets the value of the id property.
+     * <p>Die Liste der zulässigen Baustein-Ids.</p>
+     * Gets the value of the ids property.
      * 
      * <p>
      * 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 <CODE>set</CODE> method for the id property.
+     * This is why there is not a <CODE>set</CODE> method for the ids property.
      * 
      * <p>
      * For example, to add a new item, do as follows:
      * <pre>
-     *    getId().add(newItem);
+     *    getIds().add(newItem);
      * </pre>
      * 
      * 
@@ -61,11 +62,11 @@ public class KombinationType {
      * 
      * 
      */
-    public List<String> getId() {
-        if (id == null) {
-            id = new ArrayList<String>();
+    public List<String> getIds() {
+        if (ids == null) {
+            ids = new ArrayList<String>();
         }
-        return this.id;
+        return this.ids;
     }
 
 }
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KombinationenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KombinationenType.java
index 4f6cc391..c21449cc 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KombinationenType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KombinationenType.java
@@ -32,26 +32,27 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "Kombinationen_Type", propOrder = {
-    "kombination"
+    "kombinationen"
 })
 public class KombinationenType {
 
     @XmlElement(name = "Kombination", required = true)
-    protected List<KombinationType> kombination;
+    protected List<KombinationType> kombinationen;
 
     /**
-     * Gets the value of the kombination property.
+     * <p>Die Liste der zulässigen Kombinationen.</p>
+     * Gets the value of the kombinationen property.
      * 
      * <p>
      * 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 <CODE>set</CODE> method for the kombination property.
+     * This is why there is not a <CODE>set</CODE> method for the kombinationen property.
      * 
      * <p>
      * For example, to add a new item, do as follows:
      * <pre>
-     *    getKombination().add(newItem);
+     *    getKombinationen().add(newItem);
      * </pre>
      * 
      * 
@@ -61,11 +62,11 @@ public class KombinationenType {
      * 
      * 
      */
-    public List<KombinationType> getKombination() {
-        if (kombination == null) {
-            kombination = new ArrayList<KombinationType>();
+    public List<KombinationType> getKombinationen() {
+        if (kombinationen == null) {
+            kombinationen = new ArrayList<KombinationType>();
         }
-        return this.kombination;
+        return this.kombinationen;
     }
 
 }
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/KonvertierungBausteinType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/KonvertierungBausteinType.java
index 1d11c400..d68ddbbe 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/KonvertierungBausteinType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/KonvertierungBausteinType.java
@@ -44,7 +44,7 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "KonvertierungBaustein_Type", propOrder = {
     "id",
     "bezeichnung",
-    "sparten",
+    "zulaessigeAktionen",
     "gewaehlteAktion",
     "zusatzinformation"
 })
@@ -55,7 +55,7 @@ public class KonvertierungBausteinType {
     @XmlElement(name = "Bezeichnung")
     protected String bezeichnung;
     @XmlElement(name = "ZulaessigeAktion")
-    protected List<KonvertierungsaktionType> sparten;
+    protected List<KonvertierungsaktionType> zulaessigeAktionen;
     @XmlElement(name = "GewaehlteAktion")
     protected KonvertierungsaktionType gewaehlteAktion;
     @XmlElement(name = "Zusatzinformation")
@@ -113,18 +113,18 @@ public class KonvertierungBausteinType {
      * <p>Die Liste der Aktionen, die für einen Vertragsbaustein zulässig sind.
      *          Die zulässigen Aktionen müssen nur im Response vom ServiceProvider (VU) befüllt werden.
      *          Im Request eines Konvertierungsvorschlags durch den Consumer, können sie leer bleiben. </p>
-     * Gets the value of the sparten property.
+     * Gets the value of the zulaessigeAktionen property.
      * 
      * <p>
      * 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 <CODE>set</CODE> method for the sparten property.
+     * This is why there is not a <CODE>set</CODE> method for the zulaessigeAktionen property.
      * 
      * <p>
      * For example, to add a new item, do as follows:
      * <pre>
-     *    getSparten().add(newItem);
+     *    getZulaessigeAktionen().add(newItem);
      * </pre>
      * 
      * 
@@ -134,11 +134,11 @@ public class KonvertierungBausteinType {
      * 
      * 
      */
-    public List<KonvertierungsaktionType> getSparten() {
-        if (sparten == null) {
-            sparten = new ArrayList<KonvertierungsaktionType>();
+    public List<KonvertierungsaktionType> getZulaessigeAktionen() {
+        if (zulaessigeAktionen == null) {
+            zulaessigeAktionen = new ArrayList<KonvertierungsaktionType>();
         }
-        return this.sparten;
+        return this.zulaessigeAktionen;
     }
 
     /**
diff --git a/OMDSServiceDefinition/src/main/resources/bind/r1_8_0/omdsCommonServiceTypes_binding.xml b/OMDSServiceDefinition/src/main/resources/bind/r1_8_0/omdsCommonServiceTypes_binding.xml
index 8307107a..bbf7ac6c 100644
--- a/OMDSServiceDefinition/src/main/resources/bind/r1_8_0/omdsCommonServiceTypes_binding.xml
+++ b/OMDSServiceDefinition/src/main/resources/bind/r1_8_0/omdsCommonServiceTypes_binding.xml
@@ -9,4 +9,21 @@ version="1.0"
    <jaxb:schemaBindings>
       <jaxb:package name="at.vvo.omds.types.omds3Types.r1_8_0.common"/>
    </jaxb:schemaBindings>
+
+   <jaxb:bindings node="//xs:complexType[@name='Kombinationen_Type']//xs:element[@name='Kombination']">
+      <jaxb:property name="kombinationen">
+         <jaxb:javadoc><![CDATA[<p>Die Liste der zulässigen Kombinationen.</p>
+]]></jaxb:javadoc>
+      </jaxb:property>
+   </jaxb:bindings>
+
+   <jaxb:bindings node="//xs:complexType[@name='Kombination_Type']//xs:element[@name='Id']">
+      <jaxb:property name="ids">
+         <jaxb:javadoc><![CDATA[<p>Die Liste der zulässigen Baustein-Ids.</p>
+]]></jaxb:javadoc>
+      </jaxb:property>
+   </jaxb:bindings>
+
+
+
 </jaxb:bindings>
\ No newline at end of file