From b1a71206df3840a1d326608a5539bc9dc6492d73 Mon Sep 17 00:00:00 2001 From: JensBuehring Date: Sat, 29 Jan 2022 08:22:49 +0100 Subject: [PATCH] Merge branch 'master' of https://bitbucket.org/omds/omdsservicedefinitions into develop # Conflicts: # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungsartType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonProcessRequestType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonProcessResponseType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonRequestType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonResponseType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DateianhangType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DokumentDataType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DokumentInfoType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/KontierungType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ObjectFactory.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokumentBasisType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VersichertesInteresseType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZahlungsdatenType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZahlwegType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/ObjectFactory.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CalculateRequestType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CalculateResponseType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateApplicationRequestType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateApplicationResponseType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateOfferRequestType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateOfferResponseType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/FetchPolicyRequestType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/FetchPolicyResponseType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/ObjectFactory.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SpezAntragType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SubmitApplicationRequestType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SubmitApplicationResponseType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/FetchPolicyKfzResponse.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ObjectFactory.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ObjectFactory.java # OMDSServiceDefinition/src/main/resources/def/r1_7_0/ReleaseNotes-1-7-0.txt # OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds214-00.xsd # OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3CommonServiceTypes.xsd # OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3Services.wsdl # OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON1_Basisfunktionen.xsd # OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Common.xsd # OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Kfz.xsd # OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Kranken.xsd # OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON7_Schaden.xsd --- OMDSServiceDefinition/pom.xml | 14 +---- .../omds2Types/v2_14/ELLegitimationType.java | 5 ++ .../r1_8_0/common/LegitimationType.java | 61 +++++++++++++++++++ .../r1_8_0/common/ObjectFactory.java | 8 +++ ...atzversicherungUnfallinvaliditaetType.java | 2 +- .../ZusatzversicherungUnfalltodType.java | 2 +- .../r1_8_0/service/OmdsService.java | 2 +- .../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_7_0/omds3CommonServiceTypes.xsd | 7 --- .../def/r1_8_0/omds3CommonServiceTypes.xsd | 7 +++ 13 files changed, 89 insertions(+), 27 deletions(-) create mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/LegitimationType.java diff --git a/OMDSServiceDefinition/pom.xml b/OMDSServiceDefinition/pom.xml index d6655883..7467f3bb 100644 --- a/OMDSServiceDefinition/pom.xml +++ b/OMDSServiceDefinition/pom.xml @@ -253,19 +253,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs - - - - - - - - - - - - - + diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/ELLegitimationType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/ELLegitimationType.java index 57721525..b48f4392 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/ELLegitimationType.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds2Types/v2_14/ELLegitimationType.java @@ -4,8 +4,10 @@ package at.vvo.omds.types.omds2Types.v2_14; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; import javax.xml.datatype.XMLGregorianCalendar; +import at.vvo.omds.types.omds3Types.r1_8_0.common.LegitimationType; /** @@ -44,6 +46,9 @@ import javax.xml.datatype.XMLGregorianCalendar; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "EL-Legitimation_Type") +@XmlSeeAlso({ + LegitimationType.class +}) public class ELLegitimationType { @XmlAttribute(name = "LegArtCd", required = true) diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/LegitimationType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/LegitimationType.java new file mode 100644 index 00000000..d2476ba8 --- /dev/null +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/LegitimationType.java @@ -0,0 +1,61 @@ + +package at.vvo.omds.types.omds3Types.r1_8_0.common; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; +import at.vvo.omds.types.omds2Types.v2_14.ELLegitimationType; + + +/** + *

Java-Klasse für Legitimation_Type complex type. + * + *

Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist. + * + * 

+ * <complexType name="Legitimation_Type">
+ *   <complexContent>
+ *     <extension base="{urn:omds20}EL-Legitimation_Type">
+ *       <attribute name="AusstellendesLand" type="{urn:omds20}LandesCd_Type" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Legitimation_Type") +public class LegitimationType + extends ELLegitimationType +{ + + @XmlAttribute(name = "AusstellendesLand", namespace = "urn:omds3CommonServiceTypes-1-1-0") + protected String ausstellendesLand; + + /** + * Ruft den Wert der ausstellendesLand-Eigenschaft ab. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAusstellendesLand() { + return ausstellendesLand; + } + + /** + * Legt den Wert der ausstellendesLand-Eigenschaft fest. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAusstellendesLand(String value) { + this.ausstellendesLand = value; + } + +} diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ObjectFactory.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ObjectFactory.java index e69028ff..e4e03258 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ObjectFactory.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ObjectFactory.java @@ -149,6 +149,14 @@ public class ObjectFactory { return new Referenz(); } + /** + * Create an instance of {@link LegitimationType } + * + */ + public LegitimationType createLegitimationType() { + return new LegitimationType(); + } + /** * Create an instance of {@link DokumentBinaryDataType } * diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/leben/ZusatzversicherungUnfallinvaliditaetType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/leben/ZusatzversicherungUnfallinvaliditaetType.java index 8467056a..c5ab9836 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/leben/ZusatzversicherungUnfallinvaliditaetType.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/leben/ZusatzversicherungUnfallinvaliditaetType.java @@ -49,7 +49,7 @@ public class ZusatzversicherungUnfallinvaliditaetType * Sie rufen diese "catch-all"-Eigenschaft aus folgendem Grund ab: * Der Feldname "Versicherungssumme" wird von zwei verschiedenen Teilen eines Schemas verwendet. Siehe: * Zeile 131 von file:/C:/Users/jensb/git/omdsservicedefinitions2/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3_ON2_Antrag_Leben.xsd - * Zeile 1373 von file:/C:/Users/jensb/git/omdsservicedefinitions2/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3CommonServiceTypes.xsd + * Zeile 1380 von file:/C:/Users/jensb/git/omdsservicedefinitions2/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3CommonServiceTypes.xsd *

* Um diese Eigenschaft zu entfernen, wenden Sie eine Eigenschaftenanpassung für eine * der beiden folgenden Deklarationen an, um deren Namen zu ändern: diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/leben/ZusatzversicherungUnfalltodType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/leben/ZusatzversicherungUnfalltodType.java index f0036038..5c16309c 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/leben/ZusatzversicherungUnfalltodType.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/leben/ZusatzversicherungUnfalltodType.java @@ -49,7 +49,7 @@ public class ZusatzversicherungUnfalltodType * Sie rufen diese "catch-all"-Eigenschaft aus folgendem Grund ab: * Der Feldname "Versicherungssumme" wird von zwei verschiedenen Teilen eines Schemas verwendet. Siehe: * Zeile 119 von file:/C:/Users/jensb/git/omdsservicedefinitions2/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3_ON2_Antrag_Leben.xsd - * Zeile 1373 von file:/C:/Users/jensb/git/omdsservicedefinitions2/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3CommonServiceTypes.xsd + * Zeile 1380 von file:/C:/Users/jensb/git/omdsservicedefinitions2/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3CommonServiceTypes.xsd *

* Um diese Eigenschaft zu entfernen, wenden Sie eine Eigenschaftenanpassung für eine * der beiden folgenden Deklarationen an, um deren Namen zu ändern: 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 672dcf52..6a0a44c4 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,7 +10,7 @@ import javax.xml.ws.Service; /** * This class was generated by Apache CXF 3.5.0 - * 2022-01-28T17:18:11.468+01:00 + * 2022-01-29T08:20:53.861+01:00 * Generated source version: 3.5.0 * */ 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 e5bcb0fb..7a5076d2 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-01-28T17:18:11.405+01:00 + * 2022-01-29T08:20:53.843+01: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 4d45c104..c30e3565 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-01-28T17:18:11.453+01:00 + * 2022-01-29T08:20:53.856+01: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 0ba19ea6..1478f34e 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-01-28T17:18:11.263+01:00 + * 2022-01-29T08:20:53.797+01: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 ade2b4b8..09dd8734 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-01-28T17:18:11.389+01:00 + * 2022-01-29T08:20:53.840+01:00 * Generated source version: 3.5.0 */ diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3CommonServiceTypes.xsd b/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3CommonServiceTypes.xsd index 9b5d2c2e..0fb3bae2 100644 --- a/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3CommonServiceTypes.xsd +++ b/OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3CommonServiceTypes.xsd @@ -640,13 +640,6 @@ - - - - - - - Typ zur Übergabe personenbezogener Daten, entspricht weitgehend OMDS Datensatz PERSON_Type, die Personennr ist aber optional. Die Person kann eine Adresse enthalten. Die Adresse hat aber keine Id. diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3CommonServiceTypes.xsd b/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3CommonServiceTypes.xsd index 6520e740..9aa93e84 100644 --- a/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3CommonServiceTypes.xsd +++ b/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3CommonServiceTypes.xsd @@ -639,6 +639,13 @@ + + + + + + + Typ zur Übergabe personenbezogener Daten, entspricht weitgehend OMDS Datensatz PERSON_Type, die Personennr ist aber optional. Die Person kann eine Adresse enthalten. Die Adresse hat aber keine Id.