You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/06/15 11:14:34 UTC
[01/34] git commit: updated refs/heads/master to 7a57ce3
Repository: cloudstack
Updated Branches:
refs/heads/master ccd7d41ee -> 7a57ce333
Fix 3 findbugs encoding warnings in VmwareStorageProcessor.java Ova templates and metadata should be written to file in UTF-8 Fix warning in UUID generation
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #411
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/85ad1b7e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/85ad1b7e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/85ad1b7e
Branch: refs/heads/master
Commit: 85ad1b7e0fe366147b2e986e4388d618a5a68145
Parents: ccd7d41
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 14:17:40 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:09:13 2015 +0300
----------------------------------------------------------------------
.../cloud/storage/resource/VmwareStorageProcessor.java | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85ad1b7e/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
index ab1a01d..0bad8a6 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
@@ -30,6 +30,7 @@ import java.util.UUID;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
+import java.io.UnsupportedEncodingException;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
@@ -680,7 +681,7 @@ public class VmwareStorageProcessor implements StorageProcessor {
// TODO a bit ugly here
BufferedWriter out = null;
try {
- out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(installFullPath + "/template.properties")));
+ out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(installFullPath + "/template.properties"),"UTF-8"));
out.write("filename=" + templateName + ".ova");
out.newLine();
out.write("description=");
@@ -859,7 +860,7 @@ public class VmwareStorageProcessor implements StorageProcessor {
// TODO a bit ugly here
BufferedWriter out = null;
try {
- out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(installFullPath + "/" + templateName + ".ova.meta")));
+ out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(installFullPath + "/" + templateName + ".ova.meta"),"UTF-8"));
out.write("ova.filename=" + templateName + ".ova");
out.newLine();
out.write("version=1.0");
@@ -1388,7 +1389,13 @@ public class VmwareStorageProcessor implements StorageProcessor {
}
private static String getSecondaryDatastoreUUID(String storeUrl) {
- return UUID.nameUUIDFromBytes(storeUrl.getBytes()).toString();
+ String uuid = null;
+ try{
+ uuid=UUID.nameUUIDFromBytes(storeUrl.getBytes("UTF-8")).toString();
+ }catch(UnsupportedEncodingException e){
+ s_logger.warn("Failed to create UUID from string " + storeUrl + ". Bad storeUrl or UTF-8 encoding error." );
+ }
+ return uuid;
}
public synchronized ManagedObjectReference prepareSecondaryDatastoreOnHost(String storeUrl) throws Exception {
[18/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Fixed 4 findbugs warnings in CitrixResourceBase.java Unnecessary boxing/unboxing of primitive values
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #425
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/be474f95
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/be474f95
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/be474f95
Branch: refs/heads/master
Commit: be474f95a1415d604ffc8ab9278a6eb29a400627
Parents: 16ddd49
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 17:12:32 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:09:39 2015 +0300
----------------------------------------------------------------------
.../hypervisor/xenserver/resource/CitrixResourceBase.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be474f95/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
index 43cdd88..aa02d00 100644
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
@@ -2773,8 +2773,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
final String[] splitResult = result.split(":");
int i = 0;
while (i < splitResult.length - 1) {
- stats[0] += new Long(splitResult[i++]).longValue();
- stats[1] += new Long(splitResult[i++]).longValue();
+ stats[0] += Long.parseLong(splitResult[i++]);
+ stats[1] += Long.parseLong(splitResult[i++]);
}
}
return stats;
@@ -4045,7 +4045,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
throw new InternalErrorException("There were no more available slots for a new VIF on router: " + router.getNameLabel(conn));
}
- nic.setDeviceId(Integer.valueOf(vifDeviceNum));
+ nic.setDeviceId(Integer.parseInt(vifDeviceNum));
correctVif = createVif(conn, routerName, router, null, nic);
correctVif.plug(conn);
@@ -4105,7 +4105,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
s_logger.error(msg);
return new ExecutionResult(false, msg);
}
- nic.setDeviceId(Integer.valueOf(vif.getDevice(conn)));
+ nic.setDeviceId(Integer.parseInt(vif.getDevice(conn)));
} else {
final String msg = "Prepare SetNetworkACL failed due to nic is null for : " + routerName;
s_logger.error(msg);
@@ -4166,7 +4166,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
return new ExecutionResult(false, "Can not find vif with mac " + mac + " for VM " + domrName);
}
- nic.setDeviceId(Integer.valueOf(domrVif.getDevice(conn)));
+ nic.setDeviceId(Integer.parseInt(domrVif.getDevice(conn)));
} catch (final Exception e) {
final String msg = "Creating guest network failed due to " + e.toString();
s_logger.warn(msg, e);
[34/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Fix findbugs NS_DANGEROUS_NON_SHORT_CIRCUIT warning in NetworkServiceImpl.java
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #440
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7a57ce33
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7a57ce33
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7a57ce33
Branch: refs/heads/master
Commit: 7a57ce33344c8c94b2b6df6b82f6b23adf6ad56c
Parents: 3d1dde7
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 18:55:17 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:10:10 2015 +0300
----------------------------------------------------------------------
server/src/com/cloud/network/NetworkServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7a57ce33/server/src/com/cloud/network/NetworkServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java
index cf85398..e47baea 100644
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -3127,7 +3127,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
if (i != (guestVlanMaps.size() - 1)) {
List<Integer> vlanTokens2 = getVlanFromRange(guestVlanMaps.get(i + 1).getGuestVlanRange());
// Range extends 2 vlan ranges, both to the right and left
- if (endVlan == (vlanTokens2.get(0).intValue() - 1) & guestVlanMaps.get(i + 1).getAccountId() == vlanOwnerId) {
+ if (endVlan == (vlanTokens2.get(0).intValue() - 1) && guestVlanMaps.get(i + 1).getAccountId() == vlanOwnerId) {
_datacneterVnet.releaseDedicatedGuestVlans(guestVlanMaps.get(i + 1).getId());
_accountGuestVlanMapDao.remove(guestVlanMaps.get(i + 1).getId());
updatedVlanRange = vlanTokens1.get(0).intValue() + "-" + vlanTokens2.get(1).intValue();
[09/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Fix findbugs DMI_RANDOM_USED_ONLY_ONCE warning in TransportAddress.java Changed to recommended SecureRandom instead of Random
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #416
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/89a07084
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/89a07084
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/89a07084
Branch: refs/heads/master
Commit: 89a07084c55aee97c4ebcbb3e5021e5e4e384d11
Parents: 4e0fe46
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 16:28:37 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:09:22 2015 +0300
----------------------------------------------------------------------
.../apache/cloudstack/framework/transport/TransportAddress.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/89a07084/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportAddress.java
----------------------------------------------------------------------
diff --git a/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportAddress.java b/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportAddress.java
index 4a724fd..99e25b1 100644
--- a/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportAddress.java
+++ b/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportAddress.java
@@ -19,7 +19,7 @@
package org.apache.cloudstack.framework.transport;
-import java.util.Random;
+import java.security.SecureRandom;
public class TransportAddress {
public final static String LOCAL_SERVICE_NODE = "";
@@ -29,6 +29,7 @@ public class TransportAddress {
private int _connectionId = LOCAL_SERVICE_CONNECTION;
private String _endpointId;
private int _magic;
+ private final SecureRandom randomGenerator=new SecureRandom();
public TransportAddress(String nodeId, int connectionId, String endpointId) {
assert (nodeId != null);
@@ -39,7 +40,7 @@ public class TransportAddress {
_nodeId = nodeId;
_connectionId = connectionId;
_endpointId = endpointId;
- _magic = new Random().nextInt();
+ _magic = randomGenerator.nextInt();
}
public TransportAddress(String nodeId, int connectionId, String endpointId, int magic) {
[05/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Remove unused imports to fix checkstyle warnings
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #413
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a7a39a60
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a7a39a60
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a7a39a60
Branch: refs/heads/master
Commit: a7a39a608c20d48104dae94fed4d2a616aaca08b
Parents: 96d6aaa
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 15:59:16 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:09:17 2015 +0300
----------------------------------------------------------------------
.../cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a7a39a60/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
index 409b9b2..4e0547a 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
@@ -16,9 +16,6 @@
// under the License.
package org.apache.cloudstack.api.command.admin.systemvm;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import org.apache.log4j.Logger;
[27/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Fix findbugs warning in ProjectManagerImpl.java Unnecessary boxing/unboxing of primitive value
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #434
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ec280189
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ec280189
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ec280189
Branch: refs/heads/master
Commit: ec280189f49ac8aadecd6508313068e27ea50b5c
Parents: 4d31ed9
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 17:34:47 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:09:57 2015 +0300
----------------------------------------------------------------------
server/src/com/cloud/projects/ProjectManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec280189/server/src/com/cloud/projects/ProjectManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/projects/ProjectManagerImpl.java b/server/src/com/cloud/projects/ProjectManagerImpl.java
index d10c059..510b55c 100644
--- a/server/src/com/cloud/projects/ProjectManagerImpl.java
+++ b/server/src/com/cloud/projects/ProjectManagerImpl.java
@@ -140,7 +140,7 @@ public class ProjectManagerImpl extends ManagerBase implements ProjectManager {
_invitationRequired = Boolean.valueOf(configs.get(Config.ProjectInviteRequired.key()));
String value = configs.get(Config.ProjectInvitationExpirationTime.key());
- _invitationTimeOut = Long.valueOf(value != null ? value : "86400") * 1000;
+ _invitationTimeOut = Long.parseLong(value != null ? value : "86400") * 1000;
_allowUserToCreateProject = Boolean.valueOf(configs.get(Config.AllowUserToCreateProject.key()));
// set up the email system for project invitations
[04/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Fix findbugs ClassCastException in UpgradeSystemVMCmd.java 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> in line 83
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/96d6aaa2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/96d6aaa2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/96d6aaa2
Branch: refs/heads/master
Commit: 96d6aaa2933d2b37f2859323822de5e61310e4c4
Parents: 8634fe5
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 15:25:33 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:09:16 2015 +0300
----------------------------------------------------------------------
.../api/command/admin/systemvm/UpgradeSystemVMCmd.java | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/96d6aaa2/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
index f087077..409b9b2 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
@@ -75,18 +75,7 @@ public class UpgradeSystemVMCmd extends BaseCmd {
}
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 (Map.Entry<String,String>entry : value.entrySet()) {
- customparameterMap.put(entry.getKey(), entry.getValue());
- }
- }
- }
- return customparameterMap;
+ return details;
}
/////////////////////////////////////////////////////
[31/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Fix 2 findbugs warnings in ApiResponseHelper.java ints were being boxed just to call .toString()
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #438
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1bd32862
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1bd32862
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1bd32862
Branch: refs/heads/master
Commit: 1bd3286263f973380d3f411fc9d667ecc974b385
Parents: ea7f4bd
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 17:48:48 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:10:04 2015 +0300
----------------------------------------------------------------------
server/src/com/cloud/api/ApiResponseHelper.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1bd32862/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index d904e73..99a80f8 100644
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -408,7 +408,7 @@ public class ApiResponseHelper implements ResponseGenerator {
populateAccount(resourceLimitResponse, limit.getOwnerId());
populateDomain(resourceLimitResponse, accountTemp.getDomainId());
}
- resourceLimitResponse.setResourceType(Integer.valueOf(limit.getType().getOrdinal()).toString());
+ resourceLimitResponse.setResourceType(Integer.toString(limit.getType().getOrdinal()));
if ((limit.getType() == ResourceType.primary_storage || limit.getType() == ResourceType.secondary_storage) && limit.getMax() >= 0) {
resourceLimitResponse.setMax((long)Math.ceil((double)limit.getMax() / ResourceType.bytesToGiB));
@@ -434,7 +434,7 @@ public class ApiResponseHelper implements ResponseGenerator {
populateDomain(resourceCountResponse, resourceCount.getOwnerId());
}
- resourceCountResponse.setResourceType(Integer.valueOf(resourceCount.getType().getOrdinal()).toString());
+ resourceCountResponse.setResourceType(Integer.toString(resourceCount.getType().getOrdinal()));
resourceCountResponse.setResourceCount(resourceCount.getCount());
resourceCountResponse.setObjectName("resourcecount");
return resourceCountResponse;
[06/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
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
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9c4162ac
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9c4162ac
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9c4162ac
Branch: refs/heads/master
Commit: 9c4162ac7f451fc3e2155418dcfff224c8c08a4a
Parents: a7a39a6
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 15:33:50 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:09:18 2015 +0300
----------------------------------------------------------------------
.../api/command/user/vm/ScaleVMCmd.java | 18 ++----------------
.../api/command/user/vm/UpgradeVMCmd.java | 13 +------------
2 files changed, 3 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9c4162ac/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
----------------------------------------------------------------------
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 661100b..9a74fc6 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 class ScaleVMCmd extends BaseAsyncCmd {
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 class ScaleVMCmd extends BaseAsyncCmd {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to scale vm");
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9c4162ac/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
----------------------------------------------------------------------
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 b105555..a64d712 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 class UpgradeVMCmd extends BaseCmd {
}
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;
}
/////////////////////////////////////////////////////
[20/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Fix findbugs warning in PaloAltoResource.java Unnecessary boxing/unboxing of primitive value
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #427
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6f330f7a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6f330f7a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6f330f7a
Branch: refs/heads/master
Commit: 6f330f7ab63c9c7dfefc3383a7073ee7ea851b27
Parents: 1494487
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 17:17:10 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:09:43 2015 +0300
----------------------------------------------------------------------
.../palo-alto/src/com/cloud/network/resource/PaloAltoResource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6f330f7a/plugins/network-elements/palo-alto/src/com/cloud/network/resource/PaloAltoResource.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/palo-alto/src/com/cloud/network/resource/PaloAltoResource.java b/plugins/network-elements/palo-alto/src/com/cloud/network/resource/PaloAltoResource.java
index 2952b93..7fdb70b 100644
--- a/plugins/network-elements/palo-alto/src/com/cloud/network/resource/PaloAltoResource.java
+++ b/plugins/network-elements/palo-alto/src/com/cloud/network/resource/PaloAltoResource.java
@@ -1612,7 +1612,7 @@ public class PaloAltoResource implements ServerResource {
}
private String getPrivateSubnet(String vlan) throws ExecutionException {
- String _interfaceName = genPrivateInterfaceName(Long.valueOf(vlan).longValue());
+ String _interfaceName = genPrivateInterfaceName(Long.parseLong(vlan));
Map<String, String> params = new HashMap<String, String>();
params.put("type", "config");
params.put("action", "get");
[12/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Fix findbugs warning in Upgrade421to430.java Was creating Integer to assign to int
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #419
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e409bc3e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e409bc3e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e409bc3e
Branch: refs/heads/master
Commit: e409bc3e60b47760fe3cc43e50b5a1f38cf80572
Parents: a299674
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 16:50:30 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:09:27 2015 +0300
----------------------------------------------------------------------
engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e409bc3e/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
index fef29dd..eaf33d5 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
@@ -157,7 +157,7 @@ public class Upgrade421to430 implements DbUpgrade {
if (resultSet.next()) {
port = DBEncryptionUtil.decrypt(resultSet.getString(1));
if (StringUtils.isNotBlank(port)) {
- portNumber = Integer.valueOf(port);
+ portNumber = Integer.parseInt(port);
}
}
pstmt.close();
[03/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Remove unused imports to fix checkstyle warnings
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #412
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8634fe5c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8634fe5c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8634fe5c
Branch: refs/heads/master
Commit: 8634fe5cf59c007c5dc86c1741be31ad3b9c66d2
Parents: 31a4f0a
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 15:57:54 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:09:15 2015 +0300
----------------------------------------------------------------------
.../cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8634fe5c/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
index fa608cc..d53da36 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
@@ -16,9 +16,6 @@
// under the License.
package org.apache.cloudstack.api.command.admin.systemvm;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import org.apache.log4j.Logger;
[17/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Fix findbugs warning in UcsManagerImpl.java Integer was being created to assign value to int
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #424
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/16ddd498
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/16ddd498
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/16ddd498
Branch: refs/heads/master
Commit: 16ddd498d5ba9c731a696563feaaddc01ebcb520
Parents: 9ba4e9c
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 17:07:44 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:09:37 2015 +0300
----------------------------------------------------------------------
.../hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/16ddd498/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
index 797cea6..6272ee2 100644
--- a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
+++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
@@ -175,7 +175,7 @@ public class UcsManagerImpl implements UcsManager {
@Override
public boolean start() {
try {
- syncBladeInterval = Integer.valueOf(configDao.getValue(Config.UCSSyncBladeInterval.key()));
+ syncBladeInterval = Integer.parseInt(configDao.getValue(Config.UCSSyncBladeInterval.key()));
} catch (NumberFormatException e) {
syncBladeInterval = 600;
}
[23/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Fix findbugs warning in ApiDispatcher.java Unnecessary boxing/unboxing of long value
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #430
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/62e78cde
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/62e78cde
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/62e78cde
Branch: refs/heads/master
Commit: 62e78cdea043f4e9c8e4b67060de1db3665c1522
Parents: 9511831
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 17:24:08 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:09:48 2015 +0300
----------------------------------------------------------------------
server/src/com/cloud/api/ApiDispatcher.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/62e78cde/server/src/com/cloud/api/ApiDispatcher.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiDispatcher.java b/server/src/com/cloud/api/ApiDispatcher.java
index 3447662..0dc1164 100644
--- a/server/src/com/cloud/api/ApiDispatcher.java
+++ b/server/src/com/cloud/api/ApiDispatcher.java
@@ -108,7 +108,7 @@ public class ApiDispatcher {
final BaseAsyncCmd asyncCmd = (BaseAsyncCmd)cmd;
final String startEventId = params.get(ApiConstants.CTX_START_EVENT_ID);
- ctx.setStartEventId(Long.valueOf(startEventId));
+ ctx.setStartEventId(Long.parseLong(startEventId));
// Synchronise job on the object if needed
if (asyncCmd.getJob() != null && asyncCmd.getSyncObjId() != null && asyncCmd.getSyncObjType() != null) {
[28/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Fix findbugs warning in NetUtils.java Unnecessary boxing/unboxing of primitive value
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #435
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/14f761a9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/14f761a9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/14f761a9
Branch: refs/heads/master
Commit: 14f761a97667c1d2930177d3341d2040514e8d03
Parents: ec28018
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 17:36:21 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:09:58 2015 +0300
----------------------------------------------------------------------
utils/src/com/cloud/utils/net/NetUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/14f761a9/utils/src/com/cloud/utils/net/NetUtils.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/net/NetUtils.java b/utils/src/com/cloud/utils/net/NetUtils.java
index 2cd4753..883129b 100644
--- a/utils/src/com/cloud/utils/net/NetUtils.java
+++ b/utils/src/com/cloud/utils/net/NetUtils.java
@@ -1080,7 +1080,7 @@ public class NetUtils {
public static String getDhcpRange(final String cidr) {
final String[] splitResult = cidr.split("\\/");
- final long size = Long.valueOf(splitResult[1]);
+ final long size = Long.parseLong(splitResult[1]);
return NetUtils.getIpRangeStartIpFromCidr(splitResult[0], size);
}
[10/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Fix findbugs DM_BOXED_PRIMITIVE_FOR_PARSING in DeployVMCmd.java Was creating Long to assign to long
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #417
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d0a494b7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d0a494b7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d0a494b7
Branch: refs/heads/master
Commit: d0a494b71b7da575abb66e032dccbd6e1b84cb95
Parents: 89a0708
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 16:43:40 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:09:24 2015 +0300
----------------------------------------------------------------------
api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d0a494b7/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
index f17c1c1..8026d93 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
@@ -506,7 +506,7 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd {
try {
if (minIops != null) {
- lMinIops = Long.valueOf(minIops);
+ lMinIops = Long.parseLong(minIops);
}
else {
lMinIops = 0;
[19/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Fix findbugs warning in NetscalerResource.java Unnecessary boxing/unboxing of primitive value
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #426
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1494487f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1494487f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1494487f
Branch: refs/heads/master
Commit: 1494487f7216912cf980a419c59866f7af52744a
Parents: be474f9
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 17:15:06 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:09:41 2015 +0300
----------------------------------------------------------------------
.../src/com/cloud/network/resource/NetscalerResource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1494487f/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java b/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
index fd8a310..1039754 100644
--- a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
+++ b/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
@@ -457,7 +457,7 @@ public class NetscalerResource implements ServerResource {
try {
IpAddressTO[] ips = cmd.getIpAddresses();
for (IpAddressTO ip : ips) {
- long guestVlanTag = Long.valueOf(ip.getBroadcastUri());
+ long guestVlanTag = Long.parseLong(ip.getBroadcastUri());
String vlanSelfIp = ip.getVlanGateway();
String vlanNetmask = ip.getVlanNetmask();
[22/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Fix 2 findbugs warnings in ElastistorUtil.java Unnecessary boxing/unboxing of long value
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #429
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9511831f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9511831f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9511831f
Branch: refs/heads/master
Commit: 9511831f0a3f8dd30e05f093e6a5f29aa6ae5bfd
Parents: ea31a67
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 17:22:18 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:09:47 2015 +0300
----------------------------------------------------------------------
.../apache/cloudstack/storage/datastore/util/ElastistorUtil.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9511831f/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ElastistorUtil.java
----------------------------------------------------------------------
diff --git a/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ElastistorUtil.java b/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ElastistorUtil.java
index 861c180..35c51d8 100644
--- a/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ElastistorUtil.java
+++ b/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ElastistorUtil.java
@@ -2486,7 +2486,7 @@ public class ElastistorUtil {
// update the TSM storage
public static UpdateTsmStorageCmdResponse updateElastistorTsmStorage(String capacityBytes,String uuid) throws Throwable{
- Long size = (Long.valueOf(capacityBytes)/(1024 * 1024 * 1024));
+ Long size = (Long.parseLong(capacityBytes)/(1024 * 1024 * 1024));
String quotasize = null;
@@ -2564,7 +2564,7 @@ public class ElastistorUtil {
s_logger.info("elastistor tsm IOPS is updating to " + capacityIOPs);
UpdateTsmCmd updateTsmCmd = new UpdateTsmCmd();
- String throughput = String.valueOf(Long.valueOf(capacityIOPs)*4);
+ String throughput = String.valueOf(Long.parseLong(capacityIOPs)*4);
updateTsmCmd.putCommandParameter("id", uuid);
updateTsmCmd.putCommandParameter("iops", capacityIOPs);
[13/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Fix findbugs warning in ClusterManagerImpl.java ManagementServerHostDao.findByMsid takes long as input, and a boxed Long was being created for it
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #420
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/eeeb2bb3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/eeeb2bb3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/eeeb2bb3
Branch: refs/heads/master
Commit: eeeb2bb31d44ce874a206e74d56a93470b505f5d
Parents: e409bc3
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 16:54:12 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:09:29 2015 +0300
----------------------------------------------------------------------
framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eeeb2bb3/framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java
----------------------------------------------------------------------
diff --git a/framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java b/framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java
index 158a6c3..8c99ff3 100644
--- a/framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java
+++ b/framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java
@@ -413,7 +413,7 @@ public class ClusterManagerImpl extends ManagerBase implements ClusterManager, C
@Override
public ManagementServerHostVO getPeer(String mgmtServerId) {
- return _mshostDao.findByMsid(Long.valueOf(mgmtServerId));
+ return _mshostDao.findByMsid(Long.parseLong(mgmtServerId));
}
@Override
[25/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Fix 2 findbugs warnings in NetworkServiceImpl.java Unnecessary boxing/unboxing of int values
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #432
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d7a27c95
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d7a27c95
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d7a27c95
Branch: refs/heads/master
Commit: d7a27c9572d269ed9cbc7cc07b6ea885984cb6ac
Parents: e831fce
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 17:30:00 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:09:53 2015 +0300
----------------------------------------------------------------------
server/src/com/cloud/network/NetworkServiceImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d7a27c95/server/src/com/cloud/network/NetworkServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java
index f00d502..58ea63b 100644
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -1248,7 +1248,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
if (!_accountMgr.isRootAdmin(caller.getId()) && cidr != null) {
String[] cidrPair = cidr.split("\\/");
- int cidrSize = Integer.valueOf(cidrPair[1]);
+ int cidrSize = Integer.parseInt(cidrPair[1]);
if (cidrSize < _cidrLimit) {
throw new InvalidParameterValueException("Cidr size can't be less than " + _cidrLimit);
@@ -2806,7 +2806,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
String startvnet = vnetList.get(0);
String endvnet = "";
for (i = 0; i < vnetList.size() - 1; i++) {
- if (Integer.valueOf(vnetList.get(i + 1)) - Integer.valueOf(vnetList.get(i)) > 1) {
+ if (Integer.parseInt(vnetList.get(i + 1)) - Integer.parseInt(vnetList.get(i)) > 1) {
endvnet = vnetList.get(i);
vnetRange = vnetRange + startvnet + "-" + endvnet + ",";
startvnet = vnetList.get(i + 1);
[11/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Fix 4 findbugs warnings in Upgrade218to22.java Was creating boxed Integers when only int is required
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #418
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a2996748
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a2996748
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a2996748
Branch: refs/heads/master
Commit: a2996748311d4dcb36d966635365f22552f57045
Parents: d0a494b
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 16:48:11 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:09:26 2015 +0300
----------------------------------------------------------------------
engine/schema/src/com/cloud/upgrade/dao/Upgrade218to22.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a2996748/engine/schema/src/com/cloud/upgrade/dao/Upgrade218to22.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade218to22.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade218to22.java
index 4f06715..62b3605 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade218to22.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade218to22.java
@@ -1267,8 +1267,8 @@ public class Upgrade218to22 implements DbUpgrade {
conn.prepareStatement("INSERT INTO firewall_rules (id, ip_address_id, start_port, end_port, state, protocol, purpose, account_id, domain_id, network_id, xid, is_static_nat, created) VALUES (?, ?, ?, ?, 'Active', ?, 'PortForwarding', ?, ?, ?, ?, 0, now())");
pstmt.setLong(1, id);
pstmt.setInt(2, ipAddressId);
- pstmt.setInt(3, Integer.valueOf(sourcePort.trim()));
- pstmt.setInt(4, Integer.valueOf(sourcePort.trim()));
+ pstmt.setInt(3, Integer.parseInt(sourcePort.trim()));
+ pstmt.setInt(4, Integer.parseInt(sourcePort.trim()));
pstmt.setString(5, protocol);
pstmt.setLong(6, accountId);
pstmt.setLong(7, domainId);
@@ -1372,8 +1372,8 @@ public class Upgrade218to22 implements DbUpgrade {
conn.prepareStatement("INSERT INTO firewall_rules (id, ip_address_id, start_port, end_port, state, protocol, purpose, account_id, domain_id, network_id, xid, is_static_nat, created) VALUES (?, ?, ?, ?, 'Active', ?, 'LoadBalancing', ?, ?, ?, ?, 0, now())");
pstmt.setLong(1, newLbId);
pstmt.setInt(2, ipAddressId);
- pstmt.setInt(3, Integer.valueOf(sourcePort));
- pstmt.setInt(4, Integer.valueOf(sourcePort));
+ pstmt.setInt(3, Integer.parseInt(sourcePort));
+ pstmt.setInt(4, Integer.parseInt(sourcePort));
pstmt.setString(5, "tcp");
pstmt.setLong(6, accountId);
pstmt.setLong(7, domainId);
[21/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Fix findbugs warning in ElastistorPrimaryDataStoreLifeCycle.java Unnecessary boxing/unboxing of primitive value
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #428
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ea31a674
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ea31a674
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ea31a674
Branch: refs/heads/master
Commit: ea31a674a45fde39b44a5d344a57422a607d08ac
Parents: 6f330f7
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 17:19:04 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:09:45 2015 +0300
----------------------------------------------------------------------
.../datastore/lifecycle/ElastistorPrimaryDataStoreLifeCycle.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ea31a674/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/lifecycle/ElastistorPrimaryDataStoreLifeCycle.java
----------------------------------------------------------------------
diff --git a/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/lifecycle/ElastistorPrimaryDataStoreLifeCycle.java b/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/lifecycle/ElastistorPrimaryDataStoreLifeCycle.java
index 5a8ccf1..f7e9385 100644
--- a/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/lifecycle/ElastistorPrimaryDataStoreLifeCycle.java
+++ b/plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/lifecycle/ElastistorPrimaryDataStoreLifeCycle.java
@@ -555,7 +555,7 @@ public class ElastistorPrimaryDataStoreLifeCycle implements PrimaryDataStoreLife
if(capacityBytes != null){
long usedBytes = _capacityMgr.getUsedBytes(storagePoolVO);
- if (Long.valueOf(capacityBytes) < usedBytes) {
+ if (Long.parseLong(capacityBytes) < usedBytes) {
throw new CloudRuntimeException("Cannot reduce the number of bytes for this storage pool as it would lead to an insufficient number of bytes");
}
[02/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Fix findbugs ClassCastException in ScaleSystemVMCmd.java 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 Map<String,String>
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/31a4f0ad
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/31a4f0ad
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/31a4f0ad
Branch: refs/heads/master
Commit: 31a4f0ad6b822741c916be5d646cd51bf9f92288
Parents: 85ad1b7
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 15:11:16 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:09:14 2015 +0300
----------------------------------------------------------------------
.../api/command/admin/systemvm/ScaleSystemVMCmd.java | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/31a4f0ad/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
index c4b2e99..fa608cc 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
@@ -80,18 +80,7 @@ public class ScaleSystemVMCmd extends BaseAsyncCmd {
}
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 (Map.Entry<String, String> entry : value.entrySet()) {
- customparameterMap.put(entry.getKey(), entry.getValue());
- }
- }
- }
- return customparameterMap;
+ return details;
}
/////////////////////////////////////////////////////
[15/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Fix findbugs warning in HypervDirectConnectResource.java Two boxed Longs were being created instead of simple long
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #422
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9d2fef0d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9d2fef0d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9d2fef0d
Branch: refs/heads/master
Commit: 9d2fef0de8174936d1c565a4f5c00314de89d5ba
Parents: 3045755
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 17:01:22 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:09:34 2015 +0300
----------------------------------------------------------------------
.../hypervisor/hyperv/resource/HypervDirectConnectResource.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9d2fef0d/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
index 9f9fcb4..66aa425 100644
--- a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
+++ b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
@@ -2081,8 +2081,8 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S
String[] splitResult = result.split(":");
int i = 0;
while (i < splitResult.length - 1) {
- stats[0] += (new Long(splitResult[i++])).longValue();
- stats[1] += (new Long(splitResult[i++])).longValue();
+ stats[0] += Long.parseLong(splitResult[i++]);
+ stats[1] += Long.parseLong(splitResult[i++]);
}
} catch (Throwable e) {
s_logger.warn("Unable to parse return from script return of network usage command: " + e.toString(), e);
[33/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Remove accidental ~ character :)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #439
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3d1dde7a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3d1dde7a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3d1dde7a
Branch: refs/heads/master
Commit: 3d1dde7a31d6c0bc0b33a7d4daae77a00441c1d4
Parents: a670f98
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 23:17:00 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:10:08 2015 +0300
----------------------------------------------------------------------
utils/src/com/cloud/utils/net/Ip4Address.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d1dde7a/utils/src/com/cloud/utils/net/Ip4Address.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/net/Ip4Address.java b/utils/src/com/cloud/utils/net/Ip4Address.java
index 663e44e..67fe6da 100644
--- a/utils/src/com/cloud/utils/net/Ip4Address.java
+++ b/utils/src/com/cloud/utils/net/Ip4Address.java
@@ -67,5 +67,5 @@ public class Ip4Address {
@Override
public int hashCode(){
return (int)(_mac.hashCode()*_addr.hashCode());
- }~
+ }
}
[07/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Remove unused imports to fix checkstyle warnings
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #414
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/16baa128
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/16baa128
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/16baa128
Branch: refs/heads/master
Commit: 16baa1289b7de383e98d0070717b3f1873fa2db3
Parents: 9c4162a
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 16:01:11 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:09:19 2015 +0300
----------------------------------------------------------------------
api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java | 3 ---
.../org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java | 3 ---
2 files changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/16baa128/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
----------------------------------------------------------------------
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 9a74fc6..e4c2f7d 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;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/16baa128/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
----------------------------------------------------------------------
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 a64d712..bc9c1c8 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;
[32/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Fix findbugs warning HE_EQUALS_USE_HASHCODE in Ip4Address.java When overriding equals(), hashCode() must also be overriden do comply with the directive that equal objects must have equal hashcodes Without this implementation, usage of these kinds of objects in hashmaps for example, will be broken
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a670f984
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a670f984
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a670f984
Branch: refs/heads/master
Commit: a670f984d8651e681d2d1360b7c516517253958c
Parents: 1bd3286
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 18:22:39 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:10:07 2015 +0300
----------------------------------------------------------------------
utils/src/com/cloud/utils/net/Ip4Address.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a670f984/utils/src/com/cloud/utils/net/Ip4Address.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/net/Ip4Address.java b/utils/src/com/cloud/utils/net/Ip4Address.java
index b336d9d..663e44e 100644
--- a/utils/src/com/cloud/utils/net/Ip4Address.java
+++ b/utils/src/com/cloud/utils/net/Ip4Address.java
@@ -64,4 +64,8 @@ public class Ip4Address {
return false;
}
}
+ @Override
+ public int hashCode(){
+ return (int)(_mac.hashCode()*_addr.hashCode());
+ }~
}
[29/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Fix findbugs warning in Script.java Unnecessary boxing/unboxing of int value
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #436
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a4659d00
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a4659d00
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a4659d00
Branch: refs/heads/master
Commit: a4659d009e2933c511189384b1a6b039cd3ea3ce
Parents: 14f761a
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 17:38:14 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:10:00 2015 +0300
----------------------------------------------------------------------
utils/src/com/cloud/utils/script/Script.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4659d00/utils/src/com/cloud/utils/script/Script.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/script/Script.java b/utils/src/com/cloud/utils/script/Script.java
index 014432e..487c62c 100644
--- a/utils/src/com/cloud/utils/script/Script.java
+++ b/utils/src/com/cloud/utils/script/Script.java
@@ -492,7 +492,7 @@ public class Script implements Callable<String> {
return -1;
else {
try {
- return Integer.valueOf(result.trim());
+ return Integer.parseInt(result.trim());
} catch (NumberFormatException e) {
return -1;
}
[30/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Fix findbugs warning in NetworkServiceImpl.java Integer was being boxed just to call toString()
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #437
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ea7f4bd2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ea7f4bd2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ea7f4bd2
Branch: refs/heads/master
Commit: ea7f4bd2541aa2574c5ea618df8543a51ebbe866
Parents: a4659d0
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 17:41:45 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:10:02 2015 +0300
----------------------------------------------------------------------
server/src/com/cloud/network/NetworkServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ea7f4bd2/server/src/com/cloud/network/NetworkServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java
index 58ea63b..cf85398 100644
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -3152,7 +3152,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
// For every guest vlan set the corresponding account guest vlan map id
List<Integer> finaVlanTokens = getVlanFromRange(accountGuestVlanMapVO.getGuestVlanRange());
for (int i = finaVlanTokens.get(0).intValue(); i <= finaVlanTokens.get(1).intValue(); i++) {
- List<DataCenterVnetVO> dataCenterVnet = _datacneterVnet.findVnet(physicalNetwork.getDataCenterId(), physicalNetworkId, ((Integer)i).toString());
+ List<DataCenterVnetVO> dataCenterVnet = _datacneterVnet.findVnet(physicalNetwork.getDataCenterId(), physicalNetworkId, Integer.toString(i));
dataCenterVnet.get(0).setAccountGuestVlanMapId(accountGuestVlanMapVO.getId());
_datacneterVnet.update(dataCenterVnet.get(0).getId(), dataCenterVnet.get(0));
}
[24/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Fix findbugs warning in CloudZonesStartupProcessor.java Unnecessary boxing/unboxing of primitive value
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #431
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e831fce1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e831fce1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e831fce1
Branch: refs/heads/master
Commit: e831fce1b920e4b97e9a5bb09d430a221a55ae43
Parents: 62e78cd
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 17:27:45 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:09:50 2015 +0300
----------------------------------------------------------------------
server/src/com/cloud/hypervisor/CloudZonesStartupProcessor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e831fce1/server/src/com/cloud/hypervisor/CloudZonesStartupProcessor.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/hypervisor/CloudZonesStartupProcessor.java b/server/src/com/cloud/hypervisor/CloudZonesStartupProcessor.java
index e7c38c9..d407b84 100644
--- a/server/src/com/cloud/hypervisor/CloudZonesStartupProcessor.java
+++ b/server/src/com/cloud/hypervisor/CloudZonesStartupProcessor.java
@@ -178,7 +178,7 @@ public class CloudZonesStartupProcessor extends AdapterBase implements StartupCo
long zoneId = zone.getId();
ResourceDetail maxHostsInZone = _zoneDetailsDao.findDetail(zoneId, ZoneConfig.MaxHosts.key());
if (maxHostsInZone != null) {
- long maxHosts = new Long(maxHostsInZone.getValue()).longValue();
+ long maxHosts = Long.parseLong(maxHostsInZone.getValue());
long currentCountOfHosts = _hostDao.countRoutingHostsByDataCenter(zoneId);
if (s_logger.isDebugEnabled()) {
s_logger.debug("Number of hosts in Zone:" + currentCountOfHosts + ", max hosts limit: " + maxHosts);
[26/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Fix findbugs warning in NetworkUsageManagerImpl.java Unnecessary boxing/unboxing of long value to create Date
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #433
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4d31ed93
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4d31ed93
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4d31ed93
Branch: refs/heads/master
Commit: 4d31ed9342f337a6633b35763fb3301cebae4929
Parents: d7a27c9
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 17:33:05 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:09:54 2015 +0300
----------------------------------------------------------------------
server/src/com/cloud/network/NetworkUsageManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d31ed93/server/src/com/cloud/network/NetworkUsageManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkUsageManagerImpl.java b/server/src/com/cloud/network/NetworkUsageManagerImpl.java
index 13eb210..fa4eb16 100644
--- a/server/src/com/cloud/network/NetworkUsageManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkUsageManagerImpl.java
@@ -310,7 +310,7 @@ public class NetworkUsageManagerImpl extends ManagerBase implements NetworkUsage
s_logger.warn("Last collection time not available. Skipping direct usage collection for Traffic Monitor: " + host.getId());
return false;
}
- Date lastCollection = new Date(new Long(lastCollectDetail.getValue()));
+ Date lastCollection = new Date(Long.parseLong(lastCollectDetail.getValue()));
//Get list of IPs currently allocated
List<IPAddressVO> allocatedIps = listAllocatedDirectIps(zoneId);
[14/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Fix findbugs warning in BareMetalResourceBase.java Boxed Integer was being instantiated to assign to an int variable
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #421
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/30457556
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/30457556
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/30457556
Branch: refs/heads/master
Commit: 30457556f917abf497fb5ff5e64b6ec9b650d46f
Parents: eeeb2bb
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 16:57:03 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:09:32 2015 +0300
----------------------------------------------------------------------
.../com/cloud/baremetal/networkservice/BareMetalResourceBase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/30457556/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java
index ab863dc..7b8f2eb 100644
--- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java
+++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java
@@ -181,7 +181,7 @@ public class BareMetalResourceBase extends ManagerBase implements ServerResource
}
try {
- ipmiRetryTimes = Integer.valueOf(configDao.getValue(Config.BaremetalIpmiRetryTimes.key()));
+ ipmiRetryTimes = Integer.parseInt(configDao.getValue(Config.BaremetalIpmiRetryTimes.key()));
} catch (Exception e) {
s_logger.debug(e.getMessage(), e);
}
[08/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Fix findbugs DMI_RANDOM_USED_ONLY_ONCE warning in ServerTransportProvider.java Changed to recommended SecureRandom instead of Random Moved initializers to constructor
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #415
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4e0fe469
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4e0fe469
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4e0fe469
Branch: refs/heads/master
Commit: 4e0fe469dde4053a5d60b93df90ec8bd4dea8941
Parents: 16baa12
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 16:22:08 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:09:20 2015 +0300
----------------------------------------------------------------------
.../cloudstack/framework/server/ServerTransportProvider.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4e0fe469/framework/ipc/src/org/apache/cloudstack/framework/server/ServerTransportProvider.java
----------------------------------------------------------------------
diff --git a/framework/ipc/src/org/apache/cloudstack/framework/server/ServerTransportProvider.java b/framework/ipc/src/org/apache/cloudstack/framework/server/ServerTransportProvider.java
index 0fb8141..ba8750b 100644
--- a/framework/ipc/src/org/apache/cloudstack/framework/server/ServerTransportProvider.java
+++ b/framework/ipc/src/org/apache/cloudstack/framework/server/ServerTransportProvider.java
@@ -20,7 +20,7 @@ package org.apache.cloudstack.framework.server;
import java.util.HashMap;
import java.util.Map;
-import java.util.Random;
+import java.security.SecureRandom;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -47,12 +47,14 @@ public class ServerTransportProvider implements TransportProvider {
private Map<String, TransportEndpointSite> _endpointMap = new HashMap<String, TransportEndpointSite>();
private int _poolSize = DEFAULT_WORKER_POOL_SIZE;
private ExecutorService _executor;
-
- private int _nextEndpointId = new Random().nextInt();
+ private final SecureRandom randomGenerator;
+ private int _nextEndpointId;
private MessageSerializer _messageSerializer;
public ServerTransportProvider() {
+ randomGenerator=new SecureRandom();
+ _nextEndpointId=randomGenerator.nextInt();
}
public String getNodeId() {
[16/34] git commit: updated refs/heads/master to 7a57ce3
Posted by bh...@apache.org.
Fix findbugs warning in OvmResourceBase.java CreatePrivateTemplateAnswer constructor takes long as physicalSize parameter, Long was being created instead
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #423
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9ba4e9cb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9ba4e9cb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9ba4e9cb
Branch: refs/heads/master
Commit: 9ba4e9cb869cc5743e5b80de63e4c37a161263f1
Parents: 9d2fef0
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 17:04:53 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:09:36 2015 +0300
----------------------------------------------------------------------
.../ovm/src/com/cloud/ovm/hypervisor/OvmResourceBase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9ba4e9cb/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmResourceBase.java b/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmResourceBase.java
index 736f2ee..7e542d5 100644
--- a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmResourceBase.java
+++ b/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmResourceBase.java
@@ -1072,7 +1072,7 @@ public class OvmResourceBase implements ServerResource, HypervisorResource {
String secondaryStorageMountPath = uri.getHost() + ":" + uri.getPath();
String installPath = "template/tmpl/" + accountId + "/" + templateId;
Map<String, String> res = OvmStoragePool.createTemplateFromVolume(_conn, secondaryStorageMountPath, installPath, volumePath, wait);
- return new CreatePrivateTemplateAnswer(cmd, true, null, res.get("installPath"), Long.valueOf(res.get("virtualSize")), Long.valueOf(res.get("physicalSize")),
+ return new CreatePrivateTemplateAnswer(cmd, true, null, res.get("installPath"), Long.valueOf(res.get("virtualSize")), Long.parseLong(res.get("physicalSize")),
res.get("templateFileName"), ImageFormat.RAW);
} catch (Exception e) {
s_logger.debug("Create template failed", e);