Merge pull request #303 from iti-ict/bugfix/database/291-connection-e…

…rror-at-startup bugfix/Databas/connection error
iti-ict · Sep 23, 2024 · 99b5952 · 99b5952
2 parents d957137 + d105ded
commit 99b5952
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/plugins/db-wakamiti-plugin/CHANGELOG.md b/plugins/db-wakamiti-plugin/CHANGELOG.md
@@ -6,10 +6,16 @@ The format is based on [Keep a Changelog][1],
 and this project adheres to [Semantic Versioning][2].
 
 
+## [unreleased]
+
+### Fixed
+- Connection error at startup when no configuration is provided. [#291]
+
+
 ## [3.2.0] - 2024-09-09
 
 ### Fixed
-- Row with all values set to null in xls file. (#267)
+- Row with all values set to null in xls file. [#267]
 - DateTime timezone issues.
 
 ### Added

diff --git a/plugins/db-wakamiti-plugin/pom.xml b/plugins/db-wakamiti-plugin/pom.xml
@@ -18,7 +18,7 @@
 
 
     <artifactId>db-wakamiti-plugin</artifactId>
-    <version>3.2.0</version>
+    <version>3.2.1-SNAPSHOT</version>
 
     <name>[Wakamiti Plugin] Database Steps</name>
     <description>Database steps for Wakamiti</description>
@@ -229,14 +229,13 @@
                         <executions>
                             <execution>
                                 <id>test</id>
-                                <phase>integration-test</phase>
+                                <phase>install</phase>
                                 <goals>
                                     <goal>exec</goal>
                                 </goals>
                             </execution>
                         </executions>
                         <configuration>
-                            <includeProjectDependencies>true</includeProjectDependencies>
                             <executable>docker</executable>
                             <arguments>
                                 <argument>run</argument>

diff --git a/.../db-wakamiti-plugin/src/main/java/es/iti/wakamiti/database/DatabaseConfigContributor.java b/.../db-wakamiti-plugin/src/main/java/es/iti/wakamiti/database/DatabaseConfigContributor.java
@@ -89,7 +89,7 @@ private void configure(DatabaseStepContributor contributor, Configuration config
                     .map(key -> key.split("\\.")[0])
                     .collect(Collectors.toSet())
                     .forEach(alias -> contributor.addConnection(alias, parameters(datasourceConfig.inner(alias))));
-        } else {
+        } else if (databaseConfig.keyStream().anyMatch(k -> k.startsWith("connection"))) {
             contributor.addConnection(parameters(databaseConfig));
         }
 

diff --git a/...b-wakamiti-plugin/src/test/java/es/iti/wakamiti/database/DatabaseStepContributorTest.java b/...b-wakamiti-plugin/src/test/java/es/iti/wakamiti/database/DatabaseStepContributorTest.java
@@ -129,7 +129,7 @@ public void testConnectionWhenNoDatabasesFound() {
 
             // Check
         } catch (WakamitiException e) {
-            assertThat(e).hasMessage("Bad jdbc url");
+            assertThat(e).hasMessage("There is no default connection");
             throw e;
         }
     }