Review comments

Signed-off-by: Flurb <[email protected]>

Author: Flurb

app/src/main/java/org/lfenergy/compas/scl/validator/rest/CompasSclValidatorConfiguration.java

@@ -4,6 +4,7 @@
 package org.lfenergy.compas.scl.validator.rest;
 
 import org.lfenergy.compas.core.commons.ElementConverter;
+import org.lfenergy.compas.scl.validator.xsd.SclXsdValidator;
 import org.lfenergy.compas.scl.validator.collector.CompasOclFileCollector;
 import org.lfenergy.compas.scl.validator.collector.OclFileCollector;
 import org.lfenergy.compas.scl.validator.impl.SclRiseClipseValidator;
@@ -33,4 +34,10 @@ public SclRiseClipseValidator createSclRiseClipseValidator(OclFileCollector oclF
                                                                ValidatorProperties properties) {
         return new SclRiseClipseValidator(oclFileCollector, properties.tempDirectory());
     }
+
+    @Produces
+    @ApplicationScoped
+    public SclXsdValidator createSclXsdValidator() {
+        return new SclXsdValidator();
+    }
 }

app/src/test/java/org/lfenergy/compas/scl/validator/rest/CompasSclValidatorConfigurationTest.java

@@ -45,4 +45,9 @@ void createSclRiseClipseValidator_WhenCalled_ThenObjectReturned() {
 
         verify(validatorProperties, times(1)).tempDirectory();
     }
+
+    @Test
+    void createSclXsdValidator_WhenCalled_ThenObjectReturned() {
+        assertNotNull(new CompasSclValidatorConfiguration().createSclXsdValidator());
+    }
 }

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

@@ -18,7 +18,6 @@
 import org.lfenergy.compas.scl.validator.collector.OclFileCollector;
 import org.lfenergy.compas.scl.validator.model.ValidationError;
 import org.lfenergy.compas.scl.validator.util.OclUtil;
-import org.lfenergy.compas.scl.validator.xsd.XSDValidator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import java.nio.file.Path;
@@ -46,11 +45,6 @@ public List<ValidationError> validate(SclFileType type, String sclData) {
         // List with Validation Error Results if there are any.
         var validationErrors = new ArrayList<ValidationError>();
 
-        var xsdValidator = new XSDValidator(validationErrors, sclData);
-        xsdValidator.validate();
-
-        if (!validationErrors.isEmpty()) return validationErrors;
-
         // Create the validator and prepare it with the OCL Files.
         var validatorRegistry = new EValidatorRegistryImpl();
         var validator = new ComposedEValidator(null);

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

@@ -23,7 +23,7 @@ void setup() {
 
     @Test
     void load_WhenCalledWithValidSCXML_ThenResourceLoaded() throws IOException {
-        var sclData = readSCL("example-with-ocl-validation-errors.scd");
+        var sclData = readSCL("example.scd");
 
         var result = loader.load(sclData);
 

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

@@ -24,20 +24,9 @@ public void setup() {
     }
 
     @Test
-    void validate_WhenCalled_ThenExpectedXSDValidationErrorsReturned() throws IOException {
+    void validate_WhenCalled_ThenExpectedValidationErrorsReturned() throws IOException {
         var type = SclFileType.CID;
-        var sclData = readSCL("example-with-xsd-validation-errors.scd");
-
-        var result = sclValidator.validate(type, sclData);
-
-        assertNotNull(result);
-        assertEquals(1, result.size());
-    }
-
-    @Test
-    void validate_WhenCalled_ThenExpectedOCLValidationErrorsReturned() throws IOException {
-        var type = SclFileType.CID;
-        var sclData = readSCL("example-with-ocl-validation-errors.scd");
+        var sclData = readSCL("example.scd");
 
         var result = sclValidator.validate(type, sclData);
 

riseclipse/validator-riseclipse/src/test/resources/scl/example-with-xsd-validation-errors.scd

@@ -5,6 +5,7 @@
 
 import org.lfenergy.compas.scl.extensions.model.SclFileType;
 import org.lfenergy.compas.scl.validator.SclValidator;
+import org.lfenergy.compas.scl.validator.xsd.SclXsdValidator;
 import org.lfenergy.compas.scl.validator.model.ValidationError;
 
 import javax.enterprise.context.ApplicationScoped;
@@ -14,13 +15,21 @@
 @ApplicationScoped
 public class SclValidatorService {
     private final SclValidator validator;
+    private final SclXsdValidator xsdValidator;
 
     @Inject
-    public SclValidatorService(SclValidator validator) {
+    public SclValidatorService(SclValidator validator, SclXsdValidator xsdValidator) {
         this.validator = validator;
+        this.xsdValidator = xsdValidator;
     }
 
     public List<ValidationError> validate(SclFileType type, String sclData) {
-        return validator.validate(type, sclData);
+        var errors = xsdValidator.validate(sclData);
+
+        if (errors.isEmpty()) {
+            errors = validator.validate(type, sclData);
+        }
+
+        return errors;
     }
 }

riseclipse/validator-riseclipse/src/test/resources/scl/example-with-ocl-validation-errors.scd renamed to riseclipse/validator-riseclipse/src/test/resources/scl/example.scd

@@ -3,15 +3,18 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.lfenergy.compas.scl.validator.service;
 
-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.SclValidator;
+import org.lfenergy.compas.scl.validator.xsd.SclXsdValidator;
+import org.lfenergy.compas.scl.validator.model.ValidationError;
+import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import java.util.Collections;
+import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -20,28 +23,45 @@
 @ExtendWith(MockitoExtension.class)
 class SclValidatorServiceTest {
 
+    @InjectMocks
     private SclValidatorService sclValidatorService;
 
     @Mock
     private SclValidator sclValidator;
 
-    @BeforeEach
-    void beforeEach() {
-        sclValidatorService = new SclValidatorService(sclValidator);
-    }
+    @Mock
+    private SclXsdValidator xsdValidator;
 
     @Test
     void validate_WhenCalled_ThenEmptyListReturned() {
         var type = SclFileType.CID;
         var sclData = "Some String";
 
-        when(sclValidator.validate(type, sclData)).thenReturn(Collections.emptyList());
+        when(sclValidator.validate(type, sclData)).thenReturn(List.of(new ValidationError()));
+        when(xsdValidator.validate(sclData)).thenReturn(Collections.emptyList());
 
         var result = sclValidatorService.validate(type, sclData);
 
         assertNotNull(result);
-        assertEquals(0, result.size());
+        assertEquals(1, result.size());
 
         verify(sclValidator, times(1)).validate(type, sclData);
+        verify(xsdValidator, times(1)).validate(sclData);
+    }
+
+    @Test
+    void validate_WhenXsdErrorsAreReturned_ThenSclValidatorIsNeverCalled() {
+        var type = SclFileType.CID;
+        var sclData = "Some String";
+
+        when(xsdValidator.validate(sclData)).thenReturn(List.of(new ValidationError()));
+
+        var result = sclValidatorService.validate(type, sclData);
+
+        assertNotNull(result);
+        assertEquals(1, result.size());
+
+        verify(xsdValidator, times(1)).validate(sclData);
+        verify(sclValidator, never()).validate(type, sclData);
     }
 }

service/src/main/java/org/lfenergy/compas/scl/validator/service/SclValidatorService.java

@@ -0,0 +1,21 @@
+// SPDX-FileCopyrightText: 2022 Alliander N.V.
+//
+// SPDX-License-Identifier: Apache-2.0
+package org.lfenergy.compas.scl.validator.xsd;
+
+import org.lfenergy.compas.scl.validator.model.ValidationError;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SclXsdValidator {
+
+    public List<ValidationError> validate(String sclData) {
+        var validationErrors = new ArrayList<ValidationError>();
+
+        var xsdValidator = new XSDValidator(validationErrors, sclData);
+        xsdValidator.validate();
+
+        return validationErrors;
+    }
+}