Refactoring structure to be in sink with Data Service.

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

Author: Dennis Labordus

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

@@ -1,12 +1,13 @@
 // SPDX-FileCopyrightText: 2022 Alliander N.V.
 //
 // SPDX-License-Identifier: Apache-2.0
-package org.lfenergy.compas.scl.validator.rest.v1.event;
+package org.lfenergy.compas.scl.validator.websocket.event;
 
 import io.quarkus.vertx.ConsumeEvent;
 import org.lfenergy.compas.core.websocket.WebsocketHandler;
-import org.lfenergy.compas.scl.validator.rest.v1.model.SclValidateResponse;
 import org.lfenergy.compas.scl.validator.service.SclValidatorService;
+import org.lfenergy.compas.scl.validator.websocket.event.model.SclValidatorEventRequest;
+import org.lfenergy.compas.scl.validator.websocket.v1.model.SclValidateWsResponse;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
@@ -25,8 +26,8 @@ public SclValidatorEventHandler(SclValidatorService sclValidatorService) {
 
     @ConsumeEvent(value = "validate-ws", blocking = true)
     public void validateWebsocketsEvent(SclValidatorEventRequest request) {
-        new WebsocketHandler<SclValidateResponse>().execute(request.getSession(), () -> {
-            var response = new SclValidateResponse();
+        new WebsocketHandler<SclValidateWsResponse>().execute(request.getSession(), () -> {
+            var response = new SclValidateWsResponse();
             response.setValidationErrorList(sclValidatorService.validate(request.getType(), request.getSclData()));
             return response;
         });

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

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2022 Alliander N.V.
 //
 // SPDX-License-Identifier: Apache-2.0
-package org.lfenergy.compas.scl.validator.rest.v1.event;
+package org.lfenergy.compas.scl.validator.websocket.event.model;
 
 import org.lfenergy.compas.scl.extensions.model.SclFileType;
 

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

@@ -1,20 +1,18 @@
 // SPDX-FileCopyrightText: 2022 Alliander N.V.
 //
 // SPDX-License-Identifier: Apache-2.0
-package org.lfenergy.compas.scl.validator.rest.v1;
+package org.lfenergy.compas.scl.validator.websocket.v1;
 
 import io.quarkus.security.Authenticated;
 import io.vertx.mutiny.core.eventbus.EventBus;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 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;
-import org.lfenergy.compas.scl.validator.rest.v1.websocket.SclValidateRequestDecoder;
-import org.lfenergy.compas.scl.validator.rest.v1.websocket.SclValidateRequestEncoder;
-import org.lfenergy.compas.scl.validator.rest.v1.websocket.SclValidateResponseDecoder;
-import org.lfenergy.compas.scl.validator.rest.v1.websocket.SclValidateResponseEncoder;
+import org.lfenergy.compas.scl.validator.websocket.event.model.SclValidatorEventRequest;
+import org.lfenergy.compas.scl.validator.websocket.v1.decoder.SclValidateWsRequestDecoder;
+import org.lfenergy.compas.scl.validator.websocket.v1.encoder.SclValidateWsResponseEncoder;
+import org.lfenergy.compas.scl.validator.websocket.v1.model.SclValidateWsRequest;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
@@ -29,8 +27,8 @@
 @Authenticated
 @ApplicationScoped
 @ServerEndpoint(value = "/validate-ws/v1/{" + TYPE_PATH_PARAM + "}",
-        decoders = {SclValidateRequestDecoder.class, SclValidateResponseDecoder.class},
-        encoders = {SclValidateRequestEncoder.class, SclValidateResponseEncoder.class, ErrorResponseEncoder.class})
+        decoders = {SclValidateWsRequestDecoder.class},
+        encoders = {SclValidateWsResponseEncoder.class, ErrorResponseEncoder.class})
 public class SclValidatorServerEndpoint {
     private static final Logger LOGGER = LogManager.getLogger(SclValidatorServerEndpoint.class);
 
@@ -48,7 +46,7 @@ public void onOpen(Session session, @PathParam(TYPE_PATH_PARAM) String type) {
 
     @OnMessage
     public void onMessage(Session session,
-                          @Valid SclValidateRequest request,
+                          @Valid SclValidateWsRequest request,
                           @PathParam(TYPE_PATH_PARAM) String type) {
         LOGGER.info("Message from session {} for type {}.", session.getId(), type);
         eventBus.send("validate-ws", new SclValidatorEventRequest(

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

@@ -0,0 +1,20 @@
+// SPDX-FileCopyrightText: 2022 Alliander N.V.
+//
+// SPDX-License-Identifier: Apache-2.0
+package org.lfenergy.compas.scl.validator.websocket.v1.decoder;
+
+import org.lfenergy.compas.core.websocket.AbstractDecoder;
+import org.lfenergy.compas.core.websocket.WebsocketSupport;
+import org.lfenergy.compas.scl.validator.websocket.v1.model.SclValidateWsRequest;
+
+public class SclValidateWsRequestDecoder extends AbstractDecoder<SclValidateWsRequest> {
+    @Override
+    public boolean willDecode(String message) {
+        return (message != null);
+    }
+
+    @Override
+    public SclValidateWsRequest decode(String message) {
+        return WebsocketSupport.decode(message, SclValidateWsRequest.class);
+    }
+}

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

@@ -0,0 +1,20 @@
+// SPDX-FileCopyrightText: 2022 Alliander N.V.
+//
+// SPDX-License-Identifier: Apache-2.0
+package org.lfenergy.compas.scl.validator.websocket.v1.decoder;
+
+import org.lfenergy.compas.core.websocket.AbstractDecoder;
+import org.lfenergy.compas.core.websocket.WebsocketSupport;
+import org.lfenergy.compas.scl.validator.websocket.v1.model.SclValidateWsResponse;
+
+public class SclValidateWsResponseDecoder extends AbstractDecoder<SclValidateWsResponse> {
+    @Override
+    public boolean willDecode(String message) {
+        return (message != null);
+    }
+
+    @Override
+    public SclValidateWsResponse decode(String message) {
+        return WebsocketSupport.decode(message, SclValidateWsResponse.class);
+    }
+}

app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/event/SclValidatorEventRequest.java renamed to app/src/main/java/org/lfenergy/compas/scl/validator/websocket/event/model/SclValidatorEventRequest.java

@@ -0,0 +1,15 @@
+// SPDX-FileCopyrightText: 2022 Alliander N.V.
+//
+// SPDX-License-Identifier: Apache-2.0
+package org.lfenergy.compas.scl.validator.websocket.v1.encoder;
+
+import org.lfenergy.compas.core.websocket.AbstractEncoder;
+import org.lfenergy.compas.core.websocket.WebsocketSupport;
+import org.lfenergy.compas.scl.validator.websocket.v1.model.SclValidateWsRequest;
+
+public class SclValidateWsRequestEncoder extends AbstractEncoder<SclValidateWsRequest> {
+    @Override
+    public String encode(SclValidateWsRequest jaxbObject) {
+        return WebsocketSupport.encode(jaxbObject, SclValidateWsRequest.class);
+    }
+}