From 241e0ea034e3eefec64d246134efb65e57aa17b2 Mon Sep 17 00:00:00 2001 From: Jens Buehring Date: Fri, 8 Nov 2019 16:58:45 +0100 Subject: [PATCH] Korrektur Objekt --- .../on2antrag/common/ObjectFactory.java | 32 ---------- .../SubmitApplicationResponseGenType.java | 63 +------------------ ...itApplicationRechtsschutzResponseType.java | 31 ++++++++- ...bmitApplicationSachPrivatResponseType.java | 31 ++++++++- .../SubmitApplicationUnfallResponseType.java | 31 ++++++++- .../ChangeCommunicationObjectRequestType.java | 4 +- .../def/r1_5_0/omds3_ON2_Antrag_Common.xsd | 16 +---- .../r1_5_0/omds3_ON2_Antrag_SachPrivat.xsd | 5 ++ 8 files changed, 99 insertions(+), 114 deletions(-) diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/ObjectFactory.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/ObjectFactory.java index 69632ba3..fc685f57 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/ObjectFactory.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/ObjectFactory.java @@ -5,8 +5,6 @@ import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlElementDecl; import javax.xml.bind.annotation.XmlRegistry; import javax.xml.namespace.QName; -import at.vvo.omds.types.omds3Types.r1_5_0.common.DokumentInfoType; -import at.vvo.omds.types.omds3Types.r1_5_0.common.ObjektIdType; /** @@ -28,9 +26,6 @@ public class ObjectFactory { private final static QName _GetApplicationDocumentRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common", "GetApplicationDocumentRequest"); private final static QName _GetApplicationDocumentResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common", "GetApplicationDocumentResponse"); - private final static QName _SubmitApplicationResponseGenTypeAntragstatus_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common", "Antragstatus"); - private final static QName _SubmitApplicationResponseGenTypeAntragsnummer_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common", "Antragsnummer"); - private final static QName _SubmitApplicationResponseGenTypeDokumente_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common", "Dokumente"); /** * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.common @@ -73,31 +68,4 @@ public class ObjectFactory { return new JAXBElement(_GetApplicationDocumentResponse_QNAME, GetApplicationDocumentResponseType.class, null, value); } - /** - * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common", name = "Antragstatus", scope = SubmitApplicationResponseGenType.class) - public JAXBElement createSubmitApplicationResponseGenTypeAntragstatus(Integer value) { - return new JAXBElement(_SubmitApplicationResponseGenTypeAntragstatus_QNAME, Integer.class, SubmitApplicationResponseGenType.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ObjektIdType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common", name = "Antragsnummer", scope = SubmitApplicationResponseGenType.class) - public JAXBElement createSubmitApplicationResponseGenTypeAntragsnummer(ObjektIdType value) { - return new JAXBElement(_SubmitApplicationResponseGenTypeAntragsnummer_QNAME, ObjektIdType.class, SubmitApplicationResponseGenType.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link DokumentInfoType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common", name = "Dokumente", scope = SubmitApplicationResponseGenType.class) - public JAXBElement createSubmitApplicationResponseGenTypeDokumente(DokumentInfoType value) { - return new JAXBElement(_SubmitApplicationResponseGenTypeDokumente_QNAME, DokumentInfoType.class, SubmitApplicationResponseGenType.class, value); - } - } diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/SubmitApplicationResponseGenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/SubmitApplicationResponseGenType.java index fb4df936..1d3f0e67 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/SubmitApplicationResponseGenType.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/SubmitApplicationResponseGenType.java @@ -1,17 +1,10 @@ package at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.common; -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; -import at.vvo.omds.types.omds3Types.r1_5_0.common.DokumentInfoType; -import at.vvo.omds.types.omds3Types.r1_5_0.common.ObjektIdType; import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.rs.SubmitApplicationRechtsschutzResponseType; import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.sachPrivat.SubmitApplicationSachPrivatResponseType; import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.unfall.SubmitApplicationUnfallResponseType; @@ -28,11 +21,6 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.unfall.SubmitApplicationUnf * <complexType name="SubmitApplicationResponseGen_Type"> * <complexContent> * <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SubmitApplicationResponse_Type"> - * <sequence> - * <element name="Antragstatus" type="{urn:omds3CommonServiceTypes-1-1-0}SubmitApplicationStatus_Type"/> - * <element name="Antragsnummer" type="{urn:omds3CommonServiceTypes-1-1-0}ObjektId_Type"/> - * <element name="Dokumente" type="{urn:omds3CommonServiceTypes-1-1-0}DokumentInfo_Type" maxOccurs="unbounded" minOccurs="0"/> - * </sequence> * </extension> * </complexContent> * </complexType> @@ -41,9 +29,7 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.unfall.SubmitApplicationUnf * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "SubmitApplicationResponseGen_Type", propOrder = { - "rest" -}) +@XmlType(name = "SubmitApplicationResponseGen_Type") @XmlSeeAlso({ SubmitApplicationRechtsschutzResponseType.class, SubmitApplicationSachPrivatResponseType.class, @@ -53,52 +39,5 @@ public abstract class SubmitApplicationResponseGenType extends SubmitApplicationResponseType { - @XmlElementRefs({ - @XmlElementRef(name = "Antragsnummer", namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common", type = JAXBElement.class, required = false), - @XmlElementRef(name = "Antragstatus", namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common", type = JAXBElement.class, required = false), - @XmlElementRef(name = "Dokumente", namespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common", type = JAXBElement.class, required = false) - }) - protected List> rest; - - /** - * Ruft das restliche Contentmodell ab. - * - *

- * Sie rufen diese "catch-all"-Eigenschaft aus folgendem Grund ab: - * Der Feldname "Antragstatus" wird von zwei verschiedenen Teilen eines Schemas verwendet. Siehe: - * Zeile 347 von file:/C:/Users/Jens/git/omdsservicedefinitions/OMDSServiceDefinition/src/main/resources/def/r1_5_0/omds3_ON2_Antrag_Common.xsd - * Zeile 237 von file:/C:/Users/Jens/git/omdsservicedefinitions/OMDSServiceDefinition/src/main/resources/def/r1_5_0/omds3_ON2_Antrag_Common.xsd - *

- * Um diese Eigenschaft zu entfernen, wenden Sie eine Eigenschaftenanpassung für eine - * der beiden folgenden Deklarationen an, um deren Namen zu ändern: - * Gets the value of the rest 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 rest property. - * - *

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

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

- * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link Integer }{@code >} - * {@link JAXBElement }{@code <}{@link ObjektIdType }{@code >} - * {@link JAXBElement }{@code <}{@link DokumentInfoType }{@code >} - * - * - */ - public List> getRest() { - if (rest == null) { - rest = new ArrayList>(); - } - return this.rest; - } } diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/rs/SubmitApplicationRechtsschutzResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/rs/SubmitApplicationRechtsschutzResponseType.java index 020a8087..08091f60 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/rs/SubmitApplicationRechtsschutzResponseType.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/rs/SubmitApplicationRechtsschutzResponseType.java @@ -3,6 +3,7 @@ package at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.rs; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.common.SubmitApplicationResponseGenType; @@ -29,10 +30,38 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.common.SubmitApplicationRes * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "SubmitApplicationRechtsschutzResponse_Type") +@XmlType(name = "SubmitApplicationRechtsschutzResponse_Type", propOrder = { + "antragsantwort" +}) public class SubmitApplicationRechtsschutzResponseType extends SubmitApplicationResponseGenType { + @XmlElement(name = "Antragsantwort", required = true) + protected SpezAntragRechtsschutzType antragsantwort; + + /** + * Ruft den Wert der antragsantwort-Eigenschaft ab. + * + * @return + * possible object is + * {@link SpezAntragRechtsschutzType } + * + */ + public SpezAntragRechtsschutzType getAntragsantwort() { + return antragsantwort; + } + + /** + * Legt den Wert der antragsantwort-Eigenschaft fest. + * + * @param value + * allowed object is + * {@link SpezAntragRechtsschutzType } + * + */ + public void setAntragsantwort(SpezAntragRechtsschutzType value) { + this.antragsantwort = value; + } } diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/sachPrivat/SubmitApplicationSachPrivatResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/sachPrivat/SubmitApplicationSachPrivatResponseType.java index cc85184a..fb34f84a 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/sachPrivat/SubmitApplicationSachPrivatResponseType.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/sachPrivat/SubmitApplicationSachPrivatResponseType.java @@ -3,6 +3,7 @@ package at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.sachPrivat; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.common.SubmitApplicationResponseGenType; @@ -29,10 +30,38 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.common.SubmitApplicationRes * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "SubmitApplicationSachPrivatResponse_Type") +@XmlType(name = "SubmitApplicationSachPrivatResponse_Type", propOrder = { + "antragsantwort" +}) public class SubmitApplicationSachPrivatResponseType extends SubmitApplicationResponseGenType { + @XmlElement(name = "Antragsantwort", required = true) + protected AntragSachPrivatType antragsantwort; + + /** + * Ruft den Wert der antragsantwort-Eigenschaft ab. + * + * @return + * possible object is + * {@link AntragSachPrivatType } + * + */ + public AntragSachPrivatType getAntragsantwort() { + return antragsantwort; + } + + /** + * Legt den Wert der antragsantwort-Eigenschaft fest. + * + * @param value + * allowed object is + * {@link AntragSachPrivatType } + * + */ + public void setAntragsantwort(AntragSachPrivatType value) { + this.antragsantwort = value; + } } diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/unfall/SubmitApplicationUnfallResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/unfall/SubmitApplicationUnfallResponseType.java index 7aeac1a6..f9fde106 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/unfall/SubmitApplicationUnfallResponseType.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/unfall/SubmitApplicationUnfallResponseType.java @@ -3,6 +3,7 @@ package at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.unfall; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.common.SubmitApplicationResponseGenType; @@ -29,10 +30,38 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.common.SubmitApplicationRes * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "SubmitApplicationUnfallResponse_Type") +@XmlType(name = "SubmitApplicationUnfallResponse_Type", propOrder = { + "antragsantwort" +}) public class SubmitApplicationUnfallResponseType extends SubmitApplicationResponseGenType { + @XmlElement(name = "Antragsantwort", required = true) + protected SpezAntragUnfallType antragsantwort; + + /** + * Ruft den Wert der antragsantwort-Eigenschaft ab. + * + * @return + * possible object is + * {@link SpezAntragUnfallType } + * + */ + public SpezAntragUnfallType getAntragsantwort() { + return antragsantwort; + } + + /** + * Legt den Wert der antragsantwort-Eigenschaft fest. + * + * @param value + * allowed object is + * {@link SpezAntragUnfallType } + * + */ + public void setAntragsantwort(SpezAntragUnfallType value) { + this.antragsantwort = value; + } } diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on4partner/ChangeCommunicationObjectRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on4partner/ChangeCommunicationObjectRequestType.java index 4620bb8f..9c2882ef 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on4partner/ChangeCommunicationObjectRequestType.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_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 = "GeaenderteKommunikationsVerbindung", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", type = JAXBElement.class), - @XmlElementRef(name = "BisherigeKommunikationsVerbindung", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", 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) }) protected List> objektIdOrBisherigeKommunikationsVerbindungAndGeaenderteKommunikationsVerbindung; @XmlElement(name = "WirksamtkeitAb", required = true) diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_5_0/omds3_ON2_Antrag_Common.xsd b/OMDSServiceDefinition/src/main/resources/def/r1_5_0/omds3_ON2_Antrag_Common.xsd index 24eff16f..b84df897 100644 --- a/OMDSServiceDefinition/src/main/resources/def/r1_5_0/omds3_ON2_Antrag_Common.xsd +++ b/OMDSServiceDefinition/src/main/resources/def/r1_5_0/omds3_ON2_Antrag_Common.xsd @@ -342,21 +342,7 @@ Abstrakter Response der Antragsüberleitung - - - - - aktueller Status des eingespielten Antrages - - - - - - Referenzen auf Antragsdokumente, die heruntergeladen werden können. - - - - + diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_5_0/omds3_ON2_Antrag_SachPrivat.xsd b/OMDSServiceDefinition/src/main/resources/def/r1_5_0/omds3_ON2_Antrag_SachPrivat.xsd index a6e329e9..0d469ed4 100644 --- a/OMDSServiceDefinition/src/main/resources/def/r1_5_0/omds3_ON2_Antrag_SachPrivat.xsd +++ b/OMDSServiceDefinition/src/main/resources/def/r1_5_0/omds3_ON2_Antrag_SachPrivat.xsd @@ -414,6 +414,11 @@ Einbruchdiebstahl + + + Elektronik + + Feuer