Merge pull request #144 from com-pas/implement-postgresql-repo

PostgreSQL Implementation of the Repository

Author: Rob Tjalma

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

@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.lfenergy.compas.scl.data.rest;
 
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import org.lfenergy.compas.core.commons.ElementConverter;
 import org.lfenergy.compas.scl.data.util.SclDataModelMarshaller;
 import org.lfenergy.compas.scl.data.util.SclElementProcessor;
@@ -12,6 +13,13 @@
 /**
  * Create Beans from other dependencies that are used in the application.
  */
+@RegisterForReflection(
+        targets = {
+                org.lfenergy.compas.core.jaxrs.model.ErrorMessage.class,
+                org.lfenergy.compas.core.jaxrs.model.ErrorResponse.class,
+                org.lfenergy.compas.scl.data.model.SclMetaInfo.class,
+                org.lfenergy.compas.scl.data.model.ObjectFactory.class
+        })
 public class CompasSclDataServiceConfiguration {
     @Produces
     public ElementConverter createElementConverter() {

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

@@ -47,14 +47,14 @@ docker run --rm --name compas_postgres \
 You can run the following command to build the BaseX version of the application.
 
 ```shell script
-./mvnw -P !basex,postgres clean verify
+./mvnw -P postgres 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 !basex,postgres -DskipTests=true -Dquarkus.profile=dev,prod-postgres package io.quarkus:quarkus-maven-plugin::dev
+./mvnw -P postgres -DskipTests=true -Dquarkus.profile=dev,prod-postgres package io.quarkus:quarkus-maven-plugin::dev
 ```
 

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

@@ -35,7 +35,6 @@ SPDX-License-Identifier: Apache-2.0
         <slf4j.version>1.7.32</slf4j.version>
 
         <!-- Test -->
-        <basex.version>9.2.4</basex.version>
         <junit-jupiter.version>5.8.1</junit-jupiter.version>
         <mockito-junit-jupiter.version>4.0.0</mockito-junit-jupiter.version>
         <openpojo.version>0.9.1</openpojo.version>
@@ -151,10 +150,13 @@ SPDX-License-Identifier: Apache-2.0
 
             <!-- Test -->
             <dependency>
-                <groupId>org.basex</groupId>
-                <artifactId>basex</artifactId>
-                <version>${basex.version}</version>
+                <groupId>org.lfenergy.compas.scl.data</groupId>
+                <artifactId>repository</artifactId>
+                <version>${project.version}</version>
+                <type>test-jar</type>
+                <scope>test</scope>
             </dependency>
+
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-api</artifactId>
@@ -214,6 +216,13 @@ SPDX-License-Identifier: Apache-2.0
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
                     <version>3.2.0</version>
+                    <executions>
+                      <execution>
+                        <goals>
+                          <goal>test-jar</goal>
+                        </goals>
+                      </execution>
+                    </executions>
                 </plugin>
             </plugins>
         </pluginManagement>

doc/postgresql.md

@@ -17,6 +17,10 @@ SPDX-License-Identifier: Apache-2.0
     <artifactId>repository-basex</artifactId>
     <packaging>jar</packaging>
 
+    <properties>
+        <basex.version>9.2.4</basex.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.lfenergy.compas.scl.data</groupId>
@@ -51,11 +55,19 @@ SPDX-License-Identifier: Apache-2.0
         </dependency>
 
         <!-- Test Dependencies -->
+        <dependency>
+            <groupId>org.lfenergy.compas.scl.data</groupId>
+            <artifactId>repository</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.basex</groupId>
             <artifactId>basex</artifactId>
+            <version>${basex.version}</version>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>

pom.xml

@@ -110,7 +110,7 @@ public List<Item> list(SclType type) {
 
     @Override
     public List<Item> listVersionsByUUID(SclType type, UUID id) {
-        var items = executeQuery(type, DECLARE_SCL_NS_URI +
+        return executeQuery(type, DECLARE_SCL_NS_URI +
                         DECLARE_COMPAS_NAMESPACE +
                         format(DECLARE_DB_VARIABLE, type) +
                         format(DECLARE_ID_VARIABLE, id) +
@@ -125,12 +125,6 @@ public List<Item> listVersionsByUUID(SclType type, UUID id) {
                         "   order by $majorVersion, $minorVersion, $patchVersion\n" +
                         "   return '<Item xmlns=\"" + SCL_DATA_SERVICE_V1_NS_URI + "\"><Id>' || $id || '</Id><Name>' || $name || '</Name><Version>' || $version || '</Version></Item>' ",
                 sclDataMarshaller::unmarshalItem);
-
-        if (items.isEmpty()) {
-            var message = String.format("No versions found for type '%s' with ID '%s'", type, id);
-            throw new CompasNoDataFoundException(message);
-        }
-        return items;
     }
 
     @Override
@@ -190,7 +184,8 @@ public SclMetaInfo findMetaInfoByUUID(SclType type, UUID id) {
     }
 
     @Override
-    public void create(SclType type, UUID id, String name, String scl, Version version) {
+    public void create(SclType type, UUID id, String name, String scl, Version version, String who) {
+        // Who is ignored in the BaseX implementation.
         var inputStream = new ReaderInputStream(new StringReader(scl), StandardCharsets.UTF_8);
         executeCommand(client -> {
             openDatabase(client, type);