[fineract-cn-postgresql] 06/23: Added password attribute to tenant domain transfer object

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juhan pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-postgresql.git

commit 643db751aa24205684946d5037273ee2bdbb1159
Author: Isaac Kamga <u2...@gmail.com>
AuthorDate: Thu May 2 02:45:13 2019 +0100

    Added password attribute to tenant domain transfer object
---
 .../fineract/cn/postgresql/domain/ContextAwareRoutingDataSource.java | 4 +++-
 src/main/java/org/apache/fineract/cn/postgresql/domain/Tenant.java   | 5 +++++
 .../org/apache/fineract/cn/postgresql/util/JdbcUrlBuilderTest.java   | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/fineract/cn/postgresql/domain/ContextAwareRoutingDataSource.java b/src/main/java/org/apache/fineract/cn/postgresql/domain/ContextAwareRoutingDataSource.java
index d3df26f..72b310a 100644
--- a/src/main/java/org/apache/fineract/cn/postgresql/domain/ContextAwareRoutingDataSource.java
+++ b/src/main/java/org/apache/fineract/cn/postgresql/domain/ContextAwareRoutingDataSource.java
@@ -81,6 +81,7 @@ public final class ContextAwareRoutingDataSource extends AbstractRoutingDataSour
           .instanceName(tenant.getDatabaseName())
           .build());
       tenantDataSource.setUsername(tenant.getUser());
+      tenantDataSource.setPassword(tenant.getPassword());
 
       final BoneCPDataSource boneCpMetaDataSource = (BoneCPDataSource) this.metaDataSource;
       tenantDataSource.setIdleConnectionTestPeriodInMinutes(boneCpMetaDataSource.getIdleConnectionTestPeriodInMinutes());
@@ -99,7 +100,7 @@ public final class ContextAwareRoutingDataSource extends AbstractRoutingDataSour
   private void readAdditionalTenantInformation(final Tenant tenant) {
     this.logger.info("Reading additional information for {}.", tenant.getIdentifier());
     @SuppressWarnings({"SqlDialectInspection", "SqlNoDataSourceInspection"})
-    final String query = "SELECT driver_class, database_name, host, port, a_user FROM seshat.tenants WHERE identifier = ?";
+    final String query = "SELECT driver_class, database_name, host, port, a_user, pwd FROM tenants WHERE identifier = ?";
     try (final Connection connection = this.metaDataSource.getConnection()) {
       try (final PreparedStatement preparedStatement = connection.prepareStatement(query)) {
         preparedStatement.setString(1, tenant.getIdentifier());
@@ -110,6 +111,7 @@ public final class ContextAwareRoutingDataSource extends AbstractRoutingDataSour
           tenant.setHost(resultSet.getString("host"));
           tenant.setPort(resultSet.getString("port"));
           tenant.setUser(resultSet.getString("a_user"));
+          tenant.setPassword(resultSet.getString("pwd"));
         }
       }
     } catch (SQLException ex) {
diff --git a/src/main/java/org/apache/fineract/cn/postgresql/domain/Tenant.java b/src/main/java/org/apache/fineract/cn/postgresql/domain/Tenant.java
index 3bb7ef0..9b1d8d2 100644
--- a/src/main/java/org/apache/fineract/cn/postgresql/domain/Tenant.java
+++ b/src/main/java/org/apache/fineract/cn/postgresql/domain/Tenant.java
@@ -27,6 +27,7 @@ public final class Tenant {
   private String host;
   private String port;
   private String user;
+  private String password;
 
   public Tenant(final String identifier) {
     super();
@@ -76,4 +77,8 @@ public final class Tenant {
   public void setUser(String user) {
     this.user = user;
   }
+
+  public String getPassword() { return password; }
+
+  public void setPassword(String password) { this.password = password; }
 }
diff --git a/src/test/java/org/apache/fineract/cn/postgresql/util/JdbcUrlBuilderTest.java b/src/test/java/org/apache/fineract/cn/postgresql/util/JdbcUrlBuilderTest.java
index c5ffe4b..242209b 100644
--- a/src/test/java/org/apache/fineract/cn/postgresql/util/JdbcUrlBuilderTest.java
+++ b/src/test/java/org/apache/fineract/cn/postgresql/util/JdbcUrlBuilderTest.java
@@ -47,7 +47,7 @@ public class JdbcUrlBuilderTest {
   }
 
   @Test
-  public void shouldCreateMysqlUrlNoInstance() {
+  public void shouldCreatePostgresqlUrlNoInstance() {
     final String expectedJdbcUrl = "jdbc:postgresql://localhost:5432";
 
     final String postgresqlJdbcUrl = JdbcUrlBuilder
@@ -59,7 +59,7 @@ public class JdbcUrlBuilderTest {
   }
 
   @Test
-  public void shouldCreateMysqlReplicationUrl() {
+  public void shouldCreatePostgresqlReplicationUrl() {
     final String expectedJdbcUrl = "jdbc:postgresql:replication://localhost:5432,anotherhost:5432/comp_test";
 
     final String mariaDbJdbcUrl = JdbcUrlBuilder