Skip to content

Commit fae0556

Browse files
DaanHooglandDaan Hoogland
DaanHoogland
authored and
Daan Hoogland
committed
Findbugs: different issues solved(cherry picked from commit
0b13f8e)
1 parent 0daca84 commit fae0556

8 files changed

Lines changed: 70 additions & 52 deletions

File tree

‎server/src/com/cloud/api/query/vo/UserVmJoinVO.java‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import com.cloud.storage.Storage.StoragePoolType;
3636
import com.cloud.storage.Volume;
3737
import com.cloud.utils.db.GenericDao;
38+
import com.cloud.utils.exception.CloudRuntimeException;
3839
import com.cloud.vm.VirtualMachine;
3940
import com.cloud.vm.VirtualMachine.State;
4041

@@ -47,10 +48,10 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
4748
private long id;
4849

4950
@Column(name = "name", updatable = false, nullable = false, length = 255)
50-
private String name = null;
51+
private final String name = null;
5152

5253
@Column(name = "display_name", updatable = false, nullable = false, length = 255)
53-
private String displayName = null;
54+
private final String displayName = null;
5455

5556
@Column(name = "account_id")
5657
private long accountId;
@@ -59,7 +60,7 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
5960
private String accountUuid;
6061

6162
@Column(name = "account_name")
62-
private String accountName = null;
63+
private final String accountName = null;
6364

6465
@Column(name = "account_type")
6566
private short accountType;
@@ -71,10 +72,10 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
7172
private String domainUuid;
7273

7374
@Column(name = "domain_name")
74-
private String domainName = null;
75+
private final String domainName = null;
7576

7677
@Column(name = "domain_path")
77-
private String domainPath = null;
78+
private final String domainPath = null;
7879

7980
@Column(name = "instance_group_id")
8081
private long instanceGroupId;
@@ -96,7 +97,7 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
9697
*/
9798
@Enumerated(value = EnumType.STRING)
9899
@Column(name = "state", updatable = true, nullable = false, length = 32)
99-
private State state = null;
100+
private final State state = null;
100101

101102
@Column(name = GenericDao.CREATED_COLUMN)
102103
private Date created;
@@ -148,7 +149,7 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
148149
private String dataCenterUuid;
149150

150151
@Column(name = "data_center_name")
151-
private String dataCenterName = null;
152+
private final String dataCenterName = null;
152153

153154
@Column(name = "security_group_enabled")
154155
private boolean securityGroupEnabled;
@@ -233,7 +234,7 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
233234
private String volumeUuid;
234235

235236
@Column(name = "volume_device_id")
236-
private Long volumeDeviceId = null;
237+
private final Long volumeDeviceId = null;
237238

238239
@Column(name = "volume_type")
239240
@Enumerated(EnumType.STRING)
@@ -745,9 +746,11 @@ public Map<String, String> getDetails() {
745746
}
746747

747748
public String getDetail(String name) {
748-
assert (details != null) : "Did you forget to load the details?";
749+
if (details == null) {
750+
throw new CloudRuntimeException("No details to get. Did you forget to load the details?");
751+
}
749752

750-
return details != null ? details.get(name) : null;
753+
return details.get(name);
751754
}
752755

753756
public String getUserData() {

‎server/src/com/cloud/consoleproxy/AgentHookBase.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import com.cloud.servlet.ConsoleProxyPasswordBasedEncryptor;
5050
import com.cloud.servlet.ConsoleProxyServlet;
5151
import com.cloud.utils.Ternary;
52+
import com.cloud.utils.exception.CloudRuntimeException;
5253
import com.cloud.vm.VirtualMachine;
5354
import com.cloud.vm.dao.VMInstanceDao;
5455

@@ -192,7 +193,9 @@ public void startAgentHttpHandlerInVM(StartupProxyCommand startupCmd) {
192193

193194
assert (ksBits != null);
194195
if (ksBits == null) {
195-
s_logger.error("Could not find and construct a valid SSL certificate");
196+
String msg = "Could not find and construct a valid SSL certificate";
197+
s_logger.error(msg);
198+
throw new CloudRuntimeException(msg);
196199
}
197200
cmd = new StartConsoleProxyAgentHttpHandlerCommand(ksBits, storePassword);
198201
cmd.setEncryptorPassword(getEncryptorPassword());

‎server/src/com/cloud/dc/DedicatedResourceVO.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@
2929
@Table(name = "dedicated_resources")
3030
public class DedicatedResourceVO implements DedicatedResources {
3131

32+
/**
33+
*
34+
*/
35+
private static final long serialVersionUID = -6659510127145101917L;
36+
3237
@Id
3338
@GeneratedValue(strategy = GenerationType.IDENTITY)
3439
@Column(name = "id")
@@ -59,7 +64,7 @@ public class DedicatedResourceVO implements DedicatedResources {
5964
private long affinityGroupId;
6065

6166
public DedicatedResourceVO() {
62-
this.uuid = UUID.randomUUID().toString();
67+
uuid = UUID.randomUUID().toString();
6368
}
6469

6570
public DedicatedResourceVO(Long dataCenterId, Long podId, Long clusterId, Long hostId, Long domainId, Long accountId, long affinityGroupId) {
@@ -69,7 +74,7 @@ public DedicatedResourceVO(Long dataCenterId, Long podId, Long clusterId, Long h
6974
this.hostId = hostId;
7075
this.domainId = domainId;
7176
this.accountId = accountId;
72-
this.uuid = UUID.randomUUID().toString();
77+
uuid = UUID.randomUUID().toString();
7378
this.affinityGroupId = affinityGroupId;
7479
}
7580

@@ -115,7 +120,7 @@ public void setHostId(long hostId) {
115120
}
116121

117122
public DedicatedResourceVO(long dedicatedResourceId) {
118-
this.id = dedicatedResourceId;
123+
id = dedicatedResourceId;
119124
}
120125

121126
@Override
@@ -138,7 +143,7 @@ public void setAccountId(Long accountId) {
138143

139144
@Override
140145
public String getUuid() {
141-
return this.uuid;
146+
return uuid;
142147
}
143148

144149
public void setUuid(String uuid) {
@@ -153,7 +158,7 @@ public long getAffinityGroupId() {
153158
@Override
154159
public boolean equals(Object obj) {
155160
if (obj instanceof DedicatedResourceVO) {
156-
return ((DedicatedResourceVO)obj).getId() == this.getId();
161+
return ((DedicatedResourceVO)obj).getId() == getId();
157162
} else {
158163
return false;
159164
}

‎server/src/com/cloud/network/IpAddressManagerImpl.java‎

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package com.cloud.network;
1818

1919
import java.util.ArrayList;
20+
import java.util.Arrays;
2021
import java.util.Date;
2122
import java.util.HashMap;
2223
import java.util.HashSet;
@@ -28,6 +29,8 @@
2829

2930
import javax.inject.Inject;
3031

32+
import org.apache.log4j.Logger;
33+
3134
import org.apache.cloudstack.acl.ControlledEntity.ACLType;
3235
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
3336
import org.apache.cloudstack.context.CallContext;
@@ -39,7 +42,6 @@
3942
import org.apache.cloudstack.region.PortableIpDao;
4043
import org.apache.cloudstack.region.PortableIpVO;
4144
import org.apache.cloudstack.region.Region;
42-
import org.apache.log4j.Logger;
4345

4446
import com.cloud.agent.AgentManager;
4547
import com.cloud.alert.AlertManager;
@@ -570,8 +572,9 @@ public boolean disassociatePublicIpAddress(long addrId, long userId, Account cal
570572

571573
IPAddressVO ip = markIpAsUnavailable(addrId);
572574

573-
assert (ip != null) : "Unable to mark the ip address id=" + addrId + " as unavailable.";
574575
if (ip == null) {
576+
String msg = "Unable to mark the ip address id=" + addrId + " as unavailable.";
577+
s_logger.error(msg);
575578
return true;
576579
}
577580

@@ -684,10 +687,10 @@ public IPAddressVO doInTransaction(TransactionStatus status) throws Insufficient
684687
if (dedicatedVlanDbIds != null && !dedicatedVlanDbIds.isEmpty()) {
685688
fetchFromDedicatedRange = true;
686689
sc.setParameters("vlanId", dedicatedVlanDbIds.toArray());
687-
errorMessage.append(", vlanId id=" + dedicatedVlanDbIds.toArray());
690+
errorMessage.append(", vlanId id=" + Arrays.toString(dedicatedVlanDbIds.toArray()));
688691
} else if (nonDedicatedVlanDbIds != null && !nonDedicatedVlanDbIds.isEmpty()) {
689692
sc.setParameters("vlanId", nonDedicatedVlanDbIds.toArray());
690-
errorMessage.append(", vlanId id=" + nonDedicatedVlanDbIds.toArray());
693+
errorMessage.append(", vlanId id=" + Arrays.toString(nonDedicatedVlanDbIds.toArray()));
691694
} else {
692695
if (podId != null) {
693696
InsufficientAddressCapacityException ex = new InsufficientAddressCapacityException("Insufficient address capacity", Pod.class, podId);
@@ -727,7 +730,7 @@ public IPAddressVO doInTransaction(TransactionStatus status) throws Insufficient
727730
if (useSystemIps && nonDedicatedVlanDbIds != null && !nonDedicatedVlanDbIds.isEmpty()) {
728731
fetchFromDedicatedRange = false;
729732
sc.setParameters("vlanId", nonDedicatedVlanDbIds.toArray());
730-
errorMessage.append(", vlanId id=" + nonDedicatedVlanDbIds.toArray());
733+
errorMessage.append(", vlanId id=" + Arrays.toString(nonDedicatedVlanDbIds.toArray()));
731734
addrs = _ipAddressDao.lockRows(sc, filter, true);
732735
}
733736
}
@@ -852,6 +855,11 @@ public PublicIp assignSourceNatIpAddressToGuestNetwork(Account owner, Network gu
852855
public PublicIp assignDedicateIpAddress(Account owner, final Long guestNtwkId, final Long vpcId, final long dcId, final boolean isSourceNat)
853856
throws ConcurrentOperationException, InsufficientAddressCapacityException {
854857

858+
if (owner == null) {
859+
s_logger.error("No account to assign an ip to.");
860+
return null;
861+
}
862+
855863
final long ownerId = owner.getId();
856864

857865
PublicIp ip = null;
@@ -883,13 +891,11 @@ public PublicIp doInTransaction(TransactionStatus status) throws InsufficientAdd
883891

884892
return ip;
885893
} finally {
886-
if (owner != null) {
887-
if (s_logger.isDebugEnabled()) {
888-
s_logger.debug("Releasing lock account " + ownerId);
889-
}
890-
891-
_accountDao.releaseFromLockTable(ownerId);
894+
if (s_logger.isDebugEnabled()) {
895+
s_logger.debug("Releasing lock account " + ownerId);
892896
}
897+
_accountDao.releaseFromLockTable(ownerId);
898+
893899
if (ip == null) {
894900
s_logger.error("Unable to get source nat ip address for account " + ownerId);
895901
}
@@ -1218,7 +1224,7 @@ public IPAddressVO associateIPToGuestNetwork(long ipId, long networkId, boolean
12181224

12191225
s_logger.debug("Associating ip " + ipToAssoc + " to network " + network);
12201226

1221-
IPAddressVO ip = _ipAddressDao.findById(ipId);
1227+
IPAddressVO ip = ipToAssoc; //_ipAddressDao.findById(ipId);
12221228
//update ip address with networkId
12231229
ip.setAssociatedWithNetworkId(networkId);
12241230
ip.setSourceNat(isSourceNat);
@@ -1235,18 +1241,16 @@ public IPAddressVO associateIPToGuestNetwork(long ipId, long networkId, boolean
12351241
return ip;
12361242
} finally {
12371243
if (!success && releaseOnFailure) {
1238-
if (ip != null) {
1239-
try {
1240-
s_logger.warn("Failed to associate ip address, so releasing ip from the database " + ip);
1241-
_ipAddressDao.markAsUnavailable(ip.getId());
1242-
if (!applyIpAssociations(network, true)) {
1243-
// if fail to apply ip assciations again, unassign ip address without updating resource
1244-
// count and generating usage event as there is no need to keep it in the db
1245-
_ipAddressDao.unassignIpAddress(ip.getId());
1246-
}
1247-
} catch (Exception e) {
1248-
s_logger.warn("Unable to disassociate ip address for recovery", e);
1244+
try {
1245+
s_logger.warn("Failed to associate ip address, so releasing ip from the database " + ip);
1246+
_ipAddressDao.markAsUnavailable(ip.getId());
1247+
if (!applyIpAssociations(network, true)) {
1248+
// if fail to apply ip assciations again, unassign ip address without updating resource
1249+
// count and generating usage event as there is no need to keep it in the db
1250+
_ipAddressDao.unassignIpAddress(ip.getId());
12491251
}
1252+
} catch (Exception e) {
1253+
s_logger.warn("Unable to disassociate ip address for recovery", e);
12501254
}
12511255
}
12521256
}
@@ -1327,7 +1331,7 @@ public IPAddressVO disassociatePortableIPToGuestNetwork(long ipId, long networkI
13271331
PublicIp publicIp = PublicIp.createFromAddrAndVlan(ipToAssoc, _vlanDao.findById(ipToAssoc.getVlanId()));
13281332
ipList.add(publicIp);
13291333
Map<PublicIpAddress, Set<Service>> ipToServices = _networkModel.getIpToServices(ipList, false, true);
1330-
if (ipToServices != null & !ipToServices.isEmpty()) {
1334+
if (ipToServices != null && !ipToServices.isEmpty()) {
13311335
Set<Service> services = ipToServices.get(publicIp);
13321336
if (services != null && !services.isEmpty()) {
13331337
throw new InvalidParameterValueException("IP " + ipToAssoc + " has services and rules associated in the network " + networkId);
@@ -1368,7 +1372,7 @@ public boolean isPortableIpTransferableFromNetwork(long ipAddrId, long networkId
13681372
PublicIp publicIp = PublicIp.createFromAddrAndVlan(ip, _vlanDao.findById(ip.getVlanId()));
13691373
ipList.add(publicIp);
13701374
Map<PublicIpAddress, Set<Service>> ipToServices = _networkModel.getIpToServices(ipList, false, true);
1371-
if (ipToServices != null & !ipToServices.isEmpty()) {
1375+
if (ipToServices != null && !ipToServices.isEmpty()) {
13721376
Set<Service> ipServices = ipToServices.get(publicIp);
13731377
if (ipServices != null && !ipServices.isEmpty()) {
13741378
return false;
@@ -1671,14 +1675,14 @@ public String acquireGuestIpAddress(Network network, String requestedIp) {
16711675

16721676
@Override
16731677
public boolean applyStaticNats(List<? extends StaticNat> staticNats, boolean continueOnError, boolean forRevoke) throws ResourceUnavailableException {
1674-
Network network = _networksDao.findById(staticNats.get(0).getNetworkId());
1675-
boolean success = true;
1676-
16771678
if (staticNats == null || staticNats.size() == 0) {
16781679
s_logger.debug("There are no static nat rules for the network elements");
16791680
return true;
16801681
}
16811682

1683+
Network network = _networksDao.findById(staticNats.get(0).getNetworkId());
1684+
boolean success = true;
1685+
16821686
// get the list of public ip's owned by the network
16831687
List<IPAddressVO> userIps = _ipAddressDao.listByAssociatedNetwork(network.getId(), null);
16841688
List<PublicIp> publicIps = new ArrayList<PublicIp>();

‎server/src/com/cloud/network/NetworkModelImpl.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,14 +1017,14 @@ public Map<Service, Set<Provider>> getNetworkOfferingServiceProvidersMap(long ne
10171017
List<NetworkOfferingServiceMapVO> map = _ntwkOfferingSrvcDao.listByNetworkOfferingId(networkOfferingId);
10181018

10191019
for (NetworkOfferingServiceMapVO instance : map) {
1020-
String service = instance.getService();
1020+
Service service = Network.Service.getService(instance.getService());
10211021
Set<Provider> providers;
10221022
providers = serviceProviderMap.get(service);
10231023
if (providers == null) {
10241024
providers = new HashSet<Provider>();
10251025
}
10261026
providers.add(Provider.getProvider(instance.getProvider()));
1027-
serviceProviderMap.put(Service.getService(service), providers);
1027+
serviceProviderMap.put(service, providers);
10281028
}
10291029

10301030
return serviceProviderMap;
@@ -1533,6 +1533,9 @@ public void checkCapabilityForProvider(Set<Provider> providers, Service service,
15331533

15341534
@Override
15351535
public void checkNetworkPermissions(Account owner, Network network) {
1536+
if (network == null) {
1537+
throw new CloudRuntimeException("no network to check permissions for.");
1538+
}
15361539
// Perform account permission check
15371540
if (network.getGuestType() != Network.GuestType.Shared || (network.getGuestType() == Network.GuestType.Shared && network.getAclType() == ACLType.Account)) {
15381541
AccountVO networkOwner = _accountDao.findById(network.getAccountId());

‎server/src/com/cloud/network/guru/ControlNetworkGuru.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,12 +224,12 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
224224

225225
Map<String, String> dbParams = _configDao.getConfiguration(params);
226226

227-
_cidr = dbParams.get(Config.ControlCidr);
227+
_cidr = dbParams.get(Config.ControlCidr.toString());
228228
if (_cidr == null) {
229229
_cidr = "169.254.0.0/16";
230230
}
231231

232-
_gateway = dbParams.get(Config.ControlGateway);
232+
_gateway = dbParams.get(Config.ControlGateway.toString());
233233
if (_gateway == null) {
234234
_gateway = NetUtils.getLinkLocalGateway();
235235
}

‎server/src/com/cloud/network/vpc/VpcManagerImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,14 +424,14 @@ public Map<Service, Set<Provider>> getVpcOffSvcProvidersMap(long vpcOffId) {
424424
List<VpcOfferingServiceMapVO> map = _vpcOffSvcMapDao.listByVpcOffId(vpcOffId);
425425

426426
for (VpcOfferingServiceMapVO instance : map) {
427-
String service = instance.getService();
427+
Service service = Service.getService(instance.getService());
428428
Set<Provider> providers;
429429
providers = serviceProviderMap.get(service);
430430
if (providers == null) {
431431
providers = new HashSet<Provider>();
432432
}
433433
providers.add(Provider.getProvider(instance.getProvider()));
434-
serviceProviderMap.put(Service.getService(service), providers);
434+
serviceProviderMap.put(service, providers);
435435
}
436436

437437
return serviceProviderMap;

‎server/src/com/cloud/template/TemplateManagerImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ private String extract(Account caller, Long templateId, String url, Long zoneId,
425425
if (isISO) {
426426
desc = Upload.Type.ISO.toString();
427427
}
428-
eventId = eventId == null ? 0 : eventId;
428+
eventId = (eventId == null ? 0 : eventId);
429429

430430
if (!_accountMgr.isRootAdmin(caller.getType()) && _disableExtraction) {
431431
throw new PermissionDeniedException("Extraction has been disabled by admin");
@@ -1785,7 +1785,7 @@ private VMTemplateVO updateTemplateOrIso(BaseUpdateTemplateOrIsoCmd cmd) {
17851785
}
17861786

17871787
// Don't allow to modify system template
1788-
if (id == Long.valueOf(1)) {
1788+
if (Long.valueOf(1).equals(id)) {
17891789
InvalidParameterValueException ex = new InvalidParameterValueException("Unable to update template/iso of specified id");
17901790
ex.addProxyObject(String.valueOf(id), "templateId");
17911791
throw ex;

0 commit comments

Comments
 (0)