ONAP-REST DAO Sonar/Checkstyle clean and knock-on

Clean up the ONAP-REST DAO package and also deal with knock-on chages in
other packages.

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

3 files changed, 63 insertions, 51 deletions

diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/dao/CommonClassDao.java b/ONAP-REST/src/main/java/org/onap/policy/rest/dao/CommonClassDao.java
index 0056a2bf5..6bc9a646e 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/dao/CommonClassDao.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/dao/CommonClassDao.java
@@ -3,6 +3,7 @@
  * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,37 +23,46 @@ package org.onap.policy.rest.dao;
 
 import java.util.List;
 
-import org.onap.policy.rest.jpa.PolicyRoles;
 import javax.script.SimpleBindings;
 
+import org.onap.policy.rest.jpa.PolicyRoles;
+
 public interface CommonClassDao {
 
-    //Common methods
+    // Common methods
     List<Object> getData(@SuppressWarnings("rawtypes") Class className);
+
     List<Object> getDataById(@SuppressWarnings("rawtypes") Class className, String columnName, String key);
+
     List<String> getDataByColumn(@SuppressWarnings("rawtypes") Class className, String columnName);
-    List<Object> checkDuplicateEntry(String value, String columnName,  @SuppressWarnings("rawtypes") Class className);
+
+    List<Object> checkDuplicateEntry(String value, String columnName, @SuppressWarnings("rawtypes") Class className);
+
     Object getEntityItem(@SuppressWarnings("rawtypes") Class className, String columnName, String key);
-    List<Object>  getDataByQuery(String query, SimpleBindings params);
-    List<Object>  getMultipleDataOnAddingConjunction(@SuppressWarnings("rawtypes") Class className, String columnName, List<String> data);
+
+    List<Object> getDataByQuery(String query, SimpleBindings params);
+
+    List<Object> getMultipleDataOnAddingConjunction(@SuppressWarnings("rawtypes") Class className, String columnName,
+            List<String> data);
+
     void save(Object entity);
+
     void delete(Object entity);
+
     void update(Object entity);
+
     void updateQuery(String query);
 
-    //Group Policy Scope
+    // Group Policy Scope
     List<Object> checkExistingGroupListforUpdate(String groupListValue, String groupNameValue);
 
-
-    //Roles
+    // Roles
     List<PolicyRoles> getUserRoles();
 
-
-    //ClosedLoops
+    // ClosedLoops
     void updateClAlarms(String clName, String alarms);
-    void updateClYaml(String clName, String yaml);
-    void deleteAll();
-
 
+    void updateClYaml(String clName, String yaml);
 
+    void deleteAll();
 }
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/dao/PolicyDBException.java b/ONAP-REST/src/main/java/org/onap/policy/rest/dao/PolicyDbException.java
index df6bf12b2..4a982ccc0 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/dao/PolicyDBException.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/dao/PolicyDbException.java
@@ -3,6 +3,7 @@
  * ONAP-REST
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,30 +22,30 @@
 package org.onap.policy.rest.dao;
 
 /**
- * PolicyDBException extends <code>Exception</code> to implement exceptions thrown by Policy Database transactions. 
- * 
+ * PolicyDBException extends <code>Exception</code> to implement exceptions thrown by Policy Database transactions.
+ *
  * @version 0.1
  */
-public class PolicyDBException extends Exception {
+public class PolicyDbException extends Exception {
     private static final long serialVersionUID = -6162444281003852781L;
 
-    public PolicyDBException() {
+    public PolicyDbException() {
         // Empty constructor
     }
-    
-    public PolicyDBException(String message) {
+
+    public PolicyDbException(String message) {
         super(message);
     }
-    
-    public PolicyDBException(Throwable cause){
+
+    public PolicyDbException(Throwable cause) {
         super(cause);
     }
-    
-    public PolicyDBException(String message, Throwable cause) {
+
+    public PolicyDbException(String message, Throwable cause) {
         super(message, cause);
     }
-    
-    public PolicyDBException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+
+    public PolicyDbException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
         super(message, cause, enableSuppression, writableStackTrace);
     }
 }
diff --git a/ONAP-REST/src/test/java/org/onap/policy/rest/dao/PolicyDBExceptionTest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/dao/PolicyDbExceptionTest.java
index 0cd89a40e..5293477e8 100644
--- a/ONAP-REST/src/test/java/org/onap/policy/rest/dao/PolicyDBExceptionTest.java
+++ b/ONAP-REST/src/test/java/org/onap/policy/rest/dao/PolicyDbExceptionTest.java
@@ -3,13 +3,14 @@
  * PolicyEngineUtils
  * ================================================================================
  * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,32 +24,32 @@ package org.onap.policy.rest.dao;
 import java.io.IOException;
 import org.junit.Test;
 
-public class PolicyDBExceptionTest {
-  @Test(expected = PolicyDBException.class)
-  public void testException1() throws PolicyDBException {
-    throw new PolicyDBException();
-  }
+public class PolicyDbExceptionTest {
+    @Test(expected = PolicyDbException.class)
+    public void testException1() throws PolicyDbException {
+        throw new PolicyDbException();
+    }
 
-  @Test(expected = PolicyDBException.class)
-  public void testException2() throws PolicyDBException {
-    throw new PolicyDBException("test");
-  }
+    @Test(expected = PolicyDbException.class)
+    public void testException2() throws PolicyDbException {
+        throw new PolicyDbException("test");
+    }
 
-  @Test(expected = PolicyDBException.class)
-  public void testException3() throws PolicyDBException {
-    Throwable cause = new IOException();
-    throw new PolicyDBException(cause);
-  }
+    @Test(expected = PolicyDbException.class)
+    public void testException3() throws PolicyDbException {
+        Throwable cause = new IOException();
+        throw new PolicyDbException(cause);
+    }
 
-  @Test(expected = PolicyDBException.class)
-  public void testException4() throws PolicyDBException {
-    Throwable cause = new IOException();
-    throw new PolicyDBException("test", cause);
-  }
+    @Test(expected = PolicyDbException.class)
+    public void testException4() throws PolicyDbException {
+        Throwable cause = new IOException();
+        throw new PolicyDbException("test", cause);
+    }
 
-  @Test(expected = PolicyDBException.class)
-  public void testException5() throws PolicyDBException {
-    Throwable cause = new IOException();
-    throw new PolicyDBException("test", cause, true, true);
-  }
+    @Test(expected = PolicyDbException.class)
+    public void testException5() throws PolicyDbException {
+        Throwable cause = new IOException();
+        throw new PolicyDbException("test", cause, true, true);
+    }
 }