update to prosys sdk 5.2.2

connectedcooking · Jun 17, 2024 · e85a9fb · e85a9fb
1 parent c19330f
commit e85a9fb
Show file tree

Hide file tree

Showing 335 changed files with 7,024 additions and 3,866 deletions.
diff --git a/README.md b/README.md
@@ -16,12 +16,12 @@ Add necessary dependencies:
 <dependency>
   <groupId>com.connectedcooking.opcua</groupId>
   <artifactId>opcua-dynamic-node-manager</artifactId>
-  <version>0.2.2</version>
+  <version>0.2.3</version>
 </dependency>
 <dependency>
   <groupId>com.prosysopc.ua</groupId>
   <artifactId>prosys-opc-ua-sdk-client-server</artifactId>
-  <version>5.1.0-116</version>
+  <version>5.2.2-139</version>
 </dependency>
 ```
 

diff --git a/examples/parent/pom.xml b/examples/parent/pom.xml
@@ -14,15 +14,15 @@
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
 
-        <dynamicnodemanager.version>0.2.2-SNAPSHOT</dynamicnodemanager.version>
+        <dynamicnodemanager.version>0.2.3-SNAPSHOT</dynamicnodemanager.version>
 
-        <prosys.version>5.1.0-116</prosys.version>
-        <slf4j.version>2.0.11</slf4j.version>
-        <jupiter.version>5.10.1</jupiter.version>
-        <mockito.version>5.9.0</mockito.version>
-        <assertj.version>3.25.1</assertj.version>
+        <prosys.version>5.2.2-139</prosys.version>
+        <slf4j.version>2.0.13</slf4j.version>
+        <jupiter.version>5.10.2</jupiter.version>
+        <mockito.version>5.12.0</mockito.version>
+        <assertj.version>3.26.0</assertj.version>
 
-        <logback.version>1.4.14</logback.version>
+        <logback.version>1.5.6</logback.version>
     </properties>
 
     <dependencyManagement>

diff --git a/.../examples/prosys/opc30200/model/cke/CommercialKitchenEquipmentCommonInformationModel.java b/.../examples/prosys/opc30200/model/cke/CommercialKitchenEquipmentCommonInformationModel.java
@@ -29,7 +29,7 @@
 import com.prosysopc.ua.CommonCodegenModel;
 
 /**
- * Generated on 2023-09-26 10:56:54
+ * Generated on 2024-06-17 14:43:51
  */
 public class CommercialKitchenEquipmentCommonInformationModel {
   public static final CommonCodegenModel MODEL;

diff --git a/...xamples/prosys/opc30200/model/cke/CommercialKitchenEquipmentDataTypeDictionaryHelper.java b/...xamples/prosys/opc30200/model/cke/CommercialKitchenEquipmentDataTypeDictionaryHelper.java
@@ -29,7 +29,7 @@
 import com.prosysopc.ua.typedictionary.GeneratedDataTypeDictionary;
 
 /**
- * Generated on 2023-09-26 10:56:54
+ * Generated on 2024-06-17 14:43:51
  */
 public class CommercialKitchenEquipmentDataTypeDictionaryHelper {
   public static GeneratedDataTypeDictionary createDataTypeDictionary() {

diff --git a/...nodemanager/examples/prosys/opc30200/model/cke/CommercialKitchenEquipmentDataTypeIds.java b/...nodemanager/examples/prosys/opc30200/model/cke/CommercialKitchenEquipmentDataTypeIds.java
@@ -3,9 +3,10 @@
 package com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke;
 
 import com.prosysopc.ua.stack.builtintypes.ExpandedNodeId;
+import java.util.Set;
 
 /**
- * Generated on 2023-09-26 10:56:54
+ * Generated on 2024-06-17 14:43:51
  */
 public interface CommercialKitchenEquipmentDataTypeIds {
   ExpandedNodeId BeverageSMLEnumeration = CommercialKitchenEquipmentUaIds.BeverageSMLEnumeration.asExpandedNodeId();
@@ -55,4 +56,8 @@ public interface CommercialKitchenEquipmentDataTypeIds {
   ExpandedNodeId TrayModeEnumeration = CommercialKitchenEquipmentUaIds.TrayModeEnumeration.asExpandedNodeId();
 
   ExpandedNodeId TrayTypeEnumeration = CommercialKitchenEquipmentUaIds.TrayTypeEnumeration.asExpandedNodeId();
+
+  static Set<ExpandedNodeId> allDataTypeIdentifiers() {
+    return InternalCommercialKitchenEquipmentDataTypeIdsHelper.ALL_DATATYPE_IDENTIFIERS;
+  }
 }
diff --git a/.../dynamicnodemanager/examples/prosys/opc30200/model/cke/CommercialKitchenEquipmentIds.java b/.../dynamicnodemanager/examples/prosys/opc30200/model/cke/CommercialKitchenEquipmentIds.java
@@ -2,8 +2,21 @@
 //
 package com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke;
 
+import com.prosysopc.ua.stack.builtintypes.ExpandedNodeId;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
 /**
- * Generated on 2023-09-26 10:56:54
+ * Generated on 2024-06-17 14:43:51
  */
 public interface CommercialKitchenEquipmentIds extends CommercialKitchenEquipmentVariableIds, CommercialKitchenEquipmentDataTypeIds, CommercialKitchenEquipmentObjectTypeIds, CommercialKitchenEquipmentObjectIds {
+  static Set<ExpandedNodeId> allIdentifiers() {
+    Set<ExpandedNodeId> r = new HashSet<>();
+    r.addAll(CommercialKitchenEquipmentVariableIds.allVariableIdentifiers());
+    r.addAll(CommercialKitchenEquipmentDataTypeIds.allDataTypeIdentifiers());
+    r.addAll(CommercialKitchenEquipmentObjectTypeIds.allObjectTypeIdentifiers());
+    r.addAll(CommercialKitchenEquipmentObjectIds.allObjectIdentifiers());
+    return Collections.unmodifiableSet(r);
+  }
 }
diff --git a/...icnodemanager/examples/prosys/opc30200/model/cke/CommercialKitchenEquipmentObjectIds.java b/...icnodemanager/examples/prosys/opc30200/model/cke/CommercialKitchenEquipmentObjectIds.java
@@ -3,23 +3,24 @@
 package com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke;
 
 import com.prosysopc.ua.stack.builtintypes.ExpandedNodeId;
+import java.util.Set;
 
 /**
- * Generated on 2023-09-26 10:56:54
+ * Generated on 2024-06-17 14:43:51
  */
 public interface CommercialKitchenEquipmentObjectIds {
-  ExpandedNodeId CommercialKitchenDeviceType_InformationConditions = CommercialKitchenEquipmentUaIds.CommercialKitchenDeviceType_InformationConditions.asExpandedNodeId();
-
   ExpandedNodeId CommercialKitchenDeviceType_BatchInformation = CommercialKitchenEquipmentUaIds.CommercialKitchenDeviceType_BatchInformation.asExpandedNodeId();
 
+  ExpandedNodeId CommercialKitchenDeviceType_InformationConditions = CommercialKitchenEquipmentUaIds.CommercialKitchenDeviceType_InformationConditions.asExpandedNodeId();
+
   ExpandedNodeId CommercialKitchenDeviceType_ErrorConditions = CommercialKitchenEquipmentUaIds.CommercialKitchenDeviceType_ErrorConditions.asExpandedNodeId();
 
   ExpandedNodeId CommercialKitchenDeviceType_HACCPValues = CommercialKitchenEquipmentUaIds.CommercialKitchenDeviceType_HACCPValues.asExpandedNodeId();
 
-  ExpandedNodeId CoffeeMachineDeviceType_Parameters = CommercialKitchenEquipmentUaIds.CoffeeMachineDeviceType_Parameters.asExpandedNodeId();
-
   ExpandedNodeId CoffeeMachineDeviceType_RecipeName = CommercialKitchenEquipmentUaIds.CoffeeMachineDeviceType_RecipeName.asExpandedNodeId();
 
+  ExpandedNodeId CoffeeMachineDeviceType_Parameters = CommercialKitchenEquipmentUaIds.CoffeeMachineDeviceType_Parameters.asExpandedNodeId();
+
   ExpandedNodeId CombiSteamerDeviceType_CombiSteamer = CommercialKitchenEquipmentUaIds.CombiSteamerDeviceType_CombiSteamer.asExpandedNodeId();
 
   ExpandedNodeId CookingKettleDeviceType_CookingKettle = CommercialKitchenEquipmentUaIds.CookingKettleDeviceType_CookingKettle.asExpandedNodeId();
@@ -47,4 +48,8 @@ public interface CommercialKitchenEquipmentObjectIds {
   ExpandedNodeId PressureCookingKettleDeviceType_PressureCookingKettle = CommercialKitchenEquipmentUaIds.PressureCookingKettleDeviceType_PressureCookingKettle.asExpandedNodeId();
 
   ExpandedNodeId ServeryCounterDeviceType_Tray__No__ = CommercialKitchenEquipmentUaIds.ServeryCounterDeviceType_Tray__No__.asExpandedNodeId();
+
+  static Set<ExpandedNodeId> allObjectIdentifiers() {
+    return InternalCommercialKitchenEquipmentObjectIdsHelper.ALL_OBJECT_IDENTIFIERS;
+  }
 }
diff --git a/...demanager/examples/prosys/opc30200/model/cke/CommercialKitchenEquipmentObjectTypeIds.java b/...demanager/examples/prosys/opc30200/model/cke/CommercialKitchenEquipmentObjectTypeIds.java
@@ -3,9 +3,10 @@
 package com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke;
 
 import com.prosysopc.ua.stack.builtintypes.ExpandedNodeId;
+import java.util.Set;
 
 /**
- * Generated on 2023-09-26 10:56:54
+ * Generated on 2024-06-17 14:43:51
  */
 public interface CommercialKitchenEquipmentObjectTypeIds {
   ExpandedNodeId BatchInformationType = CommercialKitchenEquipmentUaIds.BatchInformationType.asExpandedNodeId();
@@ -77,4 +78,8 @@ public interface CommercialKitchenEquipmentObjectTypeIds {
   ExpandedNodeId PressureCookingKettleDeviceType = CommercialKitchenEquipmentUaIds.PressureCookingKettleDeviceType.asExpandedNodeId();
 
   ExpandedNodeId ServeryCounterDeviceType = CommercialKitchenEquipmentUaIds.ServeryCounterDeviceType.asExpandedNodeId();
+
+  static Set<ExpandedNodeId> allObjectTypeIdentifiers() {
+    return InternalCommercialKitchenEquipmentObjectTypeIdsHelper.ALL_OBJECTTYPE_IDENTIFIERS;
+  }
 }
diff --git a/...demanager/examples/prosys/opc30200/model/cke/CommercialKitchenEquipmentUaDataTypeIds.java b/...demanager/examples/prosys/opc30200/model/cke/CommercialKitchenEquipmentUaDataTypeIds.java
@@ -3,9 +3,10 @@
 package com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke;
 
 import com.prosysopc.ua.UaNodeId;
+import java.util.Set;
 
 /**
- * Generated on 2023-09-26 10:56:54
+ * Generated on 2024-06-17 14:43:51
  */
 public interface CommercialKitchenEquipmentUaDataTypeIds {
   UaNodeId BeverageSMLEnumeration = CommercialKitchenEquipmentUaDataTypeIdsInit.initBeverageSMLEnumeration();
@@ -55,4 +56,8 @@ public interface CommercialKitchenEquipmentUaDataTypeIds {
   UaNodeId TrayModeEnumeration = CommercialKitchenEquipmentUaDataTypeIdsInit.initTrayModeEnumeration();
 
   UaNodeId TrayTypeEnumeration = CommercialKitchenEquipmentUaDataTypeIdsInit.initTrayTypeEnumeration();
+
+  static Set<UaNodeId> allDataTypeIdentifiers() {
+    return InternalCommercialKitchenEquipmentUaDataTypeIdsHelper.ALL_DATATYPE_IDENTIFIERS;
+  }
 }
diff --git a/...nager/examples/prosys/opc30200/model/cke/CommercialKitchenEquipmentUaDataTypeIdsInit.java b/...nager/examples/prosys/opc30200/model/cke/CommercialKitchenEquipmentUaDataTypeIdsInit.java
@@ -4,6 +4,9 @@
 
 import com.prosysopc.ua.UaNodeId;
 
+/**
+ * Generated on 2024-06-17 14:43:51
+ */
 class CommercialKitchenEquipmentUaDataTypeIdsInit {
   static UaNodeId initBeverageSMLEnumeration() {
     return UaNodeId.numeric(CommercialKitchenEquipmentUaIdsInitHelper.NAMESPACE, 3014L);

diff --git a/...ynamicnodemanager/examples/prosys/opc30200/model/cke/CommercialKitchenEquipmentUaIds.java b/...ynamicnodemanager/examples/prosys/opc30200/model/cke/CommercialKitchenEquipmentUaIds.java
@@ -2,8 +2,21 @@
 //
 package com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke;
 
+import com.prosysopc.ua.UaNodeId;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
 /**
- * Generated on 2023-09-26 10:56:54
+ * Generated on 2024-06-17 14:43:51
  */
 public interface CommercialKitchenEquipmentUaIds extends CommercialKitchenEquipmentUaVariableIds, CommercialKitchenEquipmentUaDataTypeIds, CommercialKitchenEquipmentUaObjectTypeIds, CommercialKitchenEquipmentUaObjectIds {
+  static Set<UaNodeId> allIdentifiers() {
+    Set<UaNodeId> r = new HashSet<>();
+    r.addAll(CommercialKitchenEquipmentUaVariableIds.allVariableIdentifiers());
+    r.addAll(CommercialKitchenEquipmentUaDataTypeIds.allDataTypeIdentifiers());
+    r.addAll(CommercialKitchenEquipmentUaObjectTypeIds.allObjectTypeIdentifiers());
+    r.addAll(CommercialKitchenEquipmentUaObjectIds.allObjectIdentifiers());
+    return Collections.unmodifiableSet(r);
+  }
 }
diff --git a/...manager/examples/prosys/opc30200/model/cke/CommercialKitchenEquipmentUaIdsInitHelper.java b/...manager/examples/prosys/opc30200/model/cke/CommercialKitchenEquipmentUaIdsInitHelper.java
@@ -4,6 +4,9 @@
 
 import com.prosysopc.ua.UaNamespace;
 
+/**
+ * Generated on 2024-06-17 14:43:51
+ */
 class CommercialKitchenEquipmentUaIdsInitHelper {
   static UaNamespace NAMESPACE = UaNamespace.from("http://opcfoundation.org/UA/CommercialKitchenEquipment/");
 }
diff --git a/...nodemanager/examples/prosys/opc30200/model/cke/CommercialKitchenEquipmentUaObjectIds.java b/...nodemanager/examples/prosys/opc30200/model/cke/CommercialKitchenEquipmentUaObjectIds.java
@@ -3,23 +3,24 @@
 package com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke;
 
 import com.prosysopc.ua.UaNodeId;
+import java.util.Set;
 
 /**
- * Generated on 2023-09-26 10:56:54
+ * Generated on 2024-06-17 14:43:51
  */
 public interface CommercialKitchenEquipmentUaObjectIds {
-  UaNodeId CommercialKitchenDeviceType_InformationConditions = CommercialKitchenEquipmentUaObjectIdsInit.initCommercialKitchenDeviceType_InformationConditions();
-
   UaNodeId CommercialKitchenDeviceType_BatchInformation = CommercialKitchenEquipmentUaObjectIdsInit.initCommercialKitchenDeviceType_BatchInformation();
 
+  UaNodeId CommercialKitchenDeviceType_InformationConditions = CommercialKitchenEquipmentUaObjectIdsInit.initCommercialKitchenDeviceType_InformationConditions();
+
   UaNodeId CommercialKitchenDeviceType_ErrorConditions = CommercialKitchenEquipmentUaObjectIdsInit.initCommercialKitchenDeviceType_ErrorConditions();
 
   UaNodeId CommercialKitchenDeviceType_HACCPValues = CommercialKitchenEquipmentUaObjectIdsInit.initCommercialKitchenDeviceType_HACCPValues();
 
-  UaNodeId CoffeeMachineDeviceType_Parameters = CommercialKitchenEquipmentUaObjectIdsInit.initCoffeeMachineDeviceType_Parameters();
-
   UaNodeId CoffeeMachineDeviceType_RecipeName = CommercialKitchenEquipmentUaObjectIdsInit.initCoffeeMachineDeviceType_RecipeName();
 
+  UaNodeId CoffeeMachineDeviceType_Parameters = CommercialKitchenEquipmentUaObjectIdsInit.initCoffeeMachineDeviceType_Parameters();
+
   UaNodeId CombiSteamerDeviceType_CombiSteamer = CommercialKitchenEquipmentUaObjectIdsInit.initCombiSteamerDeviceType_CombiSteamer();
 
   UaNodeId CookingKettleDeviceType_CookingKettle = CommercialKitchenEquipmentUaObjectIdsInit.initCookingKettleDeviceType_CookingKettle();
@@ -47,4 +48,8 @@ public interface CommercialKitchenEquipmentUaObjectIds {
   UaNodeId PressureCookingKettleDeviceType_PressureCookingKettle = CommercialKitchenEquipmentUaObjectIdsInit.initPressureCookingKettleDeviceType_PressureCookingKettle();
 
   UaNodeId ServeryCounterDeviceType_Tray__No__ = CommercialKitchenEquipmentUaObjectIdsInit.initServeryCounterDeviceType_Tray__No__();
+
+  static Set<UaNodeId> allObjectIdentifiers() {
+    return InternalCommercialKitchenEquipmentUaObjectIdsHelper.ALL_OBJECT_IDENTIFIERS;
+  }
 }
diff --git a/...manager/examples/prosys/opc30200/model/cke/CommercialKitchenEquipmentUaObjectIdsInit.java b/...manager/examples/prosys/opc30200/model/cke/CommercialKitchenEquipmentUaObjectIdsInit.java
@@ -4,15 +4,18 @@
 
 import com.prosysopc.ua.UaNodeId;
 
+/**
+ * Generated on 2024-06-17 14:43:51
+ */
 class CommercialKitchenEquipmentUaObjectIdsInit {
-  static UaNodeId initCommercialKitchenDeviceType_InformationConditions() {
-    return UaNodeId.numeric(CommercialKitchenEquipmentUaIdsInitHelper.NAMESPACE, 5003L);
-  }
-
   static UaNodeId initCommercialKitchenDeviceType_BatchInformation() {
     return UaNodeId.numeric(CommercialKitchenEquipmentUaIdsInitHelper.NAMESPACE, 5001L);
   }
 
+  static UaNodeId initCommercialKitchenDeviceType_InformationConditions() {
+    return UaNodeId.numeric(CommercialKitchenEquipmentUaIdsInitHelper.NAMESPACE, 5003L);
+  }
+
   static UaNodeId initCommercialKitchenDeviceType_ErrorConditions() {
     return UaNodeId.numeric(CommercialKitchenEquipmentUaIdsInitHelper.NAMESPACE, 5002L);
   }
@@ -21,14 +24,14 @@ static UaNodeId initCommercialKitchenDeviceType_HACCPValues() {
     return UaNodeId.numeric(CommercialKitchenEquipmentUaIdsInitHelper.NAMESPACE, 5004L);
   }
 
-  static UaNodeId initCoffeeMachineDeviceType_Parameters() {
-    return UaNodeId.numeric(CommercialKitchenEquipmentUaIdsInitHelper.NAMESPACE, 5013L);
-  }
-
   static UaNodeId initCoffeeMachineDeviceType_RecipeName() {
     return UaNodeId.numeric(CommercialKitchenEquipmentUaIdsInitHelper.NAMESPACE, 5014L);
   }
 
+  static UaNodeId initCoffeeMachineDeviceType_Parameters() {
+    return UaNodeId.numeric(CommercialKitchenEquipmentUaIdsInitHelper.NAMESPACE, 5013L);
+  }
+
   static UaNodeId initCombiSteamerDeviceType_CombiSteamer() {
     return UaNodeId.numeric(CommercialKitchenEquipmentUaIdsInitHelper.NAMESPACE, 5007L);
   }

diff --git a/...manager/examples/prosys/opc30200/model/cke/CommercialKitchenEquipmentUaObjectTypeIds.java b/...manager/examples/prosys/opc30200/model/cke/CommercialKitchenEquipmentUaObjectTypeIds.java
@@ -3,9 +3,10 @@
 package com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke;
 
 import com.prosysopc.ua.UaNodeId;
+import java.util.Set;
 
 /**
- * Generated on 2023-09-26 10:56:54
+ * Generated on 2024-06-17 14:43:51
  */
 public interface CommercialKitchenEquipmentUaObjectTypeIds {
   UaNodeId BatchInformationType = CommercialKitchenEquipmentUaObjectTypeIdsInit.initBatchInformationType();
@@ -77,4 +78,8 @@ public interface CommercialKitchenEquipmentUaObjectTypeIds {
   UaNodeId PressureCookingKettleDeviceType = CommercialKitchenEquipmentUaObjectTypeIdsInit.initPressureCookingKettleDeviceType();
 
   UaNodeId ServeryCounterDeviceType = CommercialKitchenEquipmentUaObjectTypeIdsInit.initServeryCounterDeviceType();
+
+  static Set<UaNodeId> allObjectTypeIdentifiers() {
+    return InternalCommercialKitchenEquipmentUaObjectTypeIdsHelper.ALL_OBJECTTYPE_IDENTIFIERS;
+  }
 }
diff --git a/...ger/examples/prosys/opc30200/model/cke/CommercialKitchenEquipmentUaObjectTypeIdsInit.java b/...ger/examples/prosys/opc30200/model/cke/CommercialKitchenEquipmentUaObjectTypeIdsInit.java
@@ -4,6 +4,9 @@
 
 import com.prosysopc.ua.UaNodeId;
 
+/**
+ * Generated on 2024-06-17 14:43:51
+ */
 class CommercialKitchenEquipmentUaObjectTypeIdsInit {
   static UaNodeId initBatchInformationType() {
     return UaNodeId.numeric(CommercialKitchenEquipmentUaIdsInitHelper.NAMESPACE, 1002L);