Fixed warning about dependencies.

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

Author: Dennis Labordus

app/pom.xml

@@ -47,31 +47,23 @@ SPDX-License-Identifier: Apache-2.0
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy</artifactId>
+            <artifactId>quarkus-resteasy-reactive</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-smallrye-jwt</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-smallrye-openapi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-smallrye-health</artifactId>
+            <artifactId>quarkus-resteasy-reactive-jaxb</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-jaxb</artifactId>
+            <artifactId>quarkus-smallrye-jwt</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-mutiny</artifactId>
+            <artifactId>quarkus-smallrye-openapi</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-vertx</artifactId>
+            <artifactId>quarkus-smallrye-health</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>

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

@@ -4,7 +4,9 @@
 package org.lfenergy.compas.scl.validator.rest.v1;
 
 import io.quarkus.security.Authenticated;
+import io.smallrye.mutiny.Uni;
 import org.lfenergy.compas.scl.validator.rest.v1.model.NsdocListResponse;
+import org.lfenergy.compas.scl.validator.rest.v1.model.NsdocResponse;
 import org.lfenergy.compas.scl.validator.service.NsdocService;
 
 import javax.enterprise.context.RequestScoped;
@@ -27,17 +29,19 @@ public NsdocResource(NsdocService nsdocService) {
     @GET
     @Consumes(MediaType.APPLICATION_XML)
     @Produces(MediaType.APPLICATION_XML)
-    public NsdocListResponse list() {
-        NsdocListResponse response = new NsdocListResponse();
+    public Uni<NsdocListResponse> list() {
+        var response = new NsdocListResponse();
         response.setNsdocFiles(nsdocService.list());
-        return response;
+        return Uni.createFrom().item(response);
     }
 
     @GET
     @Path("{" + ID_PARAM + "}")
     @Consumes(MediaType.APPLICATION_XML)
     @Produces(MediaType.APPLICATION_XML)
-    public String get(@PathParam(ID_PARAM) UUID id) {
-        return nsdocService.get(id);
+    public Uni<NsdocResponse> get(@PathParam(ID_PARAM) UUID id) {
+        var response = new NsdocResponse();
+        response.setNsdocFile(nsdocService.get(id));
+        return Uni.createFrom().item(response);
     }
 }

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

@@ -5,12 +5,10 @@
 
 import io.quarkus.security.Authenticated;
 import io.smallrye.mutiny.Uni;
-import io.vertx.mutiny.core.eventbus.EventBus;
-import io.vertx.mutiny.core.eventbus.Message;
 import org.lfenergy.compas.scl.extensions.model.SclFileType;
-import org.lfenergy.compas.scl.validator.rest.v1.event.SclValidatorEventRequest;
 import org.lfenergy.compas.scl.validator.rest.v1.model.SclValidateRequest;
 import org.lfenergy.compas.scl.validator.rest.v1.model.SclValidateResponse;
+import org.lfenergy.compas.scl.validator.service.SclValidatorService;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
@@ -24,21 +22,20 @@
 @RequestScoped
 @Path("/validate/v1/{" + TYPE_PATH_PARAM + "}")
 public class SclValidatorResource {
-    private final EventBus eventBus;
+    private final SclValidatorService sclValidatorService;
 
     @Inject
-    public SclValidatorResource(EventBus eventBus) {
-        this.eventBus = eventBus;
+    public SclValidatorResource(SclValidatorService sclValidatorService) {
+        this.sclValidatorService = sclValidatorService;
     }
 
     @POST
     @Consumes(MediaType.APPLICATION_XML)
     @Produces(MediaType.APPLICATION_XML)
     public Uni<SclValidateResponse> validateSCL(@PathParam(TYPE_PATH_PARAM) SclFileType type,
                                                 @Valid SclValidateRequest request) {
-        return eventBus.<SclValidateResponse>request(
-                        "validate-rest",
-                        new SclValidatorEventRequest(type, request.getSclData()))
-                .onItem().transform(Message::body);
+        var response = new SclValidateResponse();
+        response.setValidationErrorList(sclValidatorService.validate(type, request.getSclData()));
+        return Uni.createFrom().item(response);
     }
 }

app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/event/SclValidatorEventHandler.java

@@ -4,7 +4,6 @@
 package org.lfenergy.compas.scl.validator.rest.v1.event;
 
 import io.quarkus.vertx.ConsumeEvent;
-import io.smallrye.mutiny.Uni;
 import org.lfenergy.compas.scl.validator.rest.v1.model.SclValidateResponse;
 import org.lfenergy.compas.scl.validator.service.SclValidatorService;
 
@@ -31,11 +30,4 @@ public void validateWebsocketsEvent(SclValidatorEventRequest request) {
         var session = request.getSession();
         session.getAsyncRemote().sendObject(response);
     }
-
-    @ConsumeEvent(value = "validate-rest", blocking = true)
-    public Uni<SclValidateResponse> validateRestEvent(SclValidatorEventRequest request) {
-        var response = new SclValidateResponse();
-        response.setValidationErrorList(sclValidatorService.validate(request.getType(), request.getSclData()));
-        return Uni.createFrom().item(response);
-    }
 }

app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/model/NsdocResponse.java

@@ -0,0 +1,30 @@
+// SPDX-FileCopyrightText: 2022 Alliander N.V.
+//
+// SPDX-License-Identifier: Apache-2.0
+package org.lfenergy.compas.scl.validator.rest.v1.model;
+
+import org.eclipse.microprofile.openapi.annotations.media.Schema;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import static org.lfenergy.compas.scl.validator.SclValidatorConstants.SCL_VALIDATOR_SERVICE_V1_NS_URI;
+
+@Schema(description = "The response with NSDoc File.")
+@XmlRootElement(name = "NsdocResponse", namespace = SCL_VALIDATOR_SERVICE_V1_NS_URI)
+@XmlAccessorType(XmlAccessType.FIELD)
+public class NsdocResponse {
+    @Schema(description = "The NSDoc File as String")
+    @XmlElement(name = "NsdocFile", namespace = SCL_VALIDATOR_SERVICE_V1_NS_URI)
+    private String nsdocFile;
+
+    public String getNsdocFile() {
+        return nsdocFile;
+    }
+
+    public void setNsdocFile(String nsdocFile) {
+        this.nsdocFile = nsdocFile;
+    }
+}

app/src/main/resources/application.properties

@@ -10,6 +10,7 @@ quarkus.http.cors                 = false
 # Sets the extra context for all RestEasy API Calls, for Websockets this needs to be included in the endpoint itself.
 quarkus.http.root-path            = /compas-scl-validator
 quarkus.http.limits.max-body-size = 150M
+quarkus.websocket.max-frame-size  = 157286400
 
 quarkus.log.level = INFO
 quarkus.log.category."org.lfenergy.compas.scl.validator".level = INFO
@@ -22,7 +23,7 @@ quarkus.log.category."org.lfenergy.compas.scl.validator".level = INFO
 %dev.quarkus.http.port      = 9093
 %dev.quarkus.http.cors      = true
 
-%dev.quarkus.log.level = DEBUG
+%dev.quarkus.log.level = TRACE
 %dev.quarkus.log.category."org.lfenergy.compas.scl.validator".level = DEBUG
 
 # Test Profile overrides.

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

@@ -73,7 +73,9 @@ void get_WhenCalled_ThenContentReturned() {
                 .extract()
                 .response();
 
-        var nsdocFile = response.asString();
+        var xmlPath = response.xmlPath()
+                .using(xmlPathConfig().declaredNamespace("svs", SCL_VALIDATOR_SERVICE_V1_NS_URI));
+        var nsdocFile = xmlPath.getString("svs:NsdocResponse.svs:NsdocFile");
         assertNotNull(nsdocFile);
         assertEquals(result, nsdocFile);
         verify(nsdocService, times(1)).get(id);

app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/event/SclValidatorEventHandlerTest.java

@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.lfenergy.compas.scl.validator.rest.v1.event;
 
-import io.smallrye.mutiny.helpers.test.UniAssertSubscriber;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.lfenergy.compas.scl.extensions.model.SclFileType;
@@ -32,30 +31,6 @@ class SclValidatorEventHandlerTest {
     @InjectMocks
     private SclValidatorEventHandler eventHandler;
 
-    @Test
-    void validateRestEvent_WhenCalled_ThenExpectedCallsAreMade() {
-        var veList = new ArrayList<ValidationError>();
-        var type = SclFileType.CID;
-        var sclData = "Some SCL Data";
-
-        var request = Mockito.mock(SclValidatorEventRequest.class);
-        when(request.getType()).thenReturn(type);
-        when(request.getSclData()).thenReturn(sclData);
-
-        when(service.validate(type, sclData)).thenReturn(veList);
-
-        var result = eventHandler.validateRestEvent(request);
-
-        var subscriber = result.subscribe().withSubscriber(UniAssertSubscriber.create());
-        var response = subscriber.assertCompleted().getItem();
-        assertEquals(veList, response.getValidationErrorList());
-
-        verify(service, times(1)).validate(type, sclData);
-        verify(request, never()).getSession();
-        verify(request, times(1)).getType();
-        verify(request, times(1)).getSclData();
-    }
-
     @Test
     void validateWebsocketsEvent_WhenCalled_ThenExpectedCallsAreMade() throws IOException {
         var veList = new ArrayList<ValidationError>();

app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/model/NsdocResponseTest.java

@@ -0,0 +1,13 @@
+// SPDX-FileCopyrightText: 2022 Alliander N.V.
+//
+// SPDX-License-Identifier: Apache-2.0
+package org.lfenergy.compas.scl.validator.rest.v1.model;
+
+import org.lfenergy.compas.scl.validator.model.AbstractPojoTester;
+
+class NsdocResponseTest extends AbstractPojoTester {
+    @Override
+    protected Class<?> getClassToBeTested() {
+        return NsdocResponse.class;
+    }
+}

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

@@ -5,8 +5,8 @@
 
 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.lfenergy.compas.scl.validator.xsd.SclXsdValidator;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
@@ -25,11 +25,9 @@ public SclValidatorService(SclValidator validator, SclXsdValidator xsdValidator)
 
     public List<ValidationError> validate(SclFileType type, String sclData) {
         var errors = xsdValidator.validate(sclData);
-
         if (errors.isEmpty()) {
             errors = validator.validate(type, sclData);
         }
-
         return errors;
     }
 }