Merge pull request #281 from com-pas/develop

New release

.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/github-project-automation-plus@v0.8.1
+        uses: alex-page/github-project-automation-plus@v0.8.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/github-project-automation-plus@v0.8.1
+        uses: alex-page/github-project-automation-plus@v0.8.2
         with:
           project: CoMPAS Pull Request Overview Board
           column: To do

.github/workflows/build-project.yml

@@ -45,13 +45,13 @@ jobs:
           java-version: '17'
 
       - 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 }}" }]'
       - name: Build with Maven (Pull Request)
         if: ${{ github.event_name == 'pull_request' }}
-        run: ./mvnw -s custom_maven_settings.xml -B -Pnative-image clean verify
+        run: ./mvnw -s custom_maven_settings.xml -B -Pjvm-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

@@ -51,7 +51,7 @@ jobs:
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
 
       - 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 }}" }]'
@@ -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 -Pnative-image,release clean deploy
+        run: ./mvnw -B -s custom_maven_settings.xml -Pjvm-image,release clean deploy
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sonarcloud-analysis.yml

@@ -56,7 +56,7 @@ jobs:
             -Dsonar.projectKey=com-pas_compas-scl-data-service \
             -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 }}" }]'

app/pom.xml

@@ -50,7 +50,11 @@ SPDX-License-Identifier: Apache-2.0
         </dependency>
         <dependency>
             <groupId>org.lfenergy.compas.core</groupId>
-            <artifactId>jaxrs-commons</artifactId>
+            <artifactId>rest-commons</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.lfenergy.compas.core</groupId>
+            <artifactId>websocket-commons</artifactId>
         </dependency>
 
         <dependency>
@@ -59,16 +63,17 @@ SPDX-License-Identifier: Apache-2.0
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy</artifactId>
+            <artifactId>quarkus-resteasy-reactive</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-jaxb</artifactId>
+            <artifactId>quarkus-resteasy-reactive-jaxb</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-hibernate-validator</artifactId>
+            <artifactId>quarkus-websockets</artifactId>
         </dependency>
+
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-smallrye-jwt</artifactId>
@@ -81,6 +86,11 @@ SPDX-License-Identifier: Apache-2.0
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-smallrye-health</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-validator</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-agroal</artifactId>

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.6 
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7 
 
 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.6
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7
 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.6 
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7 
 
 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.6
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7
 WORKDIR /work/
 RUN chown 1001 /work \
     && chmod "g+rwX" /work \

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

@@ -14,8 +14,8 @@
  * Create Beans from other dependencies that are used in the application.
  */
 @RegisterForReflection(targets = {
-        org.lfenergy.compas.core.jaxrs.model.ErrorResponse.class,
-        org.lfenergy.compas.core.jaxrs.model.ErrorMessage.class
+        org.lfenergy.compas.core.commons.model.ErrorResponse.class,
+        org.lfenergy.compas.core.commons.model.ErrorMessage.class
 })
 public class CompasSclDataServiceConfiguration {
     @Produces

app/src/main/java/org/lfenergy/compas/scl/data/rest/exception/CompasNoDataFoundExceptionHandler.java

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.lfenergy.compas.scl.data.rest.exception;
 
-import org.lfenergy.compas.core.jaxrs.model.ErrorResponse;
+import org.lfenergy.compas.core.commons.model.ErrorResponse;
 import org.lfenergy.compas.scl.data.exception.CompasNoDataFoundException;
 
 import javax.ws.rs.core.Response;

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

@@ -4,6 +4,7 @@
 package org.lfenergy.compas.scl.data.rest.v1;
 
 import io.quarkus.security.Authenticated;
+import io.smallrye.mutiny.Uni;
 import org.eclipse.microprofile.jwt.JsonWebToken;
 import org.lfenergy.compas.scl.data.rest.UserInfoProperties;
 import org.lfenergy.compas.scl.data.rest.v1.model.Type;
@@ -40,10 +41,10 @@ public class CompasCommonResource {
     @GET
     @Path("/type/list")
     @Produces(MediaType.APPLICATION_XML)
-    public TypeListResponse list(@HeaderParam("Authorization") String authHeader) {
+    public Uni<TypeListResponse> list(@HeaderParam("Authorization") String authHeader) {
         LOGGER.trace("Authorization Header '{}'", authHeader);
 
-        // Retrieve the roles the logged in user has.
+        // Retrieve the roles the logged-in user has.
         var roles = jsonWebToken.getGroups();
 
         var response = new TypeListResponse();
@@ -54,19 +55,19 @@ public TypeListResponse list(@HeaderParam("Authorization") String authHeader) {
                         .map(sclFileType -> new Type(sclFileType.name(), sclFileType.getDescription()))
                         .sorted(Comparator.comparing(Type::getDescription))
                         .toList());
-        return response;
+        return Uni.createFrom().item(response);
     }
 
     @GET
     @Path("/userinfo")
     @Produces(MediaType.APPLICATION_XML)
-    public UserInfoResponse getUserInfo(@HeaderParam("Authorization") String authHeader) {
+    public Uni<UserInfoResponse> getUserInfo(@HeaderParam("Authorization") String authHeader) {
         LOGGER.trace("Authorization Header '{}'", authHeader);
 
         var response = new UserInfoResponse();
         response.setName(jsonWebToken.getClaim(userInfoProperties.name()));
         response.setSessionWarning(userInfoProperties.sessionWarning());
         response.setSessionExpires(userInfoProperties.sessionExpires());
-        return response;
+        return Uni.createFrom().item(response);
     }
 }

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

@@ -4,6 +4,8 @@
 package org.lfenergy.compas.scl.data.rest.v1;
 
 import io.quarkus.security.Authenticated;
+import io.smallrye.common.annotation.Blocking;
+import io.smallrye.mutiny.Uni;
 import org.eclipse.microprofile.jwt.JsonWebToken;
 import org.lfenergy.compas.scl.data.model.Version;
 import org.lfenergy.compas.scl.data.rest.UserInfoProperties;
@@ -42,89 +44,95 @@ public CompasSclDataResource(CompasSclDataService compasSclDataService) {
     }
 
     @POST
+    @Blocking
     @Consumes(MediaType.APPLICATION_XML)
     @Produces(MediaType.APPLICATION_XML)
-    public CreateResponse create(@PathParam(TYPE_PATH_PARAM) SclFileType type,
-                                 @Valid CreateRequest request) {
+    public Uni<CreateResponse> create(@PathParam(TYPE_PATH_PARAM) SclFileType type,
+                                      @Valid CreateRequest request) {
         String who = jsonWebToken.getClaim(userInfoProperties.who());
         LOGGER.trace("Username used for Who {}", who);
 
         var response = new CreateResponse();
         response.setSclData(compasSclDataService.create(type, request.getName(), who, request.getComment(),
                 request.getSclData()));
-        return response;
+        return Uni.createFrom().item(response);
     }
 
     @GET
     @Path("/list")
     @Produces(MediaType.APPLICATION_XML)
-    public ListResponse list(@PathParam(TYPE_PATH_PARAM) SclFileType type) {
+    public Uni<ListResponse> list(@PathParam(TYPE_PATH_PARAM) SclFileType type) {
         var response = new ListResponse();
         response.setItems(compasSclDataService.list(type));
-        return response;
+        return Uni.createFrom().item(response);
     }
 
     @GET
     @Path("/{" + ID_PATH_PARAM + "}/versions")
     @Produces(MediaType.APPLICATION_XML)
-    public VersionsResponse listVersionsByUUID(@PathParam(TYPE_PATH_PARAM) SclFileType type,
-                                               @PathParam(ID_PATH_PARAM) UUID id) {
+    public Uni<VersionsResponse> listVersionsByUUID(@PathParam(TYPE_PATH_PARAM) SclFileType type,
+                                                    @PathParam(ID_PATH_PARAM) UUID id) {
         var response = new VersionsResponse();
         response.setItems(compasSclDataService.listVersionsByUUID(type, id));
-        return response;
+        return Uni.createFrom().item(response);
     }
 
     @GET
     @Path("/{" + ID_PATH_PARAM + "}")
     @Produces(MediaType.APPLICATION_XML)
-    public GetResponse findByUUID(@PathParam(TYPE_PATH_PARAM) SclFileType type,
-                                  @PathParam(ID_PATH_PARAM) UUID id) {
+    public Uni<GetResponse> findByUUID(@PathParam(TYPE_PATH_PARAM) SclFileType type,
+                                       @PathParam(ID_PATH_PARAM) UUID id) {
         var response = new GetResponse();
         response.setSclData(compasSclDataService.findByUUID(type, id));
-        return response;
+        return Uni.createFrom().item(response);
     }
 
     @GET
     @Path("/{" + ID_PATH_PARAM + "}/{" + VERSION_PATH_PARAM + "}")
     @Produces(MediaType.APPLICATION_XML)
-    public GetResponse findByUUIDAndVersion(@PathParam(TYPE_PATH_PARAM) SclFileType type,
-                                            @PathParam(ID_PATH_PARAM) UUID id,
-                                            @PathParam(VERSION_PATH_PARAM) Version version) {
+    public Uni<GetResponse> findByUUIDAndVersion(@PathParam(TYPE_PATH_PARAM) SclFileType type,
+                                                 @PathParam(ID_PATH_PARAM) UUID id,
+                                                 @PathParam(VERSION_PATH_PARAM) Version version) {
         var response = new GetResponse();
         response.setSclData(compasSclDataService.findByUUID(type, id, version));
-        return response;
+        return Uni.createFrom().item(response);
     }
 
     @PUT
+    @Blocking
     @Path("/{" + ID_PATH_PARAM + "}")
     @Consumes(MediaType.APPLICATION_XML)
     @Produces(MediaType.APPLICATION_XML)
-    public UpdateResponse update(@PathParam(TYPE_PATH_PARAM) SclFileType type,
-                                 @PathParam(ID_PATH_PARAM) UUID id,
-                                 @Valid UpdateRequest request) {
+    public Uni<UpdateResponse> update(@PathParam(TYPE_PATH_PARAM) SclFileType type,
+                                      @PathParam(ID_PATH_PARAM) UUID id,
+                                      @Valid UpdateRequest request) {
         String who = jsonWebToken.getClaim(userInfoProperties.who());
         LOGGER.trace("Username used for Who {}", who);
 
         var response = new UpdateResponse();
         response.setSclData(compasSclDataService.update(type, id, request.getChangeSetType(), who, request.getComment(),
                 request.getSclData()));
-        return response;
+        return Uni.createFrom().item(response);
     }
 
     @DELETE
+    @Blocking
     @Path("/{" + ID_PATH_PARAM + "}")
     @Produces(MediaType.APPLICATION_XML)
-    public void deleteAll(@PathParam(TYPE_PATH_PARAM) SclFileType type,
-                          @PathParam(ID_PATH_PARAM) UUID id) {
+    public Uni<Void> deleteAll(@PathParam(TYPE_PATH_PARAM) SclFileType type,
+                               @PathParam(ID_PATH_PARAM) UUID id) {
         compasSclDataService.delete(type, id);
+        return Uni.createFrom().nullItem();
     }
 
     @DELETE
+    @Blocking
     @Path("/{" + ID_PATH_PARAM + "}/{" + VERSION_PATH_PARAM + "}")
     @Produces(MediaType.APPLICATION_XML)
-    public void deleteVersion(@PathParam(TYPE_PATH_PARAM) SclFileType type,
-                              @PathParam(ID_PATH_PARAM) UUID id,
-                              @PathParam(VERSION_PATH_PARAM) Version version) {
+    public Uni<Void> deleteVersion(@PathParam(TYPE_PATH_PARAM) SclFileType type,
+                                   @PathParam(ID_PATH_PARAM) UUID id,
+                                   @PathParam(VERSION_PATH_PARAM) Version version) {
         compasSclDataService.delete(type, id, version);
+        return Uni.createFrom().nullItem();
     }
-}
+}

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

@@ -7,6 +7,7 @@
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 import org.lfenergy.compas.core.commons.constraint.FilenameValid;
 
+import javax.validation.constraints.NotBlank;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -30,6 +31,7 @@ public class CreateRequest {
 
     @Schema(description = "The XML Content of the SCL added as CDATA. The content should contain a XML according to the IEC 61850 standard.",
             example = "<![CDATA[<SCL xmlns=\"http://www.iec.ch/61850/2003/SCL\">....</SCL>]]")
+    @NotBlank
     @XmlElement(name = "SclData", namespace = SCL_DATA_SERVICE_V1_NS_URI)
     private String sclData;
 

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

@@ -7,6 +7,7 @@
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 import org.lfenergy.compas.scl.data.model.ChangeSetType;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -32,6 +33,7 @@ public class UpdateRequest {
 
     @Schema(description = "The XML Content of the SCL added as CDATA. The content should contain a XML according to the IEC 61850 standard.",
             example = "<![CDATA[<SCL xmlns=\"http://www.iec.ch/61850/2003/SCL\">....</SCL>]]")
+    @NotBlank
     @XmlElement(name = "SclData", namespace = SCL_DATA_SERVICE_V1_NS_URI)
     private String sclData;