Added extra Error Handling in the Endpoint.

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

Author: Dennis Labordus

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

@@ -5,6 +5,7 @@
 
 import io.quarkus.security.Authenticated;
 import io.vertx.mutiny.core.eventbus.EventBus;
+import org.lfenergy.compas.core.websocket.ErrorResponseEncoder;
 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;
@@ -21,13 +22,14 @@
 import javax.websocket.server.PathParam;
 import javax.websocket.server.ServerEndpoint;
 
+import static org.lfenergy.compas.core.websocket.WebsocketSupport.handleException;
 import static org.lfenergy.compas.scl.validator.rest.SclResourceConstants.TYPE_PATH_PARAM;
 
 @Authenticated
 @ApplicationScoped
 @ServerEndpoint(value = "/validate-ws/v1/{" + TYPE_PATH_PARAM + "}",
         decoders = {SclValidateRequestDecoder.class, SclValidateResponseDecoder.class},
-        encoders = {SclValidateRequestEncoder.class, SclValidateResponseEncoder.class})
+        encoders = {SclValidateRequestEncoder.class, SclValidateResponseEncoder.class, ErrorResponseEncoder.class})
 public class SclValidatorServerEndpoint {
     private static final Logger LOGGER = LoggerFactory.getLogger(SclValidatorServerEndpoint.class);
 
@@ -53,6 +55,7 @@ public void onMessage(Session session, SclValidateRequest request, @PathParam(TY
     @OnError
     public void onError(Session session, @PathParam(TYPE_PATH_PARAM) String type, Throwable throwable) {
         LOGGER.warn("Error with session {} for type {}.", session.getId(), type, throwable);
+        handleException(session, throwable);
     }
 
     @OnClose

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

@@ -8,6 +8,9 @@
 import io.quarkus.test.junit.mockito.InjectMock;
 import io.quarkus.test.security.TestSecurity;
 import org.junit.jupiter.api.Test;
+import org.lfenergy.compas.core.commons.model.ErrorMessage;
+import org.lfenergy.compas.core.commons.model.ErrorResponse;
+import org.lfenergy.compas.core.websocket.ErrorResponseDecoder;
 import org.lfenergy.compas.scl.extensions.model.SclFileType;
 import org.lfenergy.compas.scl.validator.model.ValidationError;
 import org.lfenergy.compas.scl.validator.rest.v1.model.SclValidateRequest;
@@ -28,12 +31,14 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.lfenergy.compas.core.commons.exception.CompasErrorCode.WEBSOCKET_DECODER_ERROR_CODE;
 import static org.mockito.Mockito.*;
 
 @QuarkusTest
 @TestSecurity(user = "test-user")
 class SclValidatorServerEndpointTest {
     private static final LinkedBlockingDeque<ValidationError> validationErrors = new LinkedBlockingDeque<>();
+    private static final LinkedBlockingDeque<ErrorMessage> errorQueue = new LinkedBlockingDeque<>();
 
     @InjectMock
     private SclValidatorService sclValidatorService;
@@ -60,11 +65,32 @@ void validate_WhenCalled_ThenExpectedResponseIsRetrieved() throws Exception {
         }
     }
 
+    @Test
+    void validate_WhenCalledWithInvalidText_ThenExceptionThrown() throws Exception {
+        try (Session session = ContainerProvider.getWebSocketContainer().connectToServer(ErrorClient.class, uri)) {
+            session.getAsyncRemote().sendText("Invalid Message");
+
+            var errorMessage = errorQueue.poll(10, TimeUnit.SECONDS);
+            assertEquals(WEBSOCKET_DECODER_ERROR_CODE, errorMessage.getCode());
+            assertEquals(0, errorQueue.size());
+        }
+    }
+
     @ClientEndpoint(decoders = SclValidateResponseDecoder.class)
     private static class Client {
         @OnMessage
         public void onMessage(SclValidateResponse response) {
             validationErrors.addAll(response.getValidationErrorList());
         }
     }
+
+    @ClientEndpoint(decoders = ErrorResponseDecoder.class)
+    static class ErrorClient {
+        @OnMessage
+        public void onMessage(ErrorResponse response) {
+            if (response.getErrorMessages().size() > 0) {
+                errorQueue.addAll(response.getErrorMessages());
+            }
+        }
+    }
 }

pom.xml

@@ -24,7 +24,7 @@ SPDX-License-Identifier: Apache-2.0
         <sonarqube-plugin.version>3.2.0</sonarqube-plugin.version>
 
         <compas.scl.xsd.version>0.0.4</compas.scl.xsd.version>
-        <compas.core.version>0.10.0</compas.core.version>
+        <compas.core.version>0.10.1</compas.core.version>
 
         <quarkus.platform.version>2.13.4.Final</quarkus.platform.version>
         <slf4j.version>2.0.3</slf4j.version>