Fix checkstyle for features submodules.

These are the remaining submodules that have checkstyle. Pretty
clean compile after this. There were a couple of sonar fixes
in there also.

Issue-ID: POLICY-882
Change-Id: I8191ea1aa261f4a7b9d3d21c108572fd31db1b8c
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

2 files changed, 191 insertions, 170 deletions

diff --git a/feature-distributed-locking/src/test/java/org/onap/policy/distributed/locking/DistributedLockingFeatureExceptionTest.java b/feature-distributed-locking/src/test/java/org/onap/policy/distributed/locking/DistributedLockingFeatureExceptionTest.java
index 5bc3ae5e..7ba2384a 100644
--- a/feature-distributed-locking/src/test/java/org/onap/policy/distributed/locking/DistributedLockingFeatureExceptionTest.java
+++ b/feature-distributed-locking/src/test/java/org/onap/policy/distributed/locking/DistributedLockingFeatureExceptionTest.java
@@ -26,11 +26,11 @@ import org.junit.Test;
 import org.onap.policy.common.utils.test.ExceptionsTester;
 import org.onap.policy.distributed.locking.DistributedLockingFeatureException;
 
-public class DistributedLockingFeatureExceptionTest extends ExceptionsTester{
-	
-	@Test
-	public void test() {
-		assertEquals(1, test(DistributedLockingFeatureException.class)); 
-	}
+public class DistributedLockingFeatureExceptionTest extends ExceptionsTester {
+
+    @Test
+    public void test() {
+        assertEquals(1, test(DistributedLockingFeatureException.class)); 
+    }
 
 }
diff --git a/feature-distributed-locking/src/test/java/org/onap/policy/distributed/locking/TargetLockTest.java b/feature-distributed-locking/src/test/java/org/onap/policy/distributed/locking/TargetLockTest.java
index 42c8a742..60a721b7 100644
--- a/feature-distributed-locking/src/test/java/org/onap/policy/distributed/locking/TargetLockTest.java
+++ b/feature-distributed-locking/src/test/java/org/onap/policy/distributed/locking/TargetLockTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -21,6 +21,7 @@
 package org.onap.policy.distributed.locking;
 
 import static org.junit.Assert.assertEquals;
+
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
@@ -36,191 +37,211 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class TargetLockTest {
-	private static final Logger logger = LoggerFactory.getLogger(TargetLockTest.class);
+    private static final Logger logger = LoggerFactory.getLogger(TargetLockTest.class);
     private static final int MAX_AGE_SEC = 4 * 60;
-	private static final String DB_CONNECTION = "jdbc:h2:mem:pooling;INIT=CREATE SCHEMA IF NOT EXISTS pooling\\;SET SCHEMA pooling";
-	private static final String DB_USER = "user";
-	private static final String DB_PASSWORD = "password";
-	private static Connection conn = null;
-	private static DistributedLockingFeature distLockFeat;
-
-	@BeforeClass
-	public static void setup() {
-		getDBConnection();
-		createTable();
-		SystemPersistence.manager.setConfigurationDir("src/test/resources");
-		distLockFeat = new DistributedLockingFeature();
-		distLockFeat.afterStart(null);
-	
-	}
-	
-	@AfterClass
-	public static void cleanUp() {
-		distLockFeat.beforeShutdown(null);
-		try {
-			conn.close();
-		} catch (SQLException e) {
-			logger.error("Error in TargetLockTest.cleanUp()", e);
-		}
-	}
-	
-	@Before
-	public void wipeDb() {
-		try (PreparedStatement lockDelete = conn.prepareStatement("DELETE FROM pooling.locks");){
-			lockDelete.executeUpdate();
-		} catch (SQLException e) {
-			logger.error("Error in TargetLockTest.wipeDb()", e);
-			throw new RuntimeException(e);
-		}
-
-	}
-	
-	@Test
-	public void testGrabLockSuccess() throws InterruptedException, ExecutionException {
-	    assertEquals(OperResult.OPER_ACCEPTED, distLockFeat.beforeLock("resource1", "owner1", MAX_AGE_SEC));
-	
-			//attempt to grab expiredLock
-		try (PreparedStatement updateStatement = conn.prepareStatement("UPDATE pooling.locks SET expirationTime = timestampadd(second, -1, now()) WHERE resourceId = ?");)
-		{
-			updateStatement.setString(1, "resource1");
-			updateStatement.executeUpdate();
-				
-		} catch (SQLException e) {
-			logger.error("Error in TargetLockTest.testGrabLockSuccess()", e);
-			throw new RuntimeException(e);
-		}
-		
-		assertEquals(OperResult.OPER_ACCEPTED, distLockFeat.beforeLock("resource1", "owner1", MAX_AGE_SEC));
-
-		// cannot re-lock
-        assertEquals(OperResult.OPER_DENIED, distLockFeat.beforeLock("resource1", "owner1", MAX_AGE_SEC));
+    private static final String DB_CONNECTION =
+            "jdbc:h2:mem:pooling;INIT=CREATE SCHEMA IF NOT EXISTS pooling\\;SET SCHEMA pooling";
+    private static final String DB_USER = "user";
+    private static final String DB_PASSWORD = "password";
+    private static Connection conn = null;
+    private static DistributedLockingFeature distLockFeat;
+
+    /**
+     * Setup the database.
+     */
+    @BeforeClass
+    public static void setup() {
+        getDbConnection();
+        createTable();
+        SystemPersistence.manager.setConfigurationDir("src/test/resources");
+        distLockFeat = new DistributedLockingFeature();
+        distLockFeat.afterStart(null);
+    }
+
+    /**
+     * Cleanup the lock.
+     */
+    @AfterClass
+    public static void cleanUp() {
+        distLockFeat.beforeShutdown(null);
+        try {
+            conn.close();
+        } catch (SQLException e) {
+            logger.error("Error in TargetLockTest.cleanUp()", e);
+        }
+    }
+
+    /**
+     * Wipe the database.
+     */
+    @Before
+    public void wipeDb() {
+        try (PreparedStatement lockDelete = conn.prepareStatement("DELETE FROM pooling.locks"); ) {
+            lockDelete.executeUpdate();
+        } catch (SQLException e) {
+            logger.error("Error in TargetLockTest.wipeDb()", e);
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Test
+    public void testGrabLockSuccess() throws InterruptedException, ExecutionException {
+        assertEquals(
+                OperResult.OPER_ACCEPTED, distLockFeat.beforeLock("resource1", "owner1", MAX_AGE_SEC));
+
+        // attempt to grab expiredLock
+        try (PreparedStatement updateStatement =
+                conn.prepareStatement(
+                  "UPDATE pooling.locks SET expirationTime = timestampadd(second, -1, now()) WHERE resourceId = ?"); ) {
+            updateStatement.setString(1, "resource1");
+            updateStatement.executeUpdate();
+
+        } catch (SQLException e) {
+            logger.error("Error in TargetLockTest.testGrabLockSuccess()", e);
+            throw new RuntimeException(e);
+        }
+
+        assertEquals(
+                OperResult.OPER_ACCEPTED, distLockFeat.beforeLock("resource1", "owner1", MAX_AGE_SEC));
+
+        // cannot re-lock
+        assertEquals(
+                OperResult.OPER_DENIED, distLockFeat.beforeLock("resource1", "owner1", MAX_AGE_SEC));
 
         assertEquals(OperResult.OPER_ACCEPTED, distLockFeat.beforeIsLockedBy("resource1", "owner1"));
-	}
-
-	@Test
-	public void testExpiredLocks() throws Exception {
-			
-			//grab lock
-		distLockFeat.beforeLock("resource1", "owner1", MAX_AGE_SEC);
-		
-			//force lock to expire
-        try (PreparedStatement lockExpire = conn.prepareStatement("UPDATE pooling.locks SET expirationTime = timestampadd(second, -?, now())");) {
+    }
+
+    @Test
+    public void testExpiredLocks() throws Exception {
+
+        // grab lock
+        distLockFeat.beforeLock("resource1", "owner1", MAX_AGE_SEC);
+
+        // force lock to expire
+        try (PreparedStatement lockExpire =
+                conn.prepareStatement(
+                        "UPDATE pooling.locks SET expirationTime = timestampadd(second, -?, now())"); ) {
             lockExpire.setInt(1, MAX_AGE_SEC + 1);
             lockExpire.executeUpdate();
         }
-	
-		assertEquals(OperResult.OPER_ACCEPTED, distLockFeat.beforeLock("resource1", "owner2", MAX_AGE_SEC));
-	}
-	
-	@Test
-	public void testGrabLockFail() throws InterruptedException, ExecutionException {
-		
-		distLockFeat.beforeLock("resource1", "owner1", MAX_AGE_SEC);
-		
-		assertEquals(OperResult.OPER_DENIED, distLockFeat.beforeLock("resource1", "owner2", MAX_AGE_SEC));
-
-	}
-    
+
+        assertEquals(
+                OperResult.OPER_ACCEPTED, distLockFeat.beforeLock("resource1", "owner2", MAX_AGE_SEC));
+    }
+
+    @Test
+    public void testGrabLockFail() throws InterruptedException, ExecutionException {
+
+        distLockFeat.beforeLock("resource1", "owner1", MAX_AGE_SEC);
+
+        assertEquals(
+                OperResult.OPER_DENIED, distLockFeat.beforeLock("resource1", "owner2", MAX_AGE_SEC));
+    }
+
     @Test
     public void testUpdateLock() throws InterruptedException, ExecutionException {
         // not locked yet - refresh should fail
-        assertEquals(OperResult.OPER_DENIED, distLockFeat.beforeRefresh("resource1", "owner1", MAX_AGE_SEC));
-        
+        assertEquals(
+                OperResult.OPER_DENIED, distLockFeat.beforeRefresh("resource1", "owner1", MAX_AGE_SEC));
+
         // now lock it
-        assertEquals(OperResult.OPER_ACCEPTED, distLockFeat.beforeLock("resource1", "owner1", MAX_AGE_SEC));
+        assertEquals(
+                OperResult.OPER_ACCEPTED, distLockFeat.beforeLock("resource1", "owner1", MAX_AGE_SEC));
 
         // refresh should work now
-        assertEquals(OperResult.OPER_ACCEPTED, distLockFeat.beforeRefresh("resource1", "owner1", MAX_AGE_SEC));
-        
+        assertEquals(
+                OperResult.OPER_ACCEPTED, distLockFeat.beforeRefresh("resource1", "owner1", MAX_AGE_SEC));
+
         assertEquals(OperResult.OPER_ACCEPTED, distLockFeat.beforeIsLockedBy("resource1", "owner1"));
-        
+
         // expire the lock
-        try (PreparedStatement updateStatement = conn.prepareStatement("UPDATE pooling.locks SET expirationTime = timestampadd(second, -1, now()) WHERE resourceId = ?");)
-        {
+        try (PreparedStatement updateStatement =
+                conn.prepareStatement(
+                  "UPDATE pooling.locks SET expirationTime = timestampadd(second, -1, now()) WHERE resourceId = ?"); ) {
             updateStatement.setString(1, "resource1");
             updateStatement.executeUpdate();
-                
+
         } catch (SQLException e) {
             logger.error("Error in TargetLockTest.testGrabLockSuccess()", e);
             throw new RuntimeException(e);
         }
-        
+
         // refresh should fail now
-        assertEquals(OperResult.OPER_DENIED, distLockFeat.beforeRefresh("resource1", "owner1", MAX_AGE_SEC));
+        assertEquals(
+                OperResult.OPER_DENIED, distLockFeat.beforeRefresh("resource1", "owner1", MAX_AGE_SEC));
 
         assertEquals(OperResult.OPER_DENIED, distLockFeat.beforeIsLockedBy("resource1", "owner1"));
     }
-	
-	
-	@Test
-	public void testUnlock() throws InterruptedException, ExecutionException {
-		distLockFeat.beforeLock("resource1", "owner1", MAX_AGE_SEC);
-
-		assertEquals(OperResult.OPER_ACCEPTED, distLockFeat.beforeUnlock("resource1", "owner1"));
-		assertEquals(OperResult.OPER_ACCEPTED, distLockFeat.beforeLock("resource1", "owner2", MAX_AGE_SEC));
-	}
-	
-	@Test
-	public void testIsActive() {
-		assertEquals(OperResult.OPER_DENIED, distLockFeat.beforeIsLockedBy("resource1", "owner1"));
-		distLockFeat.beforeLock("resource1", "owner1", MAX_AGE_SEC);
-		assertEquals(OperResult.OPER_ACCEPTED, distLockFeat.beforeIsLockedBy("resource1", "owner1"));
-		assertEquals(OperResult.OPER_DENIED, distLockFeat.beforeIsLockedBy("resource1", "owner2"));
-
-		// isActive on expiredLock
-		try (PreparedStatement updateStatement = conn
-				.prepareStatement("UPDATE pooling.locks SET expirationTime = timestampadd(second, -5, now()) WHERE resourceId = ?");) {
-			updateStatement.setString(1, "resource1");
-			updateStatement.executeUpdate();
-
-		} catch (SQLException e) {
-			logger.error("Error in TargetLockTest.testIsActive()", e);
-			throw new RuntimeException(e);
-		}
-
-		assertEquals(OperResult.OPER_DENIED, distLockFeat.beforeIsLockedBy("resource1", "owner1"));
-
-		distLockFeat.beforeLock("resource1", "owner1", MAX_AGE_SEC);
-			//Unlock record, next isActive attempt should fail
-		distLockFeat.beforeUnlock("resource1", "owner1");
-		assertEquals(OperResult.OPER_DENIED, distLockFeat.beforeIsLockedBy("resource1", "owner1"));
-		
-	}
-	
-	@Test
-	public void unlockBeforeLock() {
-		assertEquals(OperResult.OPER_DENIED, distLockFeat.beforeUnlock("resource1", "owner1"));
-		distLockFeat.beforeLock("resource1", "owner1", MAX_AGE_SEC);
-		assertEquals(OperResult.OPER_ACCEPTED, distLockFeat.beforeUnlock("resource1", "owner1"));
-		assertEquals(OperResult.OPER_DENIED, distLockFeat.beforeUnlock("resource1", "owner1"));
-	}
-	
-	@Test
-	public void testIsLocked() {
-		assertEquals(OperResult.OPER_DENIED, distLockFeat.beforeIsLocked("resource1"));
-		distLockFeat.beforeLock("resource1", "owner1", MAX_AGE_SEC);
-		assertEquals(OperResult.OPER_ACCEPTED, distLockFeat.beforeIsLocked("resource1"));
-	
-	}
-	
-	private static void getDBConnection() {
-		try {
-			conn = DriverManager.getConnection(DB_CONNECTION, DB_USER, DB_PASSWORD);
-		} catch (SQLException e) {
-			logger.error("Error in TargetLockTest.getDBConnection()", e);
-		}
-	}
-
-	private static void createTable() {
-		String createString = "create table if not exists pooling.locks (resourceId VARCHAR(128), host VARCHAR(128), owner VARCHAR(128), expirationTime TIMESTAMP DEFAULT 0, PRIMARY KEY (resourceId))";
-		try (PreparedStatement createStmt = conn.prepareStatement(createString);) {
-			createStmt.executeUpdate();
-			
-		} catch (SQLException e) {
-			logger.error("Error in TargetLockTest.createTable()", e);
-		}
-	}	
-	 
 
+    @Test
+    public void testUnlock() throws InterruptedException, ExecutionException {
+        distLockFeat.beforeLock("resource1", "owner1", MAX_AGE_SEC);
+
+        assertEquals(OperResult.OPER_ACCEPTED, distLockFeat.beforeUnlock("resource1", "owner1"));
+        assertEquals(
+                OperResult.OPER_ACCEPTED, distLockFeat.beforeLock("resource1", "owner2", MAX_AGE_SEC));
+    }
+
+    @Test
+    public void testIsActive() {
+        assertEquals(OperResult.OPER_DENIED, distLockFeat.beforeIsLockedBy("resource1", "owner1"));
+        distLockFeat.beforeLock("resource1", "owner1", MAX_AGE_SEC);
+        assertEquals(OperResult.OPER_ACCEPTED, distLockFeat.beforeIsLockedBy("resource1", "owner1"));
+        assertEquals(OperResult.OPER_DENIED, distLockFeat.beforeIsLockedBy("resource1", "owner2"));
+
+        // isActive on expiredLock
+        try (PreparedStatement updateStatement =
+                conn.prepareStatement(
+                  "UPDATE pooling.locks SET expirationTime = timestampadd(second, -5, now()) WHERE resourceId = ?"); ) {
+            updateStatement.setString(1, "resource1");
+            updateStatement.executeUpdate();
+
+        } catch (SQLException e) {
+            logger.error("Error in TargetLockTest.testIsActive()", e);
+            throw new RuntimeException(e);
+        }
+
+        assertEquals(OperResult.OPER_DENIED, distLockFeat.beforeIsLockedBy("resource1", "owner1"));
+
+        distLockFeat.beforeLock("resource1", "owner1", MAX_AGE_SEC);
+        // Unlock record, next isActive attempt should fail
+        distLockFeat.beforeUnlock("resource1", "owner1");
+        assertEquals(OperResult.OPER_DENIED, distLockFeat.beforeIsLockedBy("resource1", "owner1"));
+    }
+
+    @Test
+    public void unlockBeforeLock() {
+        assertEquals(OperResult.OPER_DENIED, distLockFeat.beforeUnlock("resource1", "owner1"));
+        distLockFeat.beforeLock("resource1", "owner1", MAX_AGE_SEC);
+        assertEquals(OperResult.OPER_ACCEPTED, distLockFeat.beforeUnlock("resource1", "owner1"));
+        assertEquals(OperResult.OPER_DENIED, distLockFeat.beforeUnlock("resource1", "owner1"));
+    }
+
+    @Test
+    public void testIsLocked() {
+        assertEquals(OperResult.OPER_DENIED, distLockFeat.beforeIsLocked("resource1"));
+        distLockFeat.beforeLock("resource1", "owner1", MAX_AGE_SEC);
+        assertEquals(OperResult.OPER_ACCEPTED, distLockFeat.beforeIsLocked("resource1"));
+    }
+
+    private static void getDbConnection() {
+        try {
+            conn = DriverManager.getConnection(DB_CONNECTION, DB_USER, DB_PASSWORD);
+        } catch (SQLException e) {
+            logger.error("Error in TargetLockTest.getDBConnection()", e);
+        }
+    }
+
+    private static void createTable() {
+        String createString =
+                "create table if not exists pooling.locks "
+                + "(resourceId VARCHAR(128), host VARCHAR(128), owner VARCHAR(128), "
+                + "expirationTime TIMESTAMP DEFAULT 0, PRIMARY KEY (resourceId))";
+        try (PreparedStatement createStmt = conn.prepareStatement(createString); ) {
+            createStmt.executeUpdate();
+
+        } catch (SQLException e) {
+            logger.error("Error in TargetLockTest.createTable()", e);
+        }
+    }
 }