name conventions on local vars that are touched
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8662a0ea Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8662a0ea Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8662a0ea Branch: refs/heads/4.9-bountycastle-daan Commit: 8662a0ea59d1d29ae46089acf4e183399b3784bd Parents: cd5a7b5 Author: Daan Hoogland <[email protected]> Authored: Wed May 18 15:47:16 2016 +0200 Committer: Daan Hoogland <[email protected]> Committed: Thu May 19 13:22:27 2016 +0200 ---------------------------------------------------------------------- .../network/resource/NetscalerResource.java | 22 ++--- .../cloudstack/network/lb/CertServiceTest.java | 88 ++++++++++---------- 2 files changed, 55 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8662a0ea/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 d5a8ca1..15fbdeb 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 @@ -979,11 +979,11 @@ public class NetscalerResource implements ServerResource { final long nsServiceWaitMilliSeconds = 60000; while (System.currentTimeMillis() - startTick < nsServiceWaitMilliSeconds) { try { - final nitro_service _netscalerService = new nitro_service(cmd.getLoadBalancerIP(), "https"); - _netscalerService.set_certvalidation(false); - _netscalerService.set_hostnameverification(false); - _netscalerService.set_credential(username, password); - apiCallResult = _netscalerService.login(); + final nitro_service netscalerService = new nitro_service(cmd.getLoadBalancerIP(), "https"); + netscalerService.set_certvalidation(false); + netscalerService.set_hostnameverification(false); + netscalerService.set_credential(username, password); + apiCallResult = netscalerService.login(); if (apiCallResult.errorcode == 0) { nsServiceUp = true; break; @@ -2273,10 +2273,10 @@ public class NetscalerResource implements ServerResource { // remove subnet IP try { - final nsip _vlanSelfIp = new nsip(); - _vlanSelfIp.set_ipaddress(vlanSelfIp); + final nsip tmpVlanSelfIp = new nsip(); + tmpVlanSelfIp.set_ipaddress(vlanSelfIp); - final nsip subnetIp = nsip.get(_netscalerService, _vlanSelfIp); + final nsip subnetIp = nsip.get(_netscalerService, tmpVlanSelfIp); apiCallResult = nsip.delete(_netscalerService, subnetIp); if (apiCallResult.errorcode != 0) { throw new ExecutionException("Failed to remove subnet ip:" + vlanSelfIp + " from the NetScaler device due to" + apiCallResult.message); @@ -2323,10 +2323,10 @@ public class NetscalerResource implements ServerResource { private boolean nsSnipExists(final String subnetIp) throws ExecutionException { try { - final nsip _subnetIp = new nsip(); - _subnetIp.set_ipaddress(subnetIp); + final nsip tmpSubnetIp = new nsip(); + tmpSubnetIp.set_ipaddress(subnetIp); - final nsip snip = nsip.get(_netscalerService, _subnetIp); + final nsip snip = nsip.get(_netscalerService, tmpSubnetIp); return snip != null; } catch (final nitro_exception e) { if (e.getErrorCode() == NitroError.NS_RESOURCE_NOT_EXISTS) { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8662a0ea/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java ---------------------------------------------------------------------- diff --git a/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java b/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java index 734e381..d38fa06 100644 --- a/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java +++ b/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java @@ -126,17 +126,17 @@ public class CertServiceTest { //creating the command final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn(); - final Class<?> _class = uploadCmd.getClass().getSuperclass(); + final Class<?> klazz = uploadCmd.getClass().getSuperclass(); - final Field certField = _class.getDeclaredField("cert"); + final Field certField = klazz.getDeclaredField("cert"); certField.setAccessible(true); certField.set(uploadCmd, cert); - final Field keyField = _class.getDeclaredField("key"); + final Field keyField = klazz.getDeclaredField("key"); keyField.setAccessible(true); keyField.set(uploadCmd, key); - final Field chainField = _class.getDeclaredField("chain"); + final Field chainField = klazz.getDeclaredField("chain"); chainField.setAccessible(true); chainField.set(uploadCmd, chain); @@ -177,17 +177,17 @@ public class CertServiceTest { //creating the command final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn(); - final Class<?> _class = uploadCmd.getClass().getSuperclass(); + final Class<?> klazz = uploadCmd.getClass().getSuperclass(); - final Field certField = _class.getDeclaredField("cert"); + final Field certField = klazz.getDeclaredField("cert"); certField.setAccessible(true); certField.set(uploadCmd, cert); - final Field keyField = _class.getDeclaredField("key"); + final Field keyField = klazz.getDeclaredField("key"); keyField.setAccessible(true); keyField.set(uploadCmd, key); - final Field passField = _class.getDeclaredField("password"); + final Field passField = klazz.getDeclaredField("password"); passField.setAccessible(true); passField.set(uploadCmd, password); @@ -227,13 +227,13 @@ public class CertServiceTest { //creating the command final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn(); - final Class<?> _class = uploadCmd.getClass().getSuperclass(); + final Class<?> klazz = uploadCmd.getClass().getSuperclass(); - final Field certField = _class.getDeclaredField("cert"); + final Field certField = klazz.getDeclaredField("cert"); certField.setAccessible(true); certField.set(uploadCmd, cert); - final Field keyField = _class.getDeclaredField("key"); + final Field keyField = klazz.getDeclaredField("key"); keyField.setAccessible(true); keyField.set(uploadCmd, key); @@ -269,17 +269,17 @@ public class CertServiceTest { //creating the command final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn(); - final Class<?> _class = uploadCmd.getClass().getSuperclass(); + final Class<?> klazz = uploadCmd.getClass().getSuperclass(); - final Field certField = _class.getDeclaredField("cert"); + final Field certField = klazz.getDeclaredField("cert"); certField.setAccessible(true); certField.set(uploadCmd, cert); - final Field keyField = _class.getDeclaredField("key"); + final Field keyField = klazz.getDeclaredField("key"); keyField.setAccessible(true); keyField.set(uploadCmd, key); - final Field chainField = _class.getDeclaredField("chain"); + final Field chainField = klazz.getDeclaredField("chain"); chainField.setAccessible(true); chainField.set(uploadCmd, chain); @@ -321,17 +321,17 @@ public class CertServiceTest { //creating the command final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn(); - final Class<?> _class = uploadCmd.getClass().getSuperclass(); + final Class<?> klazz = uploadCmd.getClass().getSuperclass(); - final Field certField = _class.getDeclaredField("cert"); + final Field certField = klazz.getDeclaredField("cert"); certField.setAccessible(true); certField.set(uploadCmd, cert); - final Field keyField = _class.getDeclaredField("key"); + final Field keyField = klazz.getDeclaredField("key"); keyField.setAccessible(true); keyField.set(uploadCmd, key); - final Field chainField = _class.getDeclaredField("chain"); + final Field chainField = klazz.getDeclaredField("chain"); chainField.setAccessible(true); chainField.set(uploadCmd, chain); @@ -371,17 +371,17 @@ public class CertServiceTest { //creating the command final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn(); - final Class<?> _class = uploadCmd.getClass().getSuperclass(); + final Class<?> klazz = uploadCmd.getClass().getSuperclass(); - final Field certField = _class.getDeclaredField("cert"); + final Field certField = klazz.getDeclaredField("cert"); certField.setAccessible(true); certField.set(uploadCmd, cert); - final Field keyField = _class.getDeclaredField("key"); + final Field keyField = klazz.getDeclaredField("key"); keyField.setAccessible(true); keyField.set(uploadCmd, key); - final Field passField = _class.getDeclaredField("password"); + final Field passField = klazz.getDeclaredField("password"); passField.setAccessible(true); passField.set(uploadCmd, password); @@ -420,13 +420,13 @@ public class CertServiceTest { //creating the command final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn(); - final Class<?> _class = uploadCmd.getClass().getSuperclass(); + final Class<?> klazz = uploadCmd.getClass().getSuperclass(); - final Field certField = _class.getDeclaredField("cert"); + final Field certField = klazz.getDeclaredField("cert"); certField.setAccessible(true); certField.set(uploadCmd, cert); - final Field keyField = _class.getDeclaredField("key"); + final Field keyField = klazz.getDeclaredField("key"); keyField.setAccessible(true); keyField.set(uploadCmd, key); @@ -463,13 +463,13 @@ public class CertServiceTest { //creating the command final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn(); - final Class<?> _class = uploadCmd.getClass().getSuperclass(); + final Class<?> klazz = uploadCmd.getClass().getSuperclass(); - final Field certField = _class.getDeclaredField("cert"); + final Field certField = klazz.getDeclaredField("cert"); certField.setAccessible(true); certField.set(uploadCmd, cert); - final Field keyField = _class.getDeclaredField("key"); + final Field keyField = klazz.getDeclaredField("key"); keyField.setAccessible(true); keyField.set(uploadCmd, key); @@ -508,13 +508,13 @@ public class CertServiceTest { //creating the command final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn(); - final Class<?> _class = uploadCmd.getClass().getSuperclass(); + final Class<?> klazz = uploadCmd.getClass().getSuperclass(); - final Field certField = _class.getDeclaredField("cert"); + final Field certField = klazz.getDeclaredField("cert"); certField.setAccessible(true); certField.set(uploadCmd, cert); - final Field keyField = _class.getDeclaredField("key"); + final Field keyField = klazz.getDeclaredField("key"); keyField.setAccessible(true); keyField.set(uploadCmd, key); @@ -551,13 +551,13 @@ public class CertServiceTest { //creating the command final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn(); - final Class<?> _class = uploadCmd.getClass().getSuperclass(); + final Class<?> klazz = uploadCmd.getClass().getSuperclass(); - final Field certField = _class.getDeclaredField("cert"); + final Field certField = klazz.getDeclaredField("cert"); certField.setAccessible(true); certField.set(uploadCmd, cert); - final Field keyField = _class.getDeclaredField("key"); + final Field keyField = klazz.getDeclaredField("key"); keyField.setAccessible(true); keyField.set(uploadCmd, key); @@ -595,13 +595,13 @@ public class CertServiceTest { //creating the command final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn(); - final Class<?> _class = uploadCmd.getClass().getSuperclass(); + final Class<?> klazz = uploadCmd.getClass().getSuperclass(); - final Field certField = _class.getDeclaredField("cert"); + final Field certField = klazz.getDeclaredField("cert"); certField.setAccessible(true); certField.set(uploadCmd, cert); - final Field keyField = _class.getDeclaredField("key"); + final Field keyField = klazz.getDeclaredField("key"); keyField.setAccessible(true); keyField.set(uploadCmd, key); @@ -645,9 +645,9 @@ public class CertServiceTest { //creating the command final DeleteSslCertCmd deleteCmd = new DeleteSslCertCmdExtn(); - final Class<?> _class = deleteCmd.getClass().getSuperclass(); + final Class<?> klazz = deleteCmd.getClass().getSuperclass(); - final Field certField = _class.getDeclaredField("id"); + final Field certField = klazz.getDeclaredField("id"); certField.setAccessible(true); certField.set(deleteCmd, certId); @@ -690,9 +690,9 @@ public class CertServiceTest { //creating the command final DeleteSslCertCmd deleteCmd = new DeleteSslCertCmdExtn(); - final Class<?> _class = deleteCmd.getClass().getSuperclass(); + final Class<?> klazz = deleteCmd.getClass().getSuperclass(); - final Field certField = _class.getDeclaredField("id"); + final Field certField = klazz.getDeclaredField("id"); certField.setAccessible(true); certField.set(deleteCmd, certId); @@ -730,9 +730,9 @@ public class CertServiceTest { //creating the command final DeleteSslCertCmd deleteCmd = new DeleteSslCertCmdExtn(); - final Class<?> _class = deleteCmd.getClass().getSuperclass(); + final Class<?> klazz = deleteCmd.getClass().getSuperclass(); - final Field certField = _class.getDeclaredField("id"); + final Field certField = klazz.getDeclaredField("id"); certField.setAccessible(true); certField.set(deleteCmd, certId);
