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>

1 files changed, 27 insertions, 26 deletions

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);
+    }
 }