Merge pull request #290 from com-pas/develop

New release

Author: Dennis Labordus

.github/workflows/build-project.yml

@@ -51,7 +51,7 @@ jobs:
           servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
       - name: Build with Maven (Pull Request)
         if: ${{ github.event_name == 'pull_request' }}
-        run: ./mvnw -s custom_maven_settings.xml -B -Pjvm-image clean verify
+        run: ./mvnw -s custom_maven_settings.xml -B -Pnative-image clean verify
       - name: Build with Maven (Push)
         if: ${{ github.event_name == 'push' }}
         run: ./mvnw -s custom_maven_settings.xml -B clean verify

.github/workflows/release-project.yml

@@ -60,6 +60,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Deploy with Maven to GitHub Packages and Docker Hub
-        run: ./mvnw -B -s custom_maven_settings.xml -Pjvm-image,release clean deploy
+        run: ./mvnw -B -s custom_maven_settings.xml -Pnative-image,release clean deploy
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

app/pom.xml

@@ -107,6 +107,12 @@ SPDX-License-Identifier: Apache-2.0
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jdbc-postgresql</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.jboss.logmanager</groupId>
+            <artifactId>log4j2-jboss-logmanager</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-container-image-docker</artifactId>
@@ -148,11 +154,6 @@ SPDX-License-Identifier: Apache-2.0
             <artifactId>openpojo</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

app/src/main/docker/Dockerfile-basex.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

app/src/main/docker/Dockerfile-basex.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 \

app/src/main/docker/Dockerfile-postgresql.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

app/src/main/docker/Dockerfile-postgresql.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 \

app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/CompasCommonResource.java

@@ -5,19 +5,18 @@
 
 import io.quarkus.security.Authenticated;
 import io.smallrye.mutiny.Uni;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.eclipse.microprofile.jwt.JsonWebToken;
 import org.lfenergy.compas.scl.data.rest.UserInfoProperties;
 import org.lfenergy.compas.scl.data.rest.v1.model.Type;
 import org.lfenergy.compas.scl.data.rest.v1.model.TypeListResponse;
 import org.lfenergy.compas.scl.data.rest.v1.model.UserInfoResponse;
 import org.lfenergy.compas.scl.extensions.model.SclFileType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
@@ -30,7 +29,7 @@
 @RequestScoped
 @Path("/common/v1/")
 public class CompasCommonResource {
-    private static final Logger LOGGER = LoggerFactory.getLogger(CompasCommonResource.class);
+    private static final Logger LOGGER = LogManager.getLogger(CompasCommonResource.class);
 
     @Inject
     JsonWebToken jsonWebToken;
@@ -41,8 +40,8 @@ public class CompasCommonResource {
     @GET
     @Path("/type/list")
     @Produces(MediaType.APPLICATION_XML)
-    public Uni<TypeListResponse> list(@HeaderParam("Authorization") String authHeader) {
-        LOGGER.trace("Authorization Header '{}'", authHeader);
+    public Uni<TypeListResponse> list() {
+        LOGGER.info("Retrieving list of the types of SCL Files");
 
         // Retrieve the roles the logged-in user has.
         var roles = jsonWebToken.getGroups();
@@ -61,9 +60,8 @@ public Uni<TypeListResponse> list(@HeaderParam("Authorization") String authHeade
     @GET
     @Path("/userinfo")
     @Produces(MediaType.APPLICATION_XML)
-    public Uni<UserInfoResponse> getUserInfo(@HeaderParam("Authorization") String authHeader) {
-        LOGGER.trace("Authorization Header '{}'", authHeader);
-
+    public Uni<UserInfoResponse> getUserInfo() {
+        LOGGER.info("Retrieving user information about {}", jsonWebToken.getName());
         var response = new UserInfoResponse();
         response.setName(jsonWebToken.getClaim(userInfoProperties.name()));
         response.setSessionWarning(userInfoProperties.sessionWarning());

app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/CompasSclDataResource.java

@@ -6,14 +6,14 @@
 import io.quarkus.security.Authenticated;
 import io.smallrye.common.annotation.Blocking;
 import io.smallrye.mutiny.Uni;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.eclipse.microprofile.jwt.JsonWebToken;
 import org.lfenergy.compas.scl.data.model.Version;
 import org.lfenergy.compas.scl.data.rest.UserInfoProperties;
 import org.lfenergy.compas.scl.data.rest.v1.model.*;
 import org.lfenergy.compas.scl.data.service.CompasSclDataService;
 import org.lfenergy.compas.scl.extensions.model.SclFileType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
@@ -28,7 +28,7 @@
 @RequestScoped
 @Path("/scl/v1/{" + TYPE_PATH_PARAM + "}")
 public class CompasSclDataResource {
-    private static final Logger LOGGER = LoggerFactory.getLogger(CompasSclDataResource.class);
+    private static final Logger LOGGER = LogManager.getLogger(CompasSclDataResource.class);
 
     private final CompasSclDataService compasSclDataService;
 
@@ -49,6 +49,7 @@ public CompasSclDataResource(CompasSclDataService compasSclDataService) {
     @Produces(MediaType.APPLICATION_XML)
     public Uni<CreateResponse> create(@PathParam(TYPE_PATH_PARAM) SclFileType type,
                                       @Valid CreateRequest request) {
+        LOGGER.info("Adding new SCL File for type {} to storage.", type);
         String who = jsonWebToken.getClaim(userInfoProperties.who());
         LOGGER.trace("Username used for Who {}", who);
 
@@ -62,6 +63,7 @@ public Uni<CreateResponse> create(@PathParam(TYPE_PATH_PARAM) SclFileType type,
     @Path("/list")
     @Produces(MediaType.APPLICATION_XML)
     public Uni<ListResponse> list(@PathParam(TYPE_PATH_PARAM) SclFileType type) {
+        LOGGER.info("Listing SCL Files for type {} from storage.", type);
         var response = new ListResponse();
         response.setItems(compasSclDataService.list(type));
         return Uni.createFrom().item(response);
@@ -72,6 +74,7 @@ public Uni<ListResponse> list(@PathParam(TYPE_PATH_PARAM) SclFileType type) {
     @Produces(MediaType.APPLICATION_XML)
     public Uni<VersionsResponse> listVersionsByUUID(@PathParam(TYPE_PATH_PARAM) SclFileType type,
                                                     @PathParam(ID_PATH_PARAM) UUID id) {
+        LOGGER.info("Listing versions of SCL File {} for type {} from storage.", id, type);
         var response = new VersionsResponse();
         response.setItems(compasSclDataService.listVersionsByUUID(type, id));
         return Uni.createFrom().item(response);
@@ -82,6 +85,7 @@ public Uni<VersionsResponse> listVersionsByUUID(@PathParam(TYPE_PATH_PARAM) SclF
     @Produces(MediaType.APPLICATION_XML)
     public Uni<GetResponse> findByUUID(@PathParam(TYPE_PATH_PARAM) SclFileType type,
                                        @PathParam(ID_PATH_PARAM) UUID id) {
+        LOGGER.info("Retrieving latest version of SCL File {} for type {} from storage.", id, type);
         var response = new GetResponse();
         response.setSclData(compasSclDataService.findByUUID(type, id));
         return Uni.createFrom().item(response);
@@ -93,6 +97,7 @@ public Uni<GetResponse> findByUUID(@PathParam(TYPE_PATH_PARAM) SclFileType type,
     public Uni<GetResponse> findByUUIDAndVersion(@PathParam(TYPE_PATH_PARAM) SclFileType type,
                                                  @PathParam(ID_PATH_PARAM) UUID id,
                                                  @PathParam(VERSION_PATH_PARAM) Version version) {
+        LOGGER.info("Retrieving version {} of SCL File {} for type {} from storage.", version, id, type);
         var response = new GetResponse();
         response.setSclData(compasSclDataService.findByUUID(type, id, version));
         return Uni.createFrom().item(response);
@@ -106,6 +111,7 @@ public Uni<GetResponse> findByUUIDAndVersion(@PathParam(TYPE_PATH_PARAM) SclFile
     public Uni<UpdateResponse> update(@PathParam(TYPE_PATH_PARAM) SclFileType type,
                                       @PathParam(ID_PATH_PARAM) UUID id,
                                       @Valid UpdateRequest request) {
+        LOGGER.info("Updating SCL File {} for type {} to storage.", id, type);
         String who = jsonWebToken.getClaim(userInfoProperties.who());
         LOGGER.trace("Username used for Who {}", who);
 
@@ -121,6 +127,7 @@ public Uni<UpdateResponse> update(@PathParam(TYPE_PATH_PARAM) SclFileType type,
     @Produces(MediaType.APPLICATION_XML)
     public Uni<Void> deleteAll(@PathParam(TYPE_PATH_PARAM) SclFileType type,
                                @PathParam(ID_PATH_PARAM) UUID id) {
+        LOGGER.info("Removing all versions of SCL File {} for type {} from storage.", id, type);
         compasSclDataService.delete(type, id);
         return Uni.createFrom().nullItem();
     }
@@ -132,6 +139,7 @@ public Uni<Void> deleteAll(@PathParam(TYPE_PATH_PARAM) SclFileType type,
     public Uni<Void> deleteVersion(@PathParam(TYPE_PATH_PARAM) SclFileType type,
                                    @PathParam(ID_PATH_PARAM) UUID id,
                                    @PathParam(VERSION_PATH_PARAM) Version version) {
+        LOGGER.info("Removing version {} of SCL File {} for type {} from storage.", version, id, type);
         compasSclDataService.delete(type, id, version);
         return Uni.createFrom().nullItem();
     }

app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclCreateServerEndpoint.java

@@ -5,6 +5,8 @@
 
 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.eclipse.microprofile.jwt.JsonWebToken;
 import org.lfenergy.compas.core.websocket.ErrorResponseEncoder;
 import org.lfenergy.compas.scl.data.rest.UserInfoProperties;
@@ -13,11 +15,10 @@
 import org.lfenergy.compas.scl.data.websocket.v1.encoder.CreateWsResponseEncoder;
 import org.lfenergy.compas.scl.data.websocket.v1.model.CreateWsRequest;
 import org.lfenergy.compas.scl.extensions.model.SclFileType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 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;
@@ -31,7 +32,7 @@
         decoders = {CreateWsRequestDecoder.class},
         encoders = {CreateWsResponseEncoder.class, ErrorResponseEncoder.class})
 public class CompasSclCreateServerEndpoint {
-    private static final Logger LOGGER = LoggerFactory.getLogger(CompasSclCreateServerEndpoint.class);
+    private static final Logger LOGGER = LogManager.getLogger(CompasSclCreateServerEndpoint.class);
 
     private final EventBus eventBus;
     private final JsonWebToken jsonWebToken;
@@ -52,7 +53,9 @@ public void onOpen(Session session, @PathParam(TYPE_PATH_PARAM) String type) {
     }
 
     @OnMessage
-    public void onCreateMessage(Session session, CreateWsRequest request, @PathParam(TYPE_PATH_PARAM) String type) {
+    public void onCreateMessage(Session session,
+                                @Valid CreateWsRequest request,
+                                @PathParam(TYPE_PATH_PARAM) String type) {
         LOGGER.info("Message (create) from session {} for type {}.", session.getId(), type);
 
         String who = jsonWebToken.getClaim(userInfoProperties.who());