diff options
Diffstat (limited to 'models-provider/src/main/java')
2 files changed, 3 insertions, 13 deletions
diff --git a/models-provider/src/main/java/org/onap/policy/models/provider/PolicyModelsProviderParameters.java b/models-provider/src/main/java/org/onap/policy/models/provider/PolicyModelsProviderParameters.java index bcf9ec11e..e2784b040 100644 --- a/models-provider/src/main/java/org/onap/policy/models/provider/PolicyModelsProviderParameters.java +++ b/models-provider/src/main/java/org/onap/policy/models/provider/PolicyModelsProviderParameters.java @@ -2,6 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2019 Nordix Foundation. * Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2020 Bell Canada. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,7 +40,7 @@ import org.onap.policy.models.provider.impl.DatabasePolicyModelsProviderImpl; * defaults to {@link DatabasePolicyModelsProviderImpl} and may not be null * <li>databaseUrl: The JDBC URL for the database, mandatory. * <li>databaseUser: The user id to use for connecting to the database, optional, defaults to null. - * <li>databasePassword: The password to use for connecting to the database encoded in Base64, optional, + * <li>databasePassword: The password to use for connecting to the database, optional, * defaults to null. * <li>persistenceUnit: The persistence unit refined in META-INF/persistence.xml to use for connecting * to the database, mandatory. diff --git a/models-provider/src/main/java/org/onap/policy/models/provider/impl/DatabasePolicyModelsProviderImpl.java b/models-provider/src/main/java/org/onap/policy/models/provider/impl/DatabasePolicyModelsProviderImpl.java index 77a72adb0..e27b9a43c 100644 --- a/models-provider/src/main/java/org/onap/policy/models/provider/impl/DatabasePolicyModelsProviderImpl.java +++ b/models-provider/src/main/java/org/onap/policy/models/provider/impl/DatabasePolicyModelsProviderImpl.java @@ -22,7 +22,6 @@ package org.onap.policy.models.provider.impl; -import java.util.Base64; import java.util.Date; import java.util.List; import java.util.Properties; @@ -95,15 +94,12 @@ public class DatabasePolicyModelsProviderImpl implements PolicyModelsProvider { daoParameters.setPluginClass(DefaultPfDao.class.getName()); daoParameters.setPersistenceUnit(parameters.getPersistenceUnit()); - // Decode the password using Base64 - String decodedPassword = new String(Base64.getDecoder().decode(getValue(parameters.getDatabasePassword()))); - // @formatter:off Properties jdbcProperties = new Properties(); jdbcProperties.setProperty(PersistenceUnitProperties.JDBC_DRIVER, parameters.getDatabaseDriver()); jdbcProperties.setProperty(PersistenceUnitProperties.JDBC_URL, parameters.getDatabaseUrl()); jdbcProperties.setProperty(PersistenceUnitProperties.JDBC_USER, parameters.getDatabaseUser()); - jdbcProperties.setProperty(PersistenceUnitProperties.JDBC_PASSWORD, decodedPassword); + jdbcProperties.setProperty(PersistenceUnitProperties.JDBC_PASSWORD, parameters.getDatabasePassword()); // @formatter:on daoParameters.setJdbcProperties(jdbcProperties); @@ -120,13 +116,6 @@ public class DatabasePolicyModelsProviderImpl implements PolicyModelsProvider { } } - private String getValue(final String value) { - if (value != null && value.startsWith("${") && value.endsWith("}")) { - return System.getenv(value.substring(2, value.length() - 1)); - } - return value; - } - @Override public void close() throws PfModelException { LOGGER.debug("closing the database connection to {} using persistence unit {}", parameters.getDatabaseUrl(), |