JUnit/SONAR/Checkstyle in ONAP-REST

Second batch of JPA pojos (B-D), with JUnit added and SONAR/Checkstyle
issues addressed. In cases where a class name change caused an update in
another package, the license header on files for those knock on changes
are not updated.

Issue-ID: POLICY-2131
Change-Id: I9466f27ffa606001209ed978be592ae95d1b32c4
Signed-off-by: liamfallon <liam.fallon@est.tech>

2 files changed, 5 insertions, 5 deletions

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateBRMSParamController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateBRMSParamController.java
index 244b7fd95..143d675bf 100644
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateBRMSParamController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateBRMSParamController.java
@@ -62,7 +62,7 @@ import org.onap.policy.common.logging.flexlogger.FlexLogger;
 import org.onap.policy.common.logging.flexlogger.Logger;
 import org.onap.policy.rest.adapter.PolicyRestAdapter;
 import org.onap.policy.rest.dao.CommonClassDao;
-import org.onap.policy.rest.jpa.BRMSParamTemplate;
+import org.onap.policy.rest.jpa.BrmsParamTemplate;
 import org.onap.policy.rest.jpa.PolicyEntity;
 import org.onap.policy.utils.PolicyUtils;
 import org.onap.policy.xacml.api.XACMLErrorConstants;
@@ -131,9 +131,9 @@ public class CreateBRMSParamController extends RestrictedBaseController {
     }
 
     private String findRule(String ruleTemplate) {
-        List<Object> datas = commonClassDao.getDataById(BRMSParamTemplate.class, "ruleName", ruleTemplate);
+        List<Object> datas = commonClassDao.getDataById(BrmsParamTemplate.class, "ruleName", ruleTemplate);
         if (CollectionUtils.isNotEmpty(datas)) {
-            return ((BRMSParamTemplate) datas.get(0)).getRule();
+            return ((BrmsParamTemplate) datas.get(0)).getRule();
         }
         return null;
     }
diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyExportAndImportController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyExportAndImportController.java
index 8f508ca31..651ee7e3a 100644
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyExportAndImportController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyExportAndImportController.java
@@ -55,7 +55,7 @@ import org.onap.policy.rest.adapter.PolicyExportAdapter;
 import org.onap.policy.rest.dao.CommonClassDao;
 import org.onap.policy.rest.jpa.ActionBodyEntity;
 import org.onap.policy.rest.jpa.ConfigurationDataEntity;
-import org.onap.policy.rest.jpa.DCAEuuid;
+import org.onap.policy.rest.jpa.DcaeUuid;
 import org.onap.policy.rest.jpa.GroupPolicyScopeList;
 import org.onap.policy.rest.jpa.MicroServiceConfigName;
 import org.onap.policy.rest.jpa.MicroServiceLocation;
@@ -432,7 +432,7 @@ public class PolicyExportAndImportController extends RestrictedBaseController {
     private String validUuid(String uuid) {
         String message = null;
         if (uuid != null) {
-            List<String> uuids = commonClassDao.getDataByColumn(DCAEuuid.class, "name");
+            List<String> uuids = commonClassDao.getDataByColumn(DcaeUuid.class, "name");
             if (uuids != null && !(uuids.stream().filter(o -> o.equals(uuid)).findFirst().isPresent())) {
                 message = POLICY + policyName + " uuid: " + uuid + NOTVALID;
             }