Sonar Fixes, Formatting

Issue-ID: AAF-1019
Change-Id: Ica49d9e7323aad9622ff9d95cc21b87430c22c54
Signed-off-by: Instrumental <jonathan.gathman@att.com>

19 files changed, 111 insertions, 111 deletions

diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/approvalsets/JU_ApprovalSetTest.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/approvalsets/JU_ApprovalSetTest.java
index 10f7a2be..438e14b8 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/approvalsets/JU_ApprovalSetTest.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/approvalsets/JU_ApprovalSetTest.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.
@@ -55,20 +55,20 @@ import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Session;
 
 public class JU_ApprovalSetTest {
-    
+
     @Mock
     AuthzTrans trans;
     @Mock
     Cluster cluster;
     @Mock
     PropAccess access;
-    
+
     @Mock
     ApprovalSet actionObj;
 
     @Mock
     DataView dv;
-    
+
     @Before
     public void setUp() throws APIException, IOException {
         initMocks(this);
@@ -82,7 +82,7 @@ public class JU_ApprovalSetTest {
             Mockito.doReturn(Mockito.mock(TimeTaken.class)).when(trans).start(Mockito.anyString(),Mockito.anyInt());
             Mockito.doReturn(sessionObj).when(cluster).connect("authz");
             Mockito.doReturn(psObj).when(sessionObj).prepare(Mockito.anyString());
-            
+
             Mockito.doReturn(Mockito.mock(ColumnDefinitions.class)).when(psObj).getVariables();
             Mockito.doReturn(Mockito.mock(PreparedId.class)).when(psObj).getPreparedId();
             Mockito.doReturn(Mockito.mock(Properties.class)).when(access).getProperties();
@@ -95,23 +95,23 @@ public class JU_ApprovalSetTest {
             e.printStackTrace();
         }
    }
-    
+
     @Test
     public void testPuntDate() {
         actionObj.write(trans);
         ApprovalDAO.Data dataObj = new ApprovalDAO.Data();
-        
+
         Result<FutureDAO.Data> rs1 = new Result<FutureDAO.Data>(null,0,"test",new Object[0]);
         Mockito.doReturn(rs1).when(dv).insert(Mockito.any(AuthzTrans.class), Mockito.any(FutureDAO.Data.class));
         Mockito.doReturn(rs1).when(dv).insert(Mockito.any(AuthzTrans.class), Mockito.any(ApprovalDAO.Data.class));
         actionObj.ladd.add(dataObj);
         Result<Void> retVal = actionObj.write(trans);
-        
+
         rs1 = new Result<FutureDAO.Data>(null,1,"test",new Object[0]);
         Mockito.doReturn(rs1).when(dv).insert(Mockito.any(AuthzTrans.class), Mockito.any(ApprovalDAO.Data.class));
         retVal = actionObj.write(trans);
         assertTrue("Security - test".equals(retVal.details));
-        
+
         actionObj.ladd.add(dataObj);
         retVal = actionObj.write(trans);
         assertTrue(retVal.details.contains("Security - test"));
@@ -119,32 +119,32 @@ public class JU_ApprovalSetTest {
         Mockito.doReturn(rs1).when(dv).insert(Mockito.any(AuthzTrans.class), Mockito.any(FutureDAO.Data.class));
         retVal = actionObj.write(trans);
         assertTrue(retVal.details.contains("Security - test"));
-        
+
         actionObj.setConstruct(null);
         actionObj.setExpires(new GregorianCalendar());
         actionObj.setMemo("");
         actionObj.ladd = null;
         actionObj.write(trans);
     }
-    
+
     @Test
     public void testHasApprovals() {
         assertFalse(actionObj.hasApprovals());
-        
+
         ApprovalDAO.Data dataObj = new ApprovalDAO.Data();
         actionObj.ladd.add(dataObj);
         assertTrue(actionObj.hasApprovals());
     }
-    
+
     @Test
     public void testApprovers() {
         Set<String> retVal = actionObj.approvers();
         assertTrue(retVal.size() == 0);
-        
+
         ApprovalDAO.Data dataObj = new ApprovalDAO.Data();
         actionObj.ladd.add(dataObj);
         retVal = actionObj.approvers();
         assertTrue(retVal.size() == 1);
-        
+
     }
 }
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/approvalsets/JU_Pending.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/approvalsets/JU_Pending.java
index eca5ed7c..85d346ba 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/approvalsets/JU_Pending.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/approvalsets/JU_Pending.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.
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/approvalsets/JU_URApprovalSet.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/approvalsets/JU_URApprovalSet.java
index dd9527a1..0adbd9fb 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/approvalsets/JU_URApprovalSet.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/approvalsets/JU_URApprovalSet.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.
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/JU_BatchDataViewTest.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/JU_BatchDataViewTest.java
index b918c31d..2ddd984b 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/JU_BatchDataViewTest.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/JU_BatchDataViewTest.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.
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/JU_CQLBatchLoopTest.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/JU_CQLBatchLoopTest.java
index aef5d22c..4e60a65a 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/JU_CQLBatchLoopTest.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/JU_CQLBatchLoopTest.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.
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/JU_CQLBatchTest.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/JU_CQLBatchTest.java
index a826a983..3c8f33d7 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/JU_CQLBatchTest.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/JU_CQLBatchTest.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.
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Approval.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Approval.java
index 1b41f9ee..16e48089 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Approval.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Approval.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.
@@ -61,7 +61,7 @@ public class JU_Approval {
         Assert.assertEquals("org.onap.ns.admin",
                 Approval.roleFromMemo(Approval.RE_VALIDATE_ADMIN + "org.onap.ns]"));
         Assert.assertEquals("org.onap.ns.owner", Approval.roleFromMemo(Approval.RE_VALIDATE_OWNER + "org.onap.ns]"));
-        Assert.assertEquals("org.onap.ns.member", Approval.roleFromMemo(Approval.RE_APPROVAL_IN_ROLE 
+        Assert.assertEquals("org.onap.ns.member", Approval.roleFromMemo(Approval.RE_APPROVAL_IN_ROLE
                 + "bob] + [org.onap.ns.member] - Expires 2018-12-25"));
     }
 
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_CacheChange.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_CacheChange.java
index 27d2d3cc..50305d00 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_CacheChange.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_CacheChange.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.
@@ -40,13 +40,13 @@ import org.junit.Test;
 public class JU_CacheChange {
 
     CacheChange cc;
-    
-    
+
+
     @Before
     public void setUp() {
         cc = new CacheChange();
     }
-    
+
     @Test
     public void testDelayedDelete() {
         cc.delayedDelete(null);
@@ -57,19 +57,19 @@ public class JU_CacheChange {
         List list = cc.getRemoved();
         Assert.assertNotNull(list);
     }
-    
+
     @Test
     public void testResetLocalData() {
         cc.resetLocalData();
     }
-    
+
     @Test
     public void testCacheSize() {
         int size;
         size = cc.cacheSize();
         Assert.assertEquals(0, size);
     }
-    
+
     @Test
     public void testContains() {
         boolean containsBools;
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Creator.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Creator.java
index 2a266f54..c8c27b14 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Creator.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Creator.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.
@@ -38,7 +38,7 @@ import static org.mockito.Mockito.*;
 import org.junit.Test;
 
 public class JU_Creator {
-    
+
     CreatorStub creatorStub;
 
     private class CreatorStub extends Creator{
@@ -54,14 +54,14 @@ public class JU_Creator {
             // TODO Auto-generated method stub
             return "Select";                    //Changed from null to Select
         }
-        
+
     }
-    
+
     @Before
     public void setUp() {
         creatorStub = new CreatorStub();
     }
-    
+
     @Test
     public void testQuery() {
         creatorStub.select();
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Cred.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Cred.java
index 05a41667..db80bbf4 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Cred.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Cred.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.
@@ -50,7 +50,7 @@ import java.util.Date;
 import org.junit.Test;
 
 public class JU_Cred {
-    
+
     private ByteArrayOutputStream outStream;
     private ByteArrayOutputStream errStream;
     Cred cred;
@@ -78,43 +78,43 @@ public class JU_Cred {
         prop.setProperty(Config.AAF_ROOT_NS, "org.onap.aaf");
         prop.setProperty(Config.AAF_ROOT_COMPANY,"test");
         Define.set(prop);
-        
+
         instance = new Instance(12, date, integer, 125642678910L,"234");
         cred = new Cred("myid1234@aaf.att.com");
     }
-    
+
     @Test
-    public void testLast() {        //TODO: set instances 
+    public void testLast() {        //TODO: set instances
         Assert.assertNull(cred.last(null));
     }
-    
+
     @Test
-    public void testTypes() {        //TODO: set instances 
+    public void testTypes() {        //TODO: set instances
         Assert.assertNotNull(cred.types());
     }
-    
+
     @Test
-    public void testCount() {        //TODO: set instances 
+    public void testCount() {        //TODO: set instances
         Assert.assertNotNull(cred.count(3));
     }
-    
+
     @Test
-    public void testToString() {        //TODO: set instances 
+    public void testToString() {        //TODO: set instances
         Assert.assertEquals("myid1234@aaf.att.com[]", cred.toString());
     }
-    
+
     @Test
-    public void testHashCode() {        //TODO: set instances 
+    public void testHashCode() {        //TODO: set instances
         Assert.assertEquals(-1619358251, cred.hashCode());
     }
-    
+
     @Test
-    public void testEquals() {        //TODO: set instances 
+    public void testEquals() {        //TODO: set instances
         Assert.assertEquals(true, cred.equals("myid1234@aaf.att.com"));
     }
-    
+
     @Test
-    public void testInc() {        
+    public void testInc() {
         Date begin = new Date(date.getTime() - 10);
         Date after = new Date(date.getTime() + 10);
         cc.inc(-1, begin, after);
@@ -122,17 +122,17 @@ public class JU_Cred {
         cc.inc(2, begin, after);
         cc.inc(200, begin, after);
     }
-    
+
     @Test
-    public void testAuthCount() {        //TODO: set instances 
+    public void testAuthCount() {        //TODO: set instances
         Assert.assertEquals(0, cc.authCount(1));
     }
-    
+
     @Test
-    public void testX509Count() {        //TODO: set instances 
+    public void testX509Count() {        //TODO: set instances
         Assert.assertEquals(0, cc.x509Count(0));
     }
-    
+
     @After
     public void cleanUp() {
         System.setErr(System.err);
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_ExpireRange.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_ExpireRange.java
index 81b7c965..77eafc4b 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_ExpireRange.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_ExpireRange.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.
@@ -35,18 +35,18 @@ public class JU_ExpireRange {
     public void test() {
         ExpireRange expRange = new ExpireRange(new PropAccess());
         Date now = expRange.now();
-        
+
         Set<String> names=expRange.names();
         assertTrue(names.contains("OneMonth"));
         assertTrue(names.contains("OneWeek"));
         assertTrue(names.contains("Delete"));
         assertFalse(names.contains(null));
         assertFalse(names.contains("bogus"));
-        
+
         ExpireRange.Range r;
         GregorianCalendar gc = new GregorianCalendar();
         String[] all = new String[] {"ur","cred"};
-        
+
         // Test 3 weeks prior
         gc.setTime(now);
         gc.add(GregorianCalendar.WEEK_OF_MONTH,-3);
@@ -55,7 +55,7 @@ public class JU_ExpireRange {
             assertNotNull(r);
             assertEquals("Delete",r.name());
         }
-        
+
         // Test 1 week prior
         gc.setTime(now);
         gc.add(GregorianCalendar.WEEK_OF_MONTH,-1);
@@ -63,7 +63,7 @@ public class JU_ExpireRange {
             r = expRange.getRange(rs, gc.getTime());
             assertNull(r);
         }
-        
+
         // Test Today
         r = expRange.getRange("cred", now);
         assertNotNull(r);
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Future.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Future.java
index 7a94b9f8..0adea2c5 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Future.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Future.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.
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_NS.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_NS.java
index 3d71614b..e72b55ea 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_NS.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_NS.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.
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Role.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Role.java
index ad53e0e1..050f681b 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Role.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Role.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.
@@ -31,11 +31,11 @@ import org.onap.aaf.auth.batch.helpers.Role;
 import junit.framework.Assert;
 
 public class JU_Role {
-    
+
     Role shortRole;
     Role longRole;
     Set set;
-    
+
     @Before
     public void setUp() {
         set = new HashSet();
@@ -47,36 +47,36 @@ public class JU_Role {
     public void testEncode() {
         Assert.assertEquals("ns|name", longRole.encode());
     }
-    
+
     @Test
     public void testFullName() {
         Assert.assertEquals("ns.name", longRole.fullName());
         Assert.assertEquals("full", shortRole.fullName());
-        
+
         longRole.fullName("test");
     }
-    
+
     @Test
     public void testToString() {
         Assert.assertEquals("ns|name", longRole.toString());
     }
-    
+
     @Test
     public void testHashCode() {
         Assert.assertEquals(-2043567518, longRole.hashCode());
     }
-    
+
     @Test
     public void testEquals() {
         Assert.assertEquals(false, longRole.equals(longRole));
     }
-    
+
     @Test
     public void testCompareTo() {
         Assert.assertEquals(-14, longRole.compareTo(shortRole));
         Assert.assertEquals(14, shortRole.compareTo(longRole));
     }
-    
+
     @Test
     public void testStageRemove() {
         longRole.stageRemove(shortRole);
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_UserRole.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_UserRole.java
index 50833d0f..efda1af9 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_UserRole.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_UserRole.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.
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_Batch.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_Batch.java
index 1ef6f3b8..49cedaf2 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_Batch.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_Batch.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.
@@ -48,7 +48,7 @@ public class JU_Batch {
 
     AuthzEnv env;
     Batch batch;
-    
+
     private class BatchStub extends Batch {
 
         protected BatchStub(AuthzEnv env) throws APIException, IOException, OrganizationException {
@@ -59,17 +59,17 @@ public class JU_Batch {
         @Override
         protected void run(AuthzTrans trans) {
             // TODO Auto-generated method stub
-            
+
         }
 
         @Override
         protected void _close(AuthzTrans trans) {
             // TODO Auto-generated method stub
-            
+
         }
 
     }
-    
+
     @Before
     public void setUp() throws OrganizationException {
         env = new AuthzEnv();
@@ -82,7 +82,7 @@ public class JU_Batch {
         env.setProperty("CASS_ENV", "test");
         env.setProperty("test.VERSION", "test.VERSION");
     }
-    
+
     @Test
     public void testIsSpecial() throws APIException, IOException, OrganizationException {
         //BatchStub bStub = new BatchStub(env);
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_BatchException.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_BatchException.java
index 47a7c278..823ee282 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_BatchException.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_BatchException.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.
@@ -41,12 +41,12 @@ public class JU_BatchException {
     BatchException bExcept4;
     BatchException bExcept5;
     Throwable throwable;
-    
+
     @Before
     public void setUp() {
         throwable = new Throwable();
     }
-    
+
     @Test
     public void testBatchException() {
         bExcept1 = new BatchException();
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_BatchPrincipal.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_BatchPrincipal.java
index 4e5ad675..1271d7ce 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_BatchPrincipal.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_BatchPrincipal.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.
@@ -37,7 +37,7 @@ import org.junit.Test;
 public class JU_BatchPrincipal {
 
     BatchPrincipal bPrincipal;
-    
+
     @Test
     public void testBatchPrincipal() {
         bPrincipal = new BatchPrincipal("name");
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_CassBatch.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_CassBatch.java
index dfb30819..6f2bcd1a 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_CassBatch.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_CassBatch.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.
@@ -39,9 +39,9 @@ import java.io.IOException;
 import org.junit.Test;
 
 public class JU_CassBatch {
-    
+
     AuthzTrans aTrans;
-    
+
     private class CassBatchStub extends CassBatch {
 
         protected CassBatchStub(AuthzTrans trans, String log4jName)
@@ -53,11 +53,11 @@ public class JU_CassBatch {
         @Override
         protected void run(AuthzTrans trans) {
             // TODO Auto-generated method stub
-            
+
         }
-        
+
     }
-    
+
     @Before
     public void setUp() throws APIException, IOException, OrganizationException {
         aTrans = mock(AuthzTrans.class);