Repairing validation of Enums

Author: Matthias Böckmann

dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLDSerializer.java

@@ -73,7 +73,7 @@ public void serializeWithType(Object bean, JsonGenerator gen, SerializerProvider
         }
         else
         {
-            String randomUri = "https://admin-shell.io/autogen/" + UUID.randomUUID();
+            String randomUri = "https://admin-shell.io/autogen/" + bean.getClass().getSimpleName() + "/" + UUID.randomUUID();
             idMap.put(bean, randomUri);
             gen.writeStringField("@id", randomUri);
         }

dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLdEnumSerializer.java

@@ -30,7 +30,19 @@ public class JsonLdEnumSerializer extends JsonSerializer<Enum<?>> {
     public void serialize(Enum value, JsonGenerator gen, SerializerProvider provider) throws IOException {
         if(value.getClass().isEnum() && value.getClass().getName().startsWith("io.adminshell.aas."))
         {
-            gen.writeString(translate(value.getClass(), value.name()));
+            if(value.getClass().getAnnotation(IRI.class) != null && value.getClass().getAnnotation(IRI.class).value().length > 0)
+            {
+                gen.writeStartObject();
+                gen.writeStringField("@type", value.getClass().getAnnotation(IRI.class).value()[0]);
+                gen.writeStringField("@id", translate(value.getClass(), value.name()));
+                gen.writeEndObject();
+            }
+            else
+            {
+                gen.writeString(translate(value.getClass(), value.name()));
+            }
+
+
         } else {
             provider.findValueSerializer(Enum.class).serialize(value, gen, provider);
         }

validator/src/main/java/io/adminshell/aas/v3/model/validator/ShaclValidator.java

@@ -68,7 +68,7 @@ public void validate(Object obj) throws ValidationException {
             ValidationReport report = validateGetReport(obj);
 
             if (!report.conforms()) {
-                throw new ValidationException(report.getEntries().stream().map(ReportEntry::toString).collect(Collectors.joining()));
+                throw new ValidationException(report.getEntries().stream().map(ReportEntry::toString).collect(Collectors.joining("\n")));
             }
         }
         catch (IOException e)

validator/src/test/java/io/adminshell/aas/v3/model/validator/ShaclValidatorTest.java

@@ -17,15 +17,18 @@
 
 import io.adminshell.aas.v3.model.AssetAdministrationShell;
 import io.adminshell.aas.v3.model.AssetKind;
+import io.adminshell.aas.v3.model.IdentifierType;
 import io.adminshell.aas.v3.model.LangString;
 import io.adminshell.aas.v3.model.impl.DefaultAssetAdministrationShell;
 import io.adminshell.aas.v3.model.impl.DefaultAssetInformation;
+import io.adminshell.aas.v3.model.impl.DefaultIdentifier;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 
+
 public class ShaclValidatorTest {
 
     Logger logger = LoggerFactory.getLogger(getClass());
@@ -39,6 +42,7 @@ public void validationTest() throws ValidationException {
 
         AssetAdministrationShell aas = new DefaultAssetAdministrationShell.Builder()
                 .description(new LangString("TestDescription"))
+                .identification(new DefaultIdentifier.Builder().identifier("test1234").idType(IdentifierType.CUSTOM).build())
                 .build();
 
         logger.info("Done. Starting validation.");
@@ -56,16 +60,10 @@ public void validationTest() throws ValidationException {
 
         aas.setIdShort("test");
 
+
         aas.setAssetInformation(new DefaultAssetInformation.Builder()
                 .assetKind(AssetKind.INSTANCE)
                 .build());
-        try {
-            validator.validate(aas);
-        }
-        catch (ValidationException e)
-        {
-            e.printStackTrace();
-            //TODO: The AssetKind.INSTANCE is not yet recognized properly. Either the serialization is not correct, or the shape has an error
-        }
+        validator.validate(aas);
     }
 }