Repository: jclouds Updated Branches: refs/heads/master 0df905a87 -> 0c005f809
Address Checkstyle violations Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/0c005f80 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/0c005f80 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/0c005f80 Branch: refs/heads/master Commit: 0c005f80943b6ba785750c080a6e10934c1f563d Parents: 0df905a Author: Andrew Gaul <[email protected]> Authored: Sat Jul 19 03:34:10 2014 -0700 Committer: Andrew Gaul <[email protected]> Committed: Sat Jul 19 03:39:07 2014 -0700 ---------------------------------------------------------------------- .../org/jclouds/softlayer/SoftLayerProviderMetadata.java | 2 +- .../org/jclouds/softlayer/binders/VirtualGuestToJson.java | 2 +- .../softlayer/compute/functions/DatacenterToLocation.java | 2 +- .../compute/functions/OperatingSystemToImage.java | 4 ++-- .../compute/options/SoftLayerTemplateOptions.java | 6 +++--- .../compute/strategy/SoftLayerComputeServiceAdapter.java | 10 +++++----- .../main/java/org/jclouds/softlayer/domain/Address.java | 2 +- .../main/java/org/jclouds/softlayer/domain/Password.java | 2 +- .../java/org/jclouds/softlayer/domain/PowerState.java | 2 +- .../jclouds/softlayer/reference/SoftLayerConstants.java | 3 --- .../compute/SoftLayerTemplateBuilderLiveTest.java | 6 +++--- .../compute/functions/OperatingSystemToImageTest.java | 2 +- .../compute/functions/VirtualGuestToHardwareTest.java | 2 +- .../compute/functions/VirtualGuestToImageTest.java | 2 +- .../compute/functions/VirtualGuestToNodeMetadataTest.java | 2 +- .../jclouds/softlayer/features/DatacenterApiLiveTest.java | 6 +++--- .../softlayer/features/VirtualGuestApiLiveTest.java | 6 +++--- .../softlayer/parse/CreateVirtualGuestResponseTest.java | 3 --- .../softlayer/parse/GetAllObjectsResponseTest.java | 3 --- .../parse/GetCreateObjectOptionsResponseTest.java | 3 --- .../softlayer/parse/GetDatacenterResponseTest.java | 3 --- ...VirtualGuestBlockDeviceTemplateGroupsResponseTest.java | 3 --- .../softlayer/parse/GetVirtualGuestResponseTest.java | 3 --- .../softlayer/parse/ListDatacentersResponseTest.java | 3 --- .../softlayer/parse/ListPublicImagesResponseTest.java | 3 --- .../softlayer/parse/ListVirtualGuestsResponseTest.java | 3 --- 26 files changed, 29 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c005f80/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java index e152eb4..d1f2c90 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java @@ -66,7 +66,7 @@ public class SoftLayerProviderMetadata extends BaseProviderMetadata { .apiMetadata(new SoftLayerApiMetadata()) .homepage(URI.create("http://www.softlayer.com";)) .console(URI.create("https://manage.softlayer.com";)) - .iso3166Codes("SG","US-CA","US-TX","US-VA","US-WA","US-TX", "NL", "HK", "NSFTW-IL") // NSFTW-IL is a weird isoCode returned by Softlayer + .iso3166Codes("SG", "US-CA", "US-TX", "US-VA", "US-WA", "US-TX", "NL", "HK", "NSFTW-IL") // NSFTW-IL is a weird isoCode returned by Softlayer .endpoint("https://api.softlayer.com/rest";) .defaultProperties(SoftLayerProviderMetadata.defaultProperties()); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c005f80/providers/softlayer/src/main/java/org/jclouds/softlayer/binders/VirtualGuestToJson.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/binders/VirtualGuestToJson.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/binders/VirtualGuestToJson.java index 9a14e5a..a9025e2 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/binders/VirtualGuestToJson.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/binders/VirtualGuestToJson.java @@ -77,7 +77,7 @@ public class VirtualGuestToJson implements Binder { templateObject = new TemplateObject(hostname, domain, startCpus, maxMemory, true, operatingSystemReferenceCode, null, localDiskFlag, new Datacenter(datacenterName), networkComponents, getBlockDevices(virtualGuest)); - } else if(virtualGuest.getVirtualGuestBlockDeviceTemplateGroup() != null) { + } else if (virtualGuest.getVirtualGuestBlockDeviceTemplateGroup() != null) { String globalIdentifier = checkNotNull(virtualGuest.getVirtualGuestBlockDeviceTemplateGroup() .getGlobalIdentifier(), "blockDeviceTemplateGroup.globalIdentifier"); templateObject = new TemplateObject(hostname, domain, startCpus, maxMemory, true, null, http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c005f80/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/DatacenterToLocation.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/DatacenterToLocation.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/DatacenterToLocation.java index 106c584..81d2d08 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/DatacenterToLocation.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/DatacenterToLocation.java @@ -38,7 +38,7 @@ import com.google.common.collect.Iterables; * Converts an Datacenter into a Location. */ @Singleton -public class DatacenterToLocation implements Function<Datacenter,Location> { +public class DatacenterToLocation implements Function<Datacenter, Location> { private final JustProvider provider; // allow us to lazy discover the provider of a resource http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c005f80/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/OperatingSystemToImage.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/OperatingSystemToImage.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/OperatingSystemToImage.java index 19dfd2a..cdc4ebe 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/OperatingSystemToImage.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/OperatingSystemToImage.java @@ -57,12 +57,12 @@ public class OperatingSystemToImage implements Function<OperatingSystem, Image> OsFamily osFamily = OsFamily.UNRECOGNIZED; String osVersion = UNRECOGNIZED; Integer bits = null; - if(optOSReferenceCode.isPresent()) { + if (optOSReferenceCode.isPresent()) { String operatingSystemReferenceCode = optOSReferenceCode.get(); osFamily = OperatingSystems.osFamily().apply(operatingSystemReferenceCode); bits = OperatingSystems.bits().apply(operatingSystemReferenceCode); } - if(optVersion.isPresent()) { + if (optVersion.isPresent()) { osVersion = OperatingSystems.version().apply(optVersion.get()); } if (osFamily == OsFamily.UNRECOGNIZED) { http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c005f80/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/options/SoftLayerTemplateOptions.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/options/SoftLayerTemplateOptions.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/options/SoftLayerTemplateOptions.java index 8c74dec..6e0a85a 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/options/SoftLayerTemplateOptions.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/options/SoftLayerTemplateOptions.java @@ -67,13 +67,13 @@ public class SoftLayerTemplateOptions extends TemplateOptions implements Cloneab if (to instanceof SoftLayerTemplateOptions) { SoftLayerTemplateOptions eTo = SoftLayerTemplateOptions.class.cast(to); eTo.domainName(domainName); - if(blockDevices.isPresent()) { + if (blockDevices.isPresent()) { eTo.blockDevices(blockDevices.get()); } - if(diskType.isPresent()) { + if (diskType.isPresent()) { eTo.diskType(diskType.get()); } - if(portSpeed.isPresent()) { + if (portSpeed.isPresent()) { eTo.portSpeed(portSpeed.get()); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c005f80/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java index 611d16a..976e8bb 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java @@ -242,7 +242,7 @@ public class SoftLayerComputeServiceAdapter implements .compare(h1.getRam(), h2.getRam()) .compare(getSpace(h1), getSpace(h2)) .compare(getBootableDeviceType(h1), getBootableDeviceType(h2)); - if(!volumes1.isEmpty() && !volumes2.isEmpty() && volumes1.size() == volumes2.size()) { + if (!volumes1.isEmpty() && !volumes2.isEmpty() && volumes1.size() == volumes2.size()) { for (int i = 0; i < volumes1.size(); i++) { comparisonChain.compare(volumes1.get(i).getType(), volumes2.get(i).getType()); } @@ -285,7 +285,7 @@ public class SoftLayerComputeServiceAdapter implements return volume.getDevice().equals(BOOTABLE_DEVICE); } }); - if(!optionalBootableVolume.isPresent()) { + if (!optionalBootableVolume.isPresent()) { return Type.LOCAL.ordinal(); } return optionalBootableVolume.get().getType().ordinal(); @@ -352,9 +352,9 @@ public class SoftLayerComputeServiceAdapter implements Map<String, SoftwareDescription> softwareDescriptions = Maps.newHashMap(); for (VirtualGuestBlockDeviceTemplateGroup image : images) { final String globalIdentifier = image.getGlobalIdentifier(); - for(VirtualGuestBlockDeviceTemplateGroup child : image.getChildren()) { - for(VirtualGuestBlockDeviceTemplate blockDeviceTemplate : child.getBlockDevices()) { - for(VirtualDiskImageSoftware softwareReference : blockDeviceTemplate.getDiskImage().getSoftwareReferences()) { + for (VirtualGuestBlockDeviceTemplateGroup child : image.getChildren()) { + for (VirtualGuestBlockDeviceTemplate blockDeviceTemplate : child.getBlockDevices()) { + for (VirtualDiskImageSoftware softwareReference : blockDeviceTemplate.getDiskImage().getSoftwareReferences()) { softwareDescriptions.put(globalIdentifier, softwareReference.getSoftwareDescription()); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c005f80/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java index 65463a4..82ea706 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java @@ -200,7 +200,7 @@ public class Address { this.isActive = isActive; this.locationId = locationId; this.postalCode = postalCode; - this.country = checkNotNull(emptyToNull(country),"country cannot be null or empty:"+country); + this.country = checkNotNull(emptyToNull(country), "country cannot be null or empty:" + country); this.state = state; this.description = description; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c005f80/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Password.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Password.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Password.java index 66629cf..49ff2cd 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Password.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Password.java @@ -97,7 +97,7 @@ public class Password { @ConstructorProperties({"id", "username", "password"}) public Password(int id, String username, @Nullable String password) { this.id = id; - this.username = checkNotNull(emptyToNull(username),"username cannot be null or empty:"+username); + this.username = checkNotNull(emptyToNull(username), "username cannot be null or empty:" + username); this.password = password; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c005f80/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/PowerState.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/PowerState.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/PowerState.java index eb62394..81e8af2 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/PowerState.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/PowerState.java @@ -75,7 +75,7 @@ public class PowerState { @ConstructorProperties("keyName") public PowerState(VirtualGuest.State keyName) { - this.keyName = checkNotNull(keyName,"keyName cannot be null or empty:"+keyName); + this.keyName = checkNotNull(keyName, "keyName cannot be null or empty:" + keyName); } /** http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c005f80/providers/softlayer/src/main/java/org/jclouds/softlayer/reference/SoftLayerConstants.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/reference/SoftLayerConstants.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/reference/SoftLayerConstants.java index 18c15af..0947659 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/reference/SoftLayerConstants.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/reference/SoftLayerConstants.java @@ -18,9 +18,6 @@ package org.jclouds.softlayer.reference; /** * Configuration properties and constants used in SoftLayer connections. - * - * @author Adrian Cole - * @author Andrea Turli */ public interface SoftLayerConstants { http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c005f80/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerTemplateBuilderLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerTemplateBuilderLiveTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerTemplateBuilderLiveTest.java index 5ef638c..299da8e 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerTemplateBuilderLiveTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerTemplateBuilderLiveTest.java @@ -85,7 +85,7 @@ public class SoftLayerTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTes assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true); assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU); assertEquals(getCores(defaultTemplate.getHardware()), 1.0d); - assertEquals(defaultTemplate.getHardware().getRam(), 1*1024); + assertEquals(defaultTemplate.getHardware().getRam(), 1 * 1024); assertEquals(getSpace(defaultTemplate.getHardware()), 25.0d); assertEquals(defaultTemplate.getHardware().getVolumes().get(0).getType(), Volume.Type.LOCAL); // test that we bound the correct templateoptions in guice @@ -134,7 +134,7 @@ public class SoftLayerTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTes Template template = context.getComputeService().templateBuilder().build(); assertEquals(getCores(template.getHardware()), 1.0d); - assertEquals(template.getHardware().getRam(), 1*1024); + assertEquals(template.getHardware().getRam(), 1 * 1024); assertEquals(getSpace(template.getHardware()), 25.0d); assertEquals(template.getHardware().getVolumes().get(0).getType(), Volume.Type.LOCAL); } finally { @@ -147,7 +147,7 @@ public class SoftLayerTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTes public void testFastestTemplateBuilder() throws IOException { Template template = view.getComputeService().templateBuilder().fastest().build(); assertEquals(getCores(template.getHardware()), 16.0d); - assertEquals(template.getHardware().getRam(), 1*1024); + assertEquals(template.getHardware().getRam(), 1 * 1024); assertEquals(getSpace(template.getHardware()), 25.0d); assertEquals(template.getHardware().getVolumes().get(0).getType(), Volume.Type.LOCAL); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c005f80/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/OperatingSystemToImageTest.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/OperatingSystemToImageTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/OperatingSystemToImageTest.java index dadc911..f6c2711 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/OperatingSystemToImageTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/OperatingSystemToImageTest.java @@ -28,7 +28,7 @@ import org.testng.annotations.Test; /** * Tests the function that transforms SoftLayer OperatingSystem to generic image. */ -@Test(groups="unit", testName = "OperatingSystemToImageTest") +@Test(groups = "unit", testName = "OperatingSystemToImageTest") public class OperatingSystemToImageTest { @Test http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c005f80/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/VirtualGuestToHardwareTest.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/VirtualGuestToHardwareTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/VirtualGuestToHardwareTest.java index 108c437..561850f 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/VirtualGuestToHardwareTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/VirtualGuestToHardwareTest.java @@ -31,7 +31,7 @@ import com.google.common.collect.Iterables; /** * Tests the function that transforms SoftLayer VirtualGuest to generic hardware. */ -@Test(groups="unit", testName = "VirtualGuestToHardwareTest") +@Test(groups = "unit", testName = "VirtualGuestToHardwareTest") public class VirtualGuestToHardwareTest { @Test http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c005f80/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/VirtualGuestToImageTest.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/VirtualGuestToImageTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/VirtualGuestToImageTest.java index b903a37..830b0ea 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/VirtualGuestToImageTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/VirtualGuestToImageTest.java @@ -33,7 +33,7 @@ import com.google.inject.Guice; /** * Tests the function that transforms SoftLayer VirtualGuest to generic image. */ -@Test(groups="unit", testName = "VirtualGuestToImageTest") +@Test(groups = "unit", testName = "VirtualGuestToImageTest") public class VirtualGuestToImageTest { OperatingSystemToImage operatingSystemToImage = Guice.createInjector().getInstance(OperatingSystemToImage.class); http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c005f80/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadataTest.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadataTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadataTest.java index 637333b..d6997c6 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadataTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadataTest.java @@ -44,7 +44,7 @@ import com.google.inject.Guice; /** * Tests the function that transforms SoftLayer VirtualGuest to NodeMetadata. */ -@Test(groups="unit", testName = "VirtualGuestToNodeMetadataTest") +@Test(groups = "unit", testName = "VirtualGuestToNodeMetadataTest") public class VirtualGuestToNodeMetadataTest { VirtualGuestToImage virtualGuestToImage = Guice.createInjector().getInstance(VirtualGuestToImage.class); http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c005f80/providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterApiLiveTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterApiLiveTest.java index f7a86d9..923af2d 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterApiLiveTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterApiLiveTest.java @@ -72,9 +72,9 @@ public class DatacenterApiLiveTest extends BaseSoftLayerApiLiveTest { assertEquals(response.size(), expected.size()); - for(Datacenter datacenter: response) { + for (Datacenter datacenter : response) { Address address = datacenter.getLocationAddress(); - if(address!=null) checkAddress(address); + if (address != null) checkAddress(address); } } @@ -86,7 +86,7 @@ public class DatacenterApiLiveTest extends BaseSoftLayerApiLiveTest { assertNotNull(dc.getId()); assertNotNull(dc.getName()); assertNotNull(dc.getLongName()); - for( Region region: dc.getRegions()) checkRegion(region); + for (Region region : dc.getRegions()) checkRegion(region); } private void checkRegion(Region region) { http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c005f80/providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestApiLiveTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestApiLiveTest.java index 81948b5..c3fffd2 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestApiLiveTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestApiLiveTest.java @@ -132,7 +132,7 @@ public class VirtualGuestApiLiveTest extends BaseSoftLayerApiLiveTest { guest = api().getVirtualGuest(virtualGuest.getId()); return guest.getPowerState().getKeyName() == VirtualGuest.State.PAUSED; } - }, 5*60*1000).apply(virtualGuest), "%s still not paused!", virtualGuest); + }, 5 * 60 * 1000).apply(virtualGuest), "%s still not paused!", virtualGuest); VirtualGuest found = virtualGuestApi.getVirtualGuest(virtualGuest.getId()); assertTrue(found.getPowerState().getKeyName() == VirtualGuest.State.PAUSED); } @@ -145,7 +145,7 @@ public class VirtualGuestApiLiveTest extends BaseSoftLayerApiLiveTest { guest = api().getVirtualGuest(virtualGuest.getId()); return guest.getPowerState().getKeyName() == VirtualGuest.State.RUNNING; } - }, 5*60*1000).apply(virtualGuest), "%s still not running!", virtualGuest); + }, 5 * 60 * 1000).apply(virtualGuest), "%s still not running!", virtualGuest); VirtualGuest found = virtualGuestApi.getVirtualGuest(virtualGuest.getId()); assertTrue(found.getPowerState().getKeyName() == VirtualGuest.State.RUNNING); } @@ -156,7 +156,7 @@ public class VirtualGuestApiLiveTest extends BaseSoftLayerApiLiveTest { guest = api().getVirtualGuest(virtualGuest.getId()); return guest.getActiveTransactionCount() == 0; } - }, 5*60*1000).apply(virtualGuest), "%s still has active transactions!", virtualGuest); + }, 5 * 60 * 1000).apply(virtualGuest), "%s still has active transactions!", virtualGuest); assertTrue(api().deleteVirtualGuest(virtualGuest.getId())); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c005f80/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/CreateVirtualGuestResponseTest.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/CreateVirtualGuestResponseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/CreateVirtualGuestResponseTest.java index be1a138..8fca9ea 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/CreateVirtualGuestResponseTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/CreateVirtualGuestResponseTest.java @@ -24,9 +24,6 @@ import org.jclouds.softlayer.domain.VirtualGuest; import org.jclouds.softlayer.internal.BaseSoftLayerParseTest; import org.testng.annotations.Test; -/** - * @author Andrea Turli - */ @Test(groups = "unit") public class CreateVirtualGuestResponseTest extends BaseSoftLayerParseTest<VirtualGuest> { http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c005f80/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetAllObjectsResponseTest.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetAllObjectsResponseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetAllObjectsResponseTest.java index 3a3af17..a9709b2 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetAllObjectsResponseTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetAllObjectsResponseTest.java @@ -27,9 +27,6 @@ import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; -/** - * @author Andrea Turli - */ @Test(groups = "unit") public class GetAllObjectsResponseTest extends BaseSoftLayerParseTest<Set<SoftwareDescription>> { http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c005f80/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetCreateObjectOptionsResponseTest.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetCreateObjectOptionsResponseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetCreateObjectOptionsResponseTest.java index 3e488bd..e25d08a 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetCreateObjectOptionsResponseTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetCreateObjectOptionsResponseTest.java @@ -30,9 +30,6 @@ import org.jclouds.softlayer.internal.BaseSoftLayerParseTest; import javax.ws.rs.Consumes; import javax.ws.rs.core.MediaType; -/** - * @author Andrea Turli - */ public class GetCreateObjectOptionsResponseTest extends BaseSoftLayerParseTest<ContainerVirtualGuestConfiguration> { @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c005f80/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetDatacenterResponseTest.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetDatacenterResponseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetDatacenterResponseTest.java index 6678d43..e340707 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetDatacenterResponseTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetDatacenterResponseTest.java @@ -27,9 +27,6 @@ import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; -/** - * @author Andrea Turli - */ @Test(groups = "unit") public class GetDatacenterResponseTest extends BaseSoftLayerParseTest<Datacenter> { http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c005f80/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetVirtualGuestBlockDeviceTemplateGroupsResponseTest.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetVirtualGuestBlockDeviceTemplateGroupsResponseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetVirtualGuestBlockDeviceTemplateGroupsResponseTest.java index 90e20f7..ba214ad 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetVirtualGuestBlockDeviceTemplateGroupsResponseTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetVirtualGuestBlockDeviceTemplateGroupsResponseTest.java @@ -31,9 +31,6 @@ import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; -/** - * @author Andrea Turli - */ @Test(groups = "unit") public class GetVirtualGuestBlockDeviceTemplateGroupsResponseTest extends http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c005f80/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetVirtualGuestResponseTest.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetVirtualGuestResponseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetVirtualGuestResponseTest.java index fd75492..a5ceb4d 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetVirtualGuestResponseTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetVirtualGuestResponseTest.java @@ -24,9 +24,6 @@ import org.jclouds.softlayer.domain.VirtualGuest; import org.jclouds.softlayer.internal.BaseSoftLayerParseTest; import org.testng.annotations.Test; -/** - * @author Andrea Turli - */ @Test(groups = "unit") public class GetVirtualGuestResponseTest extends BaseSoftLayerParseTest<VirtualGuest> { http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c005f80/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ListDatacentersResponseTest.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ListDatacentersResponseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ListDatacentersResponseTest.java index 983f151..08832d6 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ListDatacentersResponseTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ListDatacentersResponseTest.java @@ -27,9 +27,6 @@ import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; -/** - * @author Andrea Turli - */ @Test(groups = "unit") public class ListDatacentersResponseTest extends BaseSoftLayerParseTest<Set<Datacenter>> { http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c005f80/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ListPublicImagesResponseTest.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ListPublicImagesResponseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ListPublicImagesResponseTest.java index 01857f7..a0f30cd 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ListPublicImagesResponseTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ListPublicImagesResponseTest.java @@ -31,9 +31,6 @@ import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; -/** - * @author Andrea Turli - */ @Test(groups = "unit") public class ListPublicImagesResponseTest extends BaseSoftLayerParseTest<Set<VirtualGuestBlockDeviceTemplateGroup>> { http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c005f80/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ListVirtualGuestsResponseTest.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ListVirtualGuestsResponseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ListVirtualGuestsResponseTest.java index 8989d59..3cea255 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ListVirtualGuestsResponseTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ListVirtualGuestsResponseTest.java @@ -28,9 +28,6 @@ import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; -/** - * @author Andrea Turli - */ @Test(groups = "unit") public class ListVirtualGuestsResponseTest extends BaseSoftLayerParseTest<Set<VirtualGuest>> {
