diff options
| author |   Ram Krishna Verma <ram_krishna.verma@bell.ca> | 2021-02-09 21:53:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-02-09 21:53:28 +0000 |
| commit | c3c83896d877602ead85c32215761b3d3555facb (patch) | |
| tree | 65071b96574d23609b64384a2e18b5018508a79b /feature-state-management/src/main/java/org | |
| parent | 13ab17b2050ecfe5265c8fc347fa0960bac185d7 (diff) | |
| parent | 6127b4d50fccaa2e59f9e40910861260eb695c15 (diff) | |
Merge "Upgrade dependencies"
Diffstat (limited to 'feature-state-management/src/main/java/org')
2 files changed, 9 insertions, 6 deletions
diff --git a/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/DroolsPdpIntegrityMonitor.java b/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/DroolsPdpIntegrityMonitor.java index 08c8e3a5..081a8292 100644 --- a/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/DroolsPdpIntegrityMonitor.java +++ b/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/DroolsPdpIntegrityMonitor.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * feature-state-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. @@ -116,6 +116,7 @@ public class DroolsPdpIntegrityMonitor extends IntegrityMonitor { checkPropError(stateManagementProperties, StateManagementProperties.SITE_NAME); checkPropError(stateManagementProperties, StateManagementProperties.NODE_TYPE); checkPropError(stateManagementProperties, StateManagementProperties.DEPENDENCY_GROUPS); + checkPropError(stateManagementProperties, StateManagementProperties.DB_TYPE); checkPropError(stateManagementProperties, StateManagementProperties.DB_DRIVER); checkPropError(stateManagementProperties, StateManagementProperties.DB_URL); checkPropError(stateManagementProperties, StateManagementProperties.DB_USER); diff --git a/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/StateManagementProperties.java b/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/StateManagementProperties.java index d7f15883..20494b0f 100644 --- a/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/StateManagementProperties.java +++ b/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/StateManagementProperties.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * feature-state-management * ================================================================================ - * Copyright (C) 2017-2018, 2020 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2018, 2020-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.statemanagement; import java.util.Properties; +import org.eclipse.persistence.config.PersistenceUnitProperties; import org.onap.policy.common.endpoints.properties.PolicyEndPointProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,10 +34,11 @@ public class StateManagementProperties { public static final String NODE_TYPE = "node_type"; public static final String SITE_NAME = "site_name"; - 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; public static final String TEST_SERVICES = PolicyEndPointProperties.PROPERTY_HTTP_SERVER_SERVICES; public static final String TEST_SERVICES_DEFAULT = "TEST"; |