Partial refactoring

anskaffelser · Nov 29, 2023 · 484fb63 · 484fb63
1 parent 952c811
commit 484fb63
Show file tree

Hide file tree

Showing 73 changed files with 745 additions and 1,077 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,4 @@
 /.idea
 target
 *.iml
-/workspace
-/validator.properties
-*.html
 .DS_Store
diff --git a/doc/configurations.md b/doc/configurations.md
diff --git a/pom.xml b/pom.xml
@@ -99,7 +99,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>2.0.7</version>
+            <version>2.0.9</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
@@ -117,14 +117,14 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.13.0</version>
+            <version>2.14.0</version>
         </dependency>
 
         <!-- Guava -->
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>32.1.2-jre</version>
+            <version>32.1.3-jre</version>
         </dependency>
 
         <!-- Guice -->
@@ -158,7 +158,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>5.5.0</version>
+            <version>5.6.0</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/src/main/java/no/difi/vefa/validator/ValidationInstance.java b/src/main/java/no/difi/vefa/validator/ValidationInstance.java
@@ -11,6 +11,7 @@
 import no.difi.vefa.validator.model.Document;
 import no.difi.vefa.validator.model.Prop;
 import no.difi.vefa.validator.model.Props;
+import no.difi.vefa.validator.util.Configuration;
 import no.difi.xsd.vefa.validator._1.AssertionType;
 import no.difi.xsd.vefa.validator._1.FileType;
 import no.difi.xsd.vefa.validator._1.FlagType;
@@ -90,7 +91,7 @@ private ValidationInstance(ValidatorInstance validatorInstance, Document documen
         if (report.getTitle() == null)
             report.setTitle("Unknown document type");
 
-        if (section.getAssertion().size() > 0) {
+        if (!section.getAssertion().isEmpty()) {
             for (AssertionType assertionType : section.getAssertion()) {
                 if (assertionType.getFlag().compareTo(section.getFlag()) > 0)
                     section.setFlag(assertionType.getFlag());

diff --git a/src/main/java/no/difi/vefa/validator/Validator.java b/src/main/java/no/difi/vefa/validator/Validator.java
@@ -38,7 +38,7 @@ public class Validator implements Closeable {
      * @return Validation result.
      */
     public Validation validate(File file, Prop... props) throws IOException {
-        return validate(Document.of(file), props);
+        return validate(file.toPath(), props);
     }
 
     /**

diff --git a/src/main/java/no/difi/vefa/validator/ValidatorBuilder.java b/src/main/java/no/difi/vefa/validator/ValidatorBuilder.java
@@ -1,23 +1,19 @@
 package no.difi.vefa.validator;
 
 import com.google.inject.Guice;
-import com.google.inject.Module;
-import com.google.inject.util.Modules;
-import no.difi.vefa.validator.api.Source;
+import no.difi.vefa.validator.api.Repository;
 import no.difi.vefa.validator.model.Prop;
-import no.difi.vefa.validator.module.PropertiesModule;
-import no.difi.vefa.validator.module.SourceModule;
 import no.difi.vefa.validator.module.ValidatorModule;
+import no.difi.vefa.validator.util.Repositories;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Objects;
 
 /**
  * Builder supporting creation of validator.
  */
 public class ValidatorBuilder {
 
-    private Source source;
+    private Repository repository;
 
     private Prop[] props;
 
@@ -49,13 +45,13 @@ public ValidatorBuilder setProperties(Prop... props) {
     }
 
     /**
-     * Define source to use if other source then production repository to be used.
+     * Define repository to use.
      *
-     * @param source Source giving access to validation rules.
+     * @param repository Repository giving access to validation rules.
      * @return Builder object
      */
-    public ValidatorBuilder setSource(Source source) {
-        this.source = source;
+    public ValidatorBuilder setRepository(Repository repository) {
+        this.repository = repository;
         return this;
     }
 
@@ -65,10 +61,9 @@ public ValidatorBuilder setSource(Source source) {
      * @return Validator ready for use.
      */
     public Validator build() {
-        List<Module> modules = new ArrayList<>();
-        modules.add(PropertiesModule.with(props));
-        modules.add(new SourceModule(source));
+        if (Objects.isNull(repository))
+            repository = Repositories.production();
 
-        return Guice.createInjector(Modules.override(new ValidatorModule()).with(modules)).getInstance(Validator.class);
+        return Guice.createInjector(new ValidatorModule(repository, props)).getInstance(Validator.class);
     }
 }