Refactoring setup project to build two docker images (basex and postgresql). Flyway is now configured using Quarkus.

Signed-off-by: Dennis Labordus <[email protected]>

Author: Dennis Labordus

app/src/main/resources/application-test.properties

@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-# Test common configuration.
+# Test configuration.
 
 # Datasource configuration for BaseX (none)
 quarkus.datasource.jdbc                = false

app/src/test/java/org/lfenergy/compas/scl/data/rest/CompasSclDataServiceBaseXConfigurationTest.java

@@ -0,0 +1,45 @@
+// SPDX-FileCopyrightText: 2021 Alliander N.V.
+//
+// SPDX-License-Identifier: Apache-2.0
+package org.lfenergy.compas.scl.data.rest;
+
+import org.junit.jupiter.api.Test;
+import org.lfenergy.compas.scl.data.basex.client.BaseXClientFactory;
+import org.lfenergy.compas.scl.data.util.SclDataModelMarshaller;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.mock;
+
+class CompasSclDataServiceBaseXConfigurationTest {
+    @Test
+    void createBaseXClientFactoryProduction_WhenCalled_ThenObjectReturned() {
+        assertNotNull(new CompasSclDataServiceBaseXConfiguration()
+                .createBaseXClientFactoryProduction("host", 8898, "admin", ""));
+    }
+
+    @Test
+    void creatCompasSclDataRepositoryProduction_WhenCalled_ThenObjectReturned() {
+        var baseXClientFactory = mock(BaseXClientFactory.class);
+        ;
+        var sclDataModelMarshaller = mock(SclDataModelMarshaller.class);
+
+        assertNotNull(new CompasSclDataServiceBaseXConfiguration()
+                .creatCompasSclDataRepositoryProduction(baseXClientFactory, sclDataModelMarshaller));
+    }
+
+    @Test
+    void createBaseXClientFactoryDevelopment_WhenCalled_ThenObjectReturned() {
+        assertNotNull(new CompasSclDataServiceBaseXConfiguration()
+                .createBaseXClientFactoryDevelopment("host", 8898, "admin", ""));
+    }
+
+    @Test
+    void creatCompasSclDataRepositoryDevelopment_WhenCalled_ThenObjectReturned() {
+        var baseXClientFactory = mock(BaseXClientFactory.class);
+        ;
+        var sclDataModelMarshaller = mock(SclDataModelMarshaller.class);
+
+        assertNotNull(new CompasSclDataServiceBaseXConfiguration()
+                .creatCompasSclDataRepositoryDevelopment(baseXClientFactory, sclDataModelMarshaller));
+    }
+}

app/src/test/java/org/lfenergy/compas/scl/data/rest/CompasSclDataServiceCommonConfigurationTest.java

@@ -4,8 +4,12 @@
 package org.lfenergy.compas.scl.data.rest;
 
 import org.junit.jupiter.api.Test;
+import org.lfenergy.compas.core.commons.ElementConverter;
+import org.lfenergy.compas.scl.data.repository.CompasSclDataRepository;
+import org.lfenergy.compas.scl.data.util.SclElementProcessor;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.mock;
 
 class CompasSclDataServiceCommonConfigurationTest {
     @Test
@@ -22,4 +26,14 @@ void creatSclElementProcessor_WhenCalled_ThenObjectReturned() {
     void createSclDataModelMarshaller_WhenCalled_ThenObjectReturned() {
         assertNotNull(new CompasSclDataServiceCommonConfiguration().createSclDataModelMarshaller());
     }
+
+    @Test
+    void createCompasSclDataService_WhenCalled_ThenObjectReturned() {
+        var repository = mock(CompasSclDataRepository.class);
+        var converter = mock(ElementConverter.class);
+        var sclElementProcessor = mock(SclElementProcessor.class);
+
+        assertNotNull(new CompasSclDataServiceCommonConfiguration()
+                .createCompasSclDataService(repository, converter, sclElementProcessor));
+    }
 }

app/src/test/java/org/lfenergy/compas/scl/data/rest/CompasSclDataServicePostgreSQLConfigurationTest.java

@@ -0,0 +1,27 @@
+// SPDX-FileCopyrightText: 2021 Alliander N.V.
+//
+// SPDX-License-Identifier: Apache-2.0
+package org.lfenergy.compas.scl.data.rest;
+
+import org.junit.jupiter.api.Test;
+
+import javax.sql.DataSource;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.mock;
+
+class CompasSclDataServicePostgreSQLConfigurationTest {
+    @Test
+    void creatCompasSclDataRepositoryProduction_WhenCalled_ThenObjectReturned() {
+        var datasource = mock(DataSource.class);
+
+        assertNotNull(new CompasSclDataServicePostgreSQLConfiguration().creatCompasSclDataRepositoryProduction(datasource));
+    }
+
+    @Test
+    void creatCompasSclDataRepositoryDevelopment_WhenCalled_ThenObjectReturned() {
+        var datasource = mock(DataSource.class);
+
+        assertNotNull(new CompasSclDataServicePostgreSQLConfiguration().creatCompasSclDataRepositoryDevelopment(datasource));
+    }
+}

doc/basex.md

@@ -50,7 +50,7 @@ You can run the following command to build the BaseX version of the application.
 You can run your application in dev mode that enables live coding using:
 
 ```shell script
-./mvnw -Dquarkus.profile=dev,prod-basex package io.quarkus:quarkus-maven-plugin::dev
+./mvnw -DskipTests=true -Dquarkus.profile=dev-basex package io.quarkus:quarkus-maven-plugin::dev
 ```
 
 ### Creating a native executable
@@ -61,9 +61,10 @@ You can create a native executable using:
 ./mvnw -P native package
 ```
 
-This will run the native executable build in a container, because in the native profile the property
+This will run the native executable build in a container. In the native profile the property
 "quarkus.native.container-build" is set to 'true'.
 
-You can then execute your native executable with: `./app/target/app-local-SNAPSHOT-runner`
+You can then execute your native executable with: `./app/target/basex-quarkus-app/app-local-SNAPSHOT-runner`
 
-If you want to learn more about building native executables, please see https://quarkus.io/guides/maven-tooling.html.
+If you want to learn more about building native executables, please see https://quarkus.io/guides/maven-tooling.html
+and https://quarkus.io/guides/writing-native-applications-tips.

doc/postgresql.md

@@ -44,17 +44,32 @@ docker run --rm --name compas_postgresql \
 
 ### Building the application
 
-You can run the following command to build the BaseX version of the application.
+You can run the following command to build the PostgreSQL version of the application.
 
 ```shell script
-./mvnw -P postgres clean verify
+./mvnw clean verify
 ```
 
 ### Running the application in dev mode
 
 You can run your application in dev mode that enables live coding using:
 
 ```shell script
-./mvnw -P postgres -DskipTests=true -Dquarkus.profile=dev,prod-postgres package io.quarkus:quarkus-maven-plugin::dev
+./mvnw -DskipTests=true -Dquarkus.profile=dev-postgres package io.quarkus:quarkus-maven-plugin::dev
 ```
 
+### Creating a native executable
+
+You can create a native executable using:
+
+```shell script
+./mvnw -P native package
+```
+
+This will run the native executable build in a container. In the native profile the property
+"quarkus.native.container-build" is set to 'true'.
+
+You can then execute your native executable with: `./app/target/postgresql-quarkus-app/app-local-SNAPSHOT-runner`
+
+If you want to learn more about building native executables, please see https://quarkus.io/guides/maven-tooling.html
+and https://quarkus.io/guides/writing-native-applications-tips.

repository-postgresql/src/main/java/org/lfenergy/compas/scl/data/repository/postgresql/CompasSclDataPostgreSQLRepository.java

@@ -25,6 +25,17 @@
 import static org.lfenergy.compas.scl.data.exception.CompasSclDataServiceErrorCode.*;
 
 public class CompasSclDataPostgreSQLRepository implements CompasSclDataRepository {
+    private static final String SElECT_METADATA_CLAUSE = "select id, name, major_version, minor_version, patch_version ";
+    private static final String FROM_CLAUSE = " from scl_file ";
+    private static final String DELETE_FROM_CLAUSE = "delete " + FROM_CLAUSE;
+    private static final String WHERE_CLAUSE = " where ";
+    private static final String AND_CLAUSE = " and ";
+    private static final String ORDER_BY_CLAUSE = " order by id, major_version, minor_version, patch_version";
+
+    private static final String FILTER_ON_TYPE = "type = ?";
+    private static final String FILTER_ON_ID = "id = ?";
+    private static final String FILTER_ON_VERSION = "major_version = ? and minor_version = ? and patch_version = ? ";
+
     private static final String ID_FIELD = "id";
     private static final String MAJOR_VERSION_FIELD = "major_version";
     private static final String MINOR_VERSION_FIELD = "minor_version";
@@ -41,31 +52,31 @@ public CompasSclDataPostgreSQLRepository(DataSource dataSource) {
     @Override
     @Transactional(SUPPORTS)
     public List<Item> list(SclType type) {
-        var sql = "select id, name, major_version, minor_version, patch_version" +
-                "    from scl_file outer_scl" +
-                "   where type = ?" +
-                "   and   (id, major_version, minor_version, patch_version) in (" +
-                //    Last select the maximum patch version with the major/minor version per id.
-                "     select id, major_version, minor_version, max(patch_version)" +
-                "       from scl_file patch_scl" +
-                "      where patch_scl.type = outer_scl.type" +
-                "      and   (id, major_version, minor_version) in (" +
-                //         Next select the maximum minor version with the major version per id.
-                "          select id, major_version, max(minor_version)" +
-                "            from scl_file minor_scl" +
-                "           where minor_scl.type = outer_scl.type" +
-                "           and   (id, major_version) in (" +
-                //              First select the maximum major version per id.
-                "               select id, max(major_version)" +
-                "                 from scl_file major_scl" +
-                "                where major_scl.type = outer_scl.type" +
-                "                group by id" +
-                "           )" +
-                "           group by id, major_version" +
-                "      )" +
-                "      group by id, major_version, minor_version" +
-                " )" +
-                " order by id, major_version, minor_version, patch_version";
+        var sql = SElECT_METADATA_CLAUSE
+                + FROM_CLAUSE
+                + WHERE_CLAUSE + FILTER_ON_TYPE
+                + "   and   (id, major_version, minor_version, patch_version) in ("
+                //      Last select the maximum patch version with the major/minor version per id.
+                + "     select id, major_version, minor_version, max(patch_version)"
+                + "       from scl_file patch_scl"
+                + "      where patch_scl.type = scl_file.type"
+                + "      and   (id, major_version, minor_version) in ("
+                //           Next select the maximum minor version with the major version per id.
+                + "          select id, major_version, max(minor_version)"
+                + "            from scl_file minor_scl"
+                + "           where minor_scl.type = scl_file.type"
+                + "           and   (id, major_version) in ("
+                //                First select the maximum major version per id.
+                + "               select id, max(major_version)"
+                + "                 from scl_file major_scl"
+                + "                where major_scl.type = scl_file.type"
+                + "                group by id"
+                + "           )"
+                + "           group by id, major_version"
+                + "      )"
+                + "      group by id, major_version, minor_version"
+                + " )"
+                + ORDER_BY_CLAUSE;
 
         var items = new ArrayList<Item>();
         try (var connection = dataSource.getConnection();
@@ -88,11 +99,11 @@ public List<Item> list(SclType type) {
     @Override
     @Transactional(SUPPORTS)
     public List<Item> listVersionsByUUID(SclType type, UUID id) {
-        var sql = "select id, name, major_version, minor_version, patch_version"
-                + "  from scl_file"
-                + " where id   = ?"
-                + " and   type = ?"
-                + " order by major_version, minor_version, patch_version";
+        var sql = SElECT_METADATA_CLAUSE
+                + FROM_CLAUSE
+                + WHERE_CLAUSE + FILTER_ON_ID
+                + AND_CLAUSE + FILTER_ON_TYPE
+                + ORDER_BY_CLAUSE;
 
         var items = new ArrayList<Item>();
         try (var connection = dataSource.getConnection();
@@ -126,12 +137,11 @@ public String findByUUID(SclType type, UUID id) {
     @Transactional(SUPPORTS)
     public String findByUUID(SclType type, UUID id, Version version) {
         var sql = "select scl_data "
-                + "  from scl_file "
-                + " where id            = ?"
-                + " and   type          = ?"
-                + " and   major_version = ? "
-                + " and   minor_version = ? "
-                + " and   patch_version = ? ";
+                + FROM_CLAUSE
+                + WHERE_CLAUSE + FILTER_ON_ID
+                + AND_CLAUSE + FILTER_ON_TYPE
+                + AND_CLAUSE + FILTER_ON_VERSION;
+
         try (var connection = dataSource.getConnection();
              var stmt = connection.prepareStatement(sql)) {
             stmt.setObject(1, id);
@@ -155,11 +165,12 @@ public String findByUUID(SclType type, UUID id, Version version) {
     @Override
     @Transactional(SUPPORTS)
     public SclMetaInfo findMetaInfoByUUID(SclType type, UUID id) {
-        var sql = "select id, name, major_version, minor_version, patch_version"
-                + "  from scl_file"
-                + " where id   = ?"
-                + " and   type = ?"
+        var sql = SElECT_METADATA_CLAUSE
+                + FROM_CLAUSE
+                + WHERE_CLAUSE + FILTER_ON_ID
+                + AND_CLAUSE + FILTER_ON_TYPE
                 + " order by major_version desc, minor_version desc, patch_version desc";
+
         try (var connection = dataSource.getConnection();
              var stmt = connection.prepareStatement(sql)) {
             stmt.setObject(1, id);
@@ -205,9 +216,10 @@ public void create(SclType type, UUID id, String name, String scl, Version versi
     @Override
     @Transactional(REQUIRED)
     public void delete(SclType type, UUID id) {
-        var sql = "delete from scl_file "
-                + " where id   = ?"
-                + " and   type = ?";
+        var sql = DELETE_FROM_CLAUSE
+                + WHERE_CLAUSE + FILTER_ON_ID
+                + AND_CLAUSE + FILTER_ON_TYPE;
+
         try (var connection = dataSource.getConnection();
              var stmt = connection.prepareStatement(sql)) {
             stmt.setObject(1, id);
@@ -221,12 +233,11 @@ public void delete(SclType type, UUID id) {
     @Override
     @Transactional(REQUIRED)
     public void delete(SclType type, UUID id, Version version) {
-        var sql = "delete from scl_file "
-                + " where id            = ?"
-                + " and   type          = ?"
-                + " and   major_version = ? "
-                + " and   minor_version = ? "
-                + " and   patch_version = ? ";
+        var sql = DELETE_FROM_CLAUSE
+                + WHERE_CLAUSE + FILTER_ON_ID
+                + AND_CLAUSE + FILTER_ON_TYPE
+                + AND_CLAUSE + FILTER_ON_VERSION;
+        
         try (var connection = dataSource.getConnection();
              var stmt = connection.prepareStatement(sql)) {
             stmt.setObject(1, id);