From 4a36ee295cf7a62e9450dc39d44ffc93f70531dd Mon Sep 17 00:00:00 2001 From: Jens Buehring Date: Thu, 24 Sep 2020 16:45:32 +0200 Subject: [PATCH] Anpassungen Feedback Martin Hartl zu Leben am 11.9. --- .../common/ElementFondsauswahlType.java | 124 ++++++++++++++++++ .../r1_6_0/common/FATCANatPersonType.java | 30 +---- .../omds3Types/r1_6_0/common/FATCAType.java | 28 ++++ .../r1_6_0/common/ObjectFactory.java | 8 ++ .../on2antrag/leben/TarifLebenType.java | 4 +- .../VersicherungssummeZusatzbausteinType.java | 4 +- .../ChangeCommunicationObjectRequestType.java | 8 +- .../r1_6_0/service/OmdsService.java | 2 +- .../r1_6_0/service/OmdsServicePortImpl.java | 2 +- .../r1_6_0/service/OmdsServicePortType.java | 2 +- ...ervicePortType_OmdsServicePort_Client.java | 2 +- .../r1_6_0/service/ServiceFaultMsg.java | 2 +- .../def/r1_6_0/omds3CommonServiceTypes.xsd | 25 +++- .../def/r1_6_0/omds3_ON2_Antrag_Leben.xsd | 6 +- 14 files changed, 199 insertions(+), 48 deletions(-) create mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/common/ElementFondsauswahlType.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/common/ElementFondsauswahlType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/common/ElementFondsauswahlType.java new file mode 100644 index 00000000..ab2cb30f --- /dev/null +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/common/ElementFondsauswahlType.java @@ -0,0 +1,124 @@ + +package at.vvo.omds.types.omds3Types.r1_6_0.common; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + * Ein einzelnes Element einer Fondsauswahl + * + *

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

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

+ * <complexType name="ElementFondsauswahl_Type">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <choice>
+ *           <element name="ISIN" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *           <element name="WKN" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         </choice>
+ *         <element name="Prozentanteil" type="{http://www.w3.org/2001/XMLSchema}unsignedByte" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "ElementFondsauswahl_Type", propOrder = { + "isin", + "wkn", + "prozentanteil" +}) +public class ElementFondsauswahlType { + + @XmlElement(name = "ISIN") + protected String isin; + @XmlElement(name = "WKN") + protected String wkn; + @XmlElement(name = "Prozentanteil") + @XmlSchemaType(name = "unsignedByte") + protected Short prozentanteil; + + /** + * Ruft den Wert der isin-Eigenschaft ab. + * + * @return + * possible object is + * {@link String } + * + */ + public String getISIN() { + return isin; + } + + /** + * Legt den Wert der isin-Eigenschaft fest. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setISIN(String value) { + this.isin = value; + } + + /** + * Ruft den Wert der wkn-Eigenschaft ab. + * + * @return + * possible object is + * {@link String } + * + */ + public String getWKN() { + return wkn; + } + + /** + * Legt den Wert der wkn-Eigenschaft fest. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setWKN(String value) { + this.wkn = value; + } + + /** + * Ruft den Wert der prozentanteil-Eigenschaft ab. + * + * @return + * possible object is + * {@link Short } + * + */ + public Short getProzentanteil() { + return prozentanteil; + } + + /** + * Legt den Wert der prozentanteil-Eigenschaft fest. + * + * @param value + * allowed object is + * {@link Short } + * + */ + public void setProzentanteil(Short value) { + this.prozentanteil = value; + } + +} diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/common/FATCANatPersonType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/common/FATCANatPersonType.java index 8b4e5b6e..3cf2d006 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/common/FATCANatPersonType.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/common/FATCANatPersonType.java @@ -22,7 +22,6 @@ import javax.xml.bind.annotation.XmlType; * <element name="Geburtsland" type="{urn:omds3CommonServiceTypes-1-1-0}AttributEnum_Type"/> * <element name="US_Indizien" type="{http://www.w3.org/2001/XMLSchema}boolean"/> * <element name="US_Steuerpflicht" type="{http://www.w3.org/2001/XMLSchema}boolean"/> - * <element name="US_TIN" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -35,8 +34,7 @@ import javax.xml.bind.annotation.XmlType; @XmlType(name = "FATCA_NatPersonType", propOrder = { "geburtsland", "usIndizien", - "usSteuerpflicht", - "ustin" + "usSteuerpflicht" }) public class FATCANatPersonType { @@ -46,8 +44,6 @@ public class FATCANatPersonType { protected boolean usIndizien; @XmlElement(name = "US_Steuerpflicht") protected boolean usSteuerpflicht; - @XmlElement(name = "US_TIN") - protected String ustin; /** * Ruft den Wert der geburtsland-Eigenschaft ab. @@ -105,28 +101,4 @@ public class FATCANatPersonType { this.usSteuerpflicht = value; } - /** - * Ruft den Wert der ustin-Eigenschaft ab. - * - * @return - * possible object is - * {@link String } - * - */ - public String getUSTIN() { - return ustin; - } - - /** - * Legt den Wert der ustin-Eigenschaft fest. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setUSTIN(String value) { - this.ustin = value; - } - } diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/common/FATCAType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/common/FATCAType.java index 61c20cb8..e81b19c3 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/common/FATCAType.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/common/FATCAType.java @@ -19,6 +19,7 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <choice> + * <element name="US_TIN" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="FATCA_NatPerson" type="{urn:omds3CommonServiceTypes-1-1-0}FATCA_NatPersonType"/> * <element name="FATCA_SonstPerson" type="{urn:omds3CommonServiceTypes-1-1-0}FATCA_SonstPersonType"/> * </choice> @@ -31,16 +32,43 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "FATCA_Type", propOrder = { + "ustin", "fatcaNatPerson", "fatcaSonstPerson" }) public class FATCAType { + @XmlElement(name = "US_TIN") + protected String ustin; @XmlElement(name = "FATCA_NatPerson") protected FATCANatPersonType fatcaNatPerson; @XmlElement(name = "FATCA_SonstPerson") protected FATCASonstPersonType fatcaSonstPerson; + /** + * Ruft den Wert der ustin-Eigenschaft ab. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUSTIN() { + return ustin; + } + + /** + * Legt den Wert der ustin-Eigenschaft fest. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUSTIN(String value) { + this.ustin = value; + } + /** * Ruft den Wert der fatcaNatPerson-Eigenschaft ab. * diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/common/ObjectFactory.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/common/ObjectFactory.java index 94deca48..2ae70182 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/common/ObjectFactory.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/common/ObjectFactory.java @@ -701,6 +701,14 @@ public class ObjectFactory { return new TreuhaenderfrageType(); } + /** + * Create an instance of {@link ElementFondsauswahlType } + * + */ + public ElementFondsauswahlType createElementFondsauswahlType() { + return new ElementFondsauswahlType(); + } + /** * Create an instance of {@link GMSGType.SteuerlichAnsaessig } * diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/on2antrag/leben/TarifLebenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/on2antrag/leben/TarifLebenType.java index 34542df4..21f16da4 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/on2antrag/leben/TarifLebenType.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/on2antrag/leben/TarifLebenType.java @@ -24,7 +24,7 @@ import at.vvo.omds.types.omds3Types.r1_6_0.common.ElementarproduktGenerischType; * <complexContent> * <extension base="{urn:omds3CommonServiceTypes-1-1-0}ElementarproduktGenerisch_Type"> * <sequence> - * <element name="GarantierteAblebenssumme" type="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}VersicherungssummeZusatzbaustein_Type"/> + * <element name="GarantierteAblebenssumme" type="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}VersicherungssummeZusatzbaustein_Type" minOccurs="0"/> * <element name="Rentenoption" type="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}Rentenoption_Type" minOccurs="0"/> * <element name="Fondsauswahl" type="{urn:omds3CommonServiceTypes-1-1-0}AttributMultiEnum_Type" minOccurs="0"/> * <element name="VersPersonenRefLfnr" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" maxOccurs="unbounded" minOccurs="0"/> @@ -49,7 +49,7 @@ public class TarifLebenType extends ElementarproduktGenerischType { - @XmlElement(name = "GarantierteAblebenssumme", required = true) + @XmlElement(name = "GarantierteAblebenssumme") protected VersicherungssummeZusatzbausteinType garantierteAblebenssumme; @XmlElement(name = "Rentenoption") protected RentenoptionType rentenoption; diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/on2antrag/leben/VersicherungssummeZusatzbausteinType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/on2antrag/leben/VersicherungssummeZusatzbausteinType.java index 46810e06..6fdae780 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/on2antrag/leben/VersicherungssummeZusatzbausteinType.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/on2antrag/leben/VersicherungssummeZusatzbausteinType.java @@ -21,8 +21,8 @@ import at.vvo.omds.types.omds3Types.r1_6_0.common.AttributDoubleType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <choice> - * <element name="ProzentVersicherungssumme" type="{urn:omds3CommonServiceTypes-1-1-0}AttributDouble_Type"/> - * <element name="Betrag" type="{urn:omds3CommonServiceTypes-1-1-0}AttributDezimal_Type"/> + * <element name="ProzentVersicherungssumme" type="{urn:omds3CommonServiceTypes-1-1-0}AttributDouble_Type" minOccurs="0"/> + * <element name="Betrag" type="{urn:omds3CommonServiceTypes-1-1-0}AttributDezimal_Type" minOccurs="0"/> * </choice> * </restriction> * </complexContent> diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/on4partner/ChangeCommunicationObjectRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/on4partner/ChangeCommunicationObjectRequestType.java index d1d7d099..fe20b567 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/on4partner/ChangeCommunicationObjectRequestType.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/on4partner/ChangeCommunicationObjectRequestType.java @@ -62,9 +62,9 @@ public class ChangeCommunicationObjectRequestType @XmlElement(name = "ObjektId", namespace = "urn:omds3CommonServiceTypes-1-1-0", required = true) protected ObjektIdType objektId; @XmlElementRefs({ - @XmlElementRef(name = "ObjektId", namespace = "urn:omds3CommonServiceTypes-1-1-0", type = JAXBElement.class), @XmlElementRef(name = "BisherigeKommunikationsVerbindung", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", type = JAXBElement.class), - @XmlElementRef(name = "GeaenderteKommunikationsVerbindung", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", type = JAXBElement.class) + @XmlElementRef(name = "GeaenderteKommunikationsVerbindung", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", type = JAXBElement.class), + @XmlElementRef(name = "ObjektId", namespace = "urn:omds3CommonServiceTypes-1-1-0", type = JAXBElement.class) }) protected List> objektIdOrBisherigeKommunikationsVerbindungAndGeaenderteKommunikationsVerbindung; @XmlElement(name = "WirksamtkeitAb", required = true) @@ -115,9 +115,9 @@ public class ChangeCommunicationObjectRequestType * *

* Objects of the following type(s) are allowed in the list + * {@link JAXBElement }{@code <}{@link ELKommunikationType }{@code >} + * {@link JAXBElement }{@code <}{@link ELKommunikationType }{@code >} * {@link JAXBElement }{@code <}{@link ObjektIdType }{@code >} - * {@link JAXBElement }{@code <}{@link ELKommunikationType }{@code >} - * {@link JAXBElement }{@code <}{@link ELKommunikationType }{@code >} * * */ diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/service/OmdsService.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/service/OmdsService.java index bea380ba..ad8f2f8e 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/service/OmdsService.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/service/OmdsService.java @@ -10,7 +10,7 @@ import javax.xml.ws.Service; /** * This class was generated by Apache CXF 3.2.0 - * 2020-09-24T14:45:52.372+02:00 + * 2020-09-24T16:22:57.415+02:00 * Generated source version: 3.2.0 * */ diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/service/OmdsServicePortImpl.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/service/OmdsServicePortImpl.java index 975e7073..fcec7ada 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/service/OmdsServicePortImpl.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/service/OmdsServicePortImpl.java @@ -16,7 +16,7 @@ import javax.xml.bind.annotation.XmlSeeAlso; /** * This class was generated by Apache CXF 3.2.0 - * 2020-09-24T14:45:52.260+02:00 + * 2020-09-24T16:22:57.026+02:00 * Generated source version: 3.2.0 * */ diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/service/OmdsServicePortType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/service/OmdsServicePortType.java index 0659d69d..e1479a0c 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/service/OmdsServicePortType.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/service/OmdsServicePortType.java @@ -9,7 +9,7 @@ import javax.xml.bind.annotation.XmlSeeAlso; /** * This class was generated by Apache CXF 3.2.0 - * 2020-09-24T14:45:52.330+02:00 + * 2020-09-24T16:22:57.276+02:00 * Generated source version: 3.2.0 * */ diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/service/OmdsServicePortType_OmdsServicePort_Client.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/service/OmdsServicePortType_OmdsServicePort_Client.java index 8581726c..e06ae23b 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/service/OmdsServicePortType_OmdsServicePort_Client.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/service/OmdsServicePortType_OmdsServicePort_Client.java @@ -19,7 +19,7 @@ import javax.xml.bind.annotation.XmlSeeAlso; /** * This class was generated by Apache CXF 3.2.0 - * 2020-09-24T14:45:52.085+02:00 + * 2020-09-24T16:22:56.641+02:00 * Generated source version: 3.2.0 * */ diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/service/ServiceFaultMsg.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/service/ServiceFaultMsg.java index f56ce637..21bb407f 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/service/ServiceFaultMsg.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_6_0/service/ServiceFaultMsg.java @@ -6,7 +6,7 @@ import javax.xml.ws.WebFault; /** * This class was generated by Apache CXF 3.2.0 - * 2020-09-24T14:45:52.236+02:00 + * 2020-09-24T16:22:56.965+02:00 * Generated source version: 3.2.0 */ diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_6_0/omds3CommonServiceTypes.xsd b/OMDSServiceDefinition/src/main/resources/def/r1_6_0/omds3CommonServiceTypes.xsd index 9b4b5c8f..41366fed 100644 --- a/OMDSServiceDefinition/src/main/resources/def/r1_6_0/omds3CommonServiceTypes.xsd +++ b/OMDSServiceDefinition/src/main/resources/def/r1_6_0/omds3CommonServiceTypes.xsd @@ -2754,6 +2754,7 @@ Fragen gemäß FATCA + @@ -2766,7 +2767,6 @@ - @@ -2809,7 +2809,7 @@ - + @@ -2818,7 +2818,26 @@ - + + + + + + Ein einzelnes Element einer Fondsauswahl + + + + + Angabe von ISIN oder WKN + + + + + + + Optional Angabe des Anteils dieses Wertpapiers am Gesamtportfolio + + diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_6_0/omds3_ON2_Antrag_Leben.xsd b/OMDSServiceDefinition/src/main/resources/def/r1_6_0/omds3_ON2_Antrag_Leben.xsd index f2607411..d0dae4a4 100644 --- a/OMDSServiceDefinition/src/main/resources/def/r1_6_0/omds3_ON2_Antrag_Leben.xsd +++ b/OMDSServiceDefinition/src/main/resources/def/r1_6_0/omds3_ON2_Antrag_Leben.xsd @@ -49,7 +49,7 @@ - + @@ -159,8 +159,8 @@ Definition einer Versicherungssumme in einem Zusatzbaustein - - + +