From 614821fe1a90a599bc5015a4231b2085942df4f3 Mon Sep 17 00:00:00 2001
From: Rafael da Fonseca <rsafonseca@gmail.com>
Date: Sun, 14 Jun 2015 15:33:50 +0200
Subject: [PATCH 1/2] Fix 2 findbugs ClassCastExceptions getDetails() isn't
 called anywhere in the code, either way, implementation is wrong since
 details is a Map\<String, String\> and not a Map\<String,
 Map\<String,String\>\> If this piece of could would get run, it would just
 fail trying to cast String to HashMap\<String,String\> Removed nonsense
 comment about casting a Collection to a Map obviously giving exception

---
 .../api/command/user/vm/ScaleVMCmd.java        | 18 ++----------------
 .../api/command/user/vm/UpgradeVMCmd.java      | 13 +------------
 2 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
index 661100b533e6..9a74fc6c662a 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
@@ -81,22 +81,8 @@ public Long getServiceOfferingId() {
         return serviceOfferingId;
     }
 
-    //instead of reading a map directly we are using collections.
-    //it is because details.values() cannot be cast to a map.
-    //it gives a exception
     public Map<String, String> getDetails() {
-        Map<String, String> customparameterMap = new HashMap<String, String>();
-        if (details != null && details.size() != 0) {
-            Collection parameterCollection = details.values();
-            Iterator iter = parameterCollection.iterator();
-            while (iter.hasNext()) {
-                HashMap<String, String> value = (HashMap<String, String>)iter.next();
-                for (String key : value.keySet()) {
-                    customparameterMap.put(key, value.get(key));
-                }
-            }
-        }
-        return customparameterMap;
+        return details;
     }
 
     /////////////////////////////////////////////////////
@@ -159,4 +145,4 @@ public void execute() {
             throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to scale vm");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
index b10555556bdc..a64d712dd170 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
@@ -80,18 +80,7 @@ public Long getServiceOfferingId() {
     }
 
     public Map<String, String> getDetails() {
-        Map<String, String> customparameterMap = new HashMap<String, String>();
-        if (details != null && details.size() != 0) {
-            Collection parameterCollection = details.values();
-            Iterator iter = parameterCollection.iterator();
-            while (iter.hasNext()) {
-                HashMap<String, String> value = (HashMap<String, String>)iter.next();
-                for (String key : value.keySet()) {
-                    customparameterMap.put(key, value.get(key));
-                }
-            }
-        }
-        return customparameterMap;
+        return details;
     }
 
     /////////////////////////////////////////////////////

From 90150c80b528e84d4511b5501119ee6327a7ece5 Mon Sep 17 00:00:00 2001
From: Rafael da Fonseca <rsafonseca@gmail.com>
Date: Sun, 14 Jun 2015 16:01:11 +0200
Subject: [PATCH 2/2] Remove unused imports to fix checkstyle warnings

---
 .../org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java  | 3 ---
 .../apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java    | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
index 9a74fc6c662a..e4c2f7d63384 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
@@ -16,9 +16,6 @@
 // under the License.
 package org.apache.cloudstack.api.command.user.vm;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
index a64d712dd170..bc9c1c859624 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
@@ -16,9 +16,6 @@
 // under the License.
 package org.apache.cloudstack.api.command.user.vm;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 
 import org.apache.log4j.Logger;