Merge pull request #39 from changqin26/feature/example-validation

Feature/example validation

Author: sebbader

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

@@ -250,26 +250,14 @@ public class AASFull {
                             .build())
                     .qualifier(new DefaultQualifier.Builder()
                             .value("100")
-                            .valueId(new DefaultReference.Builder()
-                                    .key(new DefaultKey.Builder()
-                                            .type(KeyElements.GLOBAL_REFERENCE)
-                                            .idType(KeyType.IRI)
-                                            .value("100")
-                                            .build())
-                                    .build())
+
                             .valueType("int")
                             .type("http://acplt.org/Qualifier/ExampleQualifier")
                             .build())
                     .qualifier(new DefaultQualifier.Builder()
                             .value("50")
-                            .valueId(new DefaultReference.Builder()
-                                    .key(new DefaultKey.Builder()
-                                            .type(KeyElements.GLOBAL_REFERENCE)
-                                            .idType(KeyType.IRI)
-                                            .value("50")
-                                            .build())
-                                    .build())
-                            .valueType("int")
+
+                            .valueType("http://www.w3.org/2001/XMLSchema#int")
                             .type("http://acplt.org/Qualifier/ExampleQualifier2")
                             .build())
                     .value("http://acplt.org/ValueId/ACPLT")

validator/pom.xml

@@ -17,6 +17,12 @@
             <artifactId>dataformat-rdf</artifactId>
             <version>${revision}</version>
         </dependency>
+        <dependency>
+            <groupId>io.admin-shell.aas</groupId>
+            <artifactId>dataformat-json</artifactId>
+            <version>${revision}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.admin-shell.aas</groupId>
             <artifactId>dataformat-core</artifactId>

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

@@ -130,8 +130,8 @@ private ShaclValidator() {
         //All loaded, let's parse!
         //shapes = Shapes.parse(shapesModel);
         InputStream shapesInputStream = getClass().getClassLoader().getResourceAsStream("shapes.ttl");
-        InputStream constraintShapesInputStream = getClass().getClassLoader().getResourceAsStream("constraint_shapes.ttl");
         InputStream ontologyInputStream = getClass().getClassLoader().getResourceAsStream("ontology.ttl");
+        InputStream constraintShapesInputStream = getClass().getClassLoader().getResourceAsStream("constraint_shapes.ttl");
         shapesModel.read(shapesInputStream, null, FileUtils.langTurtle);
         shapesModel.read(constraintShapesInputStream, null, FileUtils.langTurtle);
         shapes = Shapes.parse(shapesModel);

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

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2021 Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e. V.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.adminshell.aas.v3.model.validator;
+
+
+import org.apache.commons.io.IOUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringWriter;
+
+/**
+ * Helper class for Serializer Tests
+ *
+ * @author sbader
+ *
+ */
+public class ValidatorUtil {
+
+    public static String readResourceToString(String resourceName) throws IOException {
+        ClassLoader classloader = Thread.currentThread().getContextClassLoader();
+        InputStream is = classloader.getResourceAsStream(resourceName);
+        StringWriter writer = new StringWriter();
+        IOUtils.copy(is, writer, "UTF-8");
+        return writer.toString();
+    }
+
+    public static String stripWhitespaces(String input) {
+        return input.replaceAll("\\s+", "");
+    }
+
+}

validator/src/main/resources/constraint_shapes.ttl

@@ -32,7 +32,7 @@
 
 # AASd-002
 aas:IdShortShape a sh:NodeShape ;
-  sh:targetClass aas:Submodel ;
+  sh:targetClass aas:Referable ;
   sh:property [
       a sh:PropertyShape ;
       sh:path <https://admin-shell.io/aas/3/0/RC01/Referable/idShort> ;