From 0b3e114f883c82091f77efa78b9627f43e313cb5 Mon Sep 17 00:00:00 2001 From: Dennis Labordus Date: Wed, 23 Nov 2022 09:36:20 +0100 Subject: [PATCH 1/2] Using new websocket version of validation. Signed-off-by: Dennis Labordus --- .github/workflows/build-project.yml | 2 +- .github/workflows/release-project.yml | 2 +- .../scl/data/websocket/v1/CompasSclCreateServerEndpoint.java | 5 ++++- .../scl/data/websocket/v1/CompasSclGetServerEndpoint.java | 3 ++- .../data/websocket/v1/CompasSclGetVersionServerEndpoint.java | 3 ++- .../scl/data/websocket/v1/CompasSclUpdateServerEndpoint.java | 4 +++- app/src/main/resources/application.properties | 3 --- pom.xml | 2 +- 8 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml index 95370327..a7d51d65 100644 --- a/.github/workflows/build-project.yml +++ b/.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 diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml index 20a4fd38..e9fb31d6 100644 --- a/.github/workflows/release-project.yml +++ b/.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 }} diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclCreateServerEndpoint.java b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclCreateServerEndpoint.java index 46ce5d08..8962d88c 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclCreateServerEndpoint.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclCreateServerEndpoint.java @@ -18,6 +18,7 @@ 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; @@ -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()); diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetServerEndpoint.java b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetServerEndpoint.java index cd257cb0..2d66f1bc 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetServerEndpoint.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetServerEndpoint.java @@ -16,6 +16,7 @@ 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; @@ -45,7 +46,7 @@ public void onOpen(Session session, @PathParam(TYPE_PATH_PARAM) String type) { @OnMessage public void onGetMessage(Session session, - GetWsRequest request, + @Valid GetWsRequest request, @PathParam(TYPE_PATH_PARAM) String type) { LOGGER.info("Message (get) from session {} for type {}.", session.getId(), type); diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetVersionServerEndpoint.java b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetVersionServerEndpoint.java index 2f7eda8e..866941fa 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetVersionServerEndpoint.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetVersionServerEndpoint.java @@ -17,6 +17,7 @@ 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; @@ -46,7 +47,7 @@ public void onOpen(Session session, @PathParam(TYPE_PATH_PARAM) String type) { @OnMessage public void onGetVersionMessage(Session session, - GetVersionWsRequest request, + @Valid GetVersionWsRequest request, @PathParam(TYPE_PATH_PARAM) String type) { LOGGER.info("Message from session {} for type {}.", session.getId(), type); diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclUpdateServerEndpoint.java b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclUpdateServerEndpoint.java index c31cdc78..d54dfc77 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclUpdateServerEndpoint.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclUpdateServerEndpoint.java @@ -18,6 +18,7 @@ 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; @@ -52,7 +53,8 @@ public void onOpen(Session session, @PathParam(TYPE_PATH_PARAM) String type) { } @OnMessage - public void onUpdateMessage(Session session, UpdateWsRequest request, + public void onUpdateMessage(Session session, + @Valid UpdateWsRequest request, @PathParam(TYPE_PATH_PARAM) String type) { LOGGER.info("Message (update) from session {} for type {}.", session.getId(), type); diff --git a/app/src/main/resources/application.properties b/app/src/main/resources/application.properties index 61a07aae..07b1add8 100644 --- a/app/src/main/resources/application.properties +++ b/app/src/main/resources/application.properties @@ -16,9 +16,6 @@ quarkus.log.level = INFO quarkus.log.category."org.lfenergy.compas.scl.data".level = INFO # Add scanning these dependencies for scanning, also used by native compilation. -quarkus.index-dependency.hibernate-validator.group-id=org.hibernate.validator -quarkus.index-dependency.hibernate-validator.artifact-id=hibernate-validator - quarkus.index-dependency.websocket-commons.group-id = org.lfenergy.compas.core quarkus.index-dependency.websocket-commons.artifact-id = websocket-commons diff --git a/pom.xml b/pom.xml index 8d228cdf..1606e970 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ SPDX-License-Identifier: Apache-2.0 3.0.0-M7 3.2.0 - 0.11.0 + local-SNAPSHOT 2.14.1.Final 2.3.7 From ba1caa08a1b8c1eabbd811497fde72323f050b15 Mon Sep 17 00:00:00 2001 From: Dennis Labordus Date: Wed, 23 Nov 2022 10:45:17 +0100 Subject: [PATCH 2/2] Use released version of CoMPAS Core Signed-off-by: Dennis Labordus --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1606e970..b4b80c87 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ SPDX-License-Identifier: Apache-2.0 3.0.0-M7 3.2.0 - local-SNAPSHOT + 0.12.0 2.14.1.Final 2.3.7