Skip to content

Commit f28643b

Browse files
ttulkattulka
authored
Merge pull request #1 from connectedcooking/update-to-prosys-5
update to prosys sdk 5.0.0
2 parents 4773f90 + fa1fb4c commit f28643b

File tree

352 files changed

+13046
-8296
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

352 files changed

+13046
-8296
lines changed

‎.mvn/wrapper/maven-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.5/apache-maven-3.8.5-bin.zip
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
1818
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ Add necessary dependencies:
1616
<dependency>
1717
<groupId>com.connectedcooking.opcua</groupId>
1818
<artifactId>opcua-dynamic-node-manager</artifactId>
19-
<version>0.1.4</version>
19+
<version>0.1.5</version>
2020
</dependency>
2121
<dependency>
2222
<groupId>com.prosysopc.ua</groupId>
2323
<artifactId>prosys-opc-ua-sdk-client-server</artifactId>
24-
<version>4.10.4-14</version>
24+
<version>5.0.0-95</version>
2525
</dependency>
2626
```
2727

‎examples/parent/pom.xml

+10-7
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,23 @@
1414
<maven.compiler.source>11</maven.compiler.source>
1515
<maven.compiler.target>11</maven.compiler.target>
1616

17-
<prosys.version>4.10.4-14</prosys.version>
18-
<slf4j.version>1.7.36</slf4j.version>
19-
<jupiter.version>5.9.1</jupiter.version>
20-
<mockito.version>4.8.0</mockito.version>
17+
<dynamicnodemanager.version>0.2.0-SNAPSHOT</dynamicnodemanager.version>
2118

22-
<logback.version>1.4.3</logback.version>
19+
<prosys.version>5.0.0-95</prosys.version>
20+
<slf4j.version>2.0.9</slf4j.version>
21+
<jupiter.version>5.10.0</jupiter.version>
22+
<mockito.version>5.5.0</mockito.version>
23+
<assertj.version>3.24.2</assertj.version>
24+
25+
<logback.version>1.4.11</logback.version>
2326
</properties>
2427

2528
<dependencyManagement>
2629
<dependencies>
2730
<dependency>
2831
<groupId>com.connectedcooking.opcua</groupId>
2932
<artifactId>opcua-dynamic-node-manager</artifactId>
30-
<version>0.1.4-SNAPSHOT</version>
33+
<version>${dynamicnodemanager.version}</version>
3134
</dependency>
3235
<dependency>
3336
<groupId>com.prosysopc.ua</groupId>
@@ -49,7 +52,7 @@
4952
<dependency>
5053
<groupId>org.assertj</groupId>
5154
<artifactId>assertj-core</artifactId>
52-
<version>3.23.1</version>
55+
<version>${assertj.version}</version>
5356
<scope>test</scope>
5457
</dependency>
5558
<dependency>

‎examples/prosys/opc30200/src/main/java/com/connectedcooking/opcua/dynamicnodemanager/examples/prosys/opc30200/model/cke/CommercialKitchenEquipmentCommonInformationModel.java

+65
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
// Generated by Prosys OPC UA Java SDK Codegen
2+
//
3+
package com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke;
4+
5+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.BeverageSMLEnumeration;
6+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.ChamberModeEnumeration;
7+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.CoffeeMachineModeEnumeration;
8+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.CombiSteamerModeEnumeration;
9+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.CookingKettleModeEnumeration;
10+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.CurrentStateEnumeration;
11+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.EnergySourceEnumeration;
12+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.FryerModeEnumeration;
13+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.FryingPanModeEnumeration;
14+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.GrillingZoneStateEnumeration;
15+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.HygieneModeEnumeration;
16+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.MultiFunctionPanModeEnumeration;
17+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.OperatingModeEnumeration;
18+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.OperationModeEnumeration;
19+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.PastaCookerModeEnumeration;
20+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.PlatenPositionStateEnumeration;
21+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.PressureCookingKettleModeEnumeration;
22+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.ProgramModeEnumeration;
23+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.SignalModeEnumeration;
24+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.SpecialCookingModeEnumeration;
25+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.SpecialFunctionModeEnumeration;
26+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.StatusEnumeration;
27+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.TrayModeEnumeration;
28+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.TrayTypeEnumeration;
29+
import com.prosysopc.ua.CommonCodegenModel;
30+
31+
/**
32+
* Generated on 2023-09-26 10:56:54
33+
*/
34+
public class CommercialKitchenEquipmentCommonInformationModel {
35+
public static final CommonCodegenModel MODEL;
36+
37+
static {
38+
CommonCodegenModel.Builder b = CommonCodegenModel.builder();
39+
b.addDataTypeSpecification(BeverageSMLEnumeration.SPECIFICATION);
40+
b.addDataTypeSpecification(ChamberModeEnumeration.SPECIFICATION);
41+
b.addDataTypeSpecification(CoffeeMachineModeEnumeration.SPECIFICATION);
42+
b.addDataTypeSpecification(CombiSteamerModeEnumeration.SPECIFICATION);
43+
b.addDataTypeSpecification(CookingKettleModeEnumeration.SPECIFICATION);
44+
b.addDataTypeSpecification(CurrentStateEnumeration.SPECIFICATION);
45+
b.addDataTypeSpecification(EnergySourceEnumeration.SPECIFICATION);
46+
b.addDataTypeSpecification(FryerModeEnumeration.SPECIFICATION);
47+
b.addDataTypeSpecification(FryingPanModeEnumeration.SPECIFICATION);
48+
b.addDataTypeSpecification(GrillingZoneStateEnumeration.SPECIFICATION);
49+
b.addDataTypeSpecification(HygieneModeEnumeration.SPECIFICATION);
50+
b.addDataTypeSpecification(MultiFunctionPanModeEnumeration.SPECIFICATION);
51+
b.addDataTypeSpecification(OperatingModeEnumeration.SPECIFICATION);
52+
b.addDataTypeSpecification(OperationModeEnumeration.SPECIFICATION);
53+
b.addDataTypeSpecification(PastaCookerModeEnumeration.SPECIFICATION);
54+
b.addDataTypeSpecification(PlatenPositionStateEnumeration.SPECIFICATION);
55+
b.addDataTypeSpecification(PressureCookingKettleModeEnumeration.SPECIFICATION);
56+
b.addDataTypeSpecification(ProgramModeEnumeration.SPECIFICATION);
57+
b.addDataTypeSpecification(SignalModeEnumeration.SPECIFICATION);
58+
b.addDataTypeSpecification(SpecialCookingModeEnumeration.SPECIFICATION);
59+
b.addDataTypeSpecification(SpecialFunctionModeEnumeration.SPECIFICATION);
60+
b.addDataTypeSpecification(StatusEnumeration.SPECIFICATION);
61+
b.addDataTypeSpecification(TrayModeEnumeration.SPECIFICATION);
62+
b.addDataTypeSpecification(TrayTypeEnumeration.SPECIFICATION);
63+
MODEL = b.build();
64+
}
65+
}

‎examples/prosys/opc30200/src/main/java/com/connectedcooking/opcua/dynamicnodemanager/examples/prosys/opc30200/model/cke/CommercialKitchenEquipmentDataTypeDictionaryHelper.java

+49-31
Original file line numberDiff line numberDiff line change
@@ -2,44 +2,62 @@
22
//
33
package com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke;
44

5-
import com.prosysopc.ua.stack.builtintypes.ExpandedNodeId;
5+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.BeverageSMLEnumeration;
6+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.ChamberModeEnumeration;
7+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.CoffeeMachineModeEnumeration;
8+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.CombiSteamerModeEnumeration;
9+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.CookingKettleModeEnumeration;
10+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.CurrentStateEnumeration;
11+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.EnergySourceEnumeration;
12+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.FryerModeEnumeration;
13+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.FryingPanModeEnumeration;
14+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.GrillingZoneStateEnumeration;
15+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.HygieneModeEnumeration;
16+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.MultiFunctionPanModeEnumeration;
17+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.OperatingModeEnumeration;
18+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.OperationModeEnumeration;
19+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.PastaCookerModeEnumeration;
20+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.PlatenPositionStateEnumeration;
21+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.PressureCookingKettleModeEnumeration;
22+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.ProgramModeEnumeration;
23+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.SignalModeEnumeration;
24+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.SpecialCookingModeEnumeration;
25+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.SpecialFunctionModeEnumeration;
26+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.StatusEnumeration;
27+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.TrayModeEnumeration;
28+
import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.datatypes.TrayTypeEnumeration;
629
import com.prosysopc.ua.typedictionary.GeneratedDataTypeDictionary;
7-
import java.lang.String;
830

931
/**
10-
* Generated on 2022-10-10 10:21:34
32+
* Generated on 2023-09-26 10:56:54
1133
*/
1234
public class CommercialKitchenEquipmentDataTypeDictionaryHelper {
1335
public static GeneratedDataTypeDictionary createDataTypeDictionary() {
1436
GeneratedDataTypeDictionary r = new GeneratedDataTypeDictionary("http://opcfoundation.org/UA/CommercialKitchenEquipment/");
15-
r.addTypeInformation(eni("nsu=http://opcfoundation.org/UA/CommercialKitchenEquipment/;i=3014"), "BeverageSMLEnumeration", BeverageSMLEnumeration.class);
16-
r.addTypeInformation(eni("nsu=http://opcfoundation.org/UA/CommercialKitchenEquipment/;i=3008"), "ChamberModeEnumeration", ChamberModeEnumeration.class);
17-
r.addTypeInformation(eni("nsu=http://opcfoundation.org/UA/CommercialKitchenEquipment/;i=3015"), "CoffeeMachineModeEnumeration", CoffeeMachineModeEnumeration.class);
18-
r.addTypeInformation(eni("nsu=http://opcfoundation.org/UA/CommercialKitchenEquipment/;i=3006"), "CombiSteamerModeEnumeration", CombiSteamerModeEnumeration.class);
19-
r.addTypeInformation(eni("nsu=http://opcfoundation.org/UA/CommercialKitchenEquipment/;i=3010"), "CookingKettleModeEnumeration", CookingKettleModeEnumeration.class);
20-
r.addTypeInformation(eni("nsu=http://opcfoundation.org/UA/CommercialKitchenEquipment/;i=3021"), "CurrentStateEnumeration", CurrentStateEnumeration.class);
21-
r.addTypeInformation(eni("nsu=http://opcfoundation.org/UA/CommercialKitchenEquipment/;i=3002"), "EnergySourceEnumeration", EnergySourceEnumeration.class);
22-
r.addTypeInformation(eni("nsu=http://opcfoundation.org/UA/CommercialKitchenEquipment/;i=3003"), "FryerModeEnumeration", FryerModeEnumeration.class);
23-
r.addTypeInformation(eni("nsu=http://opcfoundation.org/UA/CommercialKitchenEquipment/;i=3005"), "FryingPanModeEnumeration", FryingPanModeEnumeration.class);
24-
r.addTypeInformation(eni("nsu=http://opcfoundation.org/UA/CommercialKitchenEquipment/;i=3025"), "GrillingZoneStateEnumeration", GrillingZoneStateEnumeration.class);
25-
r.addTypeInformation(eni("nsu=http://opcfoundation.org/UA/CommercialKitchenEquipment/;i=3017"), "HygieneModeEnumeration", HygieneModeEnumeration.class);
26-
r.addTypeInformation(eni("nsu=http://opcfoundation.org/UA/CommercialKitchenEquipment/;i=3011"), "MultiFunctionPanModeEnumeration", MultiFunctionPanModeEnumeration.class);
27-
r.addTypeInformation(eni("nsu=http://opcfoundation.org/UA/CommercialKitchenEquipment/;i=3023"), "OperatingModeEnumeration", OperatingModeEnumeration.class);
28-
r.addTypeInformation(eni("nsu=http://opcfoundation.org/UA/CommercialKitchenEquipment/;i=3018"), "OperationModeEnumeration", OperationModeEnumeration.class);
29-
r.addTypeInformation(eni("nsu=http://opcfoundation.org/UA/CommercialKitchenEquipment/;i=3013"), "PastaCookerModeEnumeration", PastaCookerModeEnumeration.class);
30-
r.addTypeInformation(eni("nsu=http://opcfoundation.org/UA/CommercialKitchenEquipment/;i=3022"), "PlatenPositionStateEnumeration", PlatenPositionStateEnumeration.class);
31-
r.addTypeInformation(eni("nsu=http://opcfoundation.org/UA/CommercialKitchenEquipment/;i=3009"), "PressureCookingKettleModeEnumeration", PressureCookingKettleModeEnumeration.class);
32-
r.addTypeInformation(eni("nsu=http://opcfoundation.org/UA/CommercialKitchenEquipment/;i=3016"), "ProgramModeEnumeration", ProgramModeEnumeration.class);
33-
r.addTypeInformation(eni("nsu=http://opcfoundation.org/UA/CommercialKitchenEquipment/;i=3004"), "SignalModeEnumeration", SignalModeEnumeration.class);
34-
r.addTypeInformation(eni("nsu=http://opcfoundation.org/UA/CommercialKitchenEquipment/;i=3007"), "SpecialCookingModeEnumeration", SpecialCookingModeEnumeration.class);
35-
r.addTypeInformation(eni("nsu=http://opcfoundation.org/UA/CommercialKitchenEquipment/;i=3012"), "SpecialFunctionModeEnumeration", SpecialFunctionModeEnumeration.class);
36-
r.addTypeInformation(eni("nsu=http://opcfoundation.org/UA/CommercialKitchenEquipment/;i=3024"), "StatusEnumeration", StatusEnumeration.class);
37-
r.addTypeInformation(eni("nsu=http://opcfoundation.org/UA/CommercialKitchenEquipment/;i=3019"), "TrayModeEnumeration", TrayModeEnumeration.class);
38-
r.addTypeInformation(eni("nsu=http://opcfoundation.org/UA/CommercialKitchenEquipment/;i=3020"), "TrayTypeEnumeration", TrayTypeEnumeration.class);
37+
r.addTypeInformation(CommercialKitchenEquipmentUaIds.BeverageSMLEnumeration, "BeverageSMLEnumeration", BeverageSMLEnumeration.class);
38+
r.addTypeInformation(CommercialKitchenEquipmentUaIds.ChamberModeEnumeration, "ChamberModeEnumeration", ChamberModeEnumeration.class);
39+
r.addTypeInformation(CommercialKitchenEquipmentUaIds.CoffeeMachineModeEnumeration, "CoffeeMachineModeEnumeration", CoffeeMachineModeEnumeration.class);
40+
r.addTypeInformation(CommercialKitchenEquipmentUaIds.CombiSteamerModeEnumeration, "CombiSteamerModeEnumeration", CombiSteamerModeEnumeration.class);
41+
r.addTypeInformation(CommercialKitchenEquipmentUaIds.CookingKettleModeEnumeration, "CookingKettleModeEnumeration", CookingKettleModeEnumeration.class);
42+
r.addTypeInformation(CommercialKitchenEquipmentUaIds.CurrentStateEnumeration, "CurrentStateEnumeration", CurrentStateEnumeration.class);
43+
r.addTypeInformation(CommercialKitchenEquipmentUaIds.EnergySourceEnumeration, "EnergySourceEnumeration", EnergySourceEnumeration.class);
44+
r.addTypeInformation(CommercialKitchenEquipmentUaIds.FryerModeEnumeration, "FryerModeEnumeration", FryerModeEnumeration.class);
45+
r.addTypeInformation(CommercialKitchenEquipmentUaIds.FryingPanModeEnumeration, "FryingPanModeEnumeration", FryingPanModeEnumeration.class);
46+
r.addTypeInformation(CommercialKitchenEquipmentUaIds.GrillingZoneStateEnumeration, "GrillingZoneStateEnumeration", GrillingZoneStateEnumeration.class);
47+
r.addTypeInformation(CommercialKitchenEquipmentUaIds.HygieneModeEnumeration, "HygieneModeEnumeration", HygieneModeEnumeration.class);
48+
r.addTypeInformation(CommercialKitchenEquipmentUaIds.MultiFunctionPanModeEnumeration, "MultiFunctionPanModeEnumeration", MultiFunctionPanModeEnumeration.class);
49+
r.addTypeInformation(CommercialKitchenEquipmentUaIds.OperatingModeEnumeration, "OperatingModeEnumeration", OperatingModeEnumeration.class);
50+
r.addTypeInformation(CommercialKitchenEquipmentUaIds.OperationModeEnumeration, "OperationModeEnumeration", OperationModeEnumeration.class);
51+
r.addTypeInformation(CommercialKitchenEquipmentUaIds.PastaCookerModeEnumeration, "PastaCookerModeEnumeration", PastaCookerModeEnumeration.class);
52+
r.addTypeInformation(CommercialKitchenEquipmentUaIds.PlatenPositionStateEnumeration, "PlatenPositionStateEnumeration", PlatenPositionStateEnumeration.class);
53+
r.addTypeInformation(CommercialKitchenEquipmentUaIds.PressureCookingKettleModeEnumeration, "PressureCookingKettleModeEnumeration", PressureCookingKettleModeEnumeration.class);
54+
r.addTypeInformation(CommercialKitchenEquipmentUaIds.ProgramModeEnumeration, "ProgramModeEnumeration", ProgramModeEnumeration.class);
55+
r.addTypeInformation(CommercialKitchenEquipmentUaIds.SignalModeEnumeration, "SignalModeEnumeration", SignalModeEnumeration.class);
56+
r.addTypeInformation(CommercialKitchenEquipmentUaIds.SpecialCookingModeEnumeration, "SpecialCookingModeEnumeration", SpecialCookingModeEnumeration.class);
57+
r.addTypeInformation(CommercialKitchenEquipmentUaIds.SpecialFunctionModeEnumeration, "SpecialFunctionModeEnumeration", SpecialFunctionModeEnumeration.class);
58+
r.addTypeInformation(CommercialKitchenEquipmentUaIds.StatusEnumeration, "StatusEnumeration", StatusEnumeration.class);
59+
r.addTypeInformation(CommercialKitchenEquipmentUaIds.TrayModeEnumeration, "TrayModeEnumeration", TrayModeEnumeration.class);
60+
r.addTypeInformation(CommercialKitchenEquipmentUaIds.TrayTypeEnumeration, "TrayTypeEnumeration", TrayTypeEnumeration.class);
3961
return r;
4062
}
41-
42-
private static ExpandedNodeId eni(String id) {
43-
return ExpandedNodeId.parseExpandedNodeId(id);
44-
}
4563
}

0 commit comments

Comments
 (0)