aboutsummaryrefslogtreecommitdiffstats
path: root/feature-active-standby-management/src/main/java
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2021-02-09 11:01:43 -0500
committerJim Hahn <jrh3@att.com>2021-02-09 15:45:13 -0500
commit6127b4d50fccaa2e59f9e40910861260eb695c15 (patch)
tree0bd2ee574316e82db5538332bb7bd87f4b479a10 /feature-active-standby-management/src/main/java
parent208be1c545895cf61bc38fbc7bc5e9e45d085016 (diff)
Upgrade dependencies
Changes to eclipselink are incompatible with javax-persistence-api so removed the latter. Also added target-database property. Also replaced string constants with eclipselink constants. Per review comments, moved target-database values to property files. Issue-ID: POLICY-3005 Change-Id: I043203a952d54406a5996c1e8b5ba8936bf558c0 Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'feature-active-standby-management/src/main/java')
-rw-r--r--feature-active-standby-management/src/main/java/org/onap/policy/drools/activestandby/ActiveStandbyFeature.java21
-rw-r--r--feature-active-standby-management/src/main/java/org/onap/policy/drools/activestandby/ActiveStandbyProperties.java12
2 files changed, 19 insertions, 14 deletions
diff --git a/feature-active-standby-management/src/main/java/org/onap/policy/drools/activestandby/ActiveStandbyFeature.java b/feature-active-standby-management/src/main/java/org/onap/policy/drools/activestandby/ActiveStandbyFeature.java
index 7e853990..bd3f0215 100644
--- a/feature-active-standby-management/src/main/java/org/onap/policy/drools/activestandby/ActiveStandbyFeature.java
+++ b/feature-active-standby-management/src/main/java/org/onap/policy/drools/activestandby/ActiveStandbyFeature.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* feature-active-standby-management
* ================================================================================
- * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2021 AT&T Intellectual Property. 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.
@@ -26,6 +26,7 @@ import java.util.Map;
import java.util.Properties;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
+import org.eclipse.persistence.config.PersistenceUnitProperties;
import org.onap.policy.common.im.MonitorTime;
import org.onap.policy.drools.core.PolicySessionFeatureApi;
import org.onap.policy.drools.features.PolicyEngineFeatureApi;
@@ -187,14 +188,16 @@ public class ActiveStandbyFeature implements ActiveStandbyFeatureApi,
public static DroolsPdpsConnector getDroolsPdpsConnector(String pu) {
Map<String, Object> propMap = new HashMap<>();
- propMap.put("javax.persistence.jdbc.driver", ActiveStandbyProperties
- .getProperty(ActiveStandbyProperties.DB_DRIVER));
- propMap.put("javax.persistence.jdbc.url",
- ActiveStandbyProperties.getProperty(ActiveStandbyProperties.DB_URL));
- propMap.put("javax.persistence.jdbc.user", ActiveStandbyProperties
- .getProperty(ActiveStandbyProperties.DB_USER));
- propMap.put("javax.persistence.jdbc.password",
- ActiveStandbyProperties.getProperty(ActiveStandbyProperties.DB_PWD));
+ propMap.put(PersistenceUnitProperties.JDBC_DRIVER,
+ ActiveStandbyProperties.getProperty(ActiveStandbyProperties.DB_DRIVER));
+ propMap.put(PersistenceUnitProperties.JDBC_URL,
+ ActiveStandbyProperties.getProperty(ActiveStandbyProperties.DB_URL));
+ propMap.put(PersistenceUnitProperties.JDBC_USER,
+ ActiveStandbyProperties.getProperty(ActiveStandbyProperties.DB_USER));
+ propMap.put(PersistenceUnitProperties.JDBC_PASSWORD,
+ ActiveStandbyProperties.getProperty(ActiveStandbyProperties.DB_PWD));
+ propMap.put(PersistenceUnitProperties.TARGET_DATABASE,
+ ActiveStandbyProperties.getProperty(ActiveStandbyProperties.DB_TYPE));
EntityManagerFactory emf = Persistence.createEntityManagerFactory(
pu, propMap);
diff --git a/feature-active-standby-management/src/main/java/org/onap/policy/drools/activestandby/ActiveStandbyProperties.java b/feature-active-standby-management/src/main/java/org/onap/policy/drools/activestandby/ActiveStandbyProperties.java
index 3a0ba4d1..ebe57567 100644
--- a/feature-active-standby-management/src/main/java/org/onap/policy/drools/activestandby/ActiveStandbyProperties.java
+++ b/feature-active-standby-management/src/main/java/org/onap/policy/drools/activestandby/ActiveStandbyProperties.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* feature-active-standby-management
* ================================================================================
- * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019, 2021 AT&T Intellectual Property. 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.
@@ -21,6 +21,7 @@
package org.onap.policy.drools.activestandby;
import java.util.Properties;
+import org.eclipse.persistence.config.PersistenceUnitProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,10 +40,11 @@ public class ActiveStandbyProperties {
/*
* feature-active-standby-management.properties parameter key values
*/
- public static final String DB_DRIVER = "javax.persistence.jdbc.driver";
- public static final String DB_URL = "javax.persistence.jdbc.url";
- public static final String DB_USER = "javax.persistence.jdbc.user";
- public static final String DB_PWD = "javax.persistence.jdbc.password";
+ public static final String DB_DRIVER = PersistenceUnitProperties.JDBC_DRIVER;
+ public static final String DB_URL = PersistenceUnitProperties.JDBC_URL;
+ public static final String DB_USER = PersistenceUnitProperties.JDBC_USER;
+ public static final String DB_PWD = PersistenceUnitProperties.JDBC_PASSWORD;
+ public static final String DB_TYPE = PersistenceUnitProperties.TARGET_DATABASE;
private static Properties properties = null;