Fix remaining checkstyle

Lots of formatting, missing javadoc, distance from use,
imports must be explicit, ordering of methods.

Fixed some abbreviation problems in classes and renamed
JUnit tests to fix this.

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

8 files changed, 180 insertions, 159 deletions

diff --git a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCHealActionVmInfo.java b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCHealActionVmInfo.java
index a8004203e..0286a7d8b 100644
--- a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCHealActionVmInfo.java
+++ b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCHealActionVmInfo.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  * Copyright (C) 2017 Intel Corp. All rights reserved.
+ * Modifications Copyright (C) 2018 AT&T Corporation. 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.
@@ -18,37 +19,37 @@
 
 package org.onap.policy.vfc;
 
-import java.io.Serializable;
-
 import com.google.gson.annotations.SerializedName;
 
+import java.io.Serializable;
+
 public class VFCHealActionVmInfo implements Serializable {
 
-	private static final long serialVersionUID = 3208673205100673119L;
+    private static final long serialVersionUID = 3208673205100673119L;
 
-	@SerializedName("vmid")
-	private String vmid;
+    @SerializedName("vmid")
+    private String vmid;
 
-	@SerializedName("vmname")
-	private String vmname;
+    @SerializedName("vmname")
+    private String vmname;
 
-	public VFCHealActionVmInfo() {
-		// Default constructor for VFCHealActionVmInfo
-	}
+    public VFCHealActionVmInfo() {
+        // Default constructor for VFCHealActionVmInfo
+    }
 
-	public String getVmid() {
-		return vmid;
-	}
+    public String getVmid() {
+        return vmid;
+    }
 
-	public void setVmid(String vmid) {
-		this.vmid = vmid;
-	}
+    public void setVmid(String vmid) {
+        this.vmid = vmid;
+    }
 
-	public String getVmname() {
-		return vmname;
-	}
+    public String getVmname() {
+        return vmname;
+    }
 
-	public void setVmname(String vmname) {
-		this.vmname = vmname;
-	}
+    public void setVmname(String vmname) {
+        this.vmname = vmname;
+    }
 }
diff --git a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCHealAdditionalParams.java b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCHealAdditionalParams.java
index 5c7555383..393e3761f 100644
--- a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCHealAdditionalParams.java
+++ b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCHealAdditionalParams.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  * Copyright (C) 2017 Intel Corp. All rights reserved.
+ * Modifications Copyright (C) 2018 AT&T Corporation. 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.
@@ -18,37 +19,37 @@
 
 package org.onap.policy.vfc;
 
-import java.io.Serializable;
-
 import com.google.gson.annotations.SerializedName;
 
+import java.io.Serializable;
+
 public class VFCHealAdditionalParams implements Serializable {
 
-	private static final long serialVersionUID = 2656694137285096191L;
+    private static final long serialVersionUID = 2656694137285096191L;
 
-	@SerializedName("action")
-	private String action;
+    @SerializedName("action")
+    private String action;
 
-	@SerializedName("actionvminfo")
-	private VFCHealActionVmInfo actionInfo;
+    @SerializedName("actionvminfo")
+    private VFCHealActionVmInfo actionInfo;
 
-	public VFCHealAdditionalParams() {
-		// Default constructor for VFCHealAdditionalParams
-	}
+    public VFCHealAdditionalParams() {
+        // Default constructor for VFCHealAdditionalParams
+    }
 
-	public String getAction() {
-		return action;
-	}
+    public String getAction() {
+        return action;
+    }
 
-	public void setAction(String action) {
-		this.action = action;
-	}
+    public void setAction(String action) {
+        this.action = action;
+    }
 
-	public VFCHealActionVmInfo getActionInfo() {
-		return actionInfo;
-	}
+    public VFCHealActionVmInfo getActionInfo() {
+        return actionInfo;
+    }
 
-	public void setActionInfo(VFCHealActionVmInfo actionInfo) {
-		this.actionInfo = actionInfo;
-	}
+    public void setActionInfo(VFCHealActionVmInfo actionInfo) {
+        this.actionInfo = actionInfo;
+    }
 }
diff --git a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCHealRequest.java b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCHealRequest.java
index 11ea495a8..75b9566b1 100644
--- a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCHealRequest.java
+++ b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCHealRequest.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  * Copyright (C) 2017 Intel Corp. All rights reserved.
+ * Modifications Copyright (C) 2018 AT&T Corporation. 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.
@@ -18,48 +19,48 @@
 
 package org.onap.policy.vfc;
 
-import java.io.Serializable;
-
 import com.google.gson.annotations.SerializedName;
 
+import java.io.Serializable;
+
 public class VFCHealRequest implements Serializable {
 
-	private static final long serialVersionUID = -7341931593089709247L;
+    private static final long serialVersionUID = -7341931593089709247L;
 
-	@SerializedName("vnfInstanceId")
-	private String vnfInstanceId;
+    @SerializedName("vnfInstanceId")
+    private String vnfInstanceId;
 
-	@SerializedName("cause")
-	private String cause;
+    @SerializedName("cause")
+    private String cause;
 
-	@SerializedName("additionalParams")
-	private VFCHealAdditionalParams additionalParams;
+    @SerializedName("additionalParams")
+    private VFCHealAdditionalParams additionalParams;
 
-	public VFCHealRequest() {
-		// Default constructor for VFCHealRequest
-	}
+    public VFCHealRequest() {
+        // Default constructor for VFCHealRequest
+    }
 
-	public String getVnfInstanceId() {
-		return vnfInstanceId;
-	}
+    public String getVnfInstanceId() {
+        return vnfInstanceId;
+    }
 
-	public void setVnfInstanceId(String vnfInstanceId) {
-		this.vnfInstanceId = vnfInstanceId;
-	}
+    public void setVnfInstanceId(String vnfInstanceId) {
+        this.vnfInstanceId = vnfInstanceId;
+    }
 
-	public String getCause() {
-		return cause;
-	}
+    public String getCause() {
+        return cause;
+    }
 
-	public void setCause(String cause) {
-		this.cause = cause;
-	}
+    public void setCause(String cause) {
+        this.cause = cause;
+    }
 
-	public VFCHealAdditionalParams getAdditionalParams() {
-		return additionalParams;
-	}
+    public VFCHealAdditionalParams getAdditionalParams() {
+        return additionalParams;
+    }
 
-	public void setAdditionalParams(VFCHealAdditionalParams additionalParams) {
-		this.additionalParams = additionalParams;
-	}
+    public void setAdditionalParams(VFCHealAdditionalParams additionalParams) {
+        this.additionalParams = additionalParams;
+    }
 }
diff --git a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCManager.java b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCManager.java
index e5c9f5db9..1a8d603b5 100644
--- a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCManager.java
+++ b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCManager.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  * Copyright (C) 2017-2018 Intel Corp, AT&T. All rights reserved.
+ * Modifications Copyright (C) 2018 AT&T Corporation. 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.
@@ -46,6 +47,12 @@ public final class VFCManager implements Runnable {
     // The REST manager used for processing REST calls for this VFC manager
     private RESTManager restManager;
 
+    /**
+     * Constructor.
+     * 
+     * @param wm Drools working memory
+     * @param request request
+     */
     public VFCManager(WorkingMemory wm, VFCRequest request) {
         if (wm == null || request == null) {
             throw new IllegalArgumentException(
@@ -61,6 +68,13 @@ public final class VFCManager implements Runnable {
                 PolicyEngine.manager.getEnvironmentProperty("vfc.password"));
     }
 
+    /**
+     * Set the parameters.
+     * 
+     * @param baseUrl base URL
+     * @param name username
+     * @param pwd password
+     */
     public void setVFCParams(String baseUrl, String name, String pwd) {
         vfcUrlBase = baseUrl + "/api/nslcm/v1";
         username = name;
@@ -148,7 +162,7 @@ public final class VFCManager implements Runnable {
     }
 
     /**
-     * Protected setter for rest manager to allow mocked rest manager to be used for testing
+     * Protected setter for rest manager to allow mocked rest manager to be used for testing.
      * 
      * @param restManager the test REST manager
      */
diff --git a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCRequest.java b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCRequest.java
index 78802d641..cfcaf8039 100644
--- a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCRequest.java
+++ b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCRequest.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  * Copyright (C) 2017 Intel Corp. All rights reserved.
+ * Modifications Copyright (C) 2018 AT&T Corporation. 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.
@@ -18,11 +19,11 @@
 
 package org.onap.policy.vfc;
 
+import com.google.gson.annotations.SerializedName;
+
 import java.io.Serializable;
 import java.util.UUID;
 
-import com.google.gson.annotations.SerializedName;
-
 public class VFCRequest implements Serializable {
 
     private static final long serialVersionUID = 3736300970326332512L;
@@ -34,30 +35,30 @@ public class VFCRequest implements Serializable {
     private VFCHealRequest healRequest;
 
     public VFCRequest() {
-    		// Default constructor for VFCRequest
+        // Default constructor for VFCRequest
     }
 
-	public String getNSInstanceId() {
-		return nsInstanceId;
-	}
+    public String getNSInstanceId() {
+        return nsInstanceId;
+    }
 
-	public void setNSInstanceId(String nsInstanceId) {
-		this.nsInstanceId = nsInstanceId;
-	}
+    public void setNSInstanceId(String nsInstanceId) {
+        this.nsInstanceId = nsInstanceId;
+    }
 
-	public UUID getRequestId() {
-		return requestId;
-	}
+    public UUID getRequestId() {
+        return requestId;
+    }
 
-	public void setRequestId(UUID requestId) {
-		this.requestId = requestId;
-	}
+    public void setRequestId(UUID requestId) {
+        this.requestId = requestId;
+    }
 
-	public VFCHealRequest getHealRequest() {
-		return healRequest;
-	}
+    public VFCHealRequest getHealRequest() {
+        return healRequest;
+    }
 
-	public void setHealRequest(VFCHealRequest healRequest) {
-		this.healRequest = healRequest;
-	}
+    public void setHealRequest(VFCHealRequest healRequest) {
+        this.healRequest = healRequest;
+    }
 }
diff --git a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCResponse.java b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCResponse.java
index 38b73b306..21e9472b7 100644
--- a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCResponse.java
+++ b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCResponse.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  * Copyright (C) 2017 Intel Corp. All rights reserved.
+ * Modifications Copyright (C) 2018 AT&T Corporation. 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.
@@ -18,10 +19,10 @@
 
 package org.onap.policy.vfc;
 
-import java.io.Serializable;
-
 import com.google.gson.annotations.SerializedName;
 
+import java.io.Serializable;
+
 public class VFCResponse implements Serializable {
 
     private static final long serialVersionUID = 9151443891238218455L;
@@ -35,30 +36,30 @@ public class VFCResponse implements Serializable {
     private transient String requestId;
 
     public VFCResponse() {
-		// Default constructor for VFCResponse
+        // Default constructor for VFCResponse
     }
 
-	public String getJobId() {
-		return jobId;
-	}
+    public String getJobId() {
+        return jobId;
+    }
 
-	public void setJobId(String jobId) {
-		this.jobId = jobId;
-	}
+    public void setJobId(String jobId) {
+        this.jobId = jobId;
+    }
 
-	public VFCResponseDescriptor getResponseDescriptor() {
-		return responseDescriptor;
-	}
+    public VFCResponseDescriptor getResponseDescriptor() {
+        return responseDescriptor;
+    }
 
-	public void setResponseDescriptor(VFCResponseDescriptor responseDescriptor) {
-		this.responseDescriptor = responseDescriptor;
-	}
+    public void setResponseDescriptor(VFCResponseDescriptor responseDescriptor) {
+        this.responseDescriptor = responseDescriptor;
+    }
 
-	public String getRequestId() {
-		return requestId;
-	}
+    public String getRequestId() {
+        return requestId;
+    }
 
-	public void setRequestId(String requestId) {
-		this.requestId = requestId;
-	}
+    public void setRequestId(String requestId) {
+        this.requestId = requestId;
+    }
 }
diff --git a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCResponseDescriptor.java b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCResponseDescriptor.java
index f237554fd..cdd4a39a9 100644
--- a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCResponseDescriptor.java
+++ b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCResponseDescriptor.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  * Copyright (C) 2017 Intel Corp. All rights reserved.
+ * Modifications Copyright (C) 2018 AT&T Corporation. 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.
@@ -18,9 +19,10 @@
 
 package org.onap.policy.vfc;
 
+import com.google.gson.annotations.SerializedName;
+
 import java.io.Serializable;
 import java.util.List;
-import com.google.gson.annotations.SerializedName;
 
 public class VFCResponseDescriptor implements Serializable {
 
@@ -45,54 +47,54 @@ public class VFCResponseDescriptor implements Serializable {
     private List<VFCResponseDescriptor> responseHistoryList;
 
     public VFCResponseDescriptor() {
-		// Default constructor for VFCResponseDescriptor
+        // Default constructor for VFCResponseDescriptor
     }
 
     public String getStatus() {
-	return status;
+        return status;
     }
 
-	public String getProgress() {
-		return progress;
-	}
+    public String getProgress() {
+        return progress;
+    }
 
-	public void setProgress(String progress) {
-		this.progress = progress;
-	}
+    public void setProgress(String progress) {
+        this.progress = progress;
+    }
 
-	public String getStatusDescription() {
-		return statusDescription;
-	}
+    public String getStatusDescription() {
+        return statusDescription;
+    }
 
-	public void setStatusDescription(String statusDescription) {
-		this.statusDescription = statusDescription;
-	}
+    public void setStatusDescription(String statusDescription) {
+        this.statusDescription = statusDescription;
+    }
 
-	public String getErrorCode() {
-		return errorCode;
-	}
+    public String getErrorCode() {
+        return errorCode;
+    }
 
-	public void setErrorCode(String errorCode) {
-		this.errorCode = errorCode;
-	}
+    public void setErrorCode(String errorCode) {
+        this.errorCode = errorCode;
+    }
 
-	public String getResponseId() {
-		return responseId;
-	}
+    public String getResponseId() {
+        return responseId;
+    }
 
-	public void setResponseId(String responseId) {
-		this.responseId = responseId;
-	}
+    public void setResponseId(String responseId) {
+        this.responseId = responseId;
+    }
 
-	public List<VFCResponseDescriptor> getResponseHistoryList() {
-		return responseHistoryList;
-	}
+    public List<VFCResponseDescriptor> getResponseHistoryList() {
+        return responseHistoryList;
+    }
 
-	public void setResponseHistoryList(List<VFCResponseDescriptor> responseHistoryList) {
-		this.responseHistoryList = responseHistoryList;
-	}
+    public void setResponseHistoryList(List<VFCResponseDescriptor> responseHistoryList) {
+        this.responseHistoryList = responseHistoryList;
+    }
 
-	public void setStatus(String status) {
-		this.status = status;
-	}
+    public void setStatus(String status) {
+        this.status = status;
+    }
 }
diff --git a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/util/Serialization.java b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/util/Serialization.java
index dc8662b84..2259296d2 100644
--- a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/util/Serialization.java
+++ b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/util/Serialization.java
@@ -22,11 +22,11 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
 public final class Serialization {
-	private Serialization() {
-	}
-	
-	public static final Gson gsonPretty = new GsonBuilder().disableHtmlEscaping()
-			.setPrettyPrinting()
-			.create();
+    private Serialization() {
+    }
+
+    public static final Gson gsonPretty = new GsonBuilder().disableHtmlEscaping()
+            .setPrettyPrinting()
+            .create();
 
 }