Updated Branches: refs/heads/master aa1d4ef0a -> 3d095e975
Address Checkstyle violations Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/3d095e97 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/3d095e97 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/3d095e97 Branch: refs/heads/master Commit: 3d095e975528346186152271422d168ff1a63225 Parents: aa1d4ef Author: Andrew Gaul <[email protected]> Authored: Sun Dec 1 22:42:45 2013 -0800 Committer: Andrew Gaul <[email protected]> Committed: Sun Dec 1 23:03:47 2013 -0800 ---------------------------------------------------------------------- .../org/jclouds/abiquo/AbiquoFallbacks.java | 2 +- .../services/AdministrationService.java | 2 +- .../features/services/MonitoringService.java | 20 +++++++------- .../abiquo/monitor/AsyncTaskMonitor.java | 4 +-- .../abiquo/monitor/ConversionMonitor.java | 4 +-- .../abiquo/monitor/VirtualApplianceMonitor.java | 8 +++--- .../abiquo/monitor/VirtualMachineMonitor.java | 12 ++++---- .../abiquo/reference/rest/ParentLinkName.java | 4 +-- .../CloudSigma2LasVegasProviderMetadata.java | 2 +- .../CloudSigma2ZurichProviderMetadata.java | 2 +- .../cloudsigma2/domain/IPConfigurationType.java | 2 +- .../org/jclouds/cloudsigma2/domain/License.java | 2 +- .../cloudsigma2/functions/DriveToJson.java | 2 +- .../functions/internal/ParseServerInfos.java | 2 +- .../fgcp/filters/RequestAuthenticator.java | 4 +-- .../fgcp/suppliers/FGCPCredentialsSupplier.java | 2 +- .../fgcp/xml/internal/StatusQuerable.java | 6 ++-- .../blobstore/representations/BlobStore.java | 2 +- .../JoyentCloudComputeServiceAdapter.java | 3 +- .../jclouds/virtualbox/domain/ErrorCode.java | 2 +- .../functions/CreateAndInstallVm.java | 4 ++- .../functions/IMachineToIpAddress.java | 3 +- .../functions/IMachineToSshClient.java | 2 +- .../virtualbox/functions/NodeCreator.java | 29 +++++++++++++++++--- .../jclouds/virtualbox/util/MachineUtils.java | 7 ++++- 25 files changed, 81 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/3d095e97/abiquo/src/main/java/org/jclouds/abiquo/AbiquoFallbacks.java ---------------------------------------------------------------------- diff --git a/abiquo/src/main/java/org/jclouds/abiquo/AbiquoFallbacks.java b/abiquo/src/main/java/org/jclouds/abiquo/AbiquoFallbacks.java index a69cc94..4ba9856 100644 --- a/abiquo/src/main/java/org/jclouds/abiquo/AbiquoFallbacks.java +++ b/abiquo/src/main/java/org/jclouds/abiquo/AbiquoFallbacks.java @@ -174,4 +174,4 @@ public final class AbiquoFallbacks { } }; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/3d095e97/abiquo/src/main/java/org/jclouds/abiquo/features/services/AdministrationService.java ---------------------------------------------------------------------- diff --git a/abiquo/src/main/java/org/jclouds/abiquo/features/services/AdministrationService.java b/abiquo/src/main/java/org/jclouds/abiquo/features/services/AdministrationService.java index 929ae4c..cae9259 100644 --- a/abiquo/src/main/java/org/jclouds/abiquo/features/services/AdministrationService.java +++ b/abiquo/src/main/java/org/jclouds/abiquo/features/services/AdministrationService.java @@ -56,7 +56,7 @@ public interface AdministrationService { /** * Get the list of all machines in the infrastructure. */ - public Iterable<Machine> listMachines(); + Iterable<Machine> listMachines(); /*********************** Enterprise ***********************/ http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/3d095e97/abiquo/src/main/java/org/jclouds/abiquo/features/services/MonitoringService.java ---------------------------------------------------------------------- diff --git a/abiquo/src/main/java/org/jclouds/abiquo/features/services/MonitoringService.java b/abiquo/src/main/java/org/jclouds/abiquo/features/services/MonitoringService.java index 2a3d558..5f8cf43 100644 --- a/abiquo/src/main/java/org/jclouds/abiquo/features/services/MonitoringService.java +++ b/abiquo/src/main/java/org/jclouds/abiquo/features/services/MonitoringService.java @@ -49,7 +49,7 @@ public interface MonitoringService { * @param objects * The objects to monitor. */ - public <T> void awaitCompletion(final Function<T, MonitorStatus> completeCondition, final T... objects); + <T> void awaitCompletion(final Function<T, MonitorStatus> completeCondition, final T... objects); /** * Monitor the given objects using the given complete condition. @@ -64,7 +64,7 @@ public interface MonitoringService { * @param objects * The objects to monitor. */ - public <T> void awaitCompletion(final Long maxWait, final TimeUnit timeUnit, + <T> void awaitCompletion(final Long maxWait, final TimeUnit timeUnit, final Function<T, MonitorStatus> completeCondition, final T... objects); /** @@ -76,7 +76,7 @@ public interface MonitoringService { * @param objects * The objects to monitor. */ - public <T> void monitor(final Function<T, MonitorStatus> completeCondition, final T... objects); + <T> void monitor(final Function<T, MonitorStatus> completeCondition, final T... objects); /** * Monitor the given objects using the given complete condition. @@ -91,7 +91,7 @@ public interface MonitoringService { * @param objects * The objects to monitor. */ - public <T> void monitor(final Long maxWait, final TimeUnit timeUnit, + <T> void monitor(final Long maxWait, final TimeUnit timeUnit, final Function<T, MonitorStatus> completeCondition, final T... objects); /*************** Handler registration methods ***************/ @@ -104,7 +104,7 @@ public interface MonitoringService { * @param handler * The event handler to register. */ - public <T extends AbstractEventHandler<?>> void register(T handler); + <T extends AbstractEventHandler<?>> void register(T handler); /** * Unregisters the given event handler. @@ -114,7 +114,7 @@ public interface MonitoringService { * @param handler * The event handler to unregister. */ - public <T extends AbstractEventHandler<?>> void unregister(T handler); + <T extends AbstractEventHandler<?>> void unregister(T handler); /*************** Delegating monitors ***************/ @@ -123,26 +123,26 @@ public interface MonitoringService { * * @return The virtual machine monitor service. */ - public VirtualMachineMonitor getVirtualMachineMonitor(); + VirtualMachineMonitor getVirtualMachineMonitor(); /** * Gets the virtual appliance monitor service. * * @return The virtual appliance monitor service. */ - public VirtualApplianceMonitor getVirtualApplianceMonitor(); + VirtualApplianceMonitor getVirtualApplianceMonitor(); /** * Gets the asynchronous task monitor service. * * @return The asynchronous task monitor service. */ - public AsyncTaskMonitor getAsyncTaskMonitor(); + AsyncTaskMonitor getAsyncTaskMonitor(); /** * Gets the conversion monitor service. * * @return The conversion monitor service. */ - public ConversionMonitor getConversionMonitor(); + ConversionMonitor getConversionMonitor(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/3d095e97/abiquo/src/main/java/org/jclouds/abiquo/monitor/AsyncTaskMonitor.java ---------------------------------------------------------------------- diff --git a/abiquo/src/main/java/org/jclouds/abiquo/monitor/AsyncTaskMonitor.java b/abiquo/src/main/java/org/jclouds/abiquo/monitor/AsyncTaskMonitor.java index dfcc7a5..8251344 100644 --- a/abiquo/src/main/java/org/jclouds/abiquo/monitor/AsyncTaskMonitor.java +++ b/abiquo/src/main/java/org/jclouds/abiquo/monitor/AsyncTaskMonitor.java @@ -47,7 +47,7 @@ public interface AsyncTaskMonitor extends MonitoringService { * @param tasks * The {@link AsyncTask}s to monitor. */ - public void monitor(final AsyncTask<?, ?>... tasks); + void monitor(final AsyncTask<?, ?>... tasks); /** * Monitor the given {@link AsyncTask}s and block until they finish. @@ -72,5 +72,5 @@ public interface AsyncTaskMonitor extends MonitoringService { * @param tasks * The {@link AsyncTask}s to monitor. */ - public void monitor(final Long maxWait, final TimeUnit timeUnit, final AsyncTask<?, ?>... tasks); + void monitor(final Long maxWait, final TimeUnit timeUnit, final AsyncTask<?, ?>... tasks); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/3d095e97/abiquo/src/main/java/org/jclouds/abiquo/monitor/ConversionMonitor.java ---------------------------------------------------------------------- diff --git a/abiquo/src/main/java/org/jclouds/abiquo/monitor/ConversionMonitor.java b/abiquo/src/main/java/org/jclouds/abiquo/monitor/ConversionMonitor.java index ca17e6e..ab22a69 100644 --- a/abiquo/src/main/java/org/jclouds/abiquo/monitor/ConversionMonitor.java +++ b/abiquo/src/main/java/org/jclouds/abiquo/monitor/ConversionMonitor.java @@ -46,7 +46,7 @@ public interface ConversionMonitor extends MonitoringService { * @param conversions * The {@link Conversion}s to monitor. */ - public void monitor(final Conversion... conversions); + void monitor(final Conversion... conversions); /** * Monitor the given {@link Conversion}s and block until they finish. @@ -71,5 +71,5 @@ public interface ConversionMonitor extends MonitoringService { * @param conversions * The {@link Conversion}s to monitor. */ - public void monitor(final Long maxWait, final TimeUnit timeUnit, final Conversion... conversions); + void monitor(final Long maxWait, final TimeUnit timeUnit, final Conversion... conversions); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/3d095e97/abiquo/src/main/java/org/jclouds/abiquo/monitor/VirtualApplianceMonitor.java ---------------------------------------------------------------------- diff --git a/abiquo/src/main/java/org/jclouds/abiquo/monitor/VirtualApplianceMonitor.java b/abiquo/src/main/java/org/jclouds/abiquo/monitor/VirtualApplianceMonitor.java index 9c861bb..73b45d0 100644 --- a/abiquo/src/main/java/org/jclouds/abiquo/monitor/VirtualApplianceMonitor.java +++ b/abiquo/src/main/java/org/jclouds/abiquo/monitor/VirtualApplianceMonitor.java @@ -47,7 +47,7 @@ public interface VirtualApplianceMonitor extends MonitoringService { * @param VirtualAppliance * The {@link VirtualAppliance}s to monitor. */ - public void monitorDeploy(final VirtualAppliance... vapps); + void monitorDeploy(final VirtualAppliance... vapps); /** * Monitor the given {@link VirtualAppliance}s and block until the deploy @@ -73,7 +73,7 @@ public interface VirtualApplianceMonitor extends MonitoringService { * @param vapps * The {@link VirtualAppliance}s to monitor. */ - public void monitorDeploy(final Long maxWait, final TimeUnit timeUnit, final VirtualAppliance... vapps); + void monitorDeploy(final Long maxWait, final TimeUnit timeUnit, final VirtualAppliance... vapps); /** * Monitor the given {@link VirtualAppliance}s and block until the undeploy @@ -91,7 +91,7 @@ public interface VirtualApplianceMonitor extends MonitoringService { * @param vapps * The {@link VirtualAppliance}s to monitor. */ - public void monitorUndeploy(final VirtualAppliance... vapps); + void monitorUndeploy(final VirtualAppliance... vapps); /** * Monitor the given {@link VirtualAppliance}s and blocks until the undeploy @@ -119,5 +119,5 @@ public interface VirtualApplianceMonitor extends MonitoringService { * @param vapps * The {@link VirtualAppliance}s to monitor. */ - public void monitorUndeploy(final Long maxWait, final TimeUnit timeUnit, final VirtualAppliance... vapps); + void monitorUndeploy(final Long maxWait, final TimeUnit timeUnit, final VirtualAppliance... vapps); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/3d095e97/abiquo/src/main/java/org/jclouds/abiquo/monitor/VirtualMachineMonitor.java ---------------------------------------------------------------------- diff --git a/abiquo/src/main/java/org/jclouds/abiquo/monitor/VirtualMachineMonitor.java b/abiquo/src/main/java/org/jclouds/abiquo/monitor/VirtualMachineMonitor.java index 3e0d3aa..3dffc6d 100644 --- a/abiquo/src/main/java/org/jclouds/abiquo/monitor/VirtualMachineMonitor.java +++ b/abiquo/src/main/java/org/jclouds/abiquo/monitor/VirtualMachineMonitor.java @@ -48,7 +48,7 @@ public interface VirtualMachineMonitor extends MonitoringService { * @param vms * The {@link VirtualMachine}s to monitor. */ - public void monitorDeploy(final VirtualMachine... vms); + void monitorDeploy(final VirtualMachine... vms); /** * Monitor the given {@link VirtualMachine}s and block until all deploys @@ -74,7 +74,7 @@ public interface VirtualMachineMonitor extends MonitoringService { * @param vms * The {@link VirtualMachine}s to monitor. */ - public void monitorDeploy(final Long maxWait, final TimeUnit timeUnit, final VirtualMachine... vms); + void monitorDeploy(final Long maxWait, final TimeUnit timeUnit, final VirtualMachine... vms); /** * Monitor the given {@link VirtualMachine}s and block until all undeploys @@ -92,7 +92,7 @@ public interface VirtualMachineMonitor extends MonitoringService { * @param vms * The {@link VirtualMachine}s to monitor. */ - public void monitorUndeploy(final VirtualMachine... vms); + void monitorUndeploy(final VirtualMachine... vms); /** * Monitor the given {@link VirtualMachine}s and blocks until all undeploys @@ -120,7 +120,7 @@ public interface VirtualMachineMonitor extends MonitoringService { * @param vms * The {@link VirtualMachine}s to monitor. */ - public void monitorUndeploy(final Long maxWait, final TimeUnit timeUnit, final VirtualMachine... vms); + void monitorUndeploy(final Long maxWait, final TimeUnit timeUnit, final VirtualMachine... vms); /** * Monitor the given {@link VirtualMachine}s and block until it is in the @@ -138,7 +138,7 @@ public interface VirtualMachineMonitor extends MonitoringService { * @param vms * The {@link VirtualMachine}s to monitor. */ - public void monitorState(VirtualMachineState state, final VirtualMachine... vms); + void monitorState(VirtualMachineState state, final VirtualMachine... vms); /** * Monitor the given {@link VirtualMachine}s and block until it is in the @@ -166,6 +166,6 @@ public interface VirtualMachineMonitor extends MonitoringService { * @param vms * The {@link VirtualMachine}s to monitor. */ - public void monitorState(final Long maxWait, final TimeUnit timeUnit, VirtualMachineState state, + void monitorState(final Long maxWait, final TimeUnit timeUnit, VirtualMachineState state, final VirtualMachine... vms); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/3d095e97/abiquo/src/main/java/org/jclouds/abiquo/reference/rest/ParentLinkName.java ---------------------------------------------------------------------- diff --git a/abiquo/src/main/java/org/jclouds/abiquo/reference/rest/ParentLinkName.java b/abiquo/src/main/java/org/jclouds/abiquo/reference/rest/ParentLinkName.java index 1b16e65..525c8e5 100644 --- a/abiquo/src/main/java/org/jclouds/abiquo/reference/rest/ParentLinkName.java +++ b/abiquo/src/main/java/org/jclouds/abiquo/reference/rest/ParentLinkName.java @@ -58,7 +58,7 @@ public class ParentLinkName { public static final String NETWORK_GATEWAY = "network_configuration"; - public final static String TASK_RESULT = "result"; + public static final String TASK_RESULT = "result"; - public final static String VIRTUAL_MACHINE = "virtualmachine"; + public static final String VIRTUAL_MACHINE = "virtualmachine"; } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/3d095e97/cloudsigma2-lvs/src/main/java/org/jclouds/cloudsigma2/CloudSigma2LasVegasProviderMetadata.java ---------------------------------------------------------------------- diff --git a/cloudsigma2-lvs/src/main/java/org/jclouds/cloudsigma2/CloudSigma2LasVegasProviderMetadata.java b/cloudsigma2-lvs/src/main/java/org/jclouds/cloudsigma2/CloudSigma2LasVegasProviderMetadata.java index 896baeb..648ca07 100644 --- a/cloudsigma2-lvs/src/main/java/org/jclouds/cloudsigma2/CloudSigma2LasVegasProviderMetadata.java +++ b/cloudsigma2-lvs/src/main/java/org/jclouds/cloudsigma2/CloudSigma2LasVegasProviderMetadata.java @@ -79,4 +79,4 @@ public class CloudSigma2LasVegasProviderMetadata extends BaseProviderMetadata { } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/3d095e97/cloudsigma2-zrh/src/main/java/org/jclouds/cloudsigma2/CloudSigma2ZurichProviderMetadata.java ---------------------------------------------------------------------- diff --git a/cloudsigma2-zrh/src/main/java/org/jclouds/cloudsigma2/CloudSigma2ZurichProviderMetadata.java b/cloudsigma2-zrh/src/main/java/org/jclouds/cloudsigma2/CloudSigma2ZurichProviderMetadata.java index dd4b9b4..923f7d7 100644 --- a/cloudsigma2-zrh/src/main/java/org/jclouds/cloudsigma2/CloudSigma2ZurichProviderMetadata.java +++ b/cloudsigma2-zrh/src/main/java/org/jclouds/cloudsigma2/CloudSigma2ZurichProviderMetadata.java @@ -79,4 +79,4 @@ public class CloudSigma2ZurichProviderMetadata extends BaseProviderMetadata { } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/3d095e97/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/IPConfigurationType.java ---------------------------------------------------------------------- diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/IPConfigurationType.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/IPConfigurationType.java index 6433a9f..4cce424 100644 --- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/IPConfigurationType.java +++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/IPConfigurationType.java @@ -40,4 +40,4 @@ public enum IPConfigurationType { return UNRECOGNIZED; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/3d095e97/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/License.java ---------------------------------------------------------------------- diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/License.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/License.java index 13c7e30..f581e68 100644 --- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/License.java +++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/License.java @@ -151,7 +151,7 @@ public class License { @Override public int hashCode() { - int result = (burstable ? 1 : 0); + int result = burstable ? 1 : 0; result = 31 * result + (longName != null ? longName.hashCode() : 0); result = 31 * result + (name != null ? name.hashCode() : 0); result = 31 * result + (resourceUri != null ? resourceUri.hashCode() : 0); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/3d095e97/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/DriveToJson.java ---------------------------------------------------------------------- diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/DriveToJson.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/DriveToJson.java index 21f7527..ff0f73c 100644 --- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/DriveToJson.java +++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/DriveToJson.java @@ -60,4 +60,4 @@ public class DriveToJson implements Function<DriveInfo, JsonObject> { driveObject.addProperty("allow_multimount", input.isAllowMultimount()); return driveObject; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/3d095e97/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseServerInfos.java ---------------------------------------------------------------------- diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseServerInfos.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseServerInfos.java index cbc7a56..a0f61fb 100644 --- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseServerInfos.java +++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseServerInfos.java @@ -71,4 +71,4 @@ public class ParseServerInfos extends ParseJson<ParseServerInfos.ServerInfos> { }; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/3d095e97/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/filters/RequestAuthenticator.java ---------------------------------------------------------------------- diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/filters/RequestAuthenticator.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/filters/RequestAuthenticator.java index dac21a5..d8d77d0 100644 --- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/filters/RequestAuthenticator.java +++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/filters/RequestAuthenticator.java @@ -80,8 +80,8 @@ public class RequestAuthenticator implements HttpRequestFilter, RequestSigner { private final HttpUtils utils; private final String apiVersion; - final static String SIGNATURE_VERSION = "1.0"; - final static String SIGNATURE_METHOD = "SHA1withRSA"; + static final String SIGNATURE_VERSION = "1.0"; + static final String SIGNATURE_METHOD = "SHA1withRSA"; @Inject public RequestAuthenticator(Supplier<FGCPCredentials> creds, http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/3d095e97/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/suppliers/FGCPCredentialsSupplier.java ---------------------------------------------------------------------- diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/suppliers/FGCPCredentialsSupplier.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/suppliers/FGCPCredentialsSupplier.java index af09422..edcfc46 100644 --- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/suppliers/FGCPCredentialsSupplier.java +++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/suppliers/FGCPCredentialsSupplier.java @@ -114,7 +114,7 @@ public class FGCPCredentialsSupplier implements Supplier<FGCPCredentials> { // in : pem with Bagattributes metadata and pk // out: pem with only certs LineProcessor<String> callback = new LineProcessor<String>() { - final static String CERTIFICATE_X509_END_MARKER = "-----END CERTIFICATE-----"; + static final String CERTIFICATE_X509_END_MARKER = "-----END CERTIFICATE-----"; StringBuilder result = new StringBuilder(); boolean insideCert = false; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/3d095e97/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/StatusQuerable.java ---------------------------------------------------------------------- diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/StatusQuerable.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/StatusQuerable.java index cf60adb..115e38c 100644 --- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/StatusQuerable.java +++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/xml/internal/StatusQuerable.java @@ -22,9 +22,9 @@ package org.jclouds.fujitsu.fgcp.xml.internal; * @author Dies Koper */ public interface StatusQuerable { - public String getResponseMessage(); + String getResponseMessage(); - public String getResponseStatus(); + String getResponseStatus(); - public boolean isError(); + boolean isError(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/3d095e97/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/BlobStore.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/BlobStore.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/BlobStore.java index 23d7bf2..566552a 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/BlobStore.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/BlobStore.java @@ -51,7 +51,7 @@ public interface BlobStore { * @param directory the directory to list * @return a list that may be incomplete, depending on whether PageSet#getNextMarker is set */ - public Set<StorageMetadata> list(String container, String directory); + Set<StorageMetadata> list(String container, String directory); /** * Retrieves the metadata of a {@code Blob} at location {@code container/name} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/3d095e97/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/JoyentCloudComputeServiceAdapter.java ---------------------------------------------------------------------- diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/JoyentCloudComputeServiceAdapter.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/JoyentCloudComputeServiceAdapter.java index 11d52f1..a603454 100644 --- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/JoyentCloudComputeServiceAdapter.java +++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/JoyentCloudComputeServiceAdapter.java @@ -54,6 +54,7 @@ import com.google.common.base.Predicate; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet.Builder; +import com.google.common.util.concurrent.Atomics; /** * The adapter used by the JoyentCloudComputeServiceContextModule to interface the @@ -187,7 +188,7 @@ public class JoyentCloudComputeServiceAdapter implements @Override public void destroyNode(String id) { - final AtomicReference<MachineInDatacenter> machine = new AtomicReference<MachineInDatacenter>(getNode(id)); + final AtomicReference<MachineInDatacenter> machine = Atomics.newReference(getNode(id)); if (machine.get() == null) return; if (machine.get().get().getState() == State.RUNNING) { http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/3d095e97/virtualbox/src/main/java/org/jclouds/virtualbox/domain/ErrorCode.java ---------------------------------------------------------------------- diff --git a/virtualbox/src/main/java/org/jclouds/virtualbox/domain/ErrorCode.java b/virtualbox/src/main/java/org/jclouds/virtualbox/domain/ErrorCode.java index 1d8eeda..75cac66 100644 --- a/virtualbox/src/main/java/org/jclouds/virtualbox/domain/ErrorCode.java +++ b/virtualbox/src/main/java/org/jclouds/virtualbox/domain/ErrorCode.java @@ -73,7 +73,7 @@ public enum ErrorCode { this.code = code; } - private final static Map<Long, ErrorCode> TABLE; + private static final Map<Long, ErrorCode> TABLE; static { ImmutableMap.Builder<Long, ErrorCode> builder = ImmutableMap.builder(); for (ErrorCode errorCode : ErrorCode.values()) { http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/3d095e97/virtualbox/src/main/java/org/jclouds/virtualbox/functions/CreateAndInstallVm.java ---------------------------------------------------------------------- diff --git a/virtualbox/src/main/java/org/jclouds/virtualbox/functions/CreateAndInstallVm.java b/virtualbox/src/main/java/org/jclouds/virtualbox/functions/CreateAndInstallVm.java index f95899b..f093667 100644 --- a/virtualbox/src/main/java/org/jclouds/virtualbox/functions/CreateAndInstallVm.java +++ b/virtualbox/src/main/java/org/jclouds/virtualbox/functions/CreateAndInstallVm.java @@ -51,7 +51,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.Iterables.transform; import static org.jclouds.scriptbuilder.domain.Statements.call; -import static org.jclouds.virtualbox.config.VirtualBoxConstants.*; +import static org.jclouds.virtualbox.config.VirtualBoxConstants.GUEST_OS_PASSWORD; +import static org.jclouds.virtualbox.config.VirtualBoxConstants.GUEST_OS_USER; +import static org.jclouds.virtualbox.config.VirtualBoxConstants.VIRTUALBOX_PRECONFIGURATION_URL; @Singleton public class CreateAndInstallVm implements Function<MasterSpec, IMachine> { http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/3d095e97/virtualbox/src/main/java/org/jclouds/virtualbox/functions/IMachineToIpAddress.java ---------------------------------------------------------------------- diff --git a/virtualbox/src/main/java/org/jclouds/virtualbox/functions/IMachineToIpAddress.java b/virtualbox/src/main/java/org/jclouds/virtualbox/functions/IMachineToIpAddress.java index 506850d..a928414 100644 --- a/virtualbox/src/main/java/org/jclouds/virtualbox/functions/IMachineToIpAddress.java +++ b/virtualbox/src/main/java/org/jclouds/virtualbox/functions/IMachineToIpAddress.java @@ -47,7 +47,8 @@ public class IMachineToIpAddress implements Function<IMachine, String> { public String apply(IMachine machine) { String macAddress = machine.getNetworkAdapter(0l).getMACAddress(); - int offset = 0, step = 2; + int offset = 0; + int step = 2; for (int j = 1; j <= 5; j++) { macAddress = new StringBuilder(macAddress).insert(j * step + offset, ":").toString().toLowerCase(); offset++; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/3d095e97/virtualbox/src/main/java/org/jclouds/virtualbox/functions/IMachineToSshClient.java ---------------------------------------------------------------------- diff --git a/virtualbox/src/main/java/org/jclouds/virtualbox/functions/IMachineToSshClient.java b/virtualbox/src/main/java/org/jclouds/virtualbox/functions/IMachineToSshClient.java index 9841bbf..c515f5f 100644 --- a/virtualbox/src/main/java/org/jclouds/virtualbox/functions/IMachineToSshClient.java +++ b/virtualbox/src/main/java/org/jclouds/virtualbox/functions/IMachineToSshClient.java @@ -93,4 +93,4 @@ public class IMachineToSshClient implements Function<IMachine, SshClient> { loginCredentials); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/3d095e97/virtualbox/src/main/java/org/jclouds/virtualbox/functions/NodeCreator.java ---------------------------------------------------------------------- diff --git a/virtualbox/src/main/java/org/jclouds/virtualbox/functions/NodeCreator.java b/virtualbox/src/main/java/org/jclouds/virtualbox/functions/NodeCreator.java index a3ffbef..2fe2a66 100644 --- a/virtualbox/src/main/java/org/jclouds/virtualbox/functions/NodeCreator.java +++ b/virtualbox/src/main/java/org/jclouds/virtualbox/functions/NodeCreator.java @@ -16,7 +16,11 @@ */ package org.jclouds.virtualbox.functions; - import com.google.common.base.*; + import com.google.common.base.Charsets; + import com.google.common.base.Function; + import com.google.common.base.Optional; + import com.google.common.base.Predicate; + import com.google.common.base.Supplier; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.io.Files; @@ -29,13 +33,24 @@ package org.jclouds.virtualbox.functions; import org.jclouds.logging.Logger; import org.jclouds.util.Strings2; import org.jclouds.virtualbox.config.VirtualBoxComputeServiceContextModule; - import org.jclouds.virtualbox.domain.*; + import org.jclouds.virtualbox.domain.CloneSpec; + import org.jclouds.virtualbox.domain.Master; + import org.jclouds.virtualbox.domain.NetworkInterfaceCard; + import org.jclouds.virtualbox.domain.NetworkSpec; + import org.jclouds.virtualbox.domain.NodeSpec; + import org.jclouds.virtualbox.domain.VmSpec; import org.jclouds.virtualbox.statements.DeleteGShadowLock; import org.jclouds.virtualbox.statements.PasswordlessSudo; import org.jclouds.virtualbox.util.MachineController; import org.jclouds.virtualbox.util.MachineUtils; import org.jclouds.virtualbox.util.NetworkUtils; - import org.virtualbox_4_2.*; + import org.virtualbox_4_2.CleanupMode; + import org.virtualbox_4_2.IMachine; + import org.virtualbox_4_2.IProgress; + import org.virtualbox_4_2.ISession; + import org.virtualbox_4_2.LockType; + import org.virtualbox_4_2.NetworkAttachmentType; + import org.virtualbox_4_2.VirtualBoxManager; import com.google.common.collect.ImmutableList; import javax.annotation.Resource; @@ -48,7 +63,13 @@ package org.jclouds.virtualbox.functions; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; - import static org.jclouds.virtualbox.config.VirtualBoxConstants.*; + import static org.jclouds.virtualbox.config.VirtualBoxConstants.GUEST_OS_PASSWORD; + import static org.jclouds.virtualbox.config.VirtualBoxConstants.GUEST_OS_USER; + import static org.jclouds.virtualbox.config.VirtualBoxConstants.VIRTUALBOX_GUEST_MEMORY; + import static org.jclouds.virtualbox.config.VirtualBoxConstants.VIRTUALBOX_IMAGE_PREFIX; + import static org.jclouds.virtualbox.config.VirtualBoxConstants.VIRTUALBOX_NODE_NAME_SEPARATOR; + import static org.jclouds.virtualbox.config.VirtualBoxConstants.VIRTUALBOX_NODE_PREFIX; + import static org.jclouds.virtualbox.config.VirtualBoxConstants.VIRTUALBOX_WORKINGDIR; /** * Creates nodes, by cloning a master vm and based on the provided {@link NodeSpec}. Must be http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/3d095e97/virtualbox/src/main/java/org/jclouds/virtualbox/util/MachineUtils.java ---------------------------------------------------------------------- diff --git a/virtualbox/src/main/java/org/jclouds/virtualbox/util/MachineUtils.java b/virtualbox/src/main/java/org/jclouds/virtualbox/util/MachineUtils.java index e2d75ce..5747ab7 100644 --- a/virtualbox/src/main/java/org/jclouds/virtualbox/util/MachineUtils.java +++ b/virtualbox/src/main/java/org/jclouds/virtualbox/util/MachineUtils.java @@ -31,7 +31,12 @@ import org.jclouds.compute.reference.ComputeServiceConstants; import org.jclouds.logging.Logger; import org.jclouds.scriptbuilder.domain.Statement; import org.jclouds.util.Throwables2; -import org.virtualbox_4_2.*; +import org.virtualbox_4_2.IMachine; +import org.virtualbox_4_2.ISession; +import org.virtualbox_4_2.LockType; +import org.virtualbox_4_2.SessionState; +import org.virtualbox_4_2.VBoxException; +import org.virtualbox_4_2.VirtualBoxManager; import javax.annotation.Resource; import javax.inject.Named;
