You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2015/07/08 21:20:15 UTC
[40/50] [abbrv] git commit: updated refs/heads/reporter to 28300b5
findbugs: impossible cast(s) fixed by changing field types
Signed-off-by: Daan Hoogland <da...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e34389a6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e34389a6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e34389a6
Branch: refs/heads/reporter
Commit: e34389a612ab0931cf3ae3d36c47047dc91b170e
Parents: 31c6b14
Author: Daan Hoogland <da...@gmail.com>
Authored: Mon Jun 29 15:07:34 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Mon Jul 6 16:22:19 2015 +0200
----------------------------------------------------------------------
.../api/command/admin/vpc/CreateVPCOfferingCmd.java | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e34389a6/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
index 13e4c0e..99c1719 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
@@ -64,10 +64,10 @@ public class CreateVPCOfferingCmd extends BaseAsyncCreateCmd {
@Parameter(name = ApiConstants.SERVICE_PROVIDER_LIST, type = CommandType.MAP, description = "provider to service mapping. "
+ "If not specified, the provider for the service will be mapped to the default provider on the physical network")
- private Map<String, String> serviceProviderList;
+ private Map<String, ? extends Map<String, String>> serviceProviderList;
@Parameter(name = ApiConstants.SERVICE_CAPABILITY_LIST, type = CommandType.MAP, description = "desired service capabilities as part of vpc offering", since = "4.4")
- private Map serviceCapabilitystList;
+ private Map<String, List<String>> serviceCapabilitystList;
@Parameter(name = ApiConstants.SERVICE_OFFERING_ID,
type = CommandType.UUID,
@@ -95,10 +95,14 @@ public class CreateVPCOfferingCmd extends BaseAsyncCreateCmd {
Map<String, List<String>> serviceProviderMap = null;
if (serviceProviderList != null && !serviceProviderList.isEmpty()) {
serviceProviderMap = new HashMap<String, List<String>>();
- Collection servicesCollection = serviceProviderList.values();
- Iterator iter = servicesCollection.iterator();
+ Collection<? extends Map<String, String>> servicesCollection = serviceProviderList.values();
+ Iterator<? extends Map<String, String>> iter = servicesCollection.iterator();
while (iter.hasNext()) {
- HashMap<String, String> services = (HashMap<String, String>)iter.next();
+ Map<String, String> obj = iter.next();
+ if (s_logger.isTraceEnabled()) {
+ s_logger.trace("service provider entry specified: " + obj);
+ }
+ HashMap<String, String> services = (HashMap<String, String>)obj;
String service = services.get("service");
String provider = services.get("provider");
List<String> providerList = null;