Merge "Remove redundant declaration of extending object"

3 files changed, 8 insertions, 8 deletions

diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java
index 699bd7c684..6862492d7e 100644
--- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java
@@ -143,7 +143,7 @@ public class MsoHeatUtils extends MsoCommonUtils {
                                   String tenantId,
                                   String stackName,
                                   String heatTemplate,
-                                  Map <String, ? extends Object> stackInputs,
+                                  Map <String, ?> stackInputs,
                                   boolean pollForCompletion,
                                   int timeoutMinutes) throws MsoException {
         // Just call the new method with the environment & files variable set to null
@@ -165,7 +165,7 @@ public class MsoHeatUtils extends MsoCommonUtils {
                                   String tenantId,
                                   String stackName,
                                   String heatTemplate,
-                                  Map <String, ? extends Object> stackInputs,
+                                  Map <String, ?> stackInputs,
                                   boolean pollForCompletion,
                                   int timeoutMinutes,
                                   String environment) throws MsoException {
@@ -188,7 +188,7 @@ public class MsoHeatUtils extends MsoCommonUtils {
                                   String tenantId,
                                   String stackName,
                                   String heatTemplate,
-                                  Map <String, ? extends Object> stackInputs,
+                                  Map <String, ?> stackInputs,
                                   boolean pollForCompletion,
                                   int timeoutMinutes,
                                   String environment,
@@ -211,7 +211,7 @@ public class MsoHeatUtils extends MsoCommonUtils {
                                   String tenantId,
                                   String stackName,
                                   String heatTemplate,
-                                  Map <String, ? extends Object> stackInputs,
+                                  Map <String, ?> stackInputs,
                                   boolean pollForCompletion,
                                   int timeoutMinutes,
                                   String environment,
@@ -275,7 +275,7 @@ public class MsoHeatUtils extends MsoCommonUtils {
                                   String tenantId,
                                   String stackName,
                                   String heatTemplate,
-                                  Map <String, ? extends Object> stackInputs,
+                                  Map <String, ?> stackInputs,
                                   boolean pollForCompletion,
                                   int timeoutMinutes,
                                   String environment,
diff --git a/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/vdu/utils/VduPlugin.java b/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/vdu/utils/VduPlugin.java
index 856b713c94..2118eec0a5 100755
--- a/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/vdu/utils/VduPlugin.java
+++ b/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/vdu/utils/VduPlugin.java
@@ -88,7 +88,7 @@ public interface VduPlugin {
     				String tenantId,
     				String vduInstanceName,
     				VduBlueprint vduBlueprint,
-    				Map <String, ? extends Object> inputs,
+    				Map <String, ?> inputs,
     				String environmentFile,
     				int timeoutMinutes,
     				boolean suppressBackout)
@@ -198,7 +198,7 @@ public interface VduPlugin {
     				String tenantId,
     				String vduInstanceId,
     				VduBlueprint vduBlueprint,
-    				Map <String, ? extends Object> inputs,
+    				Map <String, ?> inputs,
     				String environmentFile,
     				int timeoutMinutes)
 			throws MsoException;
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java
index 9fcde31e4f..0bb5186a17 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java
@@ -68,7 +68,7 @@ public class BPMNUtil {
 	}

 

 	@SuppressWarnings("unchecked")

-	public static <T extends Object> T getRawVariable(ProcessEngineServices processEngineServices, String processDefinitionID, String name) {

+	public static <T> T getRawVariable(ProcessEngineServices processEngineServices, String processDefinitionID, String name) {

 		String pID = getProcessInstanceId(processEngineServices,

 				processDefinitionID);

 		assertProcessInstanceFinished(processEngineServices, pID);