Beschreibung spartenunabhängige Services in BOA-allgemein

Kleinere Korrekturen Sach-Privat:
 - Im Response muss nicht immer ein Ergebnis enthalten sein,
 - Upselling-Objekt ausspezifiziert

OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_4_0/on2antrag/sachPrivat/CalculateSachPrivatResponseType.java

@@ -20,7 +20,7 @@ import at.vvo.omds.types.omds3Types.r1_4_0.on2antrag.common.CalculateResponseTyp
  *   <complexContent>
  *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CalculateResponse_Type">
  *       <sequence>
- *         <element name="Berechnungsantwort" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}BerechnungSachPrivat_Type"/>
+ *         <element name="Berechnungsantwort" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}BerechnungSachPrivat_Type" minOccurs="0"/>
  *         <element name="ResponseUpselling" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}UpsellingSachPrivatResponse_Type" minOccurs="0"/>
  *       </sequence>
  *     </extension>
@@ -39,7 +39,7 @@ public class CalculateSachPrivatResponseType
     extends CalculateResponseType
 {
 
-    @XmlElement(name = "Berechnungsantwort", required = true)
+    @XmlElement(name = "Berechnungsantwort")
     protected BerechnungSachPrivatType berechnungsantwort;
     @XmlElement(name = "ResponseUpselling")
     protected UpsellingSachPrivatResponseType responseUpselling;

OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_4_0/on2antrag/sachPrivat/CreateApplicationSachPrivatResponseType.java

@@ -20,7 +20,7 @@ import at.vvo.omds.types.omds3Types.r1_4_0.on2antrag.common.CreateApplicationRes
  *   <complexContent>
  *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CreateApplicationResponse_Type">
  *       <sequence>
- *         <element name="Antragsantwort" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}AntragSachPrivat_Type"/>
+ *         <element name="Antragsantwort" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}AntragSachPrivat_Type" minOccurs="0"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
@@ -37,7 +37,7 @@ public class CreateApplicationSachPrivatResponseType
     extends CreateApplicationResponseType
 {
 
-    @XmlElement(name = "Antragsantwort", required = true)
+    @XmlElement(name = "Antragsantwort")
     protected AntragSachPrivatType antragsantwort;
 
     /**

OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_4_0/on2antrag/sachPrivat/CreateOfferSachPrivatResponseType.java

@@ -20,7 +20,7 @@ import at.vvo.omds.types.omds3Types.r1_4_0.on2antrag.common.CreateOfferResponseT
  *   <complexContent>
  *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CreateOfferResponse_Type">
  *       <sequence>
- *         <element name="Offertantwort" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}OffertSachPrivat_Type"/>
+ *         <element name="Offertantwort" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}OffertSachPrivat_Type" minOccurs="0"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
@@ -37,7 +37,7 @@ public class CreateOfferSachPrivatResponseType
     extends CreateOfferResponseType
 {
 
-    @XmlElement(name = "Offertantwort", required = true)
+    @XmlElement(name = "Offertantwort")
     protected OffertSachPrivatType offertantwort;
 
     /**

OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_4_0/on2antrag/sachPrivat/SubmitApplicationSachPrivatResponseType.java

@@ -20,7 +20,7 @@ import at.vvo.omds.types.omds3Types.r1_4_0.on2antrag.common.SubmitApplicationRes
  *   <complexContent>
  *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SubmitApplicationResponse_Type">
  *       <sequence>
- *         <element name="Antragsantwort" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}AntragSachPrivat_Type"/>
+ *         <element name="Antragsantwort" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}AntragSachPrivat_Type" minOccurs="0"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
@@ -37,7 +37,7 @@ public class SubmitApplicationSachPrivatResponseType
     extends SubmitApplicationResponseType
 {
 
-    @XmlElement(name = "Antragsantwort", required = true)
+    @XmlElement(name = "Antragsantwort")
     protected AntragSachPrivatType antragsantwort;
 
     /**

OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_4_0/on2antrag/sachPrivat/UpsellingSachPrivatResponseType.java

@@ -1,12 +1,17 @@
 
 package at.vvo.omds.types.omds3Types.r1_4_0.on2antrag.sachPrivat;
 
+import java.util.ArrayList;
+import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
 
 /**
+ * Type Response Upselling: Enthält eines oder mehrere Verkaufsprodukte Sach-Privat
+ * 
  * <p>Java-Klasse für UpsellingSachPrivatResponse_Type complex type.
  * 
  * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
@@ -15,6 +20,9 @@ import javax.xml.bind.annotation.XmlType;
  * &lt;complexType name="UpsellingSachPrivatResponse_Type"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element name="UpsellingVerkaufsprodukte" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}VerkaufsproduktSachPrivat_Type" maxOccurs="unbounded" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
@@ -23,8 +31,41 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "UpsellingSachPrivatResponse_Type")
+@XmlType(name = "UpsellingSachPrivatResponse_Type", propOrder = {
+    "upsellingVerkaufsprodukte"
+})
 public class UpsellingSachPrivatResponseType {
 
+    @XmlElement(name = "UpsellingVerkaufsprodukte")
+    protected List<VerkaufsproduktSachPrivatType> upsellingVerkaufsprodukte;
+
+    /**
+     * Gets the value of the upsellingVerkaufsprodukte 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 upsellingVerkaufsprodukte property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getUpsellingVerkaufsprodukte().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link VerkaufsproduktSachPrivatType }
+     * 
+     * 
+     */
+    public List<VerkaufsproduktSachPrivatType> getUpsellingVerkaufsprodukte() {
+        if (upsellingVerkaufsprodukte == null) {
+            upsellingVerkaufsprodukte = new ArrayList<VerkaufsproduktSachPrivatType>();
+        }
+        return this.upsellingVerkaufsprodukte;
+    }
 
 }

OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_4_0/on2antrag/unfall/ElementarproduktUnfallType.java

@@ -51,10 +51,10 @@ public class ElementarproduktUnfallType
 {
 
     @XmlElementRefs({
+        @XmlElementRef(name = "AttributMetadaten", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", type = JAXBElement.class, required = false),
         @XmlElementRef(name = "VersPersonRefLfNr", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", type = JAXBElement.class, required = false),
         @XmlElementRef(name = "Versicherungssumme", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "Selbstbehalt", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "Selbstbehalt", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", type = JAXBElement.class, required = false)
-        @XmlElementRef(name = "AttributMetadaten", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", type = JAXBElement.class, required = false)
     })
     protected List<JAXBElement<?>> rest;
 
@@ -86,10 +86,10 @@ public class ElementarproduktUnfallType
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
+     * {@link JAXBElement }{@code <}{@link AttributMetadatenType }{@code >}
+     * {@link JAXBElement }{@code <}{@link SelbstbehaltType }{@code >}
      * {@link JAXBElement }{@code <}{@link String }{@code >}
      * {@link JAXBElement }{@code <}{@link Long }{@code >}
-     * {@link JAXBElement }{@code <}{@link SelbstbehaltType }{@code >}
-     * {@link JAXBElement }{@code <}{@link AttributMetadatenType }{@code >}
      * 
      * 
      */

OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_4_0/on4partner/ChangeCommunicationObjectRequestType.java

@@ -63,8 +63,8 @@ public class ChangeCommunicationObjectRequestType
     protected ObjektIdType objektId;
     @XmlElementRefs({
         @XmlElementRef(name = "BisherigeKommunikationsVerbindung", 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),
+        @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<JAXBElement<?>> objektIdOrBisherigeKommunikationsVerbindungAndGeaenderteKommunikationsVerbindung;
     @XmlElement(name = "WirksamtkeitAb", required = true)
@@ -116,8 +116,8 @@ public class ChangeCommunicationObjectRequestType
      * <p>
      * Objects of the following type(s) are allowed in the list
      * {@link JAXBElement }{@code <}{@link ELKommunikationType }{@code >}
-     * {@link JAXBElement }{@code <}{@link ObjektIdType }{@code >}
      * {@link JAXBElement }{@code <}{@link ELKommunikationType }{@code >}
+     * {@link JAXBElement }{@code <}{@link ObjektIdType }{@code >}
      * 
      * 
      */

OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_4_0/service/OmdsServicePortType_OmdsServicePort_Client.java

@@ -20,7 +20,7 @@ import javax.xml.ws.soap.MTOMFeature;
 
 /**
  * This class was generated by Apache CXF 3.2.0
- * 2019-08-21T15:48:45.908+02:00
+ * 2019-08-21T17:59:18.494+02:00
  * Generated source version: 3.2.0
  * 
  */
@@ -46,6 +46,8 @@ public final class OmdsServicePortType_OmdsServicePort_Client {
             }
         }
       
+//        OmdsService ss = new OmdsService(wsdlURL, SERVICE_NAME);
+//        OmdsServicePortType port = ss.getOmdsServicePort();
         OmdsService ss = new OmdsService(wsdlURL, SERVICE_NAME);
         OmdsServicePortType port = ss.getOmdsServicePort(new MTOMFeature(1024));
         

OMDSServiceDefinition/src/main/resources/def/r1_4_0/ReleaseNotes-1-4-0.txt

@@ -28,6 +28,7 @@ Was ist neu oder anders in Version 1.4.0 im Vergleich zur Version 1.3.0?
       Unfall, Sach-Privat und Rechtsschutz verwendet wird.
 7. Kfz: Optionales Tarifmerkmal "Leasing verbundene Unternehmen"
 8. Einführung von MTOM
+9. Allgemeine - spartenunabhängige - Methoden für BOA eingeführt
 
 =============
 Version 1.3.0

OMDSServiceDefinition/src/main/resources/def/r1_4_0/omds3Services.wsdl

@@ -5,7 +5,7 @@ xmlns:os="urn:omds3Services-1-4-0"
 xmlns:ost="urn:omds3ServiceTypes-1-1-0"
 xmlns:cst="urn:omds3CommonServiceTypes-1-1-0"
 xmlns:b="urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen"
-xmlns:boa="urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common"
+xmlns:ac="urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common"
 xmlns:boak="urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz"
 xmlns:boaSp="urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat"
 xmlns:boaRs="urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs"
@@ -278,28 +278,28 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 	
 	<!-- alle Sparten -->
 	<message name="CalculateRequestMsg">
-		<part name="parameters" element="boa:CalculateCommonRequest"/>
+		<part name="parameters" element="ac:CalculateCommonRequest"/>
 	</message>
 	<message name="CalculateResponseMsg">
-		<part name="parameters" element="boa:CalculateCommonResponse"/>
+		<part name="parameters" element="ac:CalculateCommonResponse"/>
 	</message>
 	<message name="CreateOfferRequestMsg">
-		<part name="parameters" element="boa:CreateOfferCommonRequest"/>
+		<part name="parameters" element="ac:CreateOfferCommonRequest"/>
 	</message>
 	<message name="CreateOfferResponseMsg">
-		<part name="parameters" element="boa:CreateOfferCommonResponse"/>
+		<part name="parameters" element="ac:CreateOfferCommonResponse"/>
 	</message>
 	<message name="CreateApplicationRequestMsg">
-		<part name="parameters" element="boa:CreateApplicationCommonRequest"/>
+		<part name="parameters" element="ac:CreateApplicationCommonRequest"/>
 	</message>
 	<message name="CreateApplicationResponseMsg">
-		<part name="parameters" element="boa:CreateApplicationCommonResponse"/>
+		<part name="parameters" element="ac:CreateApplicationCommonResponse"/>
 	</message>
 	<message name="SubmitApplicationRequestMsg">
-		<part name="parameters" element="boa:SubmitApplicationCommonRequest"/>
+		<part name="parameters" element="ac:SubmitApplicationCommonRequest"/>
 	</message>
 	<message name="SubmitApplicationResponseMsg">
-		<part name="parameters" element="boa:SubmitApplicationCommonResponse"/>
+		<part name="parameters" element="ac:SubmitApplicationCommonResponse"/>
 	</message>
 	
 	<!-- State-Changes z.B. Polizzierung -->

OMDSServiceDefinition/src/main/resources/def/r1_4_0/omds3_ON2_Antrag_SachPrivat.xsd

@@ -498,7 +498,14 @@
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
-	<xsd:complexType name="UpsellingSachPrivatResponse_Type"/>
+	<xsd:complexType name="UpsellingSachPrivatResponse_Type">
+		<xsd:annotation>
+			<xsd:documentation>Type Response Upselling: Enthält eines oder mehrere Verkaufsprodukte Sach-Privat</xsd:documentation>
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:element name="UpsellingVerkaufsprodukte" type="VerkaufsproduktSachPrivat_Type" minOccurs="0" maxOccurs="unbounded"/>
+		</xsd:sequence>
+	</xsd:complexType>
 	<xsd:complexType name="CalculateSachPrivatRequest_Type" final="#all">
 		<xsd:annotation>
 			<xsd:documentation>Typ des Requestobjekts für eine Berechnung Sach-Privat</xsd:documentation>
@@ -518,7 +525,7 @@
 		<xsd:complexContent>
 			<xsd:extension base="ac:CalculateResponse_Type">
 				<xsd:sequence>
-					<xsd:element name="Berechnungsantwort" type="BerechnungSachPrivat_Type"/>
+					<xsd:element name="Berechnungsantwort" type="BerechnungSachPrivat_Type" minOccurs="0"/>
 					<xsd:element name="ResponseUpselling" type="UpsellingSachPrivatResponse_Type" minOccurs="0">
 						<xsd:annotation>
 							<xsd:documentation>Response für das Upselling, wenn solche Ergebnisse angefordert wurden.</xsd:documentation>
@@ -547,7 +554,7 @@
 		<xsd:complexContent>
 			<xsd:extension base="ac:CreateOfferResponse_Type">
 				<xsd:sequence>
-					<xsd:element name="Offertantwort" type="OffertSachPrivat_Type"/>
+					<xsd:element name="Offertantwort" type="OffertSachPrivat_Type" minOccurs="0"/>
 				</xsd:sequence>
 			</xsd:extension>
 		</xsd:complexContent>
@@ -571,7 +578,7 @@
 		<xsd:complexContent>
 			<xsd:extension base="ac:CreateApplicationResponse_Type">
 				<xsd:sequence>
-					<xsd:element name="Antragsantwort" type="AntragSachPrivat_Type"/>
+					<xsd:element name="Antragsantwort" type="AntragSachPrivat_Type" minOccurs="0"/>
 				</xsd:sequence>
 			</xsd:extension>
 		</xsd:complexContent>
@@ -595,7 +602,7 @@
 		<xsd:complexContent>
 			<xsd:extension base="ac:SubmitApplicationResponse_Type">
 				<xsd:sequence>
-					<xsd:element name="Antragsantwort" type="AntragSachPrivat_Type"/>
+					<xsd:element name="Antragsantwort" type="AntragSachPrivat_Type" minOccurs="0"/>
 				</xsd:sequence>
 			</xsd:extension>
 		</xsd:complexContent>