Small refactoring to cleanup code.

Signed-off-by: Dennis Labordus <[email protected]>

Author: Dennis Labordus

riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/impl/OclFileLoader.java

@@ -11,7 +11,9 @@
 import org.eclipse.ocl.pivot.utilities.OCL;
 import org.eclipse.ocl.pivot.validation.ComposedEValidator;
 import org.eclipse.ocl.xtext.completeocl.validation.CompleteOCLEObjectValidator;
+import org.lfenergy.compas.scl.extensions.model.SclFileType;
 import org.lfenergy.compas.scl.validator.exception.SclValidatorException;
+import org.lfenergy.compas.scl.validator.util.OclUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -27,10 +29,13 @@
 public class OclFileLoader {
     private static final Logger LOGGER = LoggerFactory.getLogger(OclFileLoader.class);
 
+    private final List<URI> oclFiles;
     private final Path oclTempFile;
     private final OCL ocl;
 
-    public OclFileLoader(Path tempDirectoryPath) {
+    public OclFileLoader(Path tempDirectoryPath, List<URI> oclFiles) {
+        this.oclFiles = oclFiles;
+
         // Create an EPackage.Registry for the SclPackage.
         var registry = new EPackageRegistryImpl();
         registry.put(SclPackage.eNS_URI, SclPackage.eINSTANCE);
@@ -50,6 +55,12 @@ public OclFileLoader(Path tempDirectoryPath) {
         }
     }
 
+    public void loadOCLDocuments(SclFileType type) {
+        oclFiles.stream()
+                .filter(uri -> OclUtil.includeOnType(uri, type))
+                .forEach(this::addOCLDocument);
+    }
+
     public void addOCLDocument(URI oclUri) {
         if (oclUri == null) {
             throw new SclValidatorException(NO_URI_PASSED, "Unable to create URI for temporary file");

riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/impl/SclRiseClipseValidator.java

@@ -51,13 +51,11 @@ public List<ValidationError> validate(SclFileType type, String sclData) {
         var validator = new ComposedEValidator(null);
         validatorRegistry.put(SclPackage.eINSTANCE, validator);
 
-        OclFileLoader oclFileLoader = new OclFileLoader(tempDirectory);
+        OclFileLoader oclFileLoader = new OclFileLoader(tempDirectory, oclFiles);
         try {
             // Load all the OCL Files, adding them to the OCL Instance.
             LOGGER.info("Loading OCL Files for type '{}'.", type);
-            oclFiles.stream()
-                    .filter(uri -> OclUtil.includeOnType(uri, type))
-                    .forEach(oclFileLoader::addOCLDocument);
+            oclFileLoader.loadOCLDocuments(type);
             oclFileLoader.prepareValidator(validator);
 
             // Load the SCL File as Resource ready to be processed.

riseclipse/validator-riseclipse/src/test/java/org/lfenergy/compas/scl/validator/impl/OclFileLoaderTest.java

@@ -10,6 +10,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.lfenergy.compas.scl.extensions.model.SclFileType;
 import org.lfenergy.compas.scl.validator.exception.SclValidatorException;
 import org.lfenergy.compas.scl.validator.util.OclUtil;
 import org.mockito.junit.jupiter.MockitoExtension;
@@ -18,6 +19,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -36,13 +38,22 @@ void setup() throws IOException {
 
         var tempDirectory = "./target/data/temp";
         var tempDirectoryPath = Path.of(tempDirectory);
-        loader = new OclFileLoader(tempDirectoryPath);
+        var oclFile = findOCL("example.ocl");
+
+        loader = new OclFileLoader(tempDirectoryPath, List.of(oclFile));
         tempFile = Files.walk(tempDirectoryPath)
                 .filter(path -> path.toString().contains(File.separator + "allConstraints"))
                 .findFirst()
                 .orElseThrow();
     }
 
+    @Test
+    void loadOCLDocuments_WhenCalled_ThenFilesFromListAreLoaded() throws IOException {
+        loader.loadOCLDocuments(SclFileType.CID);
+
+        assertEquals(1, Files.lines(tempFile).count());
+    }
+
     @Test
     void addOCLDocument_WhenCalledWithNull_ThenExceptionThrown() {
         var exception = assertThrows(SclValidatorException.class,