findbugs: impossible cast in CreateServiceOfferingCmd file.

sanjaytripathi · sanjaytripathi · commit bc4c8052fdd5 · 2014-03-13T15:04:18.000+05:30
diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
@@ -21,17 +21,15 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
-
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.BaseCmd.CommandType;
 import org.apache.cloudstack.api.response.DomainResponse;
 import org.apache.cloudstack.api.response.ServiceOfferingResponse;
+import org.apache.log4j.Logger;
 
 import com.cloud.offering.ServiceOffering;
 import com.cloud.user.Account;
@@ -106,7 +104,7 @@ public class CreateServiceOfferingCmd extends BaseCmd {
     private String deploymentPlanner;
 
     @Parameter(name = ApiConstants.SERVICE_OFFERING_DETAILS, type = CommandType.MAP, description = "details for planner, used to store specific parameters")
-    private Map<String, String> details;
+    private Map details;
 
     @Parameter(name = ApiConstants.BYTES_READ_RATE, type = CommandType.LONG, required = false, description = "bytes read rate of the disk offering")
     private Long bytesReadRate;
@@ -215,7 +213,7 @@ public Map<String, String> getDetails() {
             Iterator<?> iter = props.iterator();
             while (iter.hasNext()) {
                 HashMap<String, String> detail = (HashMap<String, String>) iter.next();
-                detailsMap.putAll(detail);
+                detailsMap.put(detail.get("key"), detail.get("value"));
             }
         }
         return detailsMap;
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
@@ -490,15 +490,18 @@
 
                                 var array1 = [];
                                 if (args.data.deploymentPlanner == "ImplicitDedicationPlanner" && args.data.plannerMode != "") {
-                                    array1.push("&serviceofferingdetails[0].ImplicitDedicationMode" + "=" + args.data.plannerMode);
+                                    array1.push("&serviceofferingdetails[0].key" + "=" + "ImplicitDedicationMode");
+                                    array1.push("&serviceofferingdetails[0].value" + "=" + args.data.plannerMode);
                                 }
 
                                 if (args.data.pciDevice != "") {
-                                    array1.push("&serviceofferingdetails[1].pciDevice" + "=" + args.data.pciDevice);
+                                    array1.push("&serviceofferingdetails[1].key" + "=" + "pciDevice");
+                                    array1.push("&serviceofferingdetails[1].value" + "=" + args.data.pciDevice);
                                 }
 
                                 if (args.data.pciDevice == "VGPU") {
-                                    array1.push("&serviceofferingdetails[2].vgpuType" + "=" + args.data.vgpuType);
+                                    array1.push("&serviceofferingdetails[2].key" + "=" + "vgpuType");
+                                    array1.push("&serviceofferingdetails[2].value" + "=" + args.data.vgpuType);
                                 }
 
                                 if (args.data.networkRate != null && args.data.networkRate.length > 0) {

Original file line number	Diff line number	Diff line change
`@@ -490,15 +490,18 @@`
`490`	`490`
`491`	`491`	`var array1 = [];`
`492`	`492`	`if (args.data.deploymentPlanner == "ImplicitDedicationPlanner" && args.data.plannerMode != "") {`
`493`		`- array1.push("&serviceofferingdetails[0].ImplicitDedicationMode" + "=" + args.data.plannerMode);`
	`493`	`+ array1.push("&serviceofferingdetails[0].key" + "=" + "ImplicitDedicationMode");`
	`494`	`+ array1.push("&serviceofferingdetails[0].value" + "=" + args.data.plannerMode);`
`494`	`495`	`}`
`495`	`496`
`496`	`497`	`if (args.data.pciDevice != "") {`
`497`		`- array1.push("&serviceofferingdetails[1].pciDevice" + "=" + args.data.pciDevice);`
	`498`	`+ array1.push("&serviceofferingdetails[1].key" + "=" + "pciDevice");`
	`499`	`+ array1.push("&serviceofferingdetails[1].value" + "=" + args.data.pciDevice);`
`498`	`500`	`}`
`499`	`501`
`500`	`502`	`if (args.data.pciDevice == "VGPU") {`
`501`		`- array1.push("&serviceofferingdetails[2].vgpuType" + "=" + args.data.vgpuType);`
	`503`	`+ array1.push("&serviceofferingdetails[2].key" + "=" + "vgpuType");`
	`504`	`+ array1.push("&serviceofferingdetails[2].value" + "=" + args.data.vgpuType);`
`502`	`505`	`}`
`503`	`506`
`504`	`507`	`if (args.data.networkRate != null && args.data.networkRate.length > 0) {`