Removed checkstyle warnings

Removed checkstyle warnings from:
policy/drools-applications/controlloop/common/model-impl/appc
policy/drools-applications/controlloop/common/model-impl/appclcm
policy/drools-applications/controlloop/common/model-impl/events
including changes to template files due to renamed methods

Issue-ID: POLICY-705
Change-Id: Ieb93baf43268aa608f204eef1a610354f2adec32
Signed-off-by: mmis <michael.morris@ericsson.com>

6 files changed, 265 insertions, 247 deletions

diff --git a/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/TestCommonHeader.java b/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/TestCommonHeader.java
index 039117272..2e456bca0 100644
--- a/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/TestCommonHeader.java
+++ b/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/TestCommonHeader.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * appc
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,7 +40,11 @@
 
 package org.onap.policy.appc;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.time.Instant;
 import java.util.ArrayList;
@@ -52,56 +56,56 @@ import org.junit.Test;
 
 public class TestCommonHeader {
 
-	@Test
-	public void testCommonHeader() {
-		CommonHeader commonHeader = new CommonHeader();
-		assertNotNull(commonHeader);
-		assertNotNull(new CommonHeader(commonHeader));
-		assertNotEquals(0, commonHeader.hashCode());
-		
-		commonHeader.setApiVer("Kansas");
-		assertEquals("Kansas", commonHeader.getApiVer());
-		
-		List<Map<String, String>> flagSet = new ArrayList<>();
-		commonHeader.setFlags(flagSet);
-		assertEquals(flagSet, commonHeader.getFlags());
-		
-		commonHeader.setOriginatorID("Dorothy");
-		assertEquals("Dorothy", commonHeader.getOriginatorID());
-		
-		UUID requestID = UUID.randomUUID();
-		commonHeader.setRequestID(requestID);
-		assertEquals(requestID, commonHeader.getRequestID());
-		
-		List<String> requestTrackSet = new ArrayList<>();
-		commonHeader.setRequestTrack(requestTrackSet);
-		assertEquals(requestTrackSet, commonHeader.getRequestTrack());
-		
-		commonHeader.setSubRequestID("Can I go home?");
-		assertEquals("Can I go home?", commonHeader.getSubRequestID());
-		
-		Instant timestamp = Instant.now();
-		commonHeader.setTimeStamp(timestamp);
-		assertEquals(timestamp, commonHeader.getTimeStamp());
-		
-		assertNotEquals(0, commonHeader.hashCode());
-		
-		assertEquals("CommonHeader [TimeStamp=", commonHeader.toString().substring(0,  24));
-		
+    @Test
+    public void testCommonHeader() {
+        CommonHeader commonHeader = new CommonHeader();
+        assertNotNull(commonHeader);
+        assertNotNull(new CommonHeader(commonHeader));
+        assertNotEquals(0, commonHeader.hashCode());
+
+        commonHeader.setApiVer("Kansas");
+        assertEquals("Kansas", commonHeader.getApiVer());
+
+        List<Map<String, String>> flagSet = new ArrayList<>();
+        commonHeader.setFlags(flagSet);
+        assertEquals(flagSet, commonHeader.getFlags());
+
+        commonHeader.setOriginatorId("Dorothy");
+        assertEquals("Dorothy", commonHeader.getOriginatorId());
+
+        UUID requestId = UUID.randomUUID();
+        commonHeader.setRequestId(requestId);
+        assertEquals(requestId, commonHeader.getRequestId());
+
+        List<String> requestTrackSet = new ArrayList<>();
+        commonHeader.setRequestTrack(requestTrackSet);
+        assertEquals(requestTrackSet, commonHeader.getRequestTrack());
+
+        commonHeader.setSubRequestId("Can I go home?");
+        assertEquals("Can I go home?", commonHeader.getSubRequestId());
+
+        Instant timestamp = Instant.now();
+        commonHeader.setTimeStamp(timestamp);
+        assertEquals(timestamp, commonHeader.getTimeStamp());
+
+        assertNotEquals(0, commonHeader.hashCode());
+
+        assertEquals("CommonHeader [TimeStamp=", commonHeader.toString().substring(0, 24));
+
         CommonHeader copiedCommonHeader = new CommonHeader();
         copiedCommonHeader.setApiVer(commonHeader.getApiVer());
         copiedCommonHeader.setFlags(commonHeader.getFlags());
-        copiedCommonHeader.setOriginatorID(commonHeader.getOriginatorID());
-        copiedCommonHeader.setRequestID(commonHeader.getRequestID());
+        copiedCommonHeader.setOriginatorId(commonHeader.getOriginatorId());
+        copiedCommonHeader.setRequestId(commonHeader.getRequestId());
         copiedCommonHeader.setRequestTrack(commonHeader.getRequestTrack());
-        copiedCommonHeader.setSubRequestID(commonHeader.getSubRequestID());
+        copiedCommonHeader.setSubRequestId(commonHeader.getSubRequestId());
         copiedCommonHeader.setTimeStamp(commonHeader.getTimeStamp());
-		
+
         assertTrue(commonHeader.equals(commonHeader));
         assertTrue(commonHeader.equals(copiedCommonHeader));
         assertFalse(commonHeader.equals(null));
         assertFalse(commonHeader.equals("Hello"));
-        
+
         CommonHeader clonedCommonHeader = new CommonHeader(commonHeader);
         clonedCommonHeader.setApiVer(commonHeader.getApiVer());
         clonedCommonHeader.setTimeStamp(commonHeader.getTimeStamp());
@@ -116,7 +120,7 @@ public class TestCommonHeader {
         assertFalse(commonHeader.equals(copiedCommonHeader));
         copiedCommonHeader.setApiVer("Kansas");
         assertTrue(commonHeader.equals(copiedCommonHeader));
-        
+
         commonHeader.setFlags(null);
         assertFalse(commonHeader.equals(copiedCommonHeader));
         copiedCommonHeader.setFlags(null);
@@ -125,50 +129,50 @@ public class TestCommonHeader {
         assertFalse(commonHeader.equals(copiedCommonHeader));
         copiedCommonHeader.setFlags(flagSet);
         assertTrue(commonHeader.equals(copiedCommonHeader));
-        
-        commonHeader.setOriginatorID(null);
+
+        commonHeader.setOriginatorId(null);
         assertFalse(commonHeader.equals(copiedCommonHeader));
-        copiedCommonHeader.setOriginatorID(null);
+        copiedCommonHeader.setOriginatorId(null);
         assertTrue(commonHeader.equals(copiedCommonHeader));
-        commonHeader.setOriginatorID("Dorothy");
+        commonHeader.setOriginatorId("Dorothy");
         assertFalse(commonHeader.equals(copiedCommonHeader));
-        copiedCommonHeader.setOriginatorID("Dorothy");
+        copiedCommonHeader.setOriginatorId("Dorothy");
         assertTrue(commonHeader.equals(copiedCommonHeader));
-        
-        commonHeader.setRequestID(null);
+
+        commonHeader.setRequestId(null);
         assertFalse(commonHeader.equals(copiedCommonHeader));
-        copiedCommonHeader.setRequestID(null);
+        copiedCommonHeader.setRequestId(null);
         assertTrue(commonHeader.equals(copiedCommonHeader));
-        commonHeader.setRequestID(requestID);
+        commonHeader.setRequestId(requestId);
         assertFalse(commonHeader.equals(copiedCommonHeader));
-        copiedCommonHeader.setRequestID(requestID);
+        copiedCommonHeader.setRequestId(requestId);
         assertTrue(commonHeader.equals(copiedCommonHeader));
-		
+
         commonHeader.setRequestTrack(null);
         assertFalse(commonHeader.equals(copiedCommonHeader));
-		copiedCommonHeader.setRequestTrack(null);
+        copiedCommonHeader.setRequestTrack(null);
         assertTrue(commonHeader.equals(copiedCommonHeader));
         commonHeader.setRequestTrack(requestTrackSet);
         assertFalse(commonHeader.equals(copiedCommonHeader));
-		copiedCommonHeader.setRequestTrack(requestTrackSet);
+        copiedCommonHeader.setRequestTrack(requestTrackSet);
         assertTrue(commonHeader.equals(copiedCommonHeader));
-		
-        commonHeader.setSubRequestID(null);
+
+        commonHeader.setSubRequestId(null);
         assertFalse(commonHeader.equals(copiedCommonHeader));
-		copiedCommonHeader.setSubRequestID(null);
+        copiedCommonHeader.setSubRequestId(null);
         assertTrue(commonHeader.equals(copiedCommonHeader));
-        commonHeader.setSubRequestID("Can I go home?");
+        commonHeader.setSubRequestId("Can I go home?");
         assertFalse(commonHeader.equals(copiedCommonHeader));
-		copiedCommonHeader.setSubRequestID("Can I go home?");
+        copiedCommonHeader.setSubRequestId("Can I go home?");
         assertTrue(commonHeader.equals(copiedCommonHeader));
-		
+
         commonHeader.setTimeStamp(null);
         assertFalse(commonHeader.equals(copiedCommonHeader));
-		copiedCommonHeader.setTimeStamp(null);
+        copiedCommonHeader.setTimeStamp(null);
         assertTrue(commonHeader.equals(copiedCommonHeader));
         commonHeader.setTimeStamp(timestamp);
         assertFalse(commonHeader.equals(copiedCommonHeader));
-		copiedCommonHeader.setTimeStamp(timestamp);
+        copiedCommonHeader.setTimeStamp(timestamp);
         assertTrue(commonHeader.equals(copiedCommonHeader));
-	}
+    }
 }
diff --git a/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/TestEnums.java b/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/TestEnums.java
index e04da3cce..95adec84f 100644
--- a/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/TestEnums.java
+++ b/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/TestEnums.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * appc
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,54 +20,55 @@
 
 package org.onap.policy.appc;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 import org.junit.Test;
 
 public class TestEnums {
 
-	@Test
-	public void testResponseCode() {
-		assertEquals(5, ResponseCode.values().length);
-		
-		assertNull(ResponseCode.toResponseCode(0));
-		
-		assertEquals(ResponseCode.ACCEPT, ResponseCode.toResponseCode(100));
-		assertEquals(ResponseCode.ERROR, ResponseCode.toResponseCode(200));
-		assertEquals(ResponseCode.REJECT, ResponseCode.toResponseCode(300));
-		assertEquals(ResponseCode.SUCCESS, ResponseCode.toResponseCode(400));
-		assertEquals(ResponseCode.FAILURE, ResponseCode.toResponseCode(500));
-		
-		assertEquals(100, ResponseCode.ACCEPT.getValue());
-		assertEquals(200, ResponseCode.ERROR.getValue());
-		assertEquals(300, ResponseCode.REJECT.getValue());
-		assertEquals(400, ResponseCode.SUCCESS.getValue());
-		assertEquals(500, ResponseCode.FAILURE.getValue());
+    @Test
+    public void testResponseCode() {
+        assertEquals(5, ResponseCode.values().length);
 
-		assertEquals("100", ResponseCode.ACCEPT.toString());
-		assertEquals("200", ResponseCode.ERROR.toString());
-		assertEquals("300", ResponseCode.REJECT.toString());
-		assertEquals("400", ResponseCode.SUCCESS.toString());
-		assertEquals("500", ResponseCode.FAILURE.toString());
-	}
+        assertNull(ResponseCode.toResponseCode(0));
 
-	@Test
-	public void testResponseValue() {
-		assertEquals(5, ResponseValue.values().length);
-		
-		assertNull(ResponseValue.toResponseValue("Dorothy"));
-		assertNull(ResponseValue.toResponseValue(null));
-		
-		assertEquals(ResponseValue.ACCEPT, ResponseValue.toResponseValue("ACCEPT"));
-		assertEquals(ResponseValue.ERROR, ResponseValue.toResponseValue("ERROR"));
-		assertEquals(ResponseValue.REJECT, ResponseValue.toResponseValue("REJECT"));
-		assertEquals(ResponseValue.SUCCESS, ResponseValue.toResponseValue("SUCCESS"));
-		assertEquals(ResponseValue.FAILURE, ResponseValue.toResponseValue("FAILURE"));
+        assertEquals(ResponseCode.ACCEPT, ResponseCode.toResponseCode(100));
+        assertEquals(ResponseCode.ERROR, ResponseCode.toResponseCode(200));
+        assertEquals(ResponseCode.REJECT, ResponseCode.toResponseCode(300));
+        assertEquals(ResponseCode.SUCCESS, ResponseCode.toResponseCode(400));
+        assertEquals(ResponseCode.FAILURE, ResponseCode.toResponseCode(500));
 
-		assertEquals("ACCEPT", ResponseValue.ACCEPT.toString());
-		assertEquals("ERROR", ResponseValue.ERROR.toString());
-		assertEquals("REJECT", ResponseValue.REJECT.toString());
-		assertEquals("SUCCESS", ResponseValue.SUCCESS.toString());
-		assertEquals("FAILURE", ResponseValue.FAILURE.toString());
-	}
+        assertEquals(100, ResponseCode.ACCEPT.getValue());
+        assertEquals(200, ResponseCode.ERROR.getValue());
+        assertEquals(300, ResponseCode.REJECT.getValue());
+        assertEquals(400, ResponseCode.SUCCESS.getValue());
+        assertEquals(500, ResponseCode.FAILURE.getValue());
+
+        assertEquals("100", ResponseCode.ACCEPT.toString());
+        assertEquals("200", ResponseCode.ERROR.toString());
+        assertEquals("300", ResponseCode.REJECT.toString());
+        assertEquals("400", ResponseCode.SUCCESS.toString());
+        assertEquals("500", ResponseCode.FAILURE.toString());
+    }
+
+    @Test
+    public void testResponseValue() {
+        assertEquals(5, ResponseValue.values().length);
+
+        assertNull(ResponseValue.toResponseValue("Dorothy"));
+        assertNull(ResponseValue.toResponseValue(null));
+
+        assertEquals(ResponseValue.ACCEPT, ResponseValue.toResponseValue("ACCEPT"));
+        assertEquals(ResponseValue.ERROR, ResponseValue.toResponseValue("ERROR"));
+        assertEquals(ResponseValue.REJECT, ResponseValue.toResponseValue("REJECT"));
+        assertEquals(ResponseValue.SUCCESS, ResponseValue.toResponseValue("SUCCESS"));
+        assertEquals(ResponseValue.FAILURE, ResponseValue.toResponseValue("FAILURE"));
+
+        assertEquals("ACCEPT", ResponseValue.ACCEPT.toString());
+        assertEquals("ERROR", ResponseValue.ERROR.toString());
+        assertEquals("REJECT", ResponseValue.REJECT.toString());
+        assertEquals("SUCCESS", ResponseValue.SUCCESS.toString());
+        assertEquals("FAILURE", ResponseValue.FAILURE.toString());
+    }
 }
diff --git a/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/TestRequest.java b/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/TestRequest.java
index 6fdfe0968..462fb7a01 100644
--- a/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/TestRequest.java
+++ b/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/TestRequest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * appc
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,11 @@
 
 package org.onap.policy.appc;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -29,49 +33,49 @@ import org.junit.Test;
 
 public class TestRequest {
 
-	@Test
-	public void testRequest() {
-		Request request = new Request();
-		assertNotNull(request);
-		assertNotEquals(0, request.hashCode());
-		
-		CommonHeader commonHeader = new CommonHeader();
-
-		request.setCommonHeader(commonHeader);
-		assertEquals(commonHeader, request.getCommonHeader());
-		
-		request.setAction("Go to Oz");
-		assertEquals("Go to Oz", request.getAction());
-		
-		request.setObjectID("Wizard");
-		assertEquals("Wizard", request.getObjectID());
-		
-		request.setTargetID("Oz");
-		assertEquals("Oz", request.getTargetID());
-		
-		Map<String, Object> payload = new HashMap<>();
-		payload.put("North", "Good Witch");
-		payload.put("West", "Bad Witch");
-		
-		request.setPayload(payload);
-		assertEquals(payload, request.getPayload());
-		
-		assertNotEquals(0, request.hashCode());
-		
-		assertEquals("Request [CommonHeader=CommonHeader [TimeStamp=", request.toString().substring(0,  46));
-		
+    @Test
+    public void testRequest() {
+        Request request = new Request();
+        assertNotNull(request);
+        assertNotEquals(0, request.hashCode());
+
+        CommonHeader commonHeader = new CommonHeader();
+
+        request.setCommonHeader(commonHeader);
+        assertEquals(commonHeader, request.getCommonHeader());
+
+        request.setAction("Go to Oz");
+        assertEquals("Go to Oz", request.getAction());
+
+        request.setObjectId("Wizard");
+        assertEquals("Wizard", request.getObjectId());
+
+        request.setTargetId("Oz");
+        assertEquals("Oz", request.getTargetId());
+
+        Map<String, Object> payload = new HashMap<>();
+        payload.put("North", "Good Witch");
+        payload.put("West", "Bad Witch");
+
+        request.setPayload(payload);
+        assertEquals(payload, request.getPayload());
+
+        assertNotEquals(0, request.hashCode());
+
+        assertEquals("Request [CommonHeader=CommonHeader [TimeStamp=", request.toString().substring(0, 46));
+
         Request copiedRequest = new Request();
         copiedRequest.setCommonHeader(request.getCommonHeader());
         copiedRequest.setAction(request.getAction());
-        copiedRequest.setObjectID(request.getObjectID());
+        copiedRequest.setObjectId(request.getObjectId());
         copiedRequest.setPayload(request.getPayload());
-        copiedRequest.setTargetID(request.getTargetID());
+        copiedRequest.setTargetId(request.getTargetId());
 
         assertTrue(request.equals(request));
         assertTrue(request.equals(copiedRequest));
         assertFalse(request.equals(null));
         assertFalse(request.equals("Hello"));
-        
+
         request.setCommonHeader(null);
         assertFalse(request.equals(copiedRequest));
         copiedRequest.setCommonHeader(null);
@@ -80,7 +84,7 @@ public class TestRequest {
         assertFalse(request.equals(copiedRequest));
         copiedRequest.setCommonHeader(commonHeader);
         assertTrue(request.equals(copiedRequest));
-        
+
         request.setAction(null);
         assertFalse(request.equals(copiedRequest));
         copiedRequest.setAction(null);
@@ -89,32 +93,32 @@ public class TestRequest {
         assertFalse(request.equals(copiedRequest));
         copiedRequest.setAction("Go to Oz");
         assertTrue(request.equals(copiedRequest));
-        
-        request.setObjectID(null);
+
+        request.setObjectId(null);
         assertFalse(request.equals(copiedRequest));
-        copiedRequest.setObjectID(null);
+        copiedRequest.setObjectId(null);
         assertTrue(request.equals(copiedRequest));
-        request.setObjectID("Wizard");
+        request.setObjectId("Wizard");
         assertFalse(request.equals(copiedRequest));
-        copiedRequest.setObjectID("Wizard");
+        copiedRequest.setObjectId("Wizard");
         assertTrue(request.equals(copiedRequest));
-		
-        request.setTargetID(null);
+
+        request.setTargetId(null);
         assertFalse(request.equals(copiedRequest));
-		copiedRequest.setTargetID(null);
+        copiedRequest.setTargetId(null);
         assertTrue(request.equals(copiedRequest));
-        request.setTargetID("Oz");
+        request.setTargetId("Oz");
         assertFalse(request.equals(copiedRequest));
-		copiedRequest.setTargetID("Oz");
+        copiedRequest.setTargetId("Oz");
         assertTrue(request.equals(copiedRequest));
-		
+
         request.setPayload(new HashMap<String, Object>());
         assertFalse(request.equals(copiedRequest));
-		copiedRequest.setPayload(new HashMap<String, Object>());
+        copiedRequest.setPayload(new HashMap<String, Object>());
         assertTrue(request.equals(copiedRequest));
         request.setPayload(payload);
         assertFalse(request.equals(copiedRequest));
-		copiedRequest.setPayload(payload);
+        copiedRequest.setPayload(payload);
         assertTrue(request.equals(copiedRequest));
-	}
+    }
 }
diff --git a/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/TestResponse.java b/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/TestResponse.java
index 5306a3344..bf5fec86a 100644
--- a/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/TestResponse.java
+++ b/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/TestResponse.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * appc
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,11 @@
 
 package org.onap.policy.appc;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -29,37 +33,37 @@ import org.junit.Test;
 
 public class TestResponse {
 
-	@Test
-	public void testResonse() {
-		Response response = new Response();
-		assertNotNull(response);
-		assertNotNull(new Response(new Request()));
-		assertNotEquals(0, response.hashCode());
-		
-		CommonHeader commonHeader = new CommonHeader();
-
-		Request request = new Request();
-		request.setCommonHeader(commonHeader);
-		assertNotNull(new Response(request));
-		
-		response.setCommonHeader(commonHeader);
-		assertEquals(commonHeader, response.getCommonHeader());
-		
-		ResponseStatus status = new ResponseStatus();
-		response.setStatus(status );
-		assertEquals(status, response.getStatus());
-		
-		Map<String, Object> payload = new HashMap<>();
-		payload.put("North", "Good Witch");
-		payload.put("West", "Bad Witch");
-		
-		response.setPayload(payload);
-		assertEquals(payload, response.getPayload());
-		
-		assertNotEquals(0, response.hashCode());
-		
-		assertEquals("Response [CommonHeader=CommonHeader [TimeStamp=", response.toString().substring(0,  47));
-		
+    @Test
+    public void testResonse() {
+        Response response = new Response();
+        assertNotNull(response);
+        assertNotNull(new Response(new Request()));
+        assertNotEquals(0, response.hashCode());
+
+        CommonHeader commonHeader = new CommonHeader();
+
+        Request request = new Request();
+        request.setCommonHeader(commonHeader);
+        assertNotNull(new Response(request));
+
+        response.setCommonHeader(commonHeader);
+        assertEquals(commonHeader, response.getCommonHeader());
+
+        ResponseStatus status = new ResponseStatus();
+        response.setStatus(status);
+        assertEquals(status, response.getStatus());
+
+        Map<String, Object> payload = new HashMap<>();
+        payload.put("North", "Good Witch");
+        payload.put("West", "Bad Witch");
+
+        response.setPayload(payload);
+        assertEquals(payload, response.getPayload());
+
+        assertNotEquals(0, response.hashCode());
+
+        assertEquals("Response [CommonHeader=CommonHeader [TimeStamp=", response.toString().substring(0, 47));
+
         Response copiedResponse = new Response();
         copiedResponse.setCommonHeader(response.getCommonHeader());
         copiedResponse.setStatus(response.getStatus());
@@ -69,7 +73,7 @@ public class TestResponse {
         assertTrue(response.equals(copiedResponse));
         assertFalse(response.equals(null));
         assertFalse(response.equals("Hello"));
-        
+
         response.setCommonHeader(null);
         assertFalse(response.equals(copiedResponse));
         copiedResponse.setCommonHeader(null);
@@ -78,7 +82,7 @@ public class TestResponse {
         assertFalse(response.equals(copiedResponse));
         copiedResponse.setCommonHeader(commonHeader);
         assertTrue(response.equals(copiedResponse));
-        
+
         response.setStatus(null);
         assertFalse(response.equals(copiedResponse));
         copiedResponse.setStatus(null);
@@ -87,14 +91,14 @@ public class TestResponse {
         assertFalse(response.equals(copiedResponse));
         copiedResponse.setStatus(status);
         assertTrue(response.equals(copiedResponse));
-		
+
         response.setPayload(new HashMap<String, Object>());
         assertFalse(response.equals(copiedResponse));
-		copiedResponse.setPayload(new HashMap<String, Object>());
+        copiedResponse.setPayload(new HashMap<String, Object>());
         assertTrue(response.equals(copiedResponse));
         response.setPayload(payload);
         assertFalse(response.equals(copiedResponse));
-		copiedResponse.setPayload(payload);
+        copiedResponse.setPayload(payload);
         assertTrue(response.equals(copiedResponse));
-	}
+    }
 }
diff --git a/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/TestResponseStatus.java b/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/TestResponseStatus.java
index 0cac93ca4..46d8a0b25 100644
--- a/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/TestResponseStatus.java
+++ b/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/TestResponseStatus.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * appc
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,30 +20,34 @@
 
 package org.onap.policy.appc;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
 public class TestResponseStatus {
 
-	@Test
-	public void testResonseStatus() {
-		ResponseStatus status = new ResponseStatus();
-		assertNotNull(status);
-		assertNotEquals(0, status.hashCode());
-		
-		status.setCode(1234);
-		assertEquals(1234, status.getCode());
-		
-		status.setDescription("The wonderful land of Oz");
-		assertEquals("The wonderful land of Oz", status.getDescription());
-		
-		status.setValue("There's no place like home");
-		assertEquals("There's no place like home", status.getValue());
-		assertNotEquals(0, status.hashCode());
-		
-		assertEquals("ResponseStatus [Code=1234, Value=There's no pla", status.toString().substring(0,  47));
-		
+    @Test
+    public void testResonseStatus() {
+        ResponseStatus status = new ResponseStatus();
+        assertNotNull(status);
+        assertNotEquals(0, status.hashCode());
+
+        status.setCode(1234);
+        assertEquals(1234, status.getCode());
+
+        status.setDescription("The wonderful land of Oz");
+        assertEquals("The wonderful land of Oz", status.getDescription());
+
+        status.setValue("There's no place like home");
+        assertEquals("There's no place like home", status.getValue());
+        assertNotEquals(0, status.hashCode());
+
+        assertEquals("ResponseStatus [Code=1234, Value=There's no pla", status.toString().substring(0, 47));
+
         ResponseStatus copiedStatus = new ResponseStatus();
         copiedStatus.setCode(status.getCode());
         copiedStatus.setDescription(status.getDescription());
@@ -53,7 +57,7 @@ public class TestResponseStatus {
         assertTrue(status.equals(copiedStatus));
         assertFalse(status.equals(null));
         assertFalse(status.equals("Hello"));
-        
+
         status.setCode(-1);
         assertFalse(status.equals(copiedStatus));
         copiedStatus.setCode(-1);
@@ -62,7 +66,7 @@ public class TestResponseStatus {
         assertFalse(status.equals(copiedStatus));
         copiedStatus.setCode(1234);
         assertTrue(status.equals(copiedStatus));
-        
+
         status.setDescription(null);
         assertFalse(status.equals(copiedStatus));
         copiedStatus.setDescription(null);
@@ -71,7 +75,7 @@ public class TestResponseStatus {
         assertFalse(status.equals(copiedStatus));
         copiedStatus.setDescription("The wonderful land of Oz");
         assertTrue(status.equals(copiedStatus));
-        
+
         status.setValue(null);
         assertFalse(status.equals(copiedStatus));
         copiedStatus.setValue(null);
@@ -80,5 +84,5 @@ public class TestResponseStatus {
         assertFalse(status.equals(copiedStatus));
         copiedStatus.setValue("There's no place like home");
         assertTrue(status.equals(copiedStatus));
-	}
+    }
 }
diff --git a/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/util/TestSerialization.java b/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/util/TestSerialization.java
index 0a82892ea..ae1890acf 100644
--- a/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/util/TestSerialization.java
+++ b/controlloop/common/model-impl/appc/src/test/java/org/onap/policy/appc/util/TestSerialization.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * appc
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,8 @@
 
 package org.onap.policy.appc.util;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 import java.time.Instant;
 import java.time.ZoneId;
@@ -30,26 +31,26 @@ import org.junit.Test;
 
 public class TestSerialization {
 
-	@Test
-	public void test() {
-		String nameString = "Dorothy";
-		String jsonName = Serialization.gsonPretty.toJson(nameString, String.class);
-		assertEquals("\"Dorothy\"", jsonName);
-		String jsonInOutName = Serialization.gsonPretty.fromJson(jsonName, String.class);
-		assertEquals("Dorothy", jsonInOutName);
-		
-		Instant instant = Instant.ofEpochMilli(1516127215000L);
-		String instantString = Serialization.gsonPretty.toJson(instant, Instant.class);
-		assertEquals("1516127215000", instantString);
-		Instant outInstant = Serialization.gsonPretty.fromJson(instantString, Instant.class);
-		assertEquals(instant, outInstant);
-		
-		ZonedDateTime zdt = ZonedDateTime.ofInstant(instant, ZoneId.of("UTC"));
-		String zdtString = Serialization.gsonPretty.toJson(zdt, ZonedDateTime.class);
-		assertEquals("\"2018-01-16 18:26:55.000000+00:00\"", zdtString);
-		ZonedDateTime outZdt = Serialization.gsonPretty.fromJson(zdtString, ZonedDateTime.class);
-		assertEquals(zdt.getDayOfWeek(), outZdt.getDayOfWeek());
-		
-		assertNull(Serialization.gsonPretty.fromJson("oz time is weird", ZonedDateTime.class));
-	}
+    @Test
+    public void test() {
+        String nameString = "Dorothy";
+        String jsonName = Serialization.gsonPretty.toJson(nameString, String.class);
+        assertEquals("\"Dorothy\"", jsonName);
+        String jsonInOutName = Serialization.gsonPretty.fromJson(jsonName, String.class);
+        assertEquals("Dorothy", jsonInOutName);
+
+        Instant instant = Instant.ofEpochMilli(1516127215000L);
+        String instantString = Serialization.gsonPretty.toJson(instant, Instant.class);
+        assertEquals("1516127215000", instantString);
+        Instant outInstant = Serialization.gsonPretty.fromJson(instantString, Instant.class);
+        assertEquals(instant, outInstant);
+
+        ZonedDateTime zdt = ZonedDateTime.ofInstant(instant, ZoneId.of("UTC"));
+        String zdtString = Serialization.gsonPretty.toJson(zdt, ZonedDateTime.class);
+        assertEquals("\"2018-01-16 18:26:55.000000+00:00\"", zdtString);
+        ZonedDateTime outZdt = Serialization.gsonPretty.fromJson(zdtString, ZonedDateTime.class);
+        assertEquals(zdt.getDayOfWeek(), outZdt.getDayOfWeek());
+
+        assertNull(Serialization.gsonPretty.fromJson("oz time is weird", ZonedDateTime.class));
+    }
 }