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>

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 36ab893..c728f3b 100644 (file)
--- 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 7be9501..057666e 100644 (file)
--- 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 b44841c..b431327 100644 (file)
--- 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>