summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2019-11-11 14:32:15 -0500
committerJim Hahn <jrh3@att.com>2019-11-11 17:03:19 -0500
commit2ee068fed59becbd3327937125264bdcf651f7b8 (patch)
treec7043ec553f7033385b3c5f4fb774364c8123a95
parent06d340b835b9c6a6881941b6ba27940018990612 (diff)
Fix table names for CSIT issue
Changed the table name in multiple files. Backed out some changes per review comments. Change-Id: I31f75ebdef4aa70aff841c8a52185f6ab8a4e329 Issue-ID: POLICY-2131 Signed-off-by: Jim Hahn <jrh3@att.com>
-rw-r--r--ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateBrmsParamPolicy.java2
-rw-r--r--ONAP-PAP-REST/src/main/resources/META-INF/persistence.xml8
-rw-r--r--ONAP-PDP-REST/src/test/resources/META-INF/persistence.xml8
3 files changed, 9 insertions, 9 deletions
diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateBrmsParamPolicy.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateBrmsParamPolicy.java
index 36ab893fe..c728f3bff 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateBrmsParamPolicy.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateBrmsParamPolicy.java
@@ -184,7 +184,7 @@ public class CreateBrmsParamPolicy extends Policy {
private String getValueFromDictionary(String templateName) {
String ruleTemplate = null;
CommonClassDaoImpl dbConnection = new CommonClassDaoImpl();
- String queryString = "from BRMSParamTemplate where param_template_name= :templateName";
+ String queryString = "from BrmsParamTemplate where param_template_name= :templateName";
SimpleBindings params = new SimpleBindings();
params.put("templateName", templateName);
List<Object> result = dbConnection.getDataByQuery(queryString, params);
diff --git a/ONAP-PAP-REST/src/main/resources/META-INF/persistence.xml b/ONAP-PAP-REST/src/main/resources/META-INF/persistence.xml
index 7be95014d..057666ee6 100644
--- a/ONAP-PAP-REST/src/main/resources/META-INF/persistence.xml
+++ b/ONAP-PAP-REST/src/main/resources/META-INF/persistence.xml
@@ -40,7 +40,7 @@
<class>org.onap.policy.rest.jpa.ActionPolicyDict</class>
<class>org.onap.policy.rest.jpa.DecisionSettings</class>
<class>org.onap.policy.rest.jpa.MicroServiceModels</class>
- <class>org.onap.policy.rest.jpa.BRMSParamTemplate</class>
+ <class>org.onap.policy.rest.jpa.BrmsParamTemplate</class>
<class>org.onap.policy.rest.jpa.PolicyEditorScopes</class>
<!-- unique to PolicyEngineUtils - will be audited from PAP -->
<class>org.onap.policy.jpa.BackUpMonitorEntity</class>
@@ -131,11 +131,11 @@
<class>org.onap.policy.rest.jpa.ActionList</class>
<class>org.onap.policy.rest.jpa.AddressGroup</class>
<class>org.onap.policy.rest.jpa.AttributeAssignment</class>
- <class>org.onap.policy.rest.jpa.BRMSParamTemplate</class>
+ <class>org.onap.policy.rest.jpa.BrmsParamTemplate</class>
<class>org.onap.policy.rest.jpa.ClosedLoopD2Services</class>
<class>org.onap.policy.rest.jpa.ClosedLoopSite</class>
- <class>org.onap.policy.rest.jpa.DCAEUsers</class>
- <class>org.onap.policy.rest.jpa.DCAEuuid</class>
+ <class>org.onap.policy.rest.jpa.DcaeUsers</class>
+ <class>org.onap.policy.rest.jpa.Dcaeuuid</class>
<class>org.onap.policy.rest.jpa.DescriptiveScope</class>
<class>org.onap.policy.rest.jpa.OnapName</class>
<class>org.onap.policy.rest.jpa.EnforcingType</class>
diff --git a/ONAP-PDP-REST/src/test/resources/META-INF/persistence.xml b/ONAP-PDP-REST/src/test/resources/META-INF/persistence.xml
index b44841c9d..b4313271e 100644
--- a/ONAP-PDP-REST/src/test/resources/META-INF/persistence.xml
+++ b/ONAP-PDP-REST/src/test/resources/META-INF/persistence.xml
@@ -40,7 +40,7 @@
<class>org.onap.policy.rest.jpa.ActionPolicyDict</class>
<class>org.onap.policy.rest.jpa.DecisionSettings</class>
<class>org.onap.policy.rest.jpa.MicroServiceModels</class>
- <class>org.onap.policy.rest.jpa.BRMSParamTemplate</class>
+ <class>org.onap.policy.rest.jpa.BrmsParamTemplate</class>
<class>org.onap.policy.rest.jpa.PolicyEditorScopes</class>
<!-- unique to PolicyEngineUtils - will be audited from PAP -->
<class>org.onap.policy.jpa.BackUpMonitorEntity</class>
@@ -131,11 +131,11 @@
<class>org.onap.policy.rest.jpa.ActionList</class>
<class>org.onap.policy.rest.jpa.AddressGroup</class>
<class>org.onap.policy.rest.jpa.AttributeAssignment</class>
- <class>org.onap.policy.rest.jpa.BRMSParamTemplate</class>
+ <class>org.onap.policy.rest.jpa.BrmsParamTemplate</class>
<class>org.onap.policy.rest.jpa.ClosedLoopD2Services</class>
<class>org.onap.policy.rest.jpa.ClosedLoopSite</class>
- <class>org.onap.policy.rest.jpa.DCAEUsers</class>
- <class>org.onap.policy.rest.jpa.DCAEuuid</class>
+ <class>org.onap.policy.rest.jpa.DcaeUsers</class>
+ <class>org.onap.policy.rest.jpa.Dcaeuuid</class>
<class>org.onap.policy.rest.jpa.DescriptiveScope</class>
<class>org.onap.policy.rest.jpa.OnapName</class>
<class>org.onap.policy.rest.jpa.EnforcingType</class>