From 5e1e346a52256acec1491f3380b516669869a06d Mon Sep 17 00:00:00 2001
From: Stanislav Riabokon <Stanislav_Riabokon@epam.com>
Date: Mon, 17 Jan 2022 17:24:50 +0400
Subject: [PATCH] Fixed changes.
---
.../mappers/osm/PgTenantOsmDestinationResolver.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/provider/legal-gcp/src/main/java/org/opengroup/osdu/legal/mappers/osm/PgTenantOsmDestinationResolver.java b/provider/legal-gcp/src/main/java/org/opengroup/osdu/legal/mappers/osm/PgTenantOsmDestinationResolver.java
index 996879e8b..d8a7d3933 100644
--- a/provider/legal-gcp/src/main/java/org/opengroup/osdu/legal/mappers/osm/PgTenantOsmDestinationResolver.java
+++ b/provider/legal-gcp/src/main/java/org/opengroup/osdu/legal/mappers/osm/PgTenantOsmDestinationResolver.java
@@ -54,8 +54,10 @@ public class PgTenantOsmDestinationResolver implements PgDestinationResolver {
private final PgOsmConfigurationProperties properties;
- private static final String DATASOURCE = ".datasource.";
- private static final String PASSWORD = DATASOURCE.concat("password");
+ private final static String DATASOURCE = ".datasource.";
+ private final static String URL = DATASOURCE.concat("url");
+ private final static String USERNAME = DATASOURCE.concat("username");
+ private final static String PASSWORD = DATASOURCE.concat("password");
private static final String DRIVER_CLASS_NAME = "org.postgresql.Driver";
@@ -82,10 +84,9 @@ public class PgTenantOsmDestinationResolver implements PgDestinationResolver {
}
Map<String, Property> partitionProperties = partitionInfo.getProperties();
- String url = "jdbc:postgresql://localhost:5432/postgres";//getPartitionProperty(partitionId, partitionProperties, URL);
- String username = "postgres";//getPartitionProperty(partitionId, partitionProperties, USERNAME);
- String password = "st4s";
- getPartitionProperty(partitionId, partitionProperties, PASSWORD);
+ String url = getPartitionProperty(partitionId, partitionProperties, URL);
+ String username = getPartitionProperty(partitionId, partitionProperties, USERNAME);
+ String password = getPartitionProperty(partitionId, partitionProperties, PASSWORD);
dataSource = DataSourceBuilder.create()
.driverClassName(DRIVER_CLASS_NAME)
--
GitLab