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

Commit 467716c

Browse files
br-iosbbr-iosb
committed
removed old Identifiers
1 parent 768c856 commit 467716c

41 files changed

Lines changed: 115 additions & 298 deletions

Some content is hidden

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.opcfoundation.ua._2011._03.uanodeset.UAVariable;
2020

2121
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4AASUtils;
22-
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4aasId;
22+
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4AASIdentifier;
2323
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.MappingContext;
2424
import io.adminshell.aas.v3.model.AdministrativeInformation;
2525

@@ -35,7 +35,7 @@ protected UAObject createTargetObject() {
3535
target = UAObject.builder().withNodeId(ctx.newModelNodeIdAsString())
3636
.withBrowseName(createI4AASBrowseName("Administration"))
3737
.withDisplayName(createLocalizedText("Administration")).build();
38-
addTypeReference(I4aasId.AASAdministrativeInformationType);
38+
addTypeReference(I4AASIdentifier.AASAdministrativeInformationType);
3939
return target;
4040
}
4141

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import java.util.List;
1919

2020
import org.opcfoundation.ua._2011._03.uanodeset.UAObject;
21-
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4aasId;
21+
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4AASIdentifier;
2222
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.MappingContext;
2323
import io.adminshell.aas.v3.model.AssetAdministrationShell;
2424
import io.adminshell.aas.v3.model.AssetInformation;
@@ -35,7 +35,7 @@ public AssetAdministrationShellMapper(AssetAdministrationShell src, MappingConte
3535
@Override
3636
protected UAObject createTargetObject() {
3737
super.createTargetObject();
38-
addTypeReference(I4aasId.AASAssetAdministrationShellType);
38+
addTypeReference(I4AASIdentifier.AASAssetAdministrationShellType);
3939
return target;
4040
}
4141

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
import io.adminshell.aas.v3.dataformat.i4aas.mappers.sme.FileMapper;
2222
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4AASUtils;
23-
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4aasId;
23+
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4AASIdentifier;
2424
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.MappingContext;
25-
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.UaId;
25+
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.UaIdentifier;
2626
import io.adminshell.aas.v3.model.AssetInformation;
2727
import io.adminshell.aas.v3.model.AssetKind;
2828
import io.adminshell.aas.v3.model.File;
@@ -39,7 +39,7 @@ public AssetInformationMapper(AssetInformation src, MappingContext ctx) {
3939
protected UAObject createTargetObject() {
4040
target = UAObject.builder().withNodeId(ctx.newModelNodeIdAsString())
4141
.withBrowseName(createI4AASBrowseName("AssetInformation")).withDisplayName(createLocalizedText("AssetInformation")).build();
42-
addTypeReference(I4aasId.AASAssetInformationType);
42+
addTypeReference(I4AASIdentifier.AASAssetInformationType);
4343
return target;
4444
}
4545

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4AASUtils;
2424
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.MappingContext;
25-
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.UaId;
25+
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.UaIdentifier;
2626

2727
public class BooleanPropertyMapper extends I4AASMapper<Boolean, UAVariable> {
2828

@@ -38,10 +38,10 @@ protected UAVariable createTargetObject() {
3838
JAXBElement<Boolean> idBoolValue = new ObjectFactory().createBoolean(source);
3939
org.opcfoundation.ua._2011._03.uanodeset.UAVariable.Builder<Void> idVarBuilder = UAVariable.builder()
4040
.withValue().withAny(idBoolValue).end().withDisplayName(createLocalizedText(key))
41-
.withDataType(UaId.Boolean.getName()).withNodeId(ctx.newModelNodeIdAsString())
41+
.withDataType(UaIdentifier.Boolean.getName()).withNodeId(ctx.newModelNodeIdAsString())
4242
.withBrowseName(createI4AASBrowseName(key)).withAccessLevel(3L);
4343
target = idVarBuilder.build();
44-
addTypeReferenceFor(target, UaId.PropertyType);
44+
addTypeReferenceFor(target, UaIdentifier.PropertyType);
4545
return target;
4646
}
4747

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.opcfoundation.ua._2011._03.uanodeset.UAVariable;
2222

2323
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.MappingContext;
24-
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.UaId;
24+
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.UaIdentifier;
2525

2626
public class ByteStringPropertyMapper extends I4AASMapper<byte[], UAVariable> {
2727

@@ -37,10 +37,10 @@ protected UAVariable createTargetObject() {
3737
JAXBElement<String> byteStringValue = new ObjectFactory().createByteString(source);
3838
org.opcfoundation.ua._2011._03.uanodeset.UAVariable.Builder<Void> idVarBuilder = UAVariable.builder()
3939
.withValue().withAny(byteStringValue).end().withDisplayName(createLocalizedText(key))
40-
.withDataType(UaId.ByteString.getName()).withNodeId(ctx.newModelNodeIdAsString())
40+
.withDataType(UaIdentifier.ByteString.getName()).withNodeId(ctx.newModelNodeIdAsString())
4141
.withBrowseName(createI4AASBrowseName(key)).withAccessLevel(3L);
4242
target = idVarBuilder.build();
43-
addTypeReferenceFor(target, UaId.PropertyType);
43+
addTypeReferenceFor(target, UaIdentifier.PropertyType);
4444
return target;
4545
}
4646

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import org.opcfoundation.ua._2011._03.uanodeset.UAObject;
1919

20-
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4aasId;
20+
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4AASIdentifier;
2121
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.MappingContext;
2222
import io.adminshell.aas.v3.model.ConceptDescription;
2323
import io.adminshell.aas.v3.model.IdentifierType;
@@ -35,11 +35,11 @@ protected UAObject createTargetObject() {
3535

3636
IdentifierType idType = source.getIdentification().getIdType();
3737
if (IdentifierType.IRI == idType) {
38-
addTypeReference(I4aasId.AASIriConceptDescriptionType);
38+
addTypeReference(I4AASIdentifier.AASIriConceptDescriptionType);
3939
} else if (IdentifierType.IRDI == idType) {
40-
addTypeReference(I4aasId.AASIrdiConceptDescriptionType);
40+
addTypeReference(I4AASIdentifier.AASIrdiConceptDescriptionType);
4141
} else if (IdentifierType.CUSTOM == idType) {
42-
addTypeReference(I4aasId.AASCustomConceptDescriptionType);
42+
addTypeReference(I4AASIdentifier.AASCustomConceptDescriptionType);
4343
}
4444
return target;
4545
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.opcfoundation.ua._2011._03.uanodeset.UAVariable;
2020

2121
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4AASUtils;
22-
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4aasId;
22+
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4AASIdentifier;
2323
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.MappingContext;
2424
import io.adminshell.aas.v3.model.DataSpecificationIEC61360;
2525
import io.adminshell.aas.v3.model.DataTypeIEC61360;
@@ -42,7 +42,7 @@ public DataSpecificationIEC61360Mapper(DataSpecificationIEC61360 src, MappingCon
4242
protected UAObject createTargetObject() {
4343
target = UAObject.builder().withNodeId(ctx.newModelNodeIdAsString()).withBrowseName(createBrowseName(name, namespaceIdx))
4444
.withDisplayName(createLocalizedText(name)).build();
45-
addTypeReference(I4aasId.AASDataSpecificationIEC61360Type);
45+
addTypeReference(I4AASIdentifier.AASDataSpecificationIEC61360Type);
4646
return target;
4747
}
4848

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4AASConstants;
2424
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4AASUtils;
25-
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4aasId;
25+
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.I4AASIdentifier;
2626
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.MappingContext;
27-
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.UaId;
27+
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.UaIdentifier;
2828
import io.adminshell.aas.v3.model.AssetAdministrationShell;
2929
import io.adminshell.aas.v3.model.AssetAdministrationShellEnvironment;
3030
import io.adminshell.aas.v3.model.ConceptDescription;
@@ -42,9 +42,9 @@ protected UAObject createTargetObject() {
4242
.withBrowseName(createModelBrowseName("AASEnvironment"))
4343
.withDisplayName(createLocalizedText("AASEnvironment"))
4444
.withReferences(new ListOfReferences()).build();
45-
addTypeReference(I4aasId.AASEnvironmentType);
45+
addTypeReference(I4AASIdentifier.AASEnvironmentType);
4646
Reference orgaRef = new Reference();
47-
orgaRef.setReferenceType(UaId.Organizes.getName());
47+
orgaRef.setReferenceType(UaIdentifier.Organizes.getName());
4848
orgaRef.setIsForward(false);
4949
orgaRef.setValue("i=85");
5050
target.getReferences().getReference().add(orgaRef);
@@ -57,7 +57,7 @@ protected void mapAndAttachChildren() {
5757
for (ConceptDescription conceptDescription : source.getConceptDescriptions()) {
5858
UAObject uaCD = new ConceptDescriptionMapper(conceptDescription, ctx).map();
5959
Reference orgaRef = new Reference();
60-
orgaRef.setReferenceType(UaId.Organizes.getName());
60+
orgaRef.setReferenceType(UaIdentifier.Organizes.getName());
6161
orgaRef.setIsForward(false);
6262
orgaRef.setValue("i=17594");
6363
uaCD.getReferences().getReference().add(orgaRef);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.opcfoundation.ua._2011._03.uanodeset.UAObject;
2222

2323
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.MappingContext;
24-
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.UaId;
24+
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.UaIdentifier;
2525
import io.adminshell.aas.v3.model.DataSpecificationContent;
2626
import io.adminshell.aas.v3.model.DataSpecificationIEC61360;
2727
import io.adminshell.aas.v3.model.EmbeddedDataSpecification;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.opcfoundation.ua._2011._03.uanodeset.UAObject;
2121

2222
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.MappingContext;
23-
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.UaId;
23+
import io.adminshell.aas.v3.dataformat.i4aas.mappers.utils.UaIdentifier;
2424
import io.adminshell.aas.v3.model.HasSemantics;
2525
import io.adminshell.aas.v3.model.Identifier;
2626
import io.adminshell.aas.v3.model.IdentifierType;
@@ -52,14 +52,14 @@ default void mapSemantics(HasSemantics source, UAObject target, MappingContext c
5252
nodeForIdentification.setReferences(new ListOfReferences());
5353
}
5454
org.opcfoundation.ua._2011._03.uanodeset.Reference parentRef = org.opcfoundation.ua._2011._03.uanodeset.Reference
55-
.builder().withIsForward(false).withReferenceType(UaId.HasDictionaryEntry.getName())
55+
.builder().withIsForward(false).withReferenceType(UaIdentifier.HasDictionaryEntry.getName())
5656
.withValue(target.getNodeId()).build();
5757
nodeForIdentification.getReferences().getReference().add(parentRef);
5858
if (target.getReferences() == null) {
5959
target.setReferences(new ListOfReferences());
6060
}
6161
org.opcfoundation.ua._2011._03.uanodeset.Reference childRef = org.opcfoundation.ua._2011._03.uanodeset.Reference
62-
.builder().withReferenceType(UaId.HasDictionaryEntry.getName()).withValue(nodeForIdentification.getNodeId())
62+
.builder().withReferenceType(UaIdentifier.HasDictionaryEntry.getName()).withValue(nodeForIdentification.getNodeId())
6363
.build();
6464
target.getReferences().getReference().add(childRef);
6565
}
@@ -91,7 +91,7 @@ public IdentifierType getIdType() {
9191

9292
UAObject uaVirtualCD = new ConceptDescriptionMapper(virtualCD, ctx).map();
9393
org.opcfoundation.ua._2011._03.uanodeset.Reference orgaRef = new org.opcfoundation.ua._2011._03.uanodeset.Reference();
94-
orgaRef.setReferenceType(UaId.Organizes.getName());
94+
orgaRef.setReferenceType(UaIdentifier.Organizes.getName());
9595
orgaRef.setIsForward(false);
9696
orgaRef.setValue("i=17594");
9797
uaVirtualCD.getReferences().getReference().add(orgaRef);

0 commit comments

Comments
 (0)