diff --git a/app/pom.xml b/app/pom.xml index ae1207f..68dedff 100644 --- a/app/pom.xml +++ b/app/pom.xml @@ -61,6 +61,10 @@ SPDX-License-Identifier: Apache-2.0 io.quarkus quarkus-websockets + + io.quarkus + quarkus-hibernate-validator + io.quarkus @@ -76,9 +80,10 @@ SPDX-License-Identifier: Apache-2.0 - io.quarkus - quarkus-hibernate-validator + org.jboss.logmanager + log4j2-jboss-logmanager + io.quarkus quarkus-container-image-docker @@ -133,11 +138,6 @@ SPDX-License-Identifier: Apache-2.0 openpojo test - - org.slf4j - slf4j-simple - test - diff --git a/app/src/main/docker/Dockerfile.jvm b/app/src/main/docker/Dockerfile.jvm index c362d8c..c870687 100644 --- a/app/src/main/docker/Dockerfile.jvm +++ b/app/src/main/docker/Dockerfile.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/app-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-923 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/app/src/main/docker/Dockerfile.native b/app/src/main/docker/Dockerfile.native index 5fc9303..6dd4700 100644 --- a/app/src/main/docker/Dockerfile.native +++ b/app/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/app # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-923 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/NsdocResource.java b/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/NsdocResource.java index c2bdc69..5e8be64 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/NsdocResource.java +++ b/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/NsdocResource.java @@ -5,6 +5,8 @@ import io.quarkus.security.Authenticated; import io.smallrye.mutiny.Uni; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; 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; @@ -20,6 +22,8 @@ @RequestScoped @Path("/nsdoc/v1") public class NsdocResource { + private static final Logger LOGGER = LogManager.getLogger(NsdocResource.class); + private final NsdocService nsdocService; public NsdocResource(NsdocService nsdocService) { @@ -30,6 +34,7 @@ public NsdocResource(NsdocService nsdocService) { @Consumes(MediaType.APPLICATION_XML) @Produces(MediaType.APPLICATION_XML) public Uni list() { + LOGGER.info("Retrieving list of NSDoc Files"); var response = new NsdocListResponse(); response.setNsdocFiles(nsdocService.list()); return Uni.createFrom().item(response); @@ -40,6 +45,7 @@ public Uni list() { @Consumes(MediaType.APPLICATION_XML) @Produces(MediaType.APPLICATION_XML) public Uni get(@PathParam(ID_PARAM) UUID id) { + LOGGER.info("Retrieving NS Doc File '{}'", id); var response = new NsdocResponse(); response.setNsdocFile(nsdocService.get(id)); return Uni.createFrom().item(response); diff --git a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/SclValidatorResource.java b/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/SclValidatorResource.java index c5f7651..8bb44ac 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/SclValidatorResource.java +++ b/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/SclValidatorResource.java @@ -5,6 +5,8 @@ import io.quarkus.security.Authenticated; import io.smallrye.mutiny.Uni; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.lfenergy.compas.scl.extensions.model.SclFileType; import org.lfenergy.compas.scl.validator.rest.v1.model.SclValidateRequest; import org.lfenergy.compas.scl.validator.rest.v1.model.SclValidateResponse; @@ -22,6 +24,8 @@ @RequestScoped @Path("/validate/v1/{" + TYPE_PATH_PARAM + "}") public class SclValidatorResource { + private static final Logger LOGGER = LogManager.getLogger(SclValidatorResource.class); + private final SclValidatorService sclValidatorService; @Inject @@ -34,6 +38,7 @@ public SclValidatorResource(SclValidatorService sclValidatorService) { @Produces(MediaType.APPLICATION_XML) public Uni validateSCL(@PathParam(TYPE_PATH_PARAM) SclFileType type, @Valid SclValidateRequest request) { + LOGGER.info("Validating SCL File for type {}.", type); var response = new SclValidateResponse(); response.setValidationErrorList(sclValidatorService.validate(type, request.getSclData())); return Uni.createFrom().item(response); diff --git a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/websocket/SclValidateRequestDecoder.java b/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/websocket/SclValidateRequestDecoder.java deleted file mode 100644 index 99a5ef0..0000000 --- a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/websocket/SclValidateRequestDecoder.java +++ /dev/null @@ -1,20 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Alliander N.V. -// -// SPDX-License-Identifier: Apache-2.0 -package org.lfenergy.compas.scl.validator.rest.v1.websocket; - -import org.lfenergy.compas.core.websocket.AbstractDecoder; -import org.lfenergy.compas.core.websocket.WebsocketSupport; -import org.lfenergy.compas.scl.validator.rest.v1.model.SclValidateRequest; - -public class SclValidateRequestDecoder extends AbstractDecoder { - @Override - public boolean willDecode(String message) { - return (message != null); - } - - @Override - public SclValidateRequest decode(String message) { - return WebsocketSupport.decode(message, SclValidateRequest.class); - } -} diff --git a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/websocket/SclValidateRequestEncoder.java b/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/websocket/SclValidateRequestEncoder.java deleted file mode 100644 index 7f936e9..0000000 --- a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/websocket/SclValidateRequestEncoder.java +++ /dev/null @@ -1,15 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Alliander N.V. -// -// SPDX-License-Identifier: Apache-2.0 -package org.lfenergy.compas.scl.validator.rest.v1.websocket; - -import org.lfenergy.compas.core.websocket.AbstractEncoder; -import org.lfenergy.compas.core.websocket.WebsocketSupport; -import org.lfenergy.compas.scl.validator.rest.v1.model.SclValidateRequest; - -public class SclValidateRequestEncoder extends AbstractEncoder { - @Override - public String encode(SclValidateRequest jaxbObject) { - return WebsocketSupport.encode(jaxbObject, SclValidateRequest.class); - } -} diff --git a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/websocket/SclValidateResponseDecoder.java b/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/websocket/SclValidateResponseDecoder.java deleted file mode 100644 index ea5e757..0000000 --- a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/websocket/SclValidateResponseDecoder.java +++ /dev/null @@ -1,20 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Alliander N.V. -// -// SPDX-License-Identifier: Apache-2.0 -package org.lfenergy.compas.scl.validator.rest.v1.websocket; - -import org.lfenergy.compas.core.websocket.AbstractDecoder; -import org.lfenergy.compas.core.websocket.WebsocketSupport; -import org.lfenergy.compas.scl.validator.rest.v1.model.SclValidateResponse; - -public class SclValidateResponseDecoder extends AbstractDecoder { - @Override - public boolean willDecode(String message) { - return (message != null); - } - - @Override - public SclValidateResponse decode(String message) { - return WebsocketSupport.decode(message, SclValidateResponse.class); - } -} diff --git a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/websocket/SclValidateResponseEncoder.java b/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/websocket/SclValidateResponseEncoder.java deleted file mode 100644 index 24a29e1..0000000 --- a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/websocket/SclValidateResponseEncoder.java +++ /dev/null @@ -1,15 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Alliander N.V. -// -// SPDX-License-Identifier: Apache-2.0 -package org.lfenergy.compas.scl.validator.rest.v1.websocket; - -import org.lfenergy.compas.core.websocket.AbstractEncoder; -import org.lfenergy.compas.core.websocket.WebsocketSupport; -import org.lfenergy.compas.scl.validator.rest.v1.model.SclValidateResponse; - -public class SclValidateResponseEncoder extends AbstractEncoder { - @Override - public String encode(SclValidateResponse jaxbObject) { - return WebsocketSupport.encode(jaxbObject, SclValidateResponse.class); - } -} diff --git a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/event/SclValidatorEventHandler.java b/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/event/SclValidatorEventHandler.java similarity index 72% rename from app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/event/SclValidatorEventHandler.java rename to app/src/main/java/org/lfenergy/compas/scl/validator/websocket/event/SclValidatorEventHandler.java index 84edcf8..efa911f 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/event/SclValidatorEventHandler.java +++ b/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/event/SclValidatorEventHandler.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().execute(request.getSession(), () -> { - var response = new SclValidateResponse(); + new WebsocketHandler().execute(request.getSession(), () -> { + var response = new SclValidateWsResponse(); response.setValidationErrorList(sclValidatorService.validate(request.getType(), request.getSclData())); return response; }); diff --git a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/event/SclValidatorEventRequest.java b/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/event/model/SclValidatorEventRequest.java similarity index 91% rename from app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/event/SclValidatorEventRequest.java rename to app/src/main/java/org/lfenergy/compas/scl/validator/websocket/event/model/SclValidatorEventRequest.java index c116c83..93798c2 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/event/SclValidatorEventRequest.java +++ b/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/event/model/SclValidatorEventRequest.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; diff --git a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/SclValidatorServerEndpoint.java b/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/SclValidatorServerEndpoint.java similarity index 64% rename from app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/SclValidatorServerEndpoint.java rename to app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/SclValidatorServerEndpoint.java index 2b3bfe7..dcbbc3a 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/SclValidatorServerEndpoint.java +++ b/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/SclValidatorServerEndpoint.java @@ -1,23 +1,22 @@ // 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.slf4j.Logger; -import org.slf4j.LoggerFactory; +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; +import javax.validation.Valid; import javax.websocket.*; import javax.websocket.server.PathParam; import javax.websocket.server.ServerEndpoint; @@ -28,10 +27,10 @@ @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 = LoggerFactory.getLogger(SclValidatorServerEndpoint.class); + private static final Logger LOGGER = LogManager.getLogger(SclValidatorServerEndpoint.class); private final EventBus eventBus; @@ -46,7 +45,9 @@ public void onOpen(Session session, @PathParam(TYPE_PATH_PARAM) String type) { } @OnMessage - public void onMessage(Session session, SclValidateRequest request, @PathParam(TYPE_PATH_PARAM) String type) { + public void onMessage(Session session, + @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( session, SclFileType.valueOf(type), request.getSclData())); diff --git a/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/decoder/SclValidateWsRequestDecoder.java b/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/decoder/SclValidateWsRequestDecoder.java new file mode 100644 index 0000000..96486ab --- /dev/null +++ b/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/decoder/SclValidateWsRequestDecoder.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 { + @Override + public boolean willDecode(String message) { + return (message != null); + } + + @Override + public SclValidateWsRequest decode(String message) { + return WebsocketSupport.decode(message, SclValidateWsRequest.class); + } +} diff --git a/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/decoder/SclValidateWsResponseDecoder.java b/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/decoder/SclValidateWsResponseDecoder.java new file mode 100644 index 0000000..c9c6151 --- /dev/null +++ b/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/decoder/SclValidateWsResponseDecoder.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 { + @Override + public boolean willDecode(String message) { + return (message != null); + } + + @Override + public SclValidateWsResponse decode(String message) { + return WebsocketSupport.decode(message, SclValidateWsResponse.class); + } +} diff --git a/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/encoder/SclValidateWsRequestEncoder.java b/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/encoder/SclValidateWsRequestEncoder.java new file mode 100644 index 0000000..263f0fe --- /dev/null +++ b/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/encoder/SclValidateWsRequestEncoder.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 { + @Override + public String encode(SclValidateWsRequest jaxbObject) { + return WebsocketSupport.encode(jaxbObject, SclValidateWsRequest.class); + } +} diff --git a/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/encoder/SclValidateWsResponseEncoder.java b/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/encoder/SclValidateWsResponseEncoder.java new file mode 100644 index 0000000..5da0278 --- /dev/null +++ b/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/encoder/SclValidateWsResponseEncoder.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.SclValidateWsResponse; + +public class SclValidateWsResponseEncoder extends AbstractEncoder { + @Override + public String encode(SclValidateWsResponse jaxbObject) { + return WebsocketSupport.encode(jaxbObject, SclValidateWsResponse.class); + } +} diff --git a/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/model/SclValidateWsRequest.java b/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/model/SclValidateWsRequest.java new file mode 100644 index 0000000..663b264 --- /dev/null +++ b/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/model/SclValidateWsRequest.java @@ -0,0 +1,22 @@ +// SPDX-FileCopyrightText: 2022 Alliander N.V. +// +// SPDX-License-Identifier: Apache-2.0 + +package org.lfenergy.compas.scl.validator.websocket.v1.model; + +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.lfenergy.compas.scl.validator.rest.v1.model.SclValidateRequest; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +import static org.lfenergy.compas.scl.validator.SclValidatorConstants.SCL_VALIDATOR_SERVICE_V1_NS_URI; + +@Schema(description = "The Validation Request retrieved") +@XmlType(name = "SclValidateWsRequest", namespace = SCL_VALIDATOR_SERVICE_V1_NS_URI) +@XmlRootElement(name = "SclValidateWsRequest", namespace = SCL_VALIDATOR_SERVICE_V1_NS_URI) +@XmlAccessorType(XmlAccessType.FIELD) +public class SclValidateWsRequest extends SclValidateRequest { +} diff --git a/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/model/SclValidateWsResponse.java b/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/model/SclValidateWsResponse.java new file mode 100644 index 0000000..7ebaceb --- /dev/null +++ b/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/model/SclValidateWsResponse.java @@ -0,0 +1,21 @@ +// SPDX-FileCopyrightText: 2022 Alliander N.V. +// +// SPDX-License-Identifier: Apache-2.0 +package org.lfenergy.compas.scl.validator.websocket.v1.model; + +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.lfenergy.compas.scl.validator.rest.v1.model.SclValidateResponse; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +import static org.lfenergy.compas.scl.validator.SclValidatorConstants.SCL_VALIDATOR_SERVICE_V1_NS_URI; + +@Schema(description = "The Validation Response returned") +@XmlType(name = "SclValidateWsResponse", namespace = SCL_VALIDATOR_SERVICE_V1_NS_URI) +@XmlRootElement(name = "SclValidateWsResponse", namespace = SCL_VALIDATOR_SERVICE_V1_NS_URI) +@XmlAccessorType(XmlAccessType.FIELD) +public class SclValidateWsResponse extends SclValidateResponse { +} diff --git a/app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/event/SclValidatorEventHandlerTest.java b/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/event/SclValidatorEventHandlerTest.java similarity index 93% rename from app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/event/SclValidatorEventHandlerTest.java rename to app/src/test/java/org/lfenergy/compas/scl/validator/websocket/event/SclValidatorEventHandlerTest.java index 48403af..494e005 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/event/SclValidatorEventHandlerTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/event/SclValidatorEventHandlerTest.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; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -9,8 +9,9 @@ import org.lfenergy.compas.core.commons.model.ErrorResponse; 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.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 org.mockito.ArgumentCaptor; import org.mockito.InjectMocks; import org.mockito.Mock; @@ -51,7 +52,7 @@ void validateWebsocketsEvent_WhenCalled_ThenExpectedCallsAreMade() { eventHandler.validateWebsocketsEvent(request); verify(session).getAsyncRemote(); - ArgumentCaptor captor = ArgumentCaptor.forClass(SclValidateResponse.class); + ArgumentCaptor captor = ArgumentCaptor.forClass(SclValidateWsResponse.class); verify(async).sendObject(captor.capture()); var response = captor.getValue(); assertEquals(veList, response.getValidationErrorList()); diff --git a/app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/event/SclValidatorEventRequestTest.java b/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/event/model/SclValidatorEventRequestTest.java similarity index 95% rename from app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/event/SclValidatorEventRequestTest.java rename to app/src/test/java/org/lfenergy/compas/scl/validator/websocket/event/model/SclValidatorEventRequestTest.java index f63996d..1b047b2 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/event/SclValidatorEventRequestTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/event/model/SclValidatorEventRequestTest.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 com.openpojo.reflection.impl.PojoClassFactory; import com.openpojo.validation.ValidatorBuilder; diff --git a/app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/SclValidatorServerEndpointTest.java b/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/SclValidatorServerEndpointTest.java similarity index 84% rename from app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/SclValidatorServerEndpointTest.java rename to app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/SclValidatorServerEndpointTest.java index 747ed2f..50f94e8 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/SclValidatorServerEndpointTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/SclValidatorServerEndpointTest.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; +package org.lfenergy.compas.scl.validator.websocket.v1; import io.quarkus.test.common.http.TestHTTPResource; import io.quarkus.test.junit.QuarkusTest; @@ -13,12 +13,12 @@ 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; -import org.lfenergy.compas.scl.validator.rest.v1.model.SclValidateResponse; -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.service.SclValidatorService; import org.lfenergy.compas.scl.validator.util.TestSupportUtil; +import org.lfenergy.compas.scl.validator.websocket.v1.decoder.SclValidateWsResponseDecoder; +import org.lfenergy.compas.scl.validator.websocket.v1.encoder.SclValidateWsRequestEncoder; +import org.lfenergy.compas.scl.validator.websocket.v1.model.SclValidateWsRequest; +import org.lfenergy.compas.scl.validator.websocket.v1.model.SclValidateWsResponse; import javax.websocket.ClientEndpoint; import javax.websocket.ContainerProvider; @@ -49,9 +49,9 @@ class SclValidatorServerEndpointTest { @Test void validate_WhenCalled_ThenExpectedResponseIsRetrieved() throws Exception { - var encoder = new SclValidateRequestEncoder(); + var encoder = new SclValidateWsRequestEncoder(); var sclFileTye = SclFileType.SCD; - var request = new SclValidateRequest(); + var request = new SclValidateWsRequest(); request.setSclData(TestSupportUtil.readSCL("scl-1.scd")); when(sclValidatorService.validate(sclFileTye, request.getSclData())) @@ -77,10 +77,10 @@ void validate_WhenCalledWithInvalidText_ThenExceptionThrown() throws Exception { } } - @ClientEndpoint(decoders = SclValidateResponseDecoder.class) + @ClientEndpoint(decoders = SclValidateWsResponseDecoder.class) private static class Client { @OnMessage - public void onMessage(SclValidateResponse response) { + public void onMessage(SclValidateWsResponse response) { validationErrors.addAll(response.getValidationErrorList()); } } diff --git a/app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/websocket/SclValidateRequestDecoderTest.java b/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/decoder/SclValidateWsRequestDecoderTest.java similarity index 78% rename from app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/websocket/SclValidateRequestDecoderTest.java rename to app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/decoder/SclValidateWsRequestDecoderTest.java index 27f2082..c15f5c6 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/websocket/SclValidateRequestDecoderTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/decoder/SclValidateWsRequestDecoderTest.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.websocket; +package org.lfenergy.compas.scl.validator.websocket.v1.decoder; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -14,12 +14,12 @@ import static org.lfenergy.compas.core.commons.exception.CompasErrorCode.WEBSOCKET_DECODER_ERROR_CODE; import static org.lfenergy.compas.scl.validator.SclValidatorConstants.SCL_VALIDATOR_SERVICE_V1_NS_URI; -class SclValidateRequestDecoderTest { - private SclValidateRequestDecoder decoder; +class SclValidateWsRequestDecoderTest { + private SclValidateWsRequestDecoder decoder; @BeforeEach void init() { - decoder = new SclValidateRequestDecoder(); + decoder = new SclValidateWsRequestDecoder(); decoder.init(null); } @@ -38,9 +38,9 @@ void willDecode_WhenCalledWithNull_ThenFalseReturned() { void decode_WhenCalledWithCorrectRequestXML_ThenStringConvertedToObject() { var sclData = "Some SCL Data"; var message = "" - + "" + + "" + "" - + ""; + + ""; var result = decoder.decode(message); @@ -51,8 +51,8 @@ void decode_WhenCalledWithCorrectRequestXML_ThenStringConvertedToObject() { @Test void decode_WhenCalledWithWrongXML_ThenExceptionThrown() { var message = "" - + "" - + ""; + + "" + + ""; var exception = assertThrows(CompasException.class, () -> decoder.decode(message)); assertEquals(WEBSOCKET_DECODER_ERROR_CODE, exception.getErrorCode()); diff --git a/app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/websocket/SclValidateResponseDecoderTest.java b/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/decoder/SclValidateWsResponseDecoderTest.java similarity index 83% rename from app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/websocket/SclValidateResponseDecoderTest.java rename to app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/decoder/SclValidateWsResponseDecoderTest.java index ea5310a..7a4ea0c 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/websocket/SclValidateResponseDecoderTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/decoder/SclValidateWsResponseDecoderTest.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.websocket; +package org.lfenergy.compas.scl.validator.websocket.v1.decoder; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -14,12 +14,12 @@ import static org.lfenergy.compas.core.commons.exception.CompasErrorCode.WEBSOCKET_DECODER_ERROR_CODE; import static org.lfenergy.compas.scl.validator.SclValidatorConstants.SCL_VALIDATOR_SERVICE_V1_NS_URI; -class SclValidateResponseDecoderTest { - private SclValidateResponseDecoder decoder; +class SclValidateWsResponseDecoderTest { + private SclValidateWsResponseDecoder decoder; @BeforeEach void init() { - decoder = new SclValidateResponseDecoder(); + decoder = new SclValidateWsResponseDecoder(); decoder.init(null); } @@ -42,14 +42,14 @@ void decode_WhenCalledWithCorrectRequestXML_ThenStringConvertedToObject() { var columnNumber = 34; var message = "" - + "" + + "" + "" + "" + validationMessage + "" + "" + ruleName + "" + "" + lineNumber + "" + "" + columnNumber + "" + "" - + ""; + + ""; var result = decoder.decode(message); @@ -66,8 +66,8 @@ void decode_WhenCalledWithCorrectRequestXML_ThenStringConvertedToObject() { @Test void decode_WhenCalledWithWrongXML_ThenExceptionThrown() { var message = "" - + "" - + ""; + + "" + + ""; var exception = assertThrows(CompasException.class, () -> decoder.decode(message)); assertEquals(WEBSOCKET_DECODER_ERROR_CODE, exception.getErrorCode()); diff --git a/app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/websocket/SclValidateRequestEncoderTest.java b/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/encoder/SclValidateWsRequestEncoderTest.java similarity index 67% rename from app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/websocket/SclValidateRequestEncoderTest.java rename to app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/encoder/SclValidateWsRequestEncoderTest.java index af33064..95daf30 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/websocket/SclValidateRequestEncoderTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/encoder/SclValidateWsRequestEncoderTest.java @@ -1,38 +1,38 @@ // SPDX-FileCopyrightText: 2022 Alliander N.V. // // SPDX-License-Identifier: Apache-2.0 -package org.lfenergy.compas.scl.validator.rest.v1.websocket; +package org.lfenergy.compas.scl.validator.websocket.v1.encoder; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.lfenergy.compas.scl.validator.rest.v1.model.SclValidateRequest; +import org.lfenergy.compas.scl.validator.websocket.v1.model.SclValidateWsRequest; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.lfenergy.compas.scl.validator.SclValidatorConstants.SCL_VALIDATOR_SERVICE_V1_NS_URI; -class SclValidateRequestEncoderTest { - private SclValidateRequestEncoder encoder; +class SclValidateWsRequestEncoderTest { + private SclValidateWsRequestEncoder encoder; @BeforeEach void init() { - encoder = new SclValidateRequestEncoder(); + encoder = new SclValidateWsRequestEncoder(); encoder.init(null); } @Test void encode_WhenCalledWithRequest_ThenRequestConvertedToString() { var sclData = "Some SCL Data"; - var request = new SclValidateRequest(); + var request = new SclValidateWsRequest(); request.setSclData(sclData); var result = encoder.encode(request); var expectedResult = "" - + "" + + "" + "" + sclData + "" - + ""; + + ""; assertNotNull(result); assertEquals(expectedResult, result); } diff --git a/app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/websocket/SclValidateResponseEncoderTest.java b/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/encoder/SclValidateWsResponseEncoderTest.java similarity index 79% rename from app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/websocket/SclValidateResponseEncoderTest.java rename to app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/encoder/SclValidateWsResponseEncoderTest.java index d67ccbe..11e6d5f 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/websocket/SclValidateResponseEncoderTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/encoder/SclValidateWsResponseEncoderTest.java @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2022 Alliander N.V. // // SPDX-License-Identifier: Apache-2.0 -package org.lfenergy.compas.scl.validator.rest.v1.websocket; +package org.lfenergy.compas.scl.validator.websocket.v1.encoder; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.lfenergy.compas.scl.validator.model.ValidationError; -import org.lfenergy.compas.scl.validator.rest.v1.model.SclValidateResponse; +import org.lfenergy.compas.scl.validator.websocket.v1.model.SclValidateWsResponse; import java.util.ArrayList; @@ -15,12 +15,12 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.lfenergy.compas.scl.validator.SclValidatorConstants.SCL_VALIDATOR_SERVICE_V1_NS_URI; -class SclValidateResponseEncoderTest { - private SclValidateResponseEncoder encoder; +class SclValidateWsResponseEncoderTest { + private SclValidateWsResponseEncoder encoder; @BeforeEach void init() { - encoder = new SclValidateResponseEncoder(); + encoder = new SclValidateWsResponseEncoder(); encoder.init(null); } @@ -31,7 +31,7 @@ void encode_WhenCalledWithRequest_ThenRequestConvertedToString() { var lineNumber = 15; var columnNumber = 34; - var request = new SclValidateResponse(); + var request = new SclValidateWsResponse(); request.setValidationErrorList(new ArrayList<>()); var validationError = new ValidationError(); validationError.setMessage(validationMessage); @@ -43,14 +43,14 @@ void encode_WhenCalledWithRequest_ThenRequestConvertedToString() { var result = encoder.encode(request); var expectedResult = "" + - "" + + "" + "" + "" + validationMessage + "" + "" + ruleName + "" + "" + lineNumber + "" + "" + columnNumber + "" + "" + - ""; + ""; assertNotNull(result); assertEquals(expectedResult, result); } diff --git a/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/model/SclValidateWsRequestTest.java b/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/model/SclValidateWsRequestTest.java new file mode 100644 index 0000000..0b5f3e2 --- /dev/null +++ b/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/model/SclValidateWsRequestTest.java @@ -0,0 +1,13 @@ +// SPDX-FileCopyrightText: 2022 Alliander N.V. +// +// SPDX-License-Identifier: Apache-2.0 +package org.lfenergy.compas.scl.validator.websocket.v1.model; + +import org.lfenergy.compas.scl.validator.model.AbstractPojoTester; + +class SclValidateWsRequestTest extends AbstractPojoTester { + @Override + protected Class getClassToBeTested() { + return SclValidateWsRequest.class; + } +} diff --git a/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/model/SclValidateWsResponseTest.java b/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/model/SclValidateWsResponseTest.java new file mode 100644 index 0000000..83d5ab6 --- /dev/null +++ b/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/model/SclValidateWsResponseTest.java @@ -0,0 +1,13 @@ +// SPDX-FileCopyrightText: 2022 Alliander N.V. +// +// SPDX-License-Identifier: Apache-2.0 +package org.lfenergy.compas.scl.validator.websocket.v1.model; + +import org.lfenergy.compas.scl.validator.model.AbstractPojoTester; + +class SclValidateWsResponseTest extends AbstractPojoTester { + @Override + protected Class getClassToBeTested() { + return SclValidateWsResponse.class; + } +} diff --git a/pom.xml b/pom.xml index 1fb475c..b8f4ff1 100644 --- a/pom.xml +++ b/pom.xml @@ -24,10 +24,10 @@ SPDX-License-Identifier: Apache-2.0 3.2.0 0.0.4 - 0.10.2 + 0.12.0 - 2.14.0.Final - 2.0.3 + 2.14.1.Final + 2.19.0 0.9.1 @@ -129,18 +129,18 @@ SPDX-License-Identifier: Apache-2.0 org.eclipse.microprofile.openapi microprofile-openapi-api - 3.0 + 3.1 - org.slf4j - slf4j-api - ${slf4j.version} + org.apache.logging.log4j + log4j-api + ${log4j2.version} - org.slf4j - slf4j-simple - ${slf4j.version} + org.apache.logging.log4j + log4j-core + ${log4j2.version} diff --git a/riseclipse/validator-riseclipse/pom.xml b/riseclipse/validator-riseclipse/pom.xml index f30c0b5..4e86133 100644 --- a/riseclipse/validator-riseclipse/pom.xml +++ b/riseclipse/validator-riseclipse/pom.xml @@ -67,15 +67,21 @@ SPDX-License-Identifier: Apache-2.0 org.antlr.runtime org.antlr.runtime - - org.apache.log4j - org.apache.log4j - javax.inject javax.inject + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-core + provided + + org.lfenergy.compas.scl.validator @@ -94,11 +100,6 @@ SPDX-License-Identifier: Apache-2.0 junit-jupiter-engine test - - org.slf4j - slf4j-simple - test - diff --git a/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/collector/AbstractFileCollector.java b/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/collector/AbstractFileCollector.java index 9b4a5e6..a9c980e 100644 --- a/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/collector/AbstractFileCollector.java +++ b/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/collector/AbstractFileCollector.java @@ -3,10 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 package org.lfenergy.compas.scl.validator.collector; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.eclipse.emf.common.util.URI; import org.lfenergy.compas.scl.validator.exception.SclValidatorException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.io.File; import java.io.IOException; @@ -23,7 +23,7 @@ * Abstract class to support retrieving default files from the ClassPath or from a Directory. */ public abstract class AbstractFileCollector implements OclFileCollector { - private static final Logger LOGGER = LoggerFactory.getLogger(AbstractFileCollector.class); + private static final Logger LOGGER = LogManager.getLogger(AbstractFileCollector.class); private static final String DEFAULT_OCL_DIRECTORY = "/ocl/"; diff --git a/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/collector/CompasOclFileCollector.java b/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/collector/CompasOclFileCollector.java index 88f4782..1805bd1 100644 --- a/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/collector/CompasOclFileCollector.java +++ b/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/collector/CompasOclFileCollector.java @@ -3,9 +3,9 @@ // SPDX-License-Identifier: Apache-2.0 package org.lfenergy.compas.scl.validator.collector; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.eclipse.emf.common.util.URI; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.List; @@ -15,7 +15,7 @@ * directory configured. */ public class CompasOclFileCollector extends AbstractFileCollector { - private static final Logger LOGGER = LoggerFactory.getLogger(CompasOclFileCollector.class); + private static final Logger LOGGER = LogManager.getLogger(CompasOclFileCollector.class); private final String oclCustomDirectory; diff --git a/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/util/MessageUtil.java b/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/impl/MessageUtil.java similarity index 88% rename from riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/util/MessageUtil.java rename to riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/impl/MessageUtil.java index cc64982..4ba9bf7 100644 --- a/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/util/MessageUtil.java +++ b/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/impl/MessageUtil.java @@ -1,16 +1,16 @@ // SPDX-FileCopyrightText: 2022 Alliander N.V. // // SPDX-License-Identifier: Apache-2.0 -package org.lfenergy.compas.scl.validator.util; +package org.lfenergy.compas.scl.validator.impl; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.lfenergy.compas.scl.validator.model.ValidationError; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.util.Optional; public class MessageUtil { - private static final Logger LOGGER = LoggerFactory.getLogger(MessageUtil.class); + private static final Logger LOGGER = LogManager.getLogger(MessageUtil.class); MessageUtil() { throw new UnsupportedOperationException("MessageUtil class"); diff --git a/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/impl/OclFileLoader.java b/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/impl/OclFileLoader.java index 7ea0460..e8fdac7 100644 --- a/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/impl/OclFileLoader.java +++ b/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/impl/OclFileLoader.java @@ -4,6 +4,8 @@ package org.lfenergy.compas.scl.validator.impl; import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.impl.EPackageRegistryImpl; import org.eclipse.emf.ecore.resource.Resource.Diagnostic; @@ -12,8 +14,6 @@ import org.eclipse.ocl.pivot.validation.ComposedEValidator; import org.eclipse.ocl.xtext.completeocl.validation.CompleteOCLEObjectValidator; import org.lfenergy.compas.scl.validator.exception.SclValidatorException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.io.BufferedWriter; import java.io.IOException; @@ -25,7 +25,7 @@ import static org.lfenergy.compas.scl.validator.exception.SclValidatorErrorCode.*; public class OclFileLoader { - private static final Logger LOGGER = LoggerFactory.getLogger(OclFileLoader.class); + private static final Logger LOGGER = LogManager.getLogger(OclFileLoader.class); private final List oclFiles; private final Path oclTempFile; diff --git a/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/util/OclUtil.java b/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/impl/OclUtil.java similarity index 95% rename from riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/util/OclUtil.java rename to riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/impl/OclUtil.java index 6f94cad..2c9b8d5 100644 --- a/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/util/OclUtil.java +++ b/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/impl/OclUtil.java @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2022 Alliander N.V. // // SPDX-License-Identifier: Apache-2.0 -package org.lfenergy.compas.scl.validator.util; +package org.lfenergy.compas.scl.validator.impl; import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; import org.lfenergy.compas.scl.validator.exception.SclValidatorException; diff --git a/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/impl/SclModelLoader.java b/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/impl/SclModelLoader.java index 7106fa8..48e3cfd 100644 --- a/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/impl/SclModelLoader.java +++ b/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/impl/SclModelLoader.java @@ -5,13 +5,13 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclResourceFactoryImpl; import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclResourceSetImpl; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.lfenergy.compas.scl.extensions.model.SclFileType; import org.lfenergy.compas.scl.validator.exception.SclValidatorException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; @@ -21,7 +21,7 @@ import static org.lfenergy.compas.scl.validator.exception.SclValidatorErrorCode.LOADING_SCL_FILE_ERROR_CODE; public class SclModelLoader { - private static final Logger LOGGER = LoggerFactory.getLogger(SclModelLoader.class); + private static final Logger LOGGER = LogManager.getLogger(SclModelLoader.class); private final ResourceSet resourceSet; diff --git a/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/impl/SclRiseClipseValidator.java b/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/impl/SclRiseClipseValidator.java index e838481..3116df7 100644 --- a/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/impl/SclRiseClipseValidator.java +++ b/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/impl/SclRiseClipseValidator.java @@ -4,6 +4,8 @@ package org.lfenergy.compas.scl.validator.impl; import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.eclipse.emf.common.util.BasicDiagnostic; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.URI; @@ -17,18 +19,15 @@ import org.lfenergy.compas.scl.validator.SclValidator; 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.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.nio.file.Path; import java.util.ArrayList; import java.util.List; -import static org.lfenergy.compas.scl.validator.util.MessageUtil.createValidationError; +import static org.lfenergy.compas.scl.validator.impl.MessageUtil.createValidationError; public class SclRiseClipseValidator implements SclValidator { - private static final Logger LOGGER = LoggerFactory.getLogger(SclRiseClipseValidator.class); + private static final Logger LOGGER = LogManager.getLogger(SclRiseClipseValidator.class); private final List oclFiles = new ArrayList<>(); private final Path tempDirectory; diff --git a/riseclipse/validator-riseclipse/src/test/java/org/lfenergy/compas/scl/validator/util/MessageUtilTest.java b/riseclipse/validator-riseclipse/src/test/java/org/lfenergy/compas/scl/validator/impl/MessageUtilTest.java similarity index 96% rename from riseclipse/validator-riseclipse/src/test/java/org/lfenergy/compas/scl/validator/util/MessageUtilTest.java rename to riseclipse/validator-riseclipse/src/test/java/org/lfenergy/compas/scl/validator/impl/MessageUtilTest.java index 2a08c46..d4a8931 100644 --- a/riseclipse/validator-riseclipse/src/test/java/org/lfenergy/compas/scl/validator/util/MessageUtilTest.java +++ b/riseclipse/validator-riseclipse/src/test/java/org/lfenergy/compas/scl/validator/impl/MessageUtilTest.java @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: 2022 Alliander N.V. // // SPDX-License-Identifier: Apache-2.0 -package org.lfenergy.compas.scl.validator.util; +package org.lfenergy.compas.scl.validator.impl; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; -import static org.lfenergy.compas.scl.validator.util.MessageUtil.createValidationError; +import static org.lfenergy.compas.scl.validator.impl.MessageUtil.createValidationError; class MessageUtilTest { @Test diff --git a/riseclipse/validator-riseclipse/src/test/java/org/lfenergy/compas/scl/validator/impl/OclFileLoaderTest.java b/riseclipse/validator-riseclipse/src/test/java/org/lfenergy/compas/scl/validator/impl/OclFileLoaderTest.java index bd5c744..a9c28ff 100644 --- a/riseclipse/validator-riseclipse/src/test/java/org/lfenergy/compas/scl/validator/impl/OclFileLoaderTest.java +++ b/riseclipse/validator-riseclipse/src/test/java/org/lfenergy/compas/scl/validator/impl/OclFileLoaderTest.java @@ -11,7 +11,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.lfenergy.compas.scl.validator.exception.SclValidatorException; -import org.lfenergy.compas.scl.validator.util.OclUtil; import org.mockito.junit.jupiter.MockitoExtension; import java.io.File; diff --git a/riseclipse/validator-riseclipse/src/test/java/org/lfenergy/compas/scl/validator/util/OclUtilTest.java b/riseclipse/validator-riseclipse/src/test/java/org/lfenergy/compas/scl/validator/impl/OclUtilTest.java similarity index 88% rename from riseclipse/validator-riseclipse/src/test/java/org/lfenergy/compas/scl/validator/util/OclUtilTest.java rename to riseclipse/validator-riseclipse/src/test/java/org/lfenergy/compas/scl/validator/impl/OclUtilTest.java index 720341a..d9e83ed 100644 --- a/riseclipse/validator-riseclipse/src/test/java/org/lfenergy/compas/scl/validator/util/OclUtilTest.java +++ b/riseclipse/validator-riseclipse/src/test/java/org/lfenergy/compas/scl/validator/impl/OclUtilTest.java @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2022 Alliander N.V. // // SPDX-License-Identifier: Apache-2.0 -package org.lfenergy.compas.scl.validator.util; +package org.lfenergy.compas.scl.validator.impl; import org.junit.jupiter.api.Test; diff --git a/riseclipse/validator-riseclipse/src/test/java/org/lfenergy/compas/scl/validator/impl/SclModelLoaderTest.java b/riseclipse/validator-riseclipse/src/test/java/org/lfenergy/compas/scl/validator/impl/SclModelLoaderTest.java index 045e491..ed83db9 100644 --- a/riseclipse/validator-riseclipse/src/test/java/org/lfenergy/compas/scl/validator/impl/SclModelLoaderTest.java +++ b/riseclipse/validator-riseclipse/src/test/java/org/lfenergy/compas/scl/validator/impl/SclModelLoaderTest.java @@ -7,7 +7,6 @@ import org.junit.jupiter.api.Test; 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 java.io.IOException; diff --git a/riseclipse/validator-riseclipse/src/test/resources/log4j2.xml b/riseclipse/validator-riseclipse/src/test/resources/log4j2.xml new file mode 100644 index 0000000..24cf918 --- /dev/null +++ b/riseclipse/validator-riseclipse/src/test/resources/log4j2.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + diff --git a/riseclipse/validator-riseclipse/src/test/resources/simplelogger.properties b/riseclipse/validator-riseclipse/src/test/resources/simplelogger.properties deleted file mode 100644 index 9326cfa..0000000 --- a/riseclipse/validator-riseclipse/src/test/resources/simplelogger.properties +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-FileCopyrightText: 2022 Alliander N.V. -# -# SPDX-License-Identifier: Apache-2.0 - -# SLF4J's SimpleLogger configuration file -# Simple implementation of Logger that sends all enabled log messages, for all defined loggers, to System.err. - -org.slf4j.simpleLogger.showThreadName=true -org.slf4j.simpleLogger.showLogName=true -org.slf4j.simpleLogger.showShortLogName=true -org.slf4j.simpleLogger.showDateTime=true -org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss - -org.slf4j.simpleLogger.defaultLogLevel=debug - -org.slf4j.simpleLogger.log.org.lfenergy.compas.scl.validator.collector.CompasOclFileCollector=warn -org.slf4j.simpleLogger.log.org.lfenergy.compas.scl.validator.util.OclUtil=info diff --git a/service/pom.xml b/service/pom.xml index ae3f6e9..a9b881d 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -43,8 +43,13 @@ SPDX-License-Identifier: Apache-2.0 - org.slf4j - slf4j-api + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-core + provided @@ -58,11 +63,6 @@ SPDX-License-Identifier: Apache-2.0 junit-jupiter-engine test - - org.slf4j - slf4j-simple - test - com.openpojo openpojo diff --git a/service/src/main/java/org/lfenergy/compas/scl/validator/common/NsdocFinder.java b/service/src/main/java/org/lfenergy/compas/scl/validator/common/NsdocFinder.java index b305da8..0b6aa82 100644 --- a/service/src/main/java/org/lfenergy/compas/scl/validator/common/NsdocFinder.java +++ b/service/src/main/java/org/lfenergy/compas/scl/validator/common/NsdocFinder.java @@ -4,11 +4,11 @@ package org.lfenergy.compas.scl.validator.common; import org.apache.commons.codec.digest.DigestUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.lfenergy.compas.scl.validator.exception.NsdocFileNotFoundException; import org.lfenergy.compas.scl.validator.exception.SclValidatorException; import org.lfenergy.compas.scl.validator.model.NsdocFile; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.io.File; import java.io.FileInputStream; @@ -22,7 +22,7 @@ import static org.lfenergy.compas.scl.validator.exception.SclValidatorErrorCode.LOADING_NSDOC_FILE_FAILED; public class NsdocFinder { - private static final Logger LOGGER = LoggerFactory.getLogger(NsdocFinder.class); + private static final Logger LOGGER = LogManager.getLogger(NsdocFinder.class); private final String nsdocDirectory; private final Map nsdocFiles; @@ -56,7 +56,7 @@ private NsdocFile convertToNsdocFile(File file) { nsdocFile.setChecksum(calculateChecksum(file)); return nsdocFile; } catch (Exception exp) { - LOGGER.warn("Error loading NSDoc File '" + file.getName() + "'. Skipping file.", exp); + LOGGER.warn("Error loading NSDoc File '{}'. Skipping file.", file.getName(), exp); return null; } } diff --git a/service/src/test/resources/log4j2.xml b/service/src/test/resources/log4j2.xml new file mode 100644 index 0000000..24cf918 --- /dev/null +++ b/service/src/test/resources/log4j2.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + diff --git a/validator/pom.xml b/validator/pom.xml index 20ff4a8..f406c61 100644 --- a/validator/pom.xml +++ b/validator/pom.xml @@ -50,10 +50,15 @@ SPDX-License-Identifier: Apache-2.0 - org.slf4j - slf4j-api + org.apache.logging.log4j + log4j-api - + + org.apache.logging.log4j + log4j-core + provided + + org.junit.jupiter @@ -75,11 +80,6 @@ SPDX-License-Identifier: Apache-2.0 openpojo test - - org.slf4j - slf4j-simple - test - diff --git a/validator/src/main/java/org/lfenergy/compas/scl/validator/xsd/XSDErrorHandler.java b/validator/src/main/java/org/lfenergy/compas/scl/validator/xsd/XSDErrorHandler.java index cba4c86..7de13f0 100644 --- a/validator/src/main/java/org/lfenergy/compas/scl/validator/xsd/XSDErrorHandler.java +++ b/validator/src/main/java/org/lfenergy/compas/scl/validator/xsd/XSDErrorHandler.java @@ -3,11 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 package org.lfenergy.compas.scl.validator.xsd; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.xerces.impl.Constants; import org.lfenergy.compas.scl.validator.exception.SclValidatorException; import org.lfenergy.compas.scl.validator.model.ValidationError; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.w3c.dom.Node; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; @@ -19,7 +19,7 @@ import static org.lfenergy.compas.scl.validator.exception.SclValidatorErrorCode.CREATE_XPATH_ELEMENT_ERROR_CODE; public class XSDErrorHandler implements ErrorHandler { - private static final Logger LOGGER = LoggerFactory.getLogger(XSDErrorHandler.class); + private static final Logger LOGGER = LogManager.getLogger(XSDErrorHandler.class); public static final String DEFAULT_PREFIX = "XSD/"; public static final String DEFAULT_RULE_NAME = DEFAULT_PREFIX + "general"; diff --git a/validator/src/main/java/org/lfenergy/compas/scl/validator/xsd/XSDValidator.java b/validator/src/main/java/org/lfenergy/compas/scl/validator/xsd/XSDValidator.java index 16aca48..820b3f9 100644 --- a/validator/src/main/java/org/lfenergy/compas/scl/validator/xsd/XSDValidator.java +++ b/validator/src/main/java/org/lfenergy/compas/scl/validator/xsd/XSDValidator.java @@ -3,12 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 package org.lfenergy.compas.scl.validator.xsd; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.xerces.jaxp.DocumentBuilderFactoryImpl; import org.lfenergy.compas.scl.validator.exception.SclValidatorException; import org.lfenergy.compas.scl.validator.model.ValidationError; import org.lfenergy.compas.scl.validator.xsd.resourceresolver.ResourceResolver; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.w3c.dom.Document; import org.xml.sax.SAXException; @@ -29,7 +29,7 @@ import static org.lfenergy.compas.scl.validator.exception.SclValidatorErrorCode.LOADING_XSD_FILE_ERROR_CODE; public class XSDValidator { - private static final Logger LOGGER = LoggerFactory.getLogger(XSDValidator.class); + private static final Logger LOGGER = LogManager.getLogger(XSDValidator.class); private final Validator validator; private final Document doc; diff --git a/validator/src/test/resources/log4j2.xml b/validator/src/test/resources/log4j2.xml new file mode 100644 index 0000000..24cf918 --- /dev/null +++ b/validator/src/test/resources/log4j2.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + +