Merge pull request #200 from com-pas/develop

Dennis Labordus · web-flow · commit 01e814bb5559 · 2022-11-23T10:36:19.000+01:00
New release
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -28,13 +28,6 @@ updates:
       interval: "daily"
     open-pull-requests-limit: 5
     ignore:
-      # Next two dependencies shouldn't be upgrade, because Quarkus isn't using newer version of EL.
-      - dependency-name: org.hibernate.validator:hibernate-validator
-        versions: [ "[7.0,)" ]
-      - dependency-name: org.glassfish:jakarta.el
-        versions: [ "[4.0,)" ]
-      # Next two dependencies shouldn't be upgrade, because RestEasy isn't using newer version. (2.3.X)
-      - dependency-name: jakarta.xml.bind:jakarta.xml.bind-api
-        versions: [ "[3.0,)" ]
+      # Next dependencies shouldn't be upgrade, because RestEasy isn't using newer version. (2.3.X)
       - dependency-name: com.sun.xml.bind:jaxb-impl
         versions: [ "[3.0,)" ]
diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml
@@ -23,11 +23,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Set up JDK 1.11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
 
       - name: Create custom Maven Settings.xml
         uses: whelk-io/maven-settings-xml-action@v21
diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml
@@ -24,11 +24,11 @@ jobs:
         # Extract the tag name from the git reference, value of GITHUB_REF will be something like refs/tags/<tag_name>.
         run: echo "##[set-output name=tagname;]$(echo ${GITHUB_REF##*/})"
 
-      - name: Set up JDK 1.11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
 
       - name: Create custom Maven Settings.xml
         uses: whelk-io/maven-settings-xml-action@v21
diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml
@@ -43,11 +43,11 @@ jobs:
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
 
-      - name: Set up JDK 1.11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
 
       - name: Set Common Sonar Variables
         id: sonar_env
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -1,2 +1,18 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
diff --git a/commons/pom.xml b/commons/pom.xml
@@ -47,6 +47,12 @@ SPDX-License-Identifier: Apache-2.0
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
@@ -67,11 +73,6 @@ 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>
diff --git a/commons/src/main/java/org/lfenergy/compas/core/commons/MarshallerWrapper.java b/commons/src/main/java/org/lfenergy/compas/core/commons/MarshallerWrapper.java
@@ -71,12 +71,11 @@ public T unmarshall(final InputStream xml) {
         }
     }
 
-    @SuppressWarnings("unchecked")
     private T cast(Object result) {
         if (!result.getClass().isAssignableFrom(getResultClass())) {
             throw new CompasException(UNMARSHAL_ERROR_CODE, "Error unmarshalling to the Class. Invalid class");
         }
-        return (T) result;
+        return getResultClass().cast(result);
     }
 
     public abstract static class Builder<W extends MarshallerWrapper<T>, T> {
@@ -145,7 +144,7 @@ private List<String> getContextPaths(List<SchemaConfig> schemaConfigs) {
             // Convert the SchemaConfig List to a List containing only the ContextPaths.
             return schemaConfigs.stream()
                     .map(SchemaConfig::getContextPath)
-                    .collect(Collectors.toList());
+                    .toList();
         }
 
         private String getImportStatements(List<SchemaConfig> schemaConfigs) {
diff --git a/commons/src/main/java/org/lfenergy/compas/core/commons/Resources.java b/commons/src/main/java/org/lfenergy/compas/core/commons/Resources.java
@@ -28,7 +28,7 @@ private static ClassLoader getClassLoader() {
             classLoader = Resources.class.getClassLoader();
         }
         if (classLoader == null) {
-            throw new CompasException(NO_CLASS_LOADER_ERROR_CODE, "Unable to get ClassLoader for loading resouces");
+            throw new CompasException(NO_CLASS_LOADER_ERROR_CODE, "Unable to get ClassLoader for loading resources");
         }
         return classLoader;
     }
diff --git a/commons/src/main/java/org/lfenergy/compas/core/commons/constraint/impl/FilenameConstraintValidator.java b/commons/src/main/java/org/lfenergy/compas/core/commons/constraint/impl/FilenameConstraintValidator.java
@@ -16,19 +16,16 @@
 public class FilenameConstraintValidator implements ConstraintValidator<FilenameValid, String> {
     // Used a RegEx from Internet to check the strict one (Old Windows) to see if all matches.
     private final Pattern pattern = Pattern.compile(
-            "# Match a valid Windows filename (unspecified file system).\n" +
-                    "^                                # Anchor to start of string.\n" +
-                    "(?!                              # Assert filename is not: CON, PRN,\n" +
-                    "  (?:                            # AUX, NUL, COM1, COM2, COM3, COM4,\n" +
-                    "    CON|PRN|AUX|NUL|             # COM5, COM6, COM7, COM8, COM9,\n" +
-                    "    COM[1-9]|LPT[1-9]            # LPT1, LPT2, LPT3, LPT4, LPT5,\n" +
-                    "  )                              # LPT6, LPT7, LPT8, and LPT9...\n" +
-                    "  (?:\\.[^.]*)?                  # followed by optional extension\n" +
-                    "  $                              # and end of string\n" +
-                    ")                                # End negative lookahead assertion.\n" +
-                    "[^<>:\"/\\\\|?*\\x00-\\x1F]*     # Zero or more valid filename chars.\n" +
-                    "[^<>:\"/\\\\|?*\\x00-\\x1F\\ .]  # Last char is not a space or dot.\n" +
-                    "$                                # Anchor to end of string.",
+            """
+                    # Match a valid Windows filename (unspecified file system).
+                    ^# Anchor to start of string.
+                    (?!# Assert filename is not:
+                    (?:CON|PRN|AUX|NUL|COM[1-9]|LPT[1-9])# CON,PRN,AUX,NUL,COM1-9,LPT1-9
+                    (?:\\.[^.]*)?# followed by optional extension
+                    $)# End negative lookahead assertion.
+                    [^<>:"/\\\\|?*\\x00-\\x1F]*# Zero or more valid filename chars.
+                    [^<>:"/\\\\|?*\\x00-\\x1F .]$# Last char is not a space or dot.
+                    """,
             Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE | Pattern.COMMENTS);
 
     @Override
diff --git a/commons/src/test/java/org/lfenergy/compas/core/commons/ElementConverterTest.java b/commons/src/test/java/org/lfenergy/compas/core/commons/ElementConverterTest.java
@@ -22,7 +22,7 @@ class ElementConverterTest {
                     "<SCL xmlns=\"" + SIMPLE_SCL_NS + "\" version=\"2007\" revision=\"B\" release=\"4\">" +
                     "</SCL>";
 
-    private ElementConverter converter = new ElementConverter();
+    private final ElementConverter converter = new ElementConverter();
 
     @Test
     void convertToString_WhenCalledWithXMLElementWithoutDeclaration_ThenElementConvertedToAString() throws ParserConfigurationException {
diff --git a/commons/src/test/java/org/lfenergy/compas/core/commons/MarshallerWrapperTest.java b/commons/src/test/java/org/lfenergy/compas/core/commons/MarshallerWrapperTest.java
@@ -46,7 +46,7 @@ void marshaller_WhenInitializedWithEmptyConfig_ThenExceptionIsThrown() {
                 new XmlElementPojoMarshallerWrapper.Builder().withProperties("invalid-configs/marshaller-empty-config.yml");
 
         // Expected that creation to fail, because there are no schemas configured.
-        var exception = assertThrows(CompasException.class, () -> marshallerWrapperBuilder.build());
+        var exception = assertThrows(CompasException.class, marshallerWrapperBuilder::build);
         assertEquals(CONFIGURATION_ERROR_CODE, exception.getErrorCode());
     }
 
@@ -56,7 +56,7 @@ void marshaller_WhenInitializedWithInvalidConfig_ThenExceptionIsThrown() {
                 new XmlElementPojoMarshallerWrapper.Builder().withProperties("invalid-configs/marshaller-invalid-config.yml");
 
         // Expected that creation to fail, because this configuration is invalid.
-        var exception = assertThrows(CompasException.class, () -> marshallerWrapperBuilder.build());
+        var exception = assertThrows(CompasException.class, marshallerWrapperBuilder::build);
         assertEquals(PROPERTY_ERROR_ERROR_CODE, exception.getErrorCode());
     }
 
@@ -66,7 +66,7 @@ void marshaller_WhenInitializedWithInvalidContextPath_ThenExceptionIsThrown() {
                 new XmlElementPojoMarshallerWrapper.Builder().withProperties("invalid-configs/marshaller-invalid-contextpath-config.yml");
 
         // Expected that creation to fail, because this configuration is invalid.
-        var exception = assertThrows(CompasException.class, () -> marshallerWrapperBuilder.build());
+        var exception = assertThrows(CompasException.class, marshallerWrapperBuilder::build);
         assertEquals(CREATION_ERROR_CODE, exception.getErrorCode());
     }
 
@@ -76,7 +76,7 @@ void marshaller_WhenInitializedWithInvalidXsdPath_ThenExceptionIsThrown() {
                 new XmlElementPojoMarshallerWrapper.Builder().withProperties("invalid-configs/marshaller-invalid-xsdpath-config.yml");
 
         // Expected that creation to fail, because this configuration is invalid.
-        var exception = assertThrows(CompasException.class, () -> marshallerWrapperBuilder.build());
+        var exception = assertThrows(CompasException.class, marshallerWrapperBuilder::build);
         assertEquals(RESOURCE_NOT_FOUND_ERROR_CODE, exception.getErrorCode());
     }
 
diff --git a/commons/src/test/java/org/lfenergy/compas/core/commons/constraint/impl/FilenameConstraintValidatorTest.java b/commons/src/test/java/org/lfenergy/compas/core/commons/constraint/impl/FilenameConstraintValidatorTest.java
@@ -18,8 +18,9 @@ class FilenameConstraintValidatorTest {
 
     @BeforeEach
     void setupValidator() {
-        var factory = Validation.buildDefaultValidatorFactory();
-        validator = factory.getValidator();
+        try (var factory = Validation.buildDefaultValidatorFactory()) {
+            validator = factory.getValidator();
+        }
     }
 
     @Test
@@ -53,16 +54,6 @@ private void assertIncorrectName(String name) {
         assertEquals(1, violations.size());
     }
 
-    private static final class SimplePojo {
-        @FilenameValid
-        private final String name;
-
-        public SimplePojo(String name) {
-            this.name = name;
-        }
-
-        public String getName() {
-            return name;
-        }
+    private record SimplePojo(@FilenameValid String name) {
     }
-}
+}
diff --git a/commons/src/test/java/org/lfenergy/compas/core/commons/constraint/impl/XmlAnyElementConstraintValidatorTest.java b/commons/src/test/java/org/lfenergy/compas/core/commons/constraint/impl/XmlAnyElementConstraintValidatorTest.java
@@ -32,8 +32,9 @@ void setupValidator() throws ParserConfigurationException {
         var documentBuilder = documentFactory.newDocumentBuilder();
         document = documentBuilder.newDocument();
 
-        var factory = Validation.buildDefaultValidatorFactory();
-        validator = factory.getValidator();
+        try (var factory = Validation.buildDefaultValidatorFactory()) {
+            validator = factory.getValidator();
+        }
     }
 
     @Test
@@ -78,7 +79,7 @@ void isValid_WhenCalledWithMultipleElementAndOneIncorrectNS_ThenViolationFound()
 
     private static final class SimplePojo {
         @XmlAnyElementValid(elementName = ELEMENT_NAME, elementNamespace = ELEMENT_NS)
-        private List<Element> elements = new ArrayList<>();
+        private final List<Element> elements = new ArrayList<>();
 
         public List<Element> getElements() {
             return elements;
diff --git a/pom.xml b/pom.xml
@@ -15,8 +15,7 @@ SPDX-License-Identifier: Apache-2.0
     <packaging>pom</packaging>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.release>17</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <compas.scl.xsd.version>0.0.4</compas.scl.xsd.version>
diff --git a/rest-commons/src/test/java/org/lfenergy/compas/core/rest/exception/CompasExceptionHandlerTest.java b/rest-commons/src/test/java/org/lfenergy/compas/core/rest/exception/CompasExceptionHandlerTest.java
@@ -18,11 +18,12 @@ void toResponse_WhenCalledWithException_ThenInternalServerErrorReturnedWithBody(
         var exception = new CompasException(NO_CLASS_LOADER_ERROR_CODE, "Some message that will only be logged");
         var handler = new CompasExceptionHandler();
 
-        var result = handler.toResponse(exception);
-        assertEquals(INTERNAL_SERVER_ERROR.getStatusCode(), result.getStatus());
-        var errorMessage = ((ErrorResponse) result.getEntity()).getErrorMessages().get(0);
-        assertEquals(exception.getErrorCode(), errorMessage.getCode());
-        assertEquals(exception.getMessage(), errorMessage.getMessage());
-        assertNull(errorMessage.getProperty());
+        try (var result = handler.toResponse(exception)) {
+            assertEquals(INTERNAL_SERVER_ERROR.getStatusCode(), result.getStatus());
+            var errorMessage = ((ErrorResponse) result.getEntity()).getErrorMessages().get(0);
+            assertEquals(exception.getErrorCode(), errorMessage.getCode());
+            assertEquals(exception.getMessage(), errorMessage.getMessage());
+            assertNull(errorMessage.getProperty());
+        }
     }
-}
+}
diff --git a/rest-commons/src/test/java/org/lfenergy/compas/core/rest/exception/ConstraintViolationExceptionHandlerTest.java b/rest-commons/src/test/java/org/lfenergy/compas/core/rest/exception/ConstraintViolationExceptionHandlerTest.java
@@ -42,13 +42,14 @@ void toResponse_WhenCalledWithConstraintViolations_ThenInternalServerErrorReturn
         var exception = new ConstraintViolationException(constraintViolations);
         var handler = new ConstraintViolationExceptionHandler();
 
-        var result = handler.toResponse(exception);
-        assertEquals(BAD_REQUEST.getStatusCode(), result.getStatus());
-        var errorMessage = ((ErrorResponse) result.getEntity()).getErrorMessages().get(0);
-        assertEquals(VALIDATION_ERROR, errorMessage.getCode());
-        assertEquals(MESSAGE, errorMessage.getMessage());
-        assertEquals(PROPERTY, errorMessage.getProperty());
-        verifyNoMoreInteractions(constraintViolation, propertyPath);
+        try (var result = handler.toResponse(exception)) {
+            assertEquals(BAD_REQUEST.getStatusCode(), result.getStatus());
+            var errorMessage = ((ErrorResponse) result.getEntity()).getErrorMessages().get(0);
+            assertEquals(VALIDATION_ERROR, errorMessage.getCode());
+            assertEquals(MESSAGE, errorMessage.getMessage());
+            assertEquals(PROPERTY, errorMessage.getProperty());
+            verifyNoMoreInteractions(constraintViolation, propertyPath);
+        }
     }
 
     @Test
@@ -57,10 +58,11 @@ void toResponse_WhenCalledWithoutConstraintViolations_ThenInternalServerErrorRet
         var exception = new ConstraintViolationException(constraintViolations);
         var handler = new ConstraintViolationExceptionHandler();
 
-        var result = handler.toResponse(exception);
-        assertEquals(BAD_REQUEST.getStatusCode(), result.getStatus());
-        var response = (ErrorResponse) result.getEntity();
-        assertTrue(response.getErrorMessages().isEmpty());
-        verifyNoInteractions(constraintViolation, propertyPath);
+        try (var result = handler.toResponse(exception)) {
+            assertEquals(BAD_REQUEST.getStatusCode(), result.getStatus());
+            var response = (ErrorResponse) result.getEntity();
+            assertTrue(response.getErrorMessages().isEmpty());
+            verifyNoInteractions(constraintViolation, propertyPath);
+        }
     }
-}
+}
diff --git a/rest-commons/src/test/java/org/lfenergy/compas/core/rest/exception/GenericExceptionHandlerTest.java b/rest-commons/src/test/java/org/lfenergy/compas/core/rest/exception/GenericExceptionHandlerTest.java
@@ -18,11 +18,12 @@ void toResponse_WhenCalledWithException_ThenInternalServerErrorReturnedWithBody(
         var exception = new Exception("Some message that will only be logged");
         var handler = new GenericExceptionHandler();
 
-        var result = handler.toResponse(exception);
-        assertEquals(INTERNAL_SERVER_ERROR.getStatusCode(), result.getStatus());
-        var errorMessage = ((ErrorResponse) result.getEntity()).getErrorMessages().get(0);
-        assertEquals(UNKNOWN_EXCEPTION_ERROR, errorMessage.getCode());
-        assertEquals(ERROR_MESSAGE, errorMessage.getMessage());
-        assertNull(errorMessage.getProperty());
+        try (var result = handler.toResponse(exception)) {
+            assertEquals(INTERNAL_SERVER_ERROR.getStatusCode(), result.getStatus());
+            var errorMessage = ((ErrorResponse) result.getEntity()).getErrorMessages().get(0);
+            assertEquals(UNKNOWN_EXCEPTION_ERROR, errorMessage.getCode());
+            assertEquals(ERROR_MESSAGE, errorMessage.getMessage());
+            assertNull(errorMessage.getProperty());
+        }
     }
-}
+}
diff --git a/scl-extension/src/test/java/org/lfenergy/compas/scl/extensions/commons/AbstractCompasExtensionsManagerTest.java b/scl-extension/src/test/java/org/lfenergy/compas/scl/extensions/commons/AbstractCompasExtensionsManagerTest.java
@@ -14,7 +14,7 @@
 import static org.lfenergy.compas.scl.extensions.commons.CompasExtensionsField.SCL_NAME;
 
 class AbstractCompasExtensionsManagerTest {
-    private AbstractCompasExtensionsManager manager = new AbstractCompasExtensionsManager() {
+    private final AbstractCompasExtensionsManager manager = new AbstractCompasExtensionsManager() {
     };
 
     @Test
diff --git a/websocket-commons/pom.xml b/websocket-commons/pom.xml
diff --git a/websocket-commons/src/main/java/org/lfenergy/compas/core/websocket/WebsocketSupport.java b/websocket-commons/src/main/java/org/lfenergy/compas/core/websocket/WebsocketSupport.java
diff --git a/websocket-commons/src/test/java/org/lfenergy/compas/core/websocket/WebsocketSupportTest.java b/websocket-commons/src/test/java/org/lfenergy/compas/core/websocket/WebsocketSupportTest.java

Original file line number	Diff line number	Diff line change
`@@ -71,12 +71,11 @@ public T unmarshall(final InputStream xml) {`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`74`		`- @SuppressWarnings("unchecked")`
`75`	`74`	`private T cast(Object result) {`
`76`	`75`	`if (!result.getClass().isAssignableFrom(getResultClass())) {`
`77`	`76`	`throw new CompasException(UNMARSHAL_ERROR_CODE, "Error unmarshalling to the Class. Invalid class");`
`78`	`77`	`}`
`79`		`- return (T) result;`
	`78`	`+ return getResultClass().cast(result);`
`80`	`79`	`}`
`81`	`80`
`82`	`81`	`public abstract static class Builder<W extends MarshallerWrapper<T>, T> {`
`@@ -145,7 +144,7 @@ private List<String> getContextPaths(List<SchemaConfig> schemaConfigs) {`
`145`	`144`	`// Convert the SchemaConfig List to a List containing only the ContextPaths.`
`146`	`145`	`return schemaConfigs.stream()`
`147`	`146`	`.map(SchemaConfig::getContextPath)`
`148`		`- .collect(Collectors.toList());`
	`147`	`+ .toList();`
`149`	`148`	`}`
`150`	`149`
`151`	`150`	`private String getImportStatements(List<SchemaConfig> schemaConfigs) {`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ private static ClassLoader getClassLoader() {`
`28`	`28`	`classLoader = Resources.class.getClassLoader();`
`29`	`29`	`}`
`30`	`30`	`if (classLoader == null) {`
`31`		`- throw new CompasException(NO_CLASS_LOADER_ERROR_CODE, "Unable to get ClassLoader for loading resouces");`
	`31`	`+ throw new CompasException(NO_CLASS_LOADER_ERROR_CODE, "Unable to get ClassLoader for loading resources");`
`32`	`32`	`}`
`33`	`33`	`return classLoader;`
`34`	`34`	`}`