From 557195a6805292ff617d6c54e71c1ceb264c5038 Mon Sep 17 00:00:00 2001 From: Dennis Labordus Date: Mon, 31 Oct 2022 16:21:12 +0100 Subject: [PATCH] Added Woodstox Stax parser dependency. Signed-off-by: Dennis Labordus --- app/pom.xml | 12 +++++++----- .../rest/v1/event/SclValidatorEventRequest.java | 4 ---- .../rest/v1/SclValidatorResourceTest.java | 2 +- .../rest/v1/SclValidatorServerEndpointTest.java | 2 +- .../v1/event/SclValidatorEventHandlerTest.java | 3 +-- .../v1/event/SclValidatorEventRequestTest.java | 17 ++--------------- pom.xml | 5 +++++ validator/pom.xml | 4 ++++ 8 files changed, 21 insertions(+), 28 deletions(-) diff --git a/app/pom.xml b/app/pom.xml index 5956c5c..9fa9ac2 100644 --- a/app/pom.xml +++ b/app/pom.xml @@ -53,6 +53,11 @@ SPDX-License-Identifier: Apache-2.0 io.quarkus quarkus-resteasy-reactive-jaxb + + io.quarkus + quarkus-websockets + + io.quarkus quarkus-smallrye-jwt @@ -65,18 +70,15 @@ SPDX-License-Identifier: Apache-2.0 io.quarkus quarkus-smallrye-health + io.quarkus - quarkus-websockets + quarkus-hibernate-validator io.quarkus quarkus-container-image-docker - - io.quarkus - quarkus-hibernate-validator - 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/rest/v1/event/SclValidatorEventRequest.java index 16dab6e..c116c83 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/rest/v1/event/SclValidatorEventRequest.java @@ -12,10 +12,6 @@ public class SclValidatorEventRequest { private final SclFileType type; private final String sclData; - public SclValidatorEventRequest(SclFileType type, String sclData) { - this(null, type, sclData); - } - public SclValidatorEventRequest(Session session, SclFileType type, String sclData) { this.session = session; this.type = type; diff --git a/app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/SclValidatorResourceTest.java b/app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/SclValidatorResourceTest.java index 57ea549..04f1a75 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/SclValidatorResourceTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/SclValidatorResourceTest.java @@ -34,7 +34,7 @@ class SclValidatorResourceTest { private SclValidatorService sclValidatorService; @Test - void updateSCL_WhenCalled_ThenExpectedResponseIsRetrieved() throws IOException { + void validate_WhenCalled_ThenExpectedResponseIsRetrieved() throws IOException { var sclFileTye = SclFileType.CID; var request = new SclValidateRequest(); request.setSclData(TestSupportUtil.readSCL("scl-1.scd")); 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/rest/v1/SclValidatorServerEndpointTest.java index 83fe697..6b24a79 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/rest/v1/SclValidatorServerEndpointTest.java @@ -42,7 +42,7 @@ class SclValidatorServerEndpointTest { private URI uri; @Test - void updateSCL_WhenCalled_ThenExpectedResponseIsRetrieved() throws Exception { + void validate_WhenCalled_ThenExpectedResponseIsRetrieved() throws Exception { var encoder = new SclValidateRequestEncoder(); var sclFileTye = SclFileType.SCD; var request = new SclValidateRequest(); 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/rest/v1/event/SclValidatorEventHandlerTest.java index 759f27f..de1b5e1 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/rest/v1/event/SclValidatorEventHandlerTest.java @@ -17,7 +17,6 @@ import javax.websocket.RemoteEndpoint; import javax.websocket.Session; -import java.io.IOException; import java.util.ArrayList; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -32,7 +31,7 @@ class SclValidatorEventHandlerTest { private SclValidatorEventHandler eventHandler; @Test - void validateWebsocketsEvent_WhenCalled_ThenExpectedCallsAreMade() throws IOException { + void validateWebsocketsEvent_WhenCalled_ThenExpectedCallsAreMade() { var veList = new ArrayList(); var type = SclFileType.CID; var sclData = "Some SCL Data"; 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/rest/v1/event/SclValidatorEventRequestTest.java index 731eef1..f63996d 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/rest/v1/event/SclValidatorEventRequestTest.java @@ -14,21 +14,8 @@ import javax.websocket.Session; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; class SclValidatorEventRequestTest { - @Test - void constructor_WhenCalledWith2Arguments_ThenValuesSet() { - var type = SclFileType.CID; - var sclData = "Some SCL Data"; - - var result = new SclValidatorEventRequest(type, sclData); - - assertNull(result.getSession()); - assertEquals(type, result.getType()); - assertEquals(sclData, result.getSclData()); - } - @Test void constructor_WhenCalledWith3Arguments_ThenValuesSet() { var session = Mockito.mock(Session.class); @@ -46,9 +33,9 @@ void constructor_WhenCalledWith3Arguments_ThenValuesSet() { void validateSettersAndGetters() { var personPojo = PojoClassFactory.getPojoClass(SclValidatorEventRequest.class); var validator = ValidatorBuilder.create() - // Lets make sure that we have a getter for every field defined. + // Let's make sure that we have a getter for every field defined. .with(new GetterMustExistRule()) - // Lets also validate that they are behaving as expected + // Let's also validate that they are behaving as expected .with(new GetterTester()) .build(); diff --git a/pom.xml b/pom.xml index 32fbd32..b45a5c3 100644 --- a/pom.xml +++ b/pom.xml @@ -115,6 +115,11 @@ SPDX-License-Identifier: Apache-2.0 xercesImpl 2.12.2 + + com.fasterxml.woodstox + woodstox-core + 6.4.0 + org.eclipse.microprofile.openapi diff --git a/validator/pom.xml b/validator/pom.xml index dac8e86..20ff4a8 100644 --- a/validator/pom.xml +++ b/validator/pom.xml @@ -44,6 +44,10 @@ SPDX-License-Identifier: Apache-2.0 xerces xercesImpl + + com.fasterxml.woodstox + woodstox-core + org.slf4j