Merge branch 'main' into 1272-update-installation-with-versioned-jar-…

…files

installation/build/pom.xml

@@ -357,7 +357,7 @@
             <dependency>
                 <groupId>org.mariadb.jdbc</groupId>
                 <artifactId>mariadb-java-client</artifactId>
-                <version>3.5.0</version>
+                <version>3.5.1</version>
             </dependency>
             <dependency>
                 <groupId>net.jradius</groupId>

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>

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);

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>

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>

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>

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>

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>

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>

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>

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>

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>

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">

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>

modules/xdev/yang/XMOM/xdev/yang/YangAppGeneration.xml

@@ -100,24 +100,24 @@
         <CodeSnippet Type="Java">return xdev.yang.YangAppGenerationImpl.loadUsecaseSignature(useCaseTableData16);</CodeSnippet>
       </SourceCode>
     </Operation>
-    <Operation IsStatic="true" Label="Remove Variable From Usecase Signautre" Name="removeVariableFromUsecaseSignautre">
+    <Operation IsStatic="true" Label="Remove Variable From Usecase Signature" Name="removeVariableFromUsecaseSignature" RequiresXynaOrder="true">
       <Input>
         <Data ID="23" Label="Use Case Table Data" ReferenceName="UseCaseTableData" ReferencePath="xmcp.yang" VariableName="useCaseTableData23"/>
         <Data ID="24" Label="UsecaseSignatureEntry" ReferenceName="UsecaseSignatureEntry" ReferencePath="xmcp.yang.fman" VariableName="usecaseSignatureEntry24"/>
       </Input>
       <Output/>
       <SourceCode>
-        <CodeSnippet Type="Java">xdev.yang.YangAppGenerationImpl.removeVariableFromUsecaseSignautre(useCaseTableData23, usecaseSignatureEntry24);</CodeSnippet>
+        <CodeSnippet Type="Java">xdev.yang.YangAppGenerationImpl.removeVariableFromUsecaseSignature(correlatedXynaOrder, useCaseTableData23, usecaseSignatureEntry24);</CodeSnippet>
       </SourceCode>
     </Operation>
-    <Operation IsStatic="true" Label="Add Variable To Usecase Signature" Name="addVariableToUsecaseSignature">
+    <Operation IsStatic="true" Label="Add Variable To Usecase Signature" Name="addVariableToUsecaseSignature" RequiresXynaOrder="true">
       <Input>
         <Data ID="21" Label="Use Case Table Data" ReferenceName="UseCaseTableData" ReferencePath="xmcp.yang" VariableName="useCaseTableData21"/>
         <Data ID="22" Label="UsecaseSignatureEntry" ReferenceName="UsecaseSignatureEntry" ReferencePath="xmcp.yang.fman" VariableName="usecaseSignatureEntry22"/>
       </Input>
       <Output/>
       <SourceCode>
-        <CodeSnippet Type="Java">xdev.yang.YangAppGenerationImpl.addVariableToUsecaseSignature(useCaseTableData21, usecaseSignatureEntry22);</CodeSnippet>
+        <CodeSnippet Type="Java">xdev.yang.YangAppGenerationImpl.addVariableToUsecaseSignature(correlatedXynaOrder, useCaseTableData21, usecaseSignatureEntry22);</CodeSnippet>
       </SourceCode>
     </Operation>
   </Service>

modules/xdev/yang/XMOM/xmcp/yang/LoadYangAssignmentsData.xml

@@ -44,4 +44,9 @@
       <Type>String</Type>
     </Meta>
   </Data>
+  <Data Label="TotalKeywords" VariableName="totalKeywords">
+    <Meta>
+      <Type>String</Type>
+    </Meta>
+  </Data>
 </DataType>

modules/xdev/yang/XMOM/xmcp/yang/fman/DeleteVariableFromUsecaseSignature.xml

@@ -22,20 +22,20 @@
       <Data ID="18" Label="UsecaseSignatureEntry" ReferenceName="UsecaseSignatureEntry" ReferencePath="xmcp.yang.fman" VariableName="usecaseSignatureEntry18"/>
     </Input>
     <Output/>
-    <ServiceReference ID="61" Label="Yang App Generation" ReferenceName="YangAppGeneration.YangAppGeneration" ReferencePath="xdev.yang">
-      <Source RefID="60"/>
-      <Target RefID="60"/>
+    <ServiceReference ID="525" Label="Yang App Generation" ReferenceName="YangAppGeneration.YangAppGeneration" ReferencePath="xdev.yang">
+      <Source RefID="524"/>
+      <Target RefID="524"/>
     </ServiceReference>
-    <Function ID="60" Label="Remove Variable From Usecase Signautre">
-      <Source RefID="61"/>
+    <Function ID="524" Label="Remove Variable From Usecase Signature">
+      <Source RefID="525"/>
       <Source RefID="515"/>
       <Source RefID="18"/>
-      <Target RefID="61"/>
-      <Invoke Operation="removeVariableFromUsecaseSignautre" ServiceID="61">
+      <Target RefID="525"/>
+      <Invoke Operation="removeVariableFromUsecaseSignature" ServiceID="525">
         <Source RefID="515"/>
         <Source RefID="18"/>
       </Invoke>
-      <Receive ServiceID="61"/>
+      <Receive ServiceID="525"/>
     </Function>
     <Assign ID="1"/>
   </Operation>

modules/xdev/yang/XMOM/xmcp/yang/fman/UseCaseRootAssignmentsDefinition.xml

@@ -52,6 +52,7 @@
       <Mapping>%1%.loadYangAssignmentsData.totalYangPath=%0%.rpcName</Mapping>
       <Mapping>%1%.loadYangAssignmentsData.usecase=%0%.useCase</Mapping>
       <Mapping>%1%.loadYangAssignmentsData.workspaceName=%0%.runtimeContext</Mapping>
+      <Mapping>%1%.loadYangAssignmentsData.totalKeywords="rpc"</Mapping>
       <Mapping>%1%.type="Rpc"</Mapping>
       <Mapping>%1%.yangPath=%0%.rpcName</Mapping>
     </Mappings>

modules/xdev/yang/application.xml

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
---><Application applicationName="YangAppGenerator" comment="" factoryVersion="" versionName="0.1.6" xmlVersion="1.1">
+--><Application applicationName="YangAppGenerator" comment="" factoryVersion="" versionName="0.1.8" xmlVersion="1.1">
   <ApplicationInfo>
     <RuntimeContextRequirements>
       <RuntimeContextRequirement>
@@ -135,7 +135,7 @@
       <Type>WORKFLOW</Type>
     </XMOMEntry>
     <XMOMEntry implicitDependency="false">
-      <FqName>xmcp.yang.fman.UseCas</FqName>
+      <FqName>xmcp.yang.fman.UseCaseSignatureInputTableInfo</FqName>
       <Type>WORKFLOW</Type>
     </XMOMEntry>
   </XMOMEntries>

modules/xdev/yang/mdmimpl/YangAppGenerationImpl/src/xdev/yang/impl/Constants.java

@@ -23,14 +23,20 @@ public class Constants {
   public static final String ATT_YANG_TYPE = "type";
   public static final String ATT_MAPPING_YANGPATH = "yang";
   public static final String ATT_MAPPING_VALUE = "config";
+  public static final String ATT_MAPPING_KEYWORD = "keyword";
   public static final String ATT_MAPPING_NAMESPACE = "namespace";
+  public static final String ATT_SIGNATURE_LOCATION = "location";
+  public static final String ATT_SIGNATURE_ENTRY_FQN = "fqn";
+  public static final String ATT_SIGNATURE_ENTRY_VARNAME = "variableName";
 
   public static final String TAG_YANG = "Yang";
   public static final String TAG_RPC = "Rpc";
   public static final String TAG_RPC_NS = "RpcNamespace";
   public static final String TAG_DEVICE_FQN = "DeviceFqn";
   public static final String TAG_MAPPINGS = "Mappings";
   public static final String TAG_MAPPING = "Mapping";
+  public static final String TAG_SIGNATURE = "Signature";
+  public static final String TAG_SIGNATURE_ENTRY = "SignatureEntry";
 
   public static final String TAG_HELLO = "hello";
   public static final String TAG_CAPABILITIES = "capabilities";
@@ -40,12 +46,17 @@ public class Constants {
   public static final String VAL_MODULECOLLECTION = "ModuleCollection";
   public static final String VAL_DEVICE = "Capabilities";
 
+  public static final String VAL_LOCATION_INPUT = "input";
+  public static final String VAL_LOCATION_OUTPUT = "output";
+
   public static final String TYPE_CONTAINER = "container";
   public static final String TYPE_LEAF = "leaf";
   public static final String TYPE_GROUPING = "grouping";
   public static final String TYPE_USES = "uses";
   public static final String TYPE_IDENTITY = "identity";
   public static final String TYPE_RPC = "rpc";
+  public static final String TYPE_CHOICE = "choice";
+  public static final String TYPE_CASE = "case";
 
   public static final String NS_SEPARATOR = "§";
 

modules/xdev/yang/mdmimpl/YangAppGenerationImpl/src/xdev/yang/impl/YangAppGenerationServiceOperationImpl.java

@@ -41,8 +41,11 @@
 import xdev.yang.cli.generated.OverallInformationProvider;
 import xdev.yang.impl.YangApplicationGeneration.YangApplicationGenerationData;
 import xdev.yang.impl.usecase.AddUsecase;
+import xdev.yang.impl.usecase.AddVariableToUsecaseSignature;
 import xdev.yang.impl.usecase.DetermineUseCaseAssignments;
+import xdev.yang.impl.usecase.LoadUsecaseSignature;
 import xdev.yang.impl.usecase.LoadUsecasesTable;
+import xdev.yang.impl.usecase.RemoveVariableFromUsecaseSignature;
 import xdev.yang.impl.usecase.SaveUsecaseAssignmentAction;
 import xmcp.yang.LoadYangAssignmentsData;
 import xmcp.yang.UseCaseAssignmentTableData;
@@ -145,19 +148,22 @@ public void saveAssignment(XynaOrderServerExtension order, UseCaseAssignmentTabl
 
 
   @Override
-  public void addVariableToUsecaseSignature(UseCaseTableData usecase, UsecaseSignatureEntry signature) {
-
+  public void addVariableToUsecaseSignature(XynaOrderServerExtension order, UseCaseTableData usecase, UsecaseSignatureEntry signature) {
+    AddVariableToUsecaseSignature executor = new AddVariableToUsecaseSignature();
+    executor.addVariable(order, usecase, signature);
   }
 
 
   @Override
   public Container loadUsecaseSignature(UseCaseTableData usecase) {
-    return null;
+    LoadUsecaseSignature executor = new LoadUsecaseSignature();
+    return executor.loadSignature(usecase);
   }
 
 
   @Override
-  public void removeVariableFromUsecaseSignautre(UseCaseTableData usecase, UsecaseSignatureEntry signature) {
-
+  public void removeVariableFromUsecaseSignature(XynaOrderServerExtension order, UseCaseTableData usecase, UsecaseSignatureEntry signature) {
+    RemoveVariableFromUsecaseSignature executor = new RemoveVariableFromUsecaseSignature();
+    executor.removeVariable(order, usecase, signature);
   }
 }

modules/xdev/yang/mdmimpl/YangAppGenerationImpl/src/xdev/yang/impl/YangStatementTranslator.java

@@ -24,6 +24,8 @@
 import java.util.Map;
 
 import org.yangcentral.yangkit.base.YangElement;
+import org.yangcentral.yangkit.model.api.stmt.Case;
+import org.yangcentral.yangkit.model.api.stmt.Choice;
 import org.yangcentral.yangkit.model.api.stmt.Container;
 import org.yangcentral.yangkit.model.api.stmt.Leaf;
 import org.yangcentral.yangkit.model.api.stmt.Rpc;
@@ -44,6 +46,8 @@ private static Map<Class<?>, YangStatementTranslation> setupStatementTranslation
     result.put(Leaf.class, new YangStatementTranslation(Constants.TYPE_LEAF));
     result.put(Uses.class, new YangStatementTranslation(Constants.TYPE_USES));
     result.put(Rpc.class, new YangStatementTranslation(Constants.TYPE_RPC));
+    result.put(Choice.class, new YangStatementTranslation(Constants.TYPE_CHOICE));
+    result.put(Case.class, new YangStatementTranslation(Constants.TYPE_CASE));
     return result;
   }