Merge pull request #7 from admin-shell-io/feature/validation

Feature/validation
admin-shell-io · Sep 13, 2021 · d3996a6 · d3996a6
2 parents 3801fed + c806d79
commit d3996a6
Show file tree

Hide file tree

Showing 46 changed files with 5,267 additions and 103 deletions.
diff --git a/dataformat-core/pom.xml b/dataformat-core/pom.xml
@@ -42,12 +42,12 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>30.1.1-jre</version>
+            <version>${guava.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
+            <version>${commons-lang3.version}</version>
         </dependency>
     </dependencies>
     <build>

diff --git a/pom.xml b/pom.xml
@@ -70,9 +70,11 @@
         <commons-codec.version>1.15</commons-codec.version>
         <commons-io.version>2.6</commons-io.version>
         <commons-compress.version>1.21</commons-compress.version>
+        <commons-lang3.version>3.12.0</commons-lang3.version>
         <shacl.version>1.3.2</shacl.version>
-        <commons-lang3.version>3.8.1</commons-lang3.version>
+        <commons-lang3.version>3.12.0</commons-lang3.version>
         <gpg.keyname>0xDFCC34A6</gpg.keyname>
+        <guava.version>30.1.1-jre</guava.version>
     </properties>
     <build>
         <plugins>

diff --git a/validator/src/main/java/io/adminshell/aas/v3/model/validator/ShaclValidator.java b/validator/src/main/java/io/adminshell/aas/v3/model/validator/ShaclValidator.java
@@ -15,7 +15,13 @@
  */
 package io.adminshell.aas.v3.model.validator;
 
-import io.adminshell.aas.v3.dataformat.rdf.Serializer;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.stream.Collectors;
+
 import org.apache.jena.graph.compose.Union;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
@@ -27,10 +33,7 @@
 import org.apache.jena.util.FileUtils;
 import org.slf4j.LoggerFactory;
 
-import java.io.*;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.stream.Collectors;
+import io.adminshell.aas.v3.dataformat.rdf.Serializer;
 
 
 public class ShaclValidator implements Validator{
@@ -124,34 +127,13 @@ private ShaclValidator() {
         //Initialize an empty model into which we will be loading the shapes
         Model shapesModel = ModelFactory.createDefaultModel();
 
-        /*
-        //Use resources from zip file
-        //TODO: Will they be compressed?
-        InputStream inputStream = getClass().getClassLoader().getResourceAsStream("validation.zip");
-
-        //Stream this to some temporary file which will be deleted after program exit
-        if (inputStream == null)
-            throw new IOException("Failed to retrieve validation.zip from resources.");
-
-        File inputStreamToFile = File.createTempFile("validation_zip_file", null);
-        inputStreamToFile.deleteOnExit();
-
-        Files.copy(inputStream, inputStreamToFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
-        ZipFile zipFile = new ZipFile(inputStreamToFile);
-        Enumeration<? extends ZipEntry> entries = zipFile.entries();
-
-        while (entries.hasMoreElements()) {
-            shapesModel.read(zipFile.getInputStream(entries.nextElement()), null, FileUtils.langTurtle);
-        }
-        */
-        //shapesModel.read(Files.readString(Path.of("src/main/resources/shapes.ttl")));
-
-
         //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");
         shapesModel.read(shapesInputStream, null, FileUtils.langTurtle);
+        shapesModel.read(constraintShapesInputStream, null, FileUtils.langTurtle);
         shapes = Shapes.parse(shapesModel);
         ontologyModel = ModelFactory.createDefaultModel();