Merge branch 'main' into 1274-yang-additional-usecase-inputs-services

Xyna-Factory · Nov 28, 2024 · 68710d7 · 68710d7
2 parents 67398ce + f651ace
commit 68710d7
Show file tree

Hide file tree

Showing 22 changed files with 39 additions and 23 deletions.
diff --git a/modules/base/base/application.xml b/modules/base/base/application.xml
@@ -16,7 +16,7 @@
  * limitations under the License.
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 -->
-<Application applicationName="Base" comment="" factoryVersion="" versionName="1.0.20" xmlVersion="1.1">
+<Application applicationName="Base" comment="" factoryVersion="" versionName="1.0.21" xmlVersion="1.1">
   <ApplicationInfo>
     <Description Lang="DE">Diverse grundlegende DatenTypen und Services</Description>
     <Description Lang="EN">Miscellaneous essential data types and services</Description>

diff --git a/modules/base/base/mdmimpl/syncService/src/xprc/synchronization/SynchronizationImpl.java b/modules/base/base/mdmimpl/syncService/src/xprc/synchronization/SynchronizationImpl.java
@@ -21,6 +21,8 @@
 import com.gip.xyna.utils.exceptions.XynaException;
 import com.gip.xyna.xdev.xfractmod.xmdm.GeneralXynaObject;
 import com.gip.xyna.xdev.xfractmod.xmdm.XynaObject;
+import com.gip.xyna.xfmg.xods.configuration.DocumentationLanguage;
+import com.gip.xyna.xfmg.xods.configuration.XynaPropertyUtils.XynaPropertyBoolean;
 import com.gip.xyna.xprc.XynaOrderServerExtension;
 import com.gip.xyna.xprc.exceptions.XPRC_DUPLICATE_CORRELATIONID;
 import com.gip.xyna.xprc.exceptions.XPRC_InvalidXMLForObjectCreationException;
@@ -34,6 +36,9 @@
 public class SynchronizationImpl {
 
   private static final String NULL_VALUE = "__NULL_VALUE_internal";
+  public static final XynaPropertyBoolean THROW_EXCEPTION = new XynaPropertyBoolean("xprc.synchronization.THROW_EXCEPTION", false)
+      .setDefaultDocumentation(DocumentationLanguage.DE, "Ist die Synchronization Answer eine Exception, wird diese vom Await Schritt geworfen.")
+      .setDefaultDocumentation(DocumentationLanguage.EN, "If the synchronization answer is an exception, that exception is thrown by the await."); 
 
 
   public SynchronizationImpl() {
@@ -59,13 +64,24 @@ public static XynaObject awaitNotification(XynaOrderServerExtension xo, Correlat
   }
 
 
-  private static XynaObject createAnswer(String resultingAnswerString, Long rootRevision) {
+  private static XynaObject createAnswer(String resultingAnswerString, Long rootRevision) throws XynaException {
     if (resultingAnswerString == null) {
       return null;
     }
     if (resultingAnswerString.equals(NULL_VALUE)) {
       return null;
     }
+    if (resultingAnswerString.startsWith("<Exception ") && THROW_EXCEPTION.get()) {
+      try {
+        GeneralXynaObject obj = XynaObject.generalFromXml(resultingAnswerString, rootRevision);
+        if (obj instanceof XynaException) {
+          ((XynaException) obj).setStackTrace(new StackTraceElement[0]);
+          throw (XynaException) obj;
+        }
+      } catch (XPRC_XmlParsingException | XPRC_InvalidXMLForObjectCreationException | XPRC_MDMObjectCreationException e) {
+        throw e;
+      }
+    }
     if (resultingAnswerString.startsWith("<Data ")) {
       try {
         return XynaObject.fromXml(resultingAnswerString, rootRevision);

diff --git a/modules/base/net/application.xml b/modules/base/net/application.xml
@@ -24,7 +24,7 @@
     <RuntimeContextRequirements>
       <RuntimeContextRequirement>
         <ApplicationName>Base</ApplicationName>
-        <VersionName>1.0.20</VersionName>
+        <VersionName>1.0.21</VersionName>
       </RuntimeContextRequirement>
     </RuntimeContextRequirements>
   </ApplicationInfo>

diff --git a/modules/base/storables/application.xml b/modules/base/storables/application.xml
@@ -21,7 +21,7 @@
     <RuntimeContextRequirements>
       <RuntimeContextRequirement>
         <ApplicationName>Base</ApplicationName>
-        <VersionName>1.0.20</VersionName>
+        <VersionName>1.0.21</VersionName>
       </RuntimeContextRequirement>
     </RuntimeContextRequirements>
   </ApplicationInfo>

diff --git a/modules/xact/connection/connection/application.xml b/modules/xact/connection/connection/application.xml
@@ -24,7 +24,7 @@
     <RuntimeContextRequirements>
       <RuntimeContextRequirement>
         <ApplicationName>Base</ApplicationName>
-        <VersionName>1.0.20</VersionName>
+        <VersionName>1.0.21</VersionName>
       </RuntimeContextRequirement>
     </RuntimeContextRequirements>
   </ApplicationInfo>

diff --git a/modules/xact/dhcp/client/application.xml b/modules/xact/dhcp/client/application.xml
@@ -21,7 +21,7 @@
     <RuntimeContextRequirements>
       <RuntimeContextRequirement>
         <ApplicationName>Base</ApplicationName>
-        <VersionName>1.0.20</VersionName>
+        <VersionName>1.0.21</VersionName>
       </RuntimeContextRequirement>
     </RuntimeContextRequirements>
   </ApplicationInfo>

diff --git a/modules/xact/ldap/application.xml b/modules/xact/ldap/application.xml
@@ -24,7 +24,7 @@
     <RuntimeContextRequirements>
       <RuntimeContextRequirement>
         <ApplicationName>Base</ApplicationName>
-        <VersionName>1.0.20</VersionName>
+        <VersionName>1.0.21</VersionName>
       </RuntimeContextRequirement>
     </RuntimeContextRequirements>
   </ApplicationInfo>

diff --git a/modules/xact/mail/application.xml b/modules/xact/mail/application.xml
@@ -21,7 +21,7 @@
     <RuntimeContextRequirements>
       <RuntimeContextRequirement>
         <ApplicationName>Base</ApplicationName>
-        <VersionName>1.0.20</VersionName>
+        <VersionName>1.0.21</VersionName>
       </RuntimeContextRequirement>
     </RuntimeContextRequirements>
   </ApplicationInfo>

diff --git a/modules/xact/queue/queue/application.xml b/modules/xact/queue/queue/application.xml
@@ -24,7 +24,7 @@
     <RuntimeContextRequirements>
       <RuntimeContextRequirement>
         <ApplicationName>Base</ApplicationName>
-        <VersionName>1.0.20</VersionName>
+        <VersionName>1.0.21</VersionName>
       </RuntimeContextRequirement>
     </RuntimeContextRequirements>
   </ApplicationInfo>

diff --git a/modules/xact/script/application.xml b/modules/xact/script/application.xml
@@ -24,7 +24,7 @@
     <RuntimeContextRequirements>
       <RuntimeContextRequirement>
         <ApplicationName>Base</ApplicationName>
-        <VersionName>1.0.20</VersionName>
+        <VersionName>1.0.21</VersionName>
       </RuntimeContextRequirement>
     </RuntimeContextRequirements>
   </ApplicationInfo>

diff --git a/modules/xact/snmp/application.xml b/modules/xact/snmp/application.xml
@@ -24,7 +24,7 @@
     <RuntimeContextRequirements>
       <RuntimeContextRequirement>
         <ApplicationName>Base</ApplicationName>
-        <VersionName>1.0.20</VersionName>
+        <VersionName>1.0.21</VersionName>
       </RuntimeContextRequirement>
     </RuntimeContextRequirements>
   </ApplicationInfo>

diff --git a/modules/xact/soap/application.xml b/modules/xact/soap/application.xml
@@ -24,9 +24,9 @@
     <RuntimeContextRequirements>
       <RuntimeContextRequirement>
         <ApplicationName>Base</ApplicationName>
-        <VersionName>1.0.20</VersionName>
+        <VersionName>1.0.21</VersionName>
       </RuntimeContextRequirement>
-    </RuntimeContextRequirements>>
+    </RuntimeContextRequirements>
   </ApplicationInfo>
   <SharedLibs>
     <SharedLib implicitDependency="true">

diff --git a/modules/xact/velocity/application.xml b/modules/xact/velocity/application.xml
@@ -21,7 +21,7 @@
     <RuntimeContextRequirements>
       <RuntimeContextRequirement>
         <ApplicationName>Base</ApplicationName>
-        <VersionName>1.0.20</VersionName>
+        <VersionName>1.0.21</VersionName>
       </RuntimeContextRequirement>
     </RuntimeContextRequirements>
   </ApplicationInfo>

diff --git a/modules/xfmg/csv/application.xml b/modules/xfmg/csv/application.xml
@@ -21,7 +21,7 @@
     <RuntimeContextRequirements>
       <RuntimeContextRequirement>
         <ApplicationName>Base</ApplicationName>
-        <VersionName>1.0.20</VersionName>
+        <VersionName>1.0.21</VersionName>
       </RuntimeContextRequirement>
     </RuntimeContextRequirements>
   </ApplicationInfo>

diff --git a/modules/xfmg/json/application.xml b/modules/xfmg/json/application.xml
@@ -21,7 +21,7 @@
     <RuntimeContextRequirements>
       <RuntimeContextRequirement>
         <ApplicationName>Base</ApplicationName>
-        <VersionName>1.0.20</VersionName>
+        <VersionName>1.0.21</VersionName>
       </RuntimeContextRequirement>
     </RuntimeContextRequirements>
   </ApplicationInfo>

diff --git a/modules/xfmg/node/application.xml b/modules/xfmg/node/application.xml
@@ -24,7 +24,7 @@
     <RuntimeContextRequirements>
       <RuntimeContextRequirement>
         <ApplicationName>Base</ApplicationName>
-        <VersionName>1.0.20</VersionName>
+        <VersionName>1.0.21</VersionName>
       </RuntimeContextRequirement>
     </RuntimeContextRequirements>
   </ApplicationInfo>

diff --git a/modules/xfmg/user/application.xml b/modules/xfmg/user/application.xml
@@ -24,7 +24,7 @@
     <RuntimeContextRequirements>
       <RuntimeContextRequirement>
         <ApplicationName>Base</ApplicationName>
-        <VersionName>1.0.20</VersionName>
+        <VersionName>1.0.21</VersionName>
       </RuntimeContextRequirement>
     </RuntimeContextRequirements>>
   </ApplicationInfo>

diff --git a/modules/xfmg/xynaproperty/application.xml b/modules/xfmg/xynaproperty/application.xml
@@ -24,7 +24,7 @@
     <RuntimeContextRequirements>
       <RuntimeContextRequirement>
         <ApplicationName>Base</ApplicationName>
-        <VersionName>1.0.20</VersionName>
+        <VersionName>1.0.21</VersionName>
       </RuntimeContextRequirement>
     </RuntimeContextRequirements>
   </ApplicationInfo>

diff --git a/modules/xint/crypto/application.xml b/modules/xint/crypto/application.xml
@@ -24,7 +24,7 @@
     <RuntimeContextRequirements>
       <RuntimeContextRequirement>
         <ApplicationName>Base</ApplicationName>
-        <VersionName>1.0.20</VersionName>
+        <VersionName>1.0.21</VersionName>
       </RuntimeContextRequirement>
     </RuntimeContextRequirements>
   </ApplicationInfo>

diff --git a/modules/xint/regexp/application.xml b/modules/xint/regexp/application.xml
@@ -24,7 +24,7 @@
     <RuntimeContextRequirements>
       <RuntimeContextRequirement>
         <ApplicationName>Base</ApplicationName>
-        <VersionName>1.0.20</VersionName>
+        <VersionName>1.0.21</VersionName>
       </RuntimeContextRequirement>
     </RuntimeContextRequirements>
   </ApplicationInfo>

diff --git a/modules/xnwh/timeseries/application.xml b/modules/xnwh/timeseries/application.xml
@@ -21,7 +21,7 @@
     <RuntimeContextRequirements>
       <RuntimeContextRequirement>
         <ApplicationName>Base</ApplicationName>
-        <VersionName>1.0.20</VersionName>
+        <VersionName>1.0.21</VersionName>
       </RuntimeContextRequirement>
     </RuntimeContextRequirements>
   </ApplicationInfo>

diff --git a/modules/xprc/processing/application.xml b/modules/xprc/processing/application.xml
@@ -25,7 +25,7 @@
     <RuntimeContextRequirements>
       <RuntimeContextRequirement>
         <ApplicationName>Base</ApplicationName>
-        <VersionName>1.0.20</VersionName>
+        <VersionName>1.0.21</VersionName>
       </RuntimeContextRequirement>
     </RuntimeContextRequirements>
   </ApplicationInfo>