apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some findbugs fixes in cloud-api project

Browse Source
This commit is contained in:
Koushik Das 2014-07-10 16:51:28 +05:30
parent e0d4af5062
commit 394be902eb
7 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java
View File

@ -114,13 +114,12 @@ public class CreatePortableIpRangeCmd extends BaseAsyncCreateCmd {
@Override @Override
public void execute() { public void execute() {
PortableIpRange portableIpRange = _entityMgr.findById(PortableIpRange.class, getEntityId()); PortableIpRange portableIpRange = _entityMgr.findById(PortableIpRange.class, getEntityId());
PortableIpRangeResponse response = null;
if (portableIpRange != null) { if (portableIpRange != null) {
response = _responseGenerator.createPortableIPRangeResponse(portableIpRange); PortableIpRangeResponse response = _responseGenerator.createPortableIPRangeResponse(portableIpRange);
}
response.setResponseName(getCommandName()); response.setResponseName(getCommandName());
this.setResponseObject(response); this.setResponseObject(response);
} }
}
@Override @Override
public void create() throws ResourceAllocationException { public void create() throws ResourceAllocationException {

2
api/src/org/apache/cloudstack/api/command/admin/region/ListPortableIpRangesCmd.java
View File

@ -98,8 +98,8 @@ public class ListPortableIpRangesCmd extends BaseListCmd {
} }
responses.add(rangeResponse); responses.add(rangeResponse);
} }
}
response.setResponses(responses, portableIpRanges.size()); response.setResponses(responses, portableIpRanges.size());
}
response.setResponseName(getCommandName()); response.setResponseName(getCommandName());
this.setResponseObject(response); this.setResponseObject(response);
} }

2
api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java
View File

@ -184,7 +184,7 @@ public class CreatePortForwardingRuleCmd extends BaseAsyncCreateCmd implements P
if (ipAddressId != null) { if (ipAddressId != null) {
IpAddress ipAddr = _networkService.getIp(ipAddressId); IpAddress ipAddr = _networkService.getIp(ipAddressId);
if (ipAddr == null || !ipAddr.readyToUse()) { if (ipAddr == null || !ipAddr.readyToUse()) {
throw new InvalidParameterValueException("Unable to create PF rule, invalid IP address id " + ipAddr.getId()); throw new InvalidParameterValueException("Unable to create PF rule, invalid IP address id " + ipAddressId);
} else { } else {
return ipAddr.getVpcId(); return ipAddr.getVpcId();
} }

4
api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
View File

@ -153,7 +153,7 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd /*implements L
if (publicIpId != null) { if (publicIpId != null) {
IpAddress ipAddr = _networkService.getIp(publicIpId); IpAddress ipAddr = _networkService.getIp(publicIpId);
if (ipAddr == null || !ipAddr.readyToUse()) { if (ipAddr == null || !ipAddr.readyToUse()) {
throw new InvalidParameterValueException("Unable to create load balancer rule, invalid IP address id " + ipAddr.getId()); throw new InvalidParameterValueException("Unable to create load balancer rule, invalid IP address id " + publicIpId);
} }
} else if (getEntityId() != null) { } else if (getEntityId() != null) {
LoadBalancer rule = _entityMgr.findById(LoadBalancer.class, getEntityId()); LoadBalancer rule = _entityMgr.findById(LoadBalancer.class, getEntityId());
@ -167,7 +167,7 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd /*implements L
if (publicIpId != null) { if (publicIpId != null) {
IpAddress ipAddr = _networkService.getIp(publicIpId); IpAddress ipAddr = _networkService.getIp(publicIpId);
if (ipAddr == null || !ipAddr.readyToUse()) { if (ipAddr == null || !ipAddr.readyToUse()) {
throw new InvalidParameterValueException("Unable to create load balancer rule, invalid IP address id " + ipAddr.getId()); throw new InvalidParameterValueException("Unable to create load balancer rule, invalid IP address id " + publicIpId);
} else { } else {
return ipAddr.getVpcId(); return ipAddr.getVpcId();
} }

2
api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java
View File

@ -130,8 +130,8 @@ public class ListLoadBalancerRulesCmd extends BaseListTaggedResourcesCmd {
lbResponse.setObjectName("loadbalancerrule"); lbResponse.setObjectName("loadbalancerrule");
lbResponses.add(lbResponse); lbResponses.add(lbResponse);
} }
}
response.setResponses(lbResponses, loadBalancers.second()); response.setResponses(lbResponses, loadBalancers.second());
}
response.setResponseName(getCommandName()); response.setResponseName(getCommandName());
this.setResponseObject(response); this.setResponseObject(response);
} }

4
api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java
View File

@ -45,7 +45,6 @@ import com.cloud.region.ha.GlobalLoadBalancerRule;
import com.cloud.region.ha.GlobalLoadBalancingRulesService; import com.cloud.region.ha.GlobalLoadBalancingRulesService;
import com.cloud.user.Account; import com.cloud.user.Account;
import com.cloud.utils.StringUtils; import com.cloud.utils.StringUtils;
import com.cloud.utils.db.EntityManager;
@APICommand(name = "assignToGlobalLoadBalancerRule", @APICommand(name = "assignToGlobalLoadBalancerRule",
description = "Assign load balancer rule or list of load " + "balancer rules to a global load balancer rules.", description = "Assign load balancer rule or list of load " + "balancer rules to a global load balancer rules.",
@ -58,9 +57,6 @@ public class AssignToGlobalLoadBalancerRuleCmd extends BaseAsyncCmd {
private static final String s_name = "assigntogloballoadbalancerruleresponse"; private static final String s_name = "assigntogloballoadbalancerruleresponse";
@Inject
public EntityManager _entityMgr;
///////////////////////////////////////////////////// /////////////////////////////////////////////////////
//////////////// API parameters ///////////////////// //////////////// API parameters /////////////////////
///////////////////////////////////////////////////// /////////////////////////////////////////////////////

9
api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java
View File

@ -147,15 +147,12 @@ public class CreateGlobalLoadBalancerRuleCmd extends BaseAsyncCreateCmd {
@Override @Override
public void execute() throws ResourceAllocationException, ResourceUnavailableException { public void execute() throws ResourceAllocationException, ResourceUnavailableException {
CallContext callerContext = CallContext.current();
GlobalLoadBalancerRule rule = _entityMgr.findById(GlobalLoadBalancerRule.class, getEntityId()); GlobalLoadBalancerRule rule = _entityMgr.findById(GlobalLoadBalancerRule.class, getEntityId());
GlobalLoadBalancerResponse response = null;
if (rule != null) { if (rule != null) {
response = _responseGenerator.createGlobalLoadBalancerResponse(rule); GlobalLoadBalancerResponse response = _responseGenerator.createGlobalLoadBalancerResponse(rule);
setResponseObject(response);
}
response.setResponseName(getCommandName()); response.setResponseName(getCommandName());
this.setResponseObject(response);
}
} }
@Override @Override