Bindings gefixt

2025-08-26 14:50:05 +02:00
parent c8e088fd1e
commit 64e94406fa
8 changed files with 69 additions and 35 deletions
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,6 +9,7 @@
    </loaded-modules>
  </component>
  <component name="ChangeListManager">
+    <list default="true" id="e0e5f782-08ef-4945-a944-b4866593efbf" name="Changes" comment="" />
    <list default="true" id="00dc40a5-3207-4d4d-ae00-ffe7eaa81775" name="Changes" comment="">
      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
@@ -25,17 +26,12 @@
    <option name="LAST_RESOLUTION" value="IGNORE" />
  </component>
  <component name="Git.Settings">
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
  </component>
  <component name="ProjectColorInfo">{
-  &quot;associatedIndex&quot;: 8
+  &quot;associatedIndex&quot;: 6
 }</component>
-  <component name="ProjectId" id="2wRIijNOwoQxuuIt4B8RQT7LOP7" />
+  <component name="ProjectId" id="2gUubiSM5Jut9YVYFBVLdNg69es" />
  <component name="ProjectViewState">
    <option name="hideEmptyMiddlePackages" value="true" />
    <option name="showLibraryContents" value="true" />
@@ -45,6 +41,9 @@
    "Maven.OMDSServiceDefinition clean package.executor": "Run",
    "ModuleVcsDetector.initialDetectionPerformed": "true",
    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "git-widget-placeholder": "develop2",
+    "kotlin-language-version-configured": "true",
+    "last_opened_file_path": "C:/Users/Lukas/IdeaProjects/omdsservicedefinitions",
    "RunOnceActivity.git.unshallow": "true",
    "git-widget-placeholder": "feature/aenderungen",
    "node.js.detected.package.eslint": "true",
@@ -58,23 +57,25 @@
    "vue.rearranger.settings.migration": "true"
  }
 }]]></component>
+  <component name="RunManager" selected="Maven.CodeGen OMDSServiceDefinition" />
  <component name="SharedIndexes">
    <attachedChunks>
      <set>
-        <option value="bundled-jdk-9823dce3aa75-fbdcb00ec9e3-intellij.indexing.shared.core-IU-251.23774.435" />
-        <option value="bundled-js-predefined-d6986cc7102b-f27c65a3e318-JavaScript-IU-251.23774.435" />
+        <option value="bundled-jdk-9823dce3aa75-28b599e66164-intellij.indexing.shared.core-IU-242.24807.4" />
+        <option value="bundled-js-predefined-d6986cc7102b-5c90d61e3bab-JavaScript-IU-242.24807.4" />
      </set>
    </attachedChunks>
  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
  <component name="TaskManager">
    <task active="true" id="Default" summary="Default task">
      <changelist id="00dc40a5-3207-4d4d-ae00-ffe7eaa81775" name="Changes" comment="" />
      <created>1745998089296</created>
      <option name="number" value="Default" />
      <option name="presentableId" value="Default" />
-      <updated>1745998089296</updated>
-      <workItem from="1745998090566" duration="199000" />
-      <workItem from="1745998342521" duration="1875000" />
+      <updated>1715764550395</updated>
+      <workItem from="1715764551681" duration="125000" />
+      <workItem from="1744355646461" duration="35000" />
    </task>
    <servers />
  </component>
--- a/OMDSServiceDefinition/.gitignore
+++ b/OMDSServiceDefinition/.gitignore
@@ -2,4 +2,5 @@
 /docGen/
 /out
 /auxil
+/.idea/workspace.xml

--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/UnfallCalcService.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/UnfallCalcService.java
@@ -34,7 +34,6 @@ public class UnfallCalcService {
        response.getBerechnungsantwort().getVerkaufsprodukt().getPraemie().stream().findFirst()
        .ifPresent(praemieType -> verkaufsproduktUnfall.setPraemie(praemieType.getPraemieBto()));

-
        return verkaufsproduktUnfall;
    }
-}
+}
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/UnterbausteinInterface.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/api/UnterbausteinInterface.java
@@ -0,0 +1,5 @@
+package at.vvo.omds.client.api;
+
+public interface UnterbausteinInterface extends ProduktbausteinInterface {
+
+}
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/api/SOAPConnector.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/client/gui/api/SOAPConnector.java
@@ -45,6 +45,9 @@ public class SOAPConnector {

        System.out.println("-----------------------------------------------------------------------------");
        printMessage(response);
+        System.out.println("-----------------------------------------------------------------------------");
+        printMessage(req);
+
        CalculateResponse erg =
                (CalculateResponse) unmarshaller.unmarshal(response.getSOAPBody().extractContentAsDocument());
        soapConnection.close();
--- a/OMDSServiceDefinition/src/main/resources/def/r2025_27/binding.xjb
+++ b/OMDSServiceDefinition/src/main/resources/def/r2025_27/binding.xjb
@@ -107,6 +107,24 @@
         </annox:annotate>
      </bindings>

+
+      <jaxb:bindings node="//xs:complexType[@name='BasisProduktbaustein_Type']//xs:element[@name='Attribut']">
+         <jaxb:property name="Attribute">
+            <jaxb:javadoc><![CDATA[<p>Die Liste der Attribute für diesen Deckungsbaustein.</p>]]></jaxb:javadoc>
+         </jaxb:property>
+      </jaxb:bindings>
+      <jaxb:bindings node="//xs:complexType[@name='BasisProduktbaustein_Type']//xs:element[@name='Meldungen']">
+         <jaxb:property name="Meldungen">
+            <jaxb:javadoc><![CDATA[<p>Die Liste der Meldungen für diesen Deckungsbaustein.</p>]]></jaxb:javadoc>
+         </jaxb:property>
+      </jaxb:bindings>
+
+      <jaxb:bindings node="//xs:complexType[@name='Produktbaustein_Type']//xs:element[@name='Baustein']">
+         <jaxb:property name="Bausteine">
+            <jaxb:javadoc><![CDATA[<p>Die Liste der Unterbausteine für diesen Deckungsbaustein.</p>]]></jaxb:javadoc>
+         </jaxb:property>
+      </jaxb:bindings>
+
      <jaxb:bindings node="//xs:complexType[@name='APrioriProduktbaustein_Type']//xs:element[@name='Klausel']">
         <jaxb:property name="Klauseln">
            <jaxb:javadoc><![CDATA[<p>Die Liste der Klauseln für diesen Deckungsbaustein.</p>]]></jaxb:javadoc>
@@ -407,26 +425,26 @@
         </annox:annotate>
      </bindings>

-      <jaxb:bindings node="//xs:complexType[@name='ProduktbausteinAuskunft_Type']//xs:element[@name='Klausel']">
-         <jaxb:property name="Klauseln">
-            <jaxb:javadoc><![CDATA[<p>Die Klauseln des Deckungsbausteins.</p>]]></jaxb:javadoc>
-         </jaxb:property>
-      </jaxb:bindings>
-      <jaxb:bindings node="//xs:complexType[@name='ProduktbausteinAuskunft_Type']//xs:element[@name='Baustein']">
-         <jaxb:property name="Bausteine">
-            <jaxb:javadoc><![CDATA[<p>Die Unterbausteine des Deckungsbausteins.</p>]]></jaxb:javadoc>
-         </jaxb:property>
-      </jaxb:bindings>
-      <jaxb:bindings node="//xs:complexType[@name='ProduktbausteinAuskunft_Type']//xs:element[@name='Attribut']">
-         <jaxb:property name="Attribute">
-            <jaxb:javadoc><![CDATA[<p>Die Attribute des Deckungsbausteins.</p>]]></jaxb:javadoc>
-         </jaxb:property>
-      </jaxb:bindings>
-      <jaxb:bindings node="//xs:complexType[@name='ProduktbausteinAuskunft_Type']//xs:element[@name='Meldung']">
-         <jaxb:property name="Meldungen">
-            <jaxb:javadoc><![CDATA[<p>Die Meldungen des Deckungsbausteins.</p>]]></jaxb:javadoc>
-         </jaxb:property>
-      </jaxb:bindings>
+<!--      <jaxb:bindings node="//xs:complexType[@name='ProduktbausteinAuskunft_Type']//xs:element[@name='Klausel']">-->
+<!--         <jaxb:property name="Klauseln">-->
+<!--            <jaxb:javadoc><![CDATA[<p>Die Klauseln des Deckungsbausteins.</p>]]></jaxb:javadoc>-->
+<!--         </jaxb:property>-->
+<!--      </jaxb:bindings>-->
+<!--      <jaxb:bindings node="//xs:complexType[@name='ProduktbausteinAuskunft_Type']//xs:element[@name='Baustein']">-->
+<!--         <jaxb:property name="Bausteine">-->
+<!--            <jaxb:javadoc><![CDATA[<p>Die Unterbausteine des Deckungsbausteins.</p>]]></jaxb:javadoc>-->
+<!--         </jaxb:property>-->
+<!--      </jaxb:bindings>-->
+<!--      <jaxb:bindings node="//xs:complexType[@name='ProduktbausteinAuskunft_Type']//xs:element[@name='Attribut']">-->
+<!--         <jaxb:property name="Attribute">-->
+<!--            <jaxb:javadoc><![CDATA[<p>Die Attribute des Deckungsbausteins.</p>]]></jaxb:javadoc>-->
+<!--         </jaxb:property>-->
+<!--      </jaxb:bindings>-->
+<!--      <jaxb:bindings node="//xs:complexType[@name='ProduktbausteinAuskunft_Type']//xs:element[@name='Meldung']">-->
+<!--         <jaxb:property name="Meldungen">-->
+<!--            <jaxb:javadoc><![CDATA[<p>Die Meldungen des Deckungsbausteins.</p>]]></jaxb:javadoc>-->
+<!--         </jaxb:property>-->
+<!--      </jaxb:bindings>-->
   </jaxb:bindings><!-- Ende Antrag Common -->

   <!-- Antrag Kfz -->
--- a/OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3CommonServiceTypes.xsd
+++ b/OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3CommonServiceTypes.xsd
@@ -1720,6 +1720,7 @@
 						</xsd:annotation>
 					</xsd:element>
 					<xsd:element name="Baustein" type="Produktbaustein_Type" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="Aktion" type="Aktion_Type" minOccurs="0" maxOccurs="unbounded"/>
 				</xsd:sequence>
 				<xsd:attribute name="MinVorkommen" type="xsd:int" />
 				<xsd:attribute name="MaxVorkommen" type="xsd:int" />
@@ -1760,6 +1761,12 @@
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
+	<xsd:complexType name="Aktion_Type">
+		<xsd:sequence>
+			<xsd:element name="Aktion_Code" type="xsd:short"/>
+			<xsd:element name="Beschreibung" type="xsd:string"/>
+		</xsd:sequence>
+	</xsd:complexType>
 	<xsd:complexType name="Kombinationen_Type">
 		<xsd:annotation>
 			<xsd:documentation>Typ für eine Liste zulässiger Kombinationen von Produktbaustein-Ids als Restriktion.</xsd:documentation>
--- a/OMDSServiceDefinition/src/main/resources/log4j.properties
+++ b/OMDSServiceDefinition/src/main/resources/log4j.properties
@@ -9,7 +9,7 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p %-12c{1}:%-3L - %m%n

 # Log-Level fuer Projekt
-log4j.logger.at.vvo=INFO
+log4j.logger.at.vvo=DEBUG

 # Wenn gewünscht, z.B. ändern auf Debug
 #log4j.logger.at.vvo=DEBUG