diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/service/v1_4_0/OmdsService.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/service/v1_4_0/OmdsService.java index d2cc1f3e..92384be5 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/service/v1_4_0/OmdsService.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/service/v1_4_0/OmdsService.java @@ -10,7 +10,7 @@ import javax.xml.ws.Service; /** * This class was generated by Apache CXF 3.2.0 - * 2019-05-15T13:15:31.874+02:00 + * 2019-05-15T13:29:56.643+02:00 * Generated source version: 3.2.0 * */ diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/service/v1_4_0/OmdsServicePortImpl.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/service/v1_4_0/OmdsServicePortImpl.java index ab356af5..6d7eb5bc 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/service/v1_4_0/OmdsServicePortImpl.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/service/v1_4_0/OmdsServicePortImpl.java @@ -16,7 +16,7 @@ import javax.xml.bind.annotation.XmlSeeAlso; /** * This class was generated by Apache CXF 3.2.0 - * 2019-05-15T13:15:31.785+02:00 + * 2019-05-15T13:29:56.537+02:00 * Generated source version: 3.2.0 * */ diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/service/v1_4_0/OmdsServicePortType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/service/v1_4_0/OmdsServicePortType.java index 3b495e0b..078ddd5e 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/service/v1_4_0/OmdsServicePortType.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/service/v1_4_0/OmdsServicePortType.java @@ -9,7 +9,7 @@ import javax.xml.bind.annotation.XmlSeeAlso; /** * This class was generated by Apache CXF 3.2.0 - * 2019-05-15T13:15:31.848+02:00 + * 2019-05-15T13:29:56.605+02:00 * Generated source version: 3.2.0 * */ diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/service/v1_4_0/OmdsServicePortType_OmdsServicePort_Client.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/service/v1_4_0/OmdsServicePortType_OmdsServicePort_Client.java index a7d99aff..d8e776ee 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/service/v1_4_0/OmdsServicePortType_OmdsServicePort_Client.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/service/v1_4_0/OmdsServicePortType_OmdsServicePort_Client.java @@ -19,7 +19,7 @@ import javax.xml.bind.annotation.XmlSeeAlso; /** * This class was generated by Apache CXF 3.2.0 - * 2019-05-15T13:15:31.657+02:00 + * 2019-05-15T13:29:56.424+02:00 * Generated source version: 3.2.0 * */ diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/service/v1_4_0/ServiceFaultMsg.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/service/v1_4_0/ServiceFaultMsg.java index c3186f2a..ce20d18e 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/service/v1_4_0/ServiceFaultMsg.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/service/v1_4_0/ServiceFaultMsg.java @@ -6,7 +6,7 @@ import javax.xml.ws.WebFault; /** * This class was generated by Apache CXF 3.2.0 - * 2019-05-15T13:15:31.768+02:00 + * 2019-05-15T13:29:56.521+02:00 * Generated source version: 3.2.0 */ diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/v1_4_0/on4partner/ChangeCommunicationObjectRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/v1_4_0/on4partner/ChangeCommunicationObjectRequestType.java index 270a7973..b2b84bfc 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/v1_4_0/on4partner/ChangeCommunicationObjectRequestType.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/v1_4_0/on4partner/ChangeCommunicationObjectRequestType.java @@ -63,8 +63,8 @@ public class ChangeCommunicationObjectRequestType protected ObjektIdType objektId; @XmlElementRefs({ @XmlElementRef(name = "ObjektId", namespace = "urn:omds3CommonServiceTypes-1-1-0", type = JAXBElement.class), - @XmlElementRef(name = "BisherigeKommunikationsVerbindung", namespace = "http://omds.vvo.at/types/omds3types/v1_4_0/on4partner", type = JAXBElement.class), - @XmlElementRef(name = "GeaenderteKommunikationsVerbindung", namespace = "http://omds.vvo.at/types/omds3types/v1_4_0/on4partner", type = JAXBElement.class) + @XmlElementRef(name = "GeaenderteKommunikationsVerbindung", namespace = "http://omds.vvo.at/types/omds3types/v1_4_0/on4partner", type = JAXBElement.class), + @XmlElementRef(name = "BisherigeKommunikationsVerbindung", namespace = "http://omds.vvo.at/types/omds3types/v1_4_0/on4partner", type = JAXBElement.class) }) protected List> objektIdOrBisherigeKommunikationsVerbindungAndGeaenderteKommunikationsVerbindung; @XmlElement(name = "WirksamtkeitAb", required = true) diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/v1_4_0/servicetypes/MeldungSchadenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/v1_4_0/servicetypes/MeldungSchadenType.java index 4f9de6f2..069d3014 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/v1_4_0/servicetypes/MeldungSchadenType.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/v1_4_0/servicetypes/MeldungSchadenType.java @@ -9,7 +9,6 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; -import at.vvo.omds.types.omds2Types.v2_11.VtgRolleCdType; import at.vvo.omds.types.omds2Types.v2_11.WaehrungsCdType; import at.vvo.omds.types.omds3Types.v1_4_0.common.BankverbindungType; @@ -34,13 +33,6 @@ import at.vvo.omds.types.omds3Types.v1_4_0.common.BankverbindungType; * <complexType> * <complexContent> * <extension base="{urn:omds3ServiceTypes-1-1-0}ReferenzAufBeteiligtePersonSchaden_Type"> - * <choice> - * <element name="Vertragsrolle" type="{urn:omds20}VtgRolleCd_Type"/> - * <sequence> - * <element name="Schadensrolle" type="{urn:omds20}BetRolleCd_Type"/> - * <element name="GeschInteresseLfnr" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" minOccurs="0"/> - * </sequence> - * </choice> * </extension> * </complexContent> * </complexType> @@ -350,13 +342,6 @@ public class MeldungSchadenType { * <complexType> * <complexContent> * <extension base="{urn:omds3ServiceTypes-1-1-0}ReferenzAufBeteiligtePersonSchaden_Type"> - * <choice> - * <element name="Vertragsrolle" type="{urn:omds20}VtgRolleCd_Type"/> - * <sequence> - * <element name="Schadensrolle" type="{urn:omds20}BetRolleCd_Type"/> - * <element name="GeschInteresseLfnr" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" minOccurs="0"/> - * </sequence> - * </choice> * </extension> * </complexContent> * </complexType> @@ -365,95 +350,11 @@ public class MeldungSchadenType { * */ @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "vertragsrolle", - "schadensrolle", - "geschInteresseLfnr" - }) + @XmlType(name = "") public static class BeteiligtePersonen extends ReferenzAufBeteiligtePersonSchadenType { - @XmlElement(name = "Vertragsrolle") - @XmlSchemaType(name = "string") - protected VtgRolleCdType vertragsrolle; - @XmlElement(name = "Schadensrolle") - protected String schadensrolle; - @XmlElement(name = "GeschInteresseLfnr") - @XmlSchemaType(name = "unsignedShort") - protected Integer geschInteresseLfnr; - - /** - * Ruft den Wert der vertragsrolle-Eigenschaft ab. - * - * @return - * possible object is - * {@link VtgRolleCdType } - * - */ - public VtgRolleCdType getVertragsrolle() { - return vertragsrolle; - } - - /** - * Legt den Wert der vertragsrolle-Eigenschaft fest. - * - * @param value - * allowed object is - * {@link VtgRolleCdType } - * - */ - public void setVertragsrolle(VtgRolleCdType value) { - this.vertragsrolle = value; - } - - /** - * Ruft den Wert der schadensrolle-Eigenschaft ab. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSchadensrolle() { - return schadensrolle; - } - - /** - * Legt den Wert der schadensrolle-Eigenschaft fest. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSchadensrolle(String value) { - this.schadensrolle = value; - } - - /** - * Ruft den Wert der geschInteresseLfnr-Eigenschaft ab. - * - * @return - * possible object is - * {@link Integer } - * - */ - public Integer getGeschInteresseLfnr() { - return geschInteresseLfnr; - } - - /** - * Legt den Wert der geschInteresseLfnr-Eigenschaft fest. - * - * @param value - * allowed object is - * {@link Integer } - * - */ - public void setGeschInteresseLfnr(Integer value) { - this.geschInteresseLfnr = value; - } } diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/v1_4_0/servicetypes/ReferenzAufBeteiligtePersonSchadenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/v1_4_0/servicetypes/ReferenzAufBeteiligtePersonSchadenType.java index cf31b35c..e5c55f9e 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/v1_4_0/servicetypes/ReferenzAufBeteiligtePersonSchadenType.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/v1_4_0/servicetypes/ReferenzAufBeteiligtePersonSchadenType.java @@ -4,9 +4,11 @@ package at.vvo.omds.types.omds3Types.v1_4_0.servicetypes; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; +import at.vvo.omds.types.omds2Types.v2_11.VtgRolleCdType; /** @@ -18,8 +20,13 @@ import javax.xml.bind.annotation.XmlType; * <complexType name="ReferenzAufBeteiligtePersonSchaden_Type"> * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * </sequence> + * <choice> + * <element name="Vertragsrolle" type="{urn:omds20}VtgRolleCd_Type"/> + * <sequence> + * <element name="Schadensrolle" type="{urn:omds20}BetRolleCd_Type"/> + * <element name="GeschInteresseLfnr" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" minOccurs="0"/> + * </sequence> + * </choice> * <attribute name="BetLfnr" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" /> * <attribute name="BetTxt"> * <simpleType> @@ -36,18 +43,102 @@ import javax.xml.bind.annotation.XmlType; * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "ReferenzAufBeteiligtePersonSchaden_Type") +@XmlType(name = "ReferenzAufBeteiligtePersonSchaden_Type", propOrder = { + "vertragsrolle", + "schadensrolle", + "geschInteresseLfnr" +}) @XmlSeeAlso({ at.vvo.omds.types.omds3Types.v1_4_0.servicetypes.MeldungSchadenType.BeteiligtePersonen.class }) public class ReferenzAufBeteiligtePersonSchadenType { + @XmlElement(name = "Vertragsrolle") + @XmlSchemaType(name = "string") + protected VtgRolleCdType vertragsrolle; + @XmlElement(name = "Schadensrolle") + protected String schadensrolle; + @XmlElement(name = "GeschInteresseLfnr") + @XmlSchemaType(name = "unsignedShort") + protected Integer geschInteresseLfnr; @XmlAttribute(name = "BetLfnr", namespace = "urn:omds3ServiceTypes-1-1-0", required = true) @XmlSchemaType(name = "unsignedShort") protected int betLfnr; @XmlAttribute(name = "BetTxt", namespace = "urn:omds3ServiceTypes-1-1-0") protected String betTxt; + /** + * Ruft den Wert der vertragsrolle-Eigenschaft ab. + * + * @return + * possible object is + * {@link VtgRolleCdType } + * + */ + public VtgRolleCdType getVertragsrolle() { + return vertragsrolle; + } + + /** + * Legt den Wert der vertragsrolle-Eigenschaft fest. + * + * @param value + * allowed object is + * {@link VtgRolleCdType } + * + */ + public void setVertragsrolle(VtgRolleCdType value) { + this.vertragsrolle = value; + } + + /** + * Ruft den Wert der schadensrolle-Eigenschaft ab. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSchadensrolle() { + return schadensrolle; + } + + /** + * Legt den Wert der schadensrolle-Eigenschaft fest. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSchadensrolle(String value) { + this.schadensrolle = value; + } + + /** + * Ruft den Wert der geschInteresseLfnr-Eigenschaft ab. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getGeschInteresseLfnr() { + return geschInteresseLfnr; + } + + /** + * Legt den Wert der geschInteresseLfnr-Eigenschaft fest. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setGeschInteresseLfnr(Integer value) { + this.geschInteresseLfnr = value; + } + /** * Ruft den Wert der betLfnr-Eigenschaft ab. * diff --git a/OMDSServiceDefinition/src/main/resources/def/v1-4-0/omds3ServiceTypes.xsd b/OMDSServiceDefinition/src/main/resources/def/v1-4-0/omds3ServiceTypes.xsd index ffeb262f..dfb74914 100644 --- a/OMDSServiceDefinition/src/main/resources/def/v1-4-0/omds3ServiceTypes.xsd +++ b/OMDSServiceDefinition/src/main/resources/def/v1-4-0/omds3ServiceTypes.xsd @@ -1119,19 +1119,7 @@ - - - - - - - - Optional die Referenz auf ein geschädigtes Interesse. - - - - - + @@ -1664,7 +1652,17 @@ - + + + + + + + Optional die Referenz auf ein geschädigtes Interesse. + + + + Referenz auf eine beteiligte Person