Merge pull request #183 from com-pas/develop

New release

Author: Dennis Labordus

.github/workflows/automate-projects.yml

@@ -14,14 +14,14 @@ jobs:
     steps:
       - name: add-new-issues-to-organization-based-project-column
         if: github.event_name == 'issues' && github.event.action == 'opened'
-        uses: alex-page/[email protected].1
+        uses: alex-page/[email protected].2
         with:
           project: CoMPAS Issues Overview Board
           column: To do
           repo-token: ${{ secrets.ORG_GITHUB_ACTION_SECRET }}
       - name: add-new-pull-request-to-organization-based-project-column
         if: (github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && github.event.action == 'opened'
-        uses: alex-page/[email protected].1
+        uses: alex-page/[email protected].2
         with:
           project: CoMPAS Pull Request Overview Board
           column: To do

.github/workflows/build-project.yml

@@ -30,7 +30,7 @@ jobs:
           java-version: '11'
 
       - name: Create custom Maven Settings.xml
-        uses: whelk-io/maven-settings-xml-action@v20
+        uses: whelk-io/maven-settings-xml-action@v21
         with:
           output_file: custom_maven_settings.xml
           servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'

.github/workflows/release-project.yml

@@ -31,7 +31,7 @@ jobs:
           java-version: '11'
 
       - name: Create custom Maven Settings.xml
-        uses: whelk-io/maven-settings-xml-action@v20
+        uses: whelk-io/maven-settings-xml-action@v21
         with:
           output_file: custom_maven_settings.xml
           servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'

.github/workflows/sonarcloud-analysis.yml

@@ -56,7 +56,7 @@ jobs:
             -Dsonar.projectKey=com-pas_compas-core \
             -Dsonar.organization=com-pas )"
       - name: Create custom Maven Settings.xml
-        uses: whelk-io/maven-settings-xml-action@v20
+        uses: whelk-io/maven-settings-xml-action@v21
         with:
           output_file: custom_maven_settings.xml
           servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'

commons/pom.xml

@@ -27,11 +27,6 @@ SPDX-License-Identifier: Apache-2.0
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <scope>provided</scope>
-        </dependency>
 
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -72,5 +67,15 @@ SPDX-License-Identifier: Apache-2.0
             <artifactId>jakarta.el</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.openpojo</groupId>
+            <artifactId>openpojo</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

jaxrs-commons/src/main/java/org/lfenergy/compas/core/jaxrs/JaxrsConstants.java renamed to commons/src/main/java/org/lfenergy/compas/core/commons/CommonConstants.java

@@ -1,11 +1,11 @@
 // SPDX-FileCopyrightText: 2021 Alliander N.V.
 //
 // SPDX-License-Identifier: Apache-2.0
-package org.lfenergy.compas.core.jaxrs;
+package org.lfenergy.compas.core.commons;
 
-public class JaxrsConstants {
-    JaxrsConstants() {
-        throw new UnsupportedOperationException("JaxrsConstants class");
+public class CommonConstants {
+    CommonConstants() {
+        throw new UnsupportedOperationException("CommonConstants class");
     }
 
     public static final String COMPAS_COMMONS_V1_NS_URI = "https://www.lfenergy.org/compas/commons/v1";

commons/src/main/java/org/lfenergy/compas/core/commons/exception/CompasErrorCode.java

@@ -17,6 +17,10 @@ public class CompasErrorCode {
     public static final String MARSHAL_ERROR_CODE = "CORE-0007";
     public static final String INVALID_YML_ERROR_CODE = "CORE-0008";
 
+    public static final String WEBSOCKET_DECODER_ERROR_CODE = "CORE-0100";
+    public static final String WEBSOCKET_ENCODER_ERROR_CODE = "CORE-0101";
+    public static final String WEBSOCKET_GENERAL_ERROR_CODE = "CORE-0102";
+
     public static final String CONVERT_TO_STRING_ERROR = "CORE-1000";
     public static final String CONVERT_TO_ELEMENT_ERROR = "CORE-1001";
 

jaxrs-commons/src/main/java/org/lfenergy/compas/core/jaxrs/model/ErrorMessage.java renamed to commons/src/main/java/org/lfenergy/compas/core/commons/model/ErrorMessage.java

@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: 2021 Alliander N.V.
 //
 // SPDX-License-Identifier: Apache-2.0
-package org.lfenergy.compas.core.jaxrs.model;
+package org.lfenergy.compas.core.commons.model;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 
-import static org.lfenergy.compas.core.jaxrs.JaxrsConstants.COMPAS_COMMONS_V1_NS_URI;
+import static org.lfenergy.compas.core.commons.CommonConstants.COMPAS_COMMONS_V1_NS_URI;
 
 @XmlAccessorType(XmlAccessType.FIELD)
 public class ErrorMessage {

jaxrs-commons/src/main/java/org/lfenergy/compas/core/jaxrs/model/ErrorResponse.java renamed to commons/src/main/java/org/lfenergy/compas/core/commons/model/ErrorResponse.java

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2021 Alliander N.V.
 //
 // SPDX-License-Identifier: Apache-2.0
-package org.lfenergy.compas.core.jaxrs.model;
+package org.lfenergy.compas.core.commons.model;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -10,7 +10,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.lfenergy.compas.core.jaxrs.JaxrsConstants.COMPAS_COMMONS_V1_NS_URI;
+import static org.lfenergy.compas.core.commons.CommonConstants.COMPAS_COMMONS_V1_NS_URI;
 
 @XmlRootElement(name = "ErrorResponse", namespace = COMPAS_COMMONS_V1_NS_URI)
 @XmlAccessorType(XmlAccessType.FIELD)

jaxrs-commons/src/main/java/org/lfenergy/compas/core/jaxrs/model/package-info.java renamed to commons/src/main/java/org/lfenergy/compas/core/commons/model/package-info.java

@@ -2,9 +2,9 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 @XmlSchema(xmlns = {@XmlNs(prefix = "compas-commons", namespaceURI = COMPAS_COMMONS_V1_NS_URI)})
-package org.lfenergy.compas.core.jaxrs.model;
+package org.lfenergy.compas.core.commons.model;
 
 import javax.xml.bind.annotation.XmlNs;
 import javax.xml.bind.annotation.XmlSchema;
 
-import static org.lfenergy.compas.core.jaxrs.JaxrsConstants.COMPAS_COMMONS_V1_NS_URI;
+import static org.lfenergy.compas.core.commons.CommonConstants.COMPAS_COMMONS_V1_NS_URI;

jaxrs-commons/src/main/resources/META-INF/beans.xml renamed to commons/src/main/resources/META-INF/beans.xml

@@ -1,15 +1,15 @@
 // SPDX-FileCopyrightText: 2021 Alliander N.V.
 //
 // SPDX-License-Identifier: Apache-2.0
-package org.lfenergy.compas.core.jaxrs;
+package org.lfenergy.compas.core.commons;
 
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-class JaxrsConstantsTest {
+class CommonConstantsTest {
     @Test
     void constructor_WhenConstructorCalled_ThenShouldThrowExceptionCauseForbidden() {
-        assertThrows(UnsupportedOperationException.class, JaxrsConstants::new);
+        assertThrows(UnsupportedOperationException.class, CommonConstants::new);
     }
-}
+}

jaxrs-commons/src/test/java/org/lfenergy/compas/core/jaxrs/JaxrsConstantsTest.java renamed to commons/src/test/java/org/lfenergy/compas/core/commons/CommonConstantsTest.java

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2021 Alliander N.V.
 //
 // SPDX-License-Identifier: Apache-2.0
-package org.lfenergy.compas.core.jaxrs.model;
+package org.lfenergy.compas.core.commons.model;
 
 import com.openpojo.reflection.impl.PojoClassFactory;
 import com.openpojo.validation.ValidatorBuilder;
@@ -16,10 +16,10 @@ abstract class AbstractPojoTester {
     void validateSettersAndGetters() {
         var personPojo = PojoClassFactory.getPojoClass(getClassToBeTested());
         var validator = ValidatorBuilder.create()
-                // Lets make sure that we have a getter and a setter for every field defined.
+                // Let's make sure that we have a getter and a setter for every field defined.
                 .with(new GetterMustExistRule())
                 .with(new SetterMustExistRule())
-                // Lets also validate that they are behaving as expected
+                // Let's also validate that they are behaving as expected
                 .with(new SetterTester())
                 .with(new GetterTester())
                 .build();

jaxrs-commons/src/test/java/org/lfenergy/compas/core/jaxrs/model/AbstractPojoTester.java renamed to commons/src/test/java/org/lfenergy/compas/core/commons/model/AbstractPojoTester.java

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2021 Alliander N.V.
 //
 // SPDX-License-Identifier: Apache-2.0
-package org.lfenergy.compas.core.jaxrs.model;
+package org.lfenergy.compas.core.commons.model;
 
 import org.junit.jupiter.api.Test;
 

jaxrs-commons/src/test/java/org/lfenergy/compas/core/jaxrs/model/ErrorMessageTest.java renamed to commons/src/test/java/org/lfenergy/compas/core/commons/model/ErrorMessageTest.java

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2021 Alliander N.V.
 //
 // SPDX-License-Identifier: Apache-2.0
-package org.lfenergy.compas.core.jaxrs.model;
+package org.lfenergy.compas.core.commons.model;
 
 import org.junit.jupiter.api.Test;
 

jaxrs-commons/src/test/java/org/lfenergy/compas/core/jaxrs/model/ErrorResponseTest.java renamed to commons/src/test/java/org/lfenergy/compas/core/commons/model/ErrorResponseTest.java

@@ -20,9 +20,9 @@ SPDX-License-Identifier: Apache-2.0
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <compas.scl.xsd.version>0.0.4</compas.scl.xsd.version>
-        <quarkus.platform.version>2.12.2.Final</quarkus.platform.version>
-        <slf4j.version>2.0.0</slf4j.version>
-        <jaxb.bind.version>2.3.6</jaxb.bind.version>
+        <quarkus.platform.version>2.13.3.Final</quarkus.platform.version>
+        <slf4j.version>2.0.3</slf4j.version>
+        <jaxb.bind.version>2.3.7</jaxb.bind.version>
         <openpojo.version>0.9.1</openpojo.version>
     </properties>
 
@@ -44,7 +44,8 @@ SPDX-License-Identifier: Apache-2.0
 
     <modules>
         <module>commons</module>
-        <module>jaxrs-commons</module>
+        <module>rest-commons</module>
+        <module>websocket-commons</module>
         <module>scl-extension</module>
         <module>scl2003</module>
         <module>scl2007b</module>
@@ -160,7 +161,7 @@ SPDX-License-Identifier: Apache-2.0
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.2.2</version>
+                    <version>3.3.0</version>
                 </plugin>
             </plugins>
         </pluginManagement>

pom.xml

@@ -14,7 +14,7 @@ SPDX-License-Identifier: Apache-2.0
         <version>local-SNAPSHOT</version>
     </parent>
 
-    <artifactId>jaxrs-commons</artifactId>
+    <artifactId>rest-commons</artifactId>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -28,16 +28,6 @@ SPDX-License-Identifier: Apache-2.0
             <artifactId>javax.ws.rs-api</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>jakarta.xml.bind</groupId>
-            <artifactId>jakarta.xml.bind-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -53,24 +43,21 @@ SPDX-License-Identifier: Apache-2.0
             <artifactId>junit-jupiter-engine</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.openpojo</groupId>
-            <artifactId>openpojo</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-core</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-core</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

jaxrs-commons/pom.xml renamed to rest-commons/pom.xml

@@ -4,7 +4,7 @@
 package org.lfenergy.compas.core.jaxrs.exception;
 
 import org.lfenergy.compas.core.commons.exception.CompasException;
-import org.lfenergy.compas.core.jaxrs.model.ErrorResponse;
+import org.lfenergy.compas.core.commons.model.ErrorResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

jaxrs-commons/src/main/java/org/lfenergy/compas/core/jaxrs/exception/CompasExceptionHandler.java renamed to rest-commons/src/main/java/org/lfenergy/compas/core/jaxrs/exception/CompasExceptionHandler.java

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.lfenergy.compas.core.jaxrs.exception;
 
-import org.lfenergy.compas.core.jaxrs.model.ErrorResponse;
+import org.lfenergy.compas.core.commons.model.ErrorResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

jaxrs-commons/src/main/java/org/lfenergy/compas/core/jaxrs/exception/ConstraintViolationExceptionHandler.java renamed to rest-commons/src/main/java/org/lfenergy/compas/core/jaxrs/exception/ConstraintViolationExceptionHandler.java

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.lfenergy.compas.core.jaxrs.exception;
 
-import org.lfenergy.compas.core.jaxrs.model.ErrorResponse;
+import org.lfenergy.compas.core.commons.model.ErrorResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

jaxrs-commons/src/main/java/org/lfenergy/compas/core/jaxrs/exception/GenericExceptionHandler.java renamed to rest-commons/src/main/java/org/lfenergy/compas/core/jaxrs/exception/GenericExceptionHandler.java

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+SPDX-FileCopyrightText: 2021 Alliander N.V.
+
+SPDX-License-Identifier: Apache-2.0
+-->
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
+       bean-discovery-mode="annotated" version="2.0">
+</beans>

rest-commons/src/main/resources/META-INF/beans.xml

@@ -5,7 +5,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.lfenergy.compas.core.commons.exception.CompasException;
-import org.lfenergy.compas.core.jaxrs.model.ErrorResponse;
+import org.lfenergy.compas.core.commons.model.ErrorResponse;
 
 import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
 import static org.junit.jupiter.api.Assertions.assertEquals;

jaxrs-commons/src/test/java/org/lfenergy/compas/core/jaxrs/exception/CompasExceptionHandlerTest.java renamed to rest-commons/src/test/java/org/lfenergy/compas/core/jaxrs/exception/CompasExceptionHandlerTest.java

@@ -5,7 +5,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.lfenergy.compas.core.jaxrs.model.ErrorResponse;
+import org.lfenergy.compas.core.commons.model.ErrorResponse;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 

jaxrs-commons/src/test/java/org/lfenergy/compas/core/jaxrs/exception/ConstraintViolationExceptionHandlerTest.java renamed to rest-commons/src/test/java/org/lfenergy/compas/core/jaxrs/exception/ConstraintViolationExceptionHandlerTest.java

@@ -4,7 +4,7 @@
 package org.lfenergy.compas.core.jaxrs.exception;
 
 import org.junit.jupiter.api.Test;
-import org.lfenergy.compas.core.jaxrs.model.ErrorResponse;
+import org.lfenergy.compas.core.commons.model.ErrorResponse;
 
 import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
 import static org.junit.jupiter.api.Assertions.assertEquals;