Merge pull request #1 from blockwarecom/DEXI-505

Dexi 505

Author: hofmeister

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.blockware.spring-boot</groupId>
     <artifactId>sqldb-postgresql</artifactId>
-    <version>0.0.3</version>
+    <version>0.0.4</version>
 
     <licenses>
         <license>
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>com.blockware.spring-boot</groupId>
             <artifactId>spring-boot</artifactId>
-            <version>0.0.5</version>
+            <version>0.0.6</version>
         </dependency>
     </dependencies>
 

src/main/java/com/blockware/spring/annotation/BlockwareEnablePostgres.java

@@ -1,6 +1,6 @@
 package com.blockware.spring.annotation;
 
-import com.blockware.spring.postgres.PostgresConfiguration;
+import com.blockware.spring.postgres.AbstractPostgresConfig;
 import org.springframework.context.annotation.Import;
 
 import java.lang.annotation.*;
@@ -9,8 +9,5 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @Inherited
-@Import({
-    PostgresConfiguration.class
-})
 public @interface BlockwareEnablePostgres {
 }

src/main/java/com/blockware/spring/postgres/PostgresConfiguration.java renamed to src/main/java/com/blockware/spring/postgres/AbstractPostgresConfig.java

@@ -6,14 +6,13 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Primary;
 
 import javax.sql.DataSource;
 import java.sql.*;
 import java.util.Optional;
 
 @Slf4j
-public class PostgresConfiguration {
+abstract public class AbstractPostgresConfig {
     private static final String RESOURCE_TYPE = "sqldb.blockware.com/v1/postgresql";
 
     private static final String PORT_TYPE = "postgres";
@@ -24,37 +23,37 @@ public class PostgresConfiguration {
     @Autowired
     private BlockwareClusterService blockwareClusterService;
 
-    private String getDatabaseName() {
-        return applicationName;
+    private final String resourceName;
+
+    public AbstractPostgresConfig(String resourceName) {
+        this.resourceName = resourceName;
     }
 
     @Bean
-    @Primary
     public DataSource dataSource() {
 
-        final BlockwareClusterService.ResourceInfo info = blockwareClusterService.getResourceInfo(RESOURCE_TYPE, PORT_TYPE);
+        final BlockwareClusterService.ResourceInfo info = blockwareClusterService.getResourceInfo(RESOURCE_TYPE, PORT_TYPE, resourceName);
         Optional<String> dbUsername = Optional.ofNullable(info.getCredentials().get("username"));
         Optional<String> dbPassword = Optional.ofNullable(info.getCredentials().get("password"));
 
+        String databaseName = String.valueOf(info.getOptions().getOrDefault("dbName", resourceName));
+
         String jdbcBaseUrl = String.format("jdbc:postgresql://%s:%s", info.getHost(), info.getPort());
 
-        log.info("Connecting to postgres server: {}", jdbcBaseUrl);
+        log.info("Connecting to postgres server: {} for database: {}", jdbcBaseUrl, databaseName);
 
-        String jdbcUrl = String.format("%s/%s", jdbcBaseUrl, getDatabaseName());
+        String jdbcUrl = String.format("%s/%s", jdbcBaseUrl, databaseName);
 
         final DataSourceBuilder<?> builder = DataSourceBuilder.create();
 
         builder.url(jdbcUrl);
 
-        if (dbUsername.isPresent()) {
-            builder.username(dbUsername.get())
-                    .password(dbPassword.orElse(""));
-        }
-
+        dbUsername.ifPresent(s -> builder.username(s)
+                .password(dbPassword.orElse("")));
 
         try {
             ensureDatabase(jdbcBaseUrl,
-                getDatabaseName(),
+                databaseName,
                 dbUsername.orElse(null),
                 dbPassword.orElse(null)
             );