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

Commit d0828fb

Browse files
changqin26changqin26
committed
Corrected errors in AASSimple example.
1 parent 5c756a4 commit d0828fb

1 file changed

Lines changed: 51 additions & 14 deletions

File tree

  • dataformat-core/src/test/java/io/adminshell/aas/v3/dataformat/core

‎dataformat-core/src/test/java/io/adminshell/aas/v3/dataformat/core/AASSimple.java‎

Lines changed: 51 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public class AASSimple {
121121
private static final String SUBMODEL_OPERATIONAL_DATA_ID = "http://i40.customer.com/instance/1/1/AC69B1CB44F07935";
122122
private static final String SUBMODEL_OPERATIONAL_DATA_SEMANTIC_ID_PROPERTY = HTTP_CUSTOMER_COM_CD_1_1_18EBD56F6B43D895;
123123
private static final String SUBMODEL_OPERATIONAL_DATA_PROPERTY_ID_SHORT = ROTATION_SPEED;
124-
private static final String SUBMODEL_OPERATIONAL_DATA_PROPERTY_CATEGORY = "VARIABLE";
124+
private static final String SUBMODEL_OPERATIONAL_DATA_PROPERTY_CATEGORY = "Variable";
125125
private static final String SUBMODEL_OPERATIONAL_DATA_PROPERTY_VALUE = "4370";
126126
private static final String SUBMODEL_OPERATIONAL_DATA_PROPERTY_VALUETYPE = "integer";
127127

@@ -235,11 +235,18 @@ public AASSimple() {
235235
.identifier(WWW_VDI2770_COM_BLATT1_ENTWURF_OKT18_CD_DESCRIPTION_TITLE).idType(IdentifierType.IRI)
236236
.build())
237237
.embeddedDataSpecification(new DefaultEmbeddedDataSpecification.Builder()
238+
.dataSpecification(new DefaultReference.Builder()
239+
.key(new DefaultKey.Builder()
240+
.type(KeyElements.GLOBAL_REFERENCE)
241+
.idType(KeyType.IRI)
242+
.value("DataSpecificationIEC61360")
243+
.build())
244+
.build())
238245
.dataSpecificationContent(new DefaultDataSpecificationIEC61360.Builder()
239246
.preferredName(new LangString(TITLE, "EN")).preferredName(new LangString(TITEL, "DE"))
240-
.shortName(new LangString(TITLE, "EN")).shortName(new LangString(TITEL, "DE")).unit("")
241-
.sourceOfDefinition("").dataType(DataTypeIEC61360.STRING_TRANSLATABLE)
242-
.definition(new LangString(SPRACHABHÄNGIGER_TITELDES_DOKUMENTS, "DE")).build())
247+
.shortName(new LangString(TITLE, "EN")).shortName(new LangString(TITEL, "DE")).unit("ExampleString")
248+
.sourceOfDefinition("ExampleString").dataType(DataTypeIEC61360.STRING_TRANSLATABLE)
249+
.definition(new LangString(SPRACHABHÄNGIGER_TITELDES_DOKUMENTS, "EN")).build())
243250
.build())
244251
.build();
245252

@@ -248,34 +255,49 @@ public AASSimple() {
248255
.identification(new DefaultIdentifier.Builder()
249256
.identifier(WWW_VDI2770_COM_BLATT1_ENTWURF_OKT18_CD_STORED_DOCUMENT_REPRESENTATION_DIGITAL_FILE)
250257
.idType(IdentifierType.IRI).build())
251-
.embeddedDataSpecification(new DefaultEmbeddedDataSpecification.Builder().dataSpecificationContent(
258+
.embeddedDataSpecification(new DefaultEmbeddedDataSpecification.Builder()
259+
.dataSpecification(new DefaultReference.Builder()
260+
.key(new DefaultKey.Builder()
261+
.type(KeyElements.GLOBAL_REFERENCE)
262+
.idType(KeyType.IRI)
263+
.value("DataSpecificationIEC61360")
264+
.build())
265+
.build())
266+
.dataSpecificationContent(
252267
new DefaultDataSpecificationIEC61360.Builder().preferredName(new LangString(DIGITAL_FILE, "EN"))
253-
.preferredName(new LangString(DIGITALE_DATEI, "DE"))
268+
.preferredName(new LangString(DIGITAL_FILE, "EN"))
254269
.shortName(new LangString(DIGITAL_FILE, "EN"))
255-
.shortName(new LangString(DIGITALE_DATEI, "DE")).unit("").sourceOfDefinition("")
256-
.dataType(DataTypeIEC61360.STRING).definition(new LangString(DIGITAL_FILE_DEFINITION, "DE"))
270+
.shortName(new LangString(DIGITALE_DATEI, "DE")).unit("ExampleString").sourceOfDefinition("ExampleString")
271+
.dataType(DataTypeIEC61360.STRING).definition(new LangString(DIGITAL_FILE_DEFINITION, "EN"))
257272
.build())
258273
.build())
259274
.build();
260275

261276
public static final ConceptDescription CONCEPT_DESCRIPTION_MAXROTATIONSPEED = new DefaultConceptDescription.Builder()
262277
.idShort(MAX_ROTATION_SPEED).category(PROPERTY)
263-
.administration(new DefaultAdministrativeInformation.Builder().version("").revision("2").build())
278+
.administration(new DefaultAdministrativeInformation.Builder().version("2").revision("2.1").build())
264279
.identification(new DefaultIdentifier.Builder().identifier(_0173_1_02_BAA120_008)
265280
.idType(IdentifierType.IRDI).build())
266281
.embeddedDataSpecifications(
267282
Arrays.asList(
268283
new DefaultEmbeddedDataSpecification.Builder()
284+
.dataSpecification(new DefaultReference.Builder()
285+
.key(new DefaultKey.Builder()
286+
.type(KeyElements.GLOBAL_REFERENCE)
287+
.idType(KeyType.IRI)
288+
.value("DataSpecificationIEC61360")
289+
.build())
290+
.build())
269291
.dataSpecificationContent(new DefaultDataSpecificationIEC61360.Builder()
270292
.preferredName(new LangString(MAX_DREHZAHL, "de"))
271293
.preferredName(new LangString(MAX_ROTATIONSPEED, "en")).unit(_1_MIN)
272294
.unitId(new DefaultReference.Builder()
273295
.key(new DefaultKey.Builder().type(KeyElements.GLOBAL_REFERENCE)
274296
.value(_0173_1_05_AAA650_002).idType(KeyType.IRDI).build())
275297
.build())
276-
.sourceOfDefinition("").dataType(DataTypeIEC61360.REAL_MEASURE)
298+
.sourceOfDefinition("ExampleString").dataType(DataTypeIEC61360.REAL_MEASURE)
277299
.definition(new LangString(MAX_ROTATE_DEF_DE, "de"))
278-
.definition(new LangString(MAX_ROTATE_DEF_EN, "en")).build())
300+
.definition(new LangString(MAX_ROTATE_DEF_EN, "EN")).build())
279301
.build()))
280302
.build();
281303

@@ -285,6 +307,13 @@ public AASSimple() {
285307
.idType(IdentifierType.IRI).build())
286308
.embeddedDataSpecification(
287309
new DefaultEmbeddedDataSpecification.Builder()
310+
.dataSpecification(new DefaultReference.Builder()
311+
.key(new DefaultKey.Builder()
312+
.type(KeyElements.GLOBAL_REFERENCE)
313+
.idType(KeyType.IRI)
314+
.value("DataSpecificationIEC61360")
315+
.build())
316+
.build())
288317
.dataSpecificationContent(
289318
new DefaultDataSpecificationIEC61360.Builder()
290319
.preferredName(new LangString(AKTUELLE_DREHZAHL, "DE"))
@@ -295,7 +324,7 @@ public AASSimple() {
295324
.key(new DefaultKey.Builder().type(KeyElements.GLOBAL_REFERENCE)
296325
.value(_0173_1_05_AAA650_002).idType(KeyType.IRDI).build())
297326
.build())
298-
.sourceOfDefinition("").dataType(DataTypeIEC61360.REAL_MEASURE)
327+
.sourceOfDefinition("ExampleString").dataType(DataTypeIEC61360.REAL_MEASURE)
299328
.definition(new LangString(
300329
AKTUELLE_DREHZAHL_MITWELCHER_DER_MOTOR_ODER_DIE_SPEISEINHEIT_BETRIEBEN_WIRD,
301330
"DE"))
@@ -311,12 +340,20 @@ public AASSimple() {
311340
.identification(new DefaultIdentifier.Builder().identifier(WWW_VDI2770_COM_BLATT1_ENTWURF_OKT18_CD_DOCUMENT)
312341
.idType(IdentifierType.IRI).build())
313342
.embeddedDataSpecification(new DefaultEmbeddedDataSpecification.Builder()
343+
.dataSpecification(new DefaultReference.Builder()
344+
.key(new DefaultKey.Builder()
345+
.type(KeyElements.GLOBAL_REFERENCE)
346+
.idType(KeyType.IRI)
347+
.value("DataSpecificationIEC61360")
348+
.build())
349+
.build())
314350
.dataSpecificationContent(new DefaultDataSpecificationIEC61360.Builder()
351+
.preferredName(new LangString(DOCUMENT, "EN"))
315352
.shortName(new LangString(DOCUMENT, "EN")).shortName(new LangString(DOKUMENT, "DE"))
316-
.unit("").sourceOfDefinition(ISO15519_1_2010).dataType(DataTypeIEC61360.STRING)
353+
.unit("ExampleString").sourceOfDefinition(ISO15519_1_2010).dataType(DataTypeIEC61360.STRING)
317354
.definition(new LangString(
318355
DOCUMENT_DEF,
319-
"DE"))
356+
"EN"))
320357
.build())
321358
.build())
322359
.build();

0 commit comments

Comments
 (0)