Merge "Remove the unused variables"

4 files changed, 4 insertions, 5 deletions

diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/DeleteVfModuleResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/DeleteVfModuleResponse.java
index aacb4d64f0..c5b8bb7d59 100644
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/DeleteVfModuleResponse.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/DeleteVfModuleResponse.java
@@ -35,7 +35,7 @@ public class DeleteVfModuleResponse extends VfResponseCommon {
 	private String vnfId;
 	private String vfModuleId;
 	private Boolean vfModuleDeleted;
-	private Map<String,String> vfModuleOutputs = new HashMap<String, String>();
+	private Map<String,String> vfModuleOutputs = new HashMap<>();
 	public DeleteVfModuleResponse() {
 		super();
 	}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/VfResponseCommon.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/VfResponseCommon.java
index 4a902bdd83..76cbda1ef4 100644
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/VfResponseCommon.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/VfResponseCommon.java
@@ -58,7 +58,7 @@ public abstract class VfResponseCommon {
 
 	public String toJsonString() {
 		try {
-			String jsonString = null;
+			String jsonString;
 			ObjectMapper mapper = new ObjectMapper();
 			mapper.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
 			jsonString = mapper.writeValueAsString(this);
diff --git a/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/VolumeAdapterRest.java b/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/VolumeAdapterRest.java
index 87b48fc68a..a8250fc35b 100644
--- a/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/VolumeAdapterRest.java
+++ b/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/VolumeAdapterRest.java
@@ -462,7 +462,6 @@ public class VolumeAdapterRest {
 			LOGGER.debug("UpdateVNFVolumesTask start");
 			try {
 				@SuppressWarnings("unused")
-				Holder<String> stackId = new Holder<> ();
 				Holder<Map<String, String>> outputs = new Holder<> ();
 				Holder<VnfRollback> vnfRollback = new Holder<> ();
 				String completeVnfVfModuleType = req.getVnfType() + "::" + req.getVfModuleType();
diff --git a/adapters/mso-workflow-message-adapter/src/main/java/org/openecomp/mso/adapters/workflowmessage/BPRestCallback.java b/adapters/mso-workflow-message-adapter/src/main/java/org/openecomp/mso/adapters/workflowmessage/BPRestCallback.java
index 0293a8d4d0..20880c24a6 100644
--- a/adapters/mso-workflow-message-adapter/src/main/java/org/openecomp/mso/adapters/workflowmessage/BPRestCallback.java
+++ b/adapters/mso-workflow-message-adapter/src/main/java/org/openecomp/mso/adapters/workflowmessage/BPRestCallback.java
@@ -132,7 +132,7 @@ public class BPRestCallback {
 				httpResponse = client.execute(method);
 
 				@SuppressWarnings("unused")
-				String responseContent = null;
+				String responseContent;
 
 				if (httpResponse.getEntity() != null) {
 					responseContent = EntityUtils.toString(httpResponse.getEntity(), "UTF-8");
@@ -175,4 +175,4 @@ public class BPRestCallback {
 			LOGGER.info(MessageEnum.RA_CALLBACK_BPEL_COMPLETE, "Camunda", "");
 		}
 	}
-}
\ No newline at end of file
+}