Skip to content
This repository was archived by the owner on Feb 15, 2024. It is now read-only.

Commit 2a74542

Browse files
author
weissarn
committed
correct reference from ...i4aas.types to ...i4aas.v3.types. Compiles now.
1 parent 277b4a0 commit 2a74542

6 files changed

Lines changed: 25 additions & 25 deletions

File tree

‎dataformat-uanodeset/src/main/java/io/adminshell/aas/v3/dataformat/i4aas/UANodeSetMarshaller.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import org.opcfoundation.ua._2008._02.types.ListOfExtensionObject;
2525
import org.opcfoundation.ua._2011._03.uanodeset.UANodeSet;
26-
import org.opcfoundation.ua.i4aas.types.AASKeyDataType;
26+
import org.opcfoundation.ua.i4aas.v3.types.AASKeyDataType;
2727

2828
public class UANodeSetMarshaller {
2929

‎dataformat-uanodeset/src/main/java/io/adminshell/aas/v3/dataformat/i4aas/UANodeSetUnmarshaller.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
import org.opcfoundation.ua._2008._02.types.ListOfExtensionObject;
2828
import org.opcfoundation.ua._2011._03.uanodeset.UANodeSet;
29-
import org.opcfoundation.ua.i4aas.types.AASKeyDataType;
29+
import org.opcfoundation.ua.i4aas.v3.types.AASKeyDataType;
3030

3131
public class UANodeSetUnmarshaller {
3232

‎dataformat-uanodeset/src/main/java/io/adminshell/aas/v3/dataformat/i4aas/mappers/I4AASEnumMapper.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,31 +31,31 @@ public class I4AASEnumMapper extends I4AASMapper<Enum<?>, UAVariable> {
3131

3232
static {
3333
enum2enumMap.put(io.adminshell.aas.v3.model.KeyElements.class,
34-
org.opcfoundation.ua.i4aas.types.AASKeyElementsDataType.class);
34+
org.opcfoundation.ua.i4aas.v3.types.AASKeyElementsDataType.class);
3535
enum2enumMap.put(io.adminshell.aas.v3.model.KeyType.class,
36-
org.opcfoundation.ua.i4aas.types.AASKeyTypeDataType.class);
36+
org.opcfoundation.ua.i4aas.v3.types.AASKeyTypeDataType.class);
3737
enum2enumMap.put(io.adminshell.aas.v3.model.AssetKind.class,
38-
org.opcfoundation.ua.i4aas.types.AASAssetKindDataType.class);
38+
org.opcfoundation.ua.i4aas.v3.types.AASAssetKindDataType.class);
3939
enum2enumMap.put(io.adminshell.aas.v3.model.Category.class,
40-
org.opcfoundation.ua.i4aas.types.AASCategoryDataType.class);
40+
org.opcfoundation.ua.i4aas.v3.types.AASCategoryDataType.class);
4141
enum2enumMap.put(io.adminshell.aas.v3.model.DataTypeIEC61360.class,
42-
org.opcfoundation.ua.i4aas.types.AASDataTypeIEC61360DataType.class);
42+
org.opcfoundation.ua.i4aas.v3.types.AASDataTypeIEC61360DataType.class);
4343
enum2enumMap.put(io.adminshell.aas.v3.model.EntityType.class,
44-
org.opcfoundation.ua.i4aas.types.AASEntityTypeDataType.class);
44+
org.opcfoundation.ua.i4aas.v3.types.AASEntityTypeDataType.class);
4545
enum2enumMap.put(io.adminshell.aas.v3.model.IdentifiableElements.class,
46-
org.opcfoundation.ua.i4aas.types.AASKeyElementsDataType.class);
46+
org.opcfoundation.ua.i4aas.v3.types.AASKeyElementsDataType.class);
4747
enum2enumMap.put(io.adminshell.aas.v3.model.IdentifierType.class,
48-
org.opcfoundation.ua.i4aas.types.AASIdentifierTypeDataType.class);
48+
org.opcfoundation.ua.i4aas.v3.types.AASIdentifierTypeDataType.class);
4949
enum2enumMap.put(io.adminshell.aas.v3.model.LevelType.class,
50-
org.opcfoundation.ua.i4aas.types.AASLevelTypeDataType.class);
50+
org.opcfoundation.ua.i4aas.v3.types.AASLevelTypeDataType.class);
5151
enum2enumMap.put(io.adminshell.aas.v3.model.LocalKeyType.class,
52-
org.opcfoundation.ua.i4aas.types.AASKeyTypeDataType.class);
52+
org.opcfoundation.ua.i4aas.v3.types.AASKeyTypeDataType.class);
5353
enum2enumMap.put(io.adminshell.aas.v3.model.ModelingKind.class,
54-
org.opcfoundation.ua.i4aas.types.AASModelingKindDataType.class);
54+
org.opcfoundation.ua.i4aas.v3.types.AASModelingKindDataType.class);
5555
// enum2enumMap.put(io.adminshell.aas.v3.model.PermissionKind.class, null);//no
5656
// match, since it is from security part
5757
enum2enumMap.put(io.adminshell.aas.v3.model.ReferableElements.class,
58-
org.opcfoundation.ua.i4aas.types.AASKeyElementsDataType.class);
58+
org.opcfoundation.ua.i4aas.v3.types.AASKeyElementsDataType.class);
5959
}
6060

6161
public I4AASEnumMapper(Enum<?> src, MappingContext ctx) {
@@ -116,7 +116,7 @@ protected void mapAndAttachChildren() {
116116
public static void main(String[] args) {
117117
// quick test
118118
System.out.println(
119-
Arrays.toString(org.opcfoundation.ua.i4aas.types.AASKeyElementsDataType.class.getEnumConstants()));
119+
Arrays.toString(org.opcfoundation.ua.i4aas.v3.types.AASKeyElementsDataType.class.getEnumConstants()));
120120
}
121121

122122
}

‎dataformat-uanodeset/src/main/java/io/adminshell/aas/v3/dataformat/i4aas/mappers/ReferenceMapper.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
import org.opcfoundation.ua._2011._03.uanodeset.UAObject;
2525
import org.opcfoundation.ua._2011._03.uanodeset.UAVariable;
2626
import org.opcfoundation.ua._2011._03.uanodeset.UAVariable.Value;
27-
import org.opcfoundation.ua.i4aas.types.AASKeyDataType;
28-
import org.opcfoundation.ua.i4aas.types.AASKeyElementsDataType;
29-
import org.opcfoundation.ua.i4aas.types.AASKeyTypeDataType;
27+
import org.opcfoundation.ua.i4aas.v3.types.AASKeyDataType;
28+
import org.opcfoundation.ua.i4aas.v3.types.AASKeyElementsDataType;
29+
import org.opcfoundation.ua.i4aas.v3.types.AASKeyTypeDataType;
3030

3131
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4AASUtils;
3232
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4AASIdentifier;
@@ -39,7 +39,7 @@ public class ReferenceMapper extends I4AASMapper<Reference, UAObject> {
3939
private String browseName;
4040

4141
org.opcfoundation.ua._2008._02.types.ObjectFactory extensionObjectFactory = new org.opcfoundation.ua._2008._02.types.ObjectFactory();
42-
org.opcfoundation.ua.i4aas.types.ObjectFactory i4aasTypesObjectFactory = new org.opcfoundation.ua.i4aas.types.ObjectFactory();
42+
org.opcfoundation.ua.i4aas.v3.types.ObjectFactory i4aasTypesObjectFactory = new org.opcfoundation.ua.i4aas.v3.types.ObjectFactory();
4343

4444
public ReferenceMapper(Reference src, MappingContext ctx, String browseName) {
4545
super(src, ctx);

‎dataformat-uanodeset/src/main/java/io/adminshell/aas/v3/dataformat/i4aas/mappers/sme/ValueTypeMapper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.opcfoundation.ua._2008._02.types.ObjectFactory;
2323
import org.opcfoundation.ua._2011._03.uanodeset.UAVariable;
2424
import org.opcfoundation.ua._2011._03.uanodeset.UAVariable.Builder;
25-
import org.opcfoundation.ua.i4aas.types.AASValueTypeDataType;
25+
import org.opcfoundation.ua.i4aas.v3.types.AASValueTypeDataType;
2626

2727
import io.adminshell.aas.v3.dataformat.i4aas.mappers.I4AASMapper;
2828
import io.adminshell.aas.v3.dataformat.i4aas.mappers.MappingContext;

‎dataformat-uanodeset/src/test/java/io/adminshell/aas/v3/dataformat/i4aas/GeneratedExtensionObjectTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
import org.opcfoundation.ua._2011._03.uanodeset.UANodeSet;
3434
import org.opcfoundation.ua._2011._03.uanodeset.UAVariable;
3535
import org.opcfoundation.ua._2011._03.uanodeset.UAVariable.Value;
36-
import org.opcfoundation.ua.i4aas.types.AASKeyDataType;
37-
import org.opcfoundation.ua.i4aas.types.AASKeyElementsDataType;
38-
import org.opcfoundation.ua.i4aas.types.AASKeyTypeDataType;
36+
import org.opcfoundation.ua.i4aas.v3.types.AASKeyDataType;
37+
import org.opcfoundation.ua.i4aas.v3.types.AASKeyElementsDataType;
38+
import org.opcfoundation.ua.i4aas.v3.types.AASKeyTypeDataType;
3939
import org.w3c.dom.Node;
4040

4141
/**
@@ -94,7 +94,7 @@ public void testJAXBmarshalling() throws JAXBException {
9494
Body body = new Body();
9595

9696
//build custom type AAS Key
97-
org.opcfoundation.ua.i4aas.types.ObjectFactory i4aasTypesObjectFactory = new org.opcfoundation.ua.i4aas.types.ObjectFactory();
97+
org.opcfoundation.ua.i4aas.v3.types.ObjectFactory i4aasTypesObjectFactory = new org.opcfoundation.ua.i4aas.v3.types.ObjectFactory();
9898
AASKeyDataType aasKey = new AASKeyDataType();
9999
aasKey.setIdType(AASKeyTypeDataType.ID_SHORT_0);
100100
aasKey.setType(AASKeyElementsDataType.ACCESS_PERMISSION_RULE_0);
@@ -134,7 +134,7 @@ public void testJAXBmarshallingOnlyExtension() throws JAXBException {
134134
Body body = new Body();
135135

136136
//build custom type AAS Key
137-
org.opcfoundation.ua.i4aas.types.ObjectFactory i4aasTypesObjectFactory = new org.opcfoundation.ua.i4aas.types.ObjectFactory();
137+
org.opcfoundation.ua.i4aas.v3.types.ObjectFactory i4aasTypesObjectFactory = new org.opcfoundation.ua.i4aas.v3.types.ObjectFactory();
138138
AASKeyDataType aasKey = new AASKeyDataType();
139139
aasKey.setIdType(AASKeyTypeDataType.ID_SHORT_0);
140140
aasKey.setType(AASKeyElementsDataType.ACCESS_PERMISSION_RULE_0);

0 commit comments

Comments
 (0)