Repository: jclouds-labs Updated Branches: refs/heads/master 6d3363fdf -> 35c68cd71
Remove unnecessary static imports Found via error-prone. Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/35c68cd7 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/35c68cd7 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/35c68cd7 Branch: refs/heads/master Commit: 35c68cd7150540ff234cba6a069cc70fee656c2a Parents: 6d3363f Author: Andrew Gaul <[email protected]> Authored: Fri Jan 29 09:34:23 2016 -0800 Committer: Andrew Gaul <[email protected]> Committed: Fri Jan 29 09:35:29 2016 -0800 ---------------------------------------------------------------------- ...rCreateStorageServiceAndVirtualNetworkThenCreateNodes.java | 2 +- .../org/jclouds/azurecompute/features/AffinityGroupApi.java | 4 ++-- .../org/jclouds/azurecompute/features/CloudServiceApi.java | 4 ++-- .../java/org/jclouds/azurecompute/features/DeploymentApi.java | 3 +-- .../main/java/org/jclouds/azurecompute/features/DiskApi.java | 5 ++--- .../java/org/jclouds/azurecompute/features/LocationApi.java | 3 +-- .../azurecompute/features/NetworkSecurityGroupApi.java | 2 +- .../java/org/jclouds/azurecompute/features/OSImageApi.java | 4 ++-- .../java/org/jclouds/azurecompute/features/OperationApi.java | 3 +-- .../jclouds/azurecompute/features/ReservedIPAddressApi.java | 4 ++-- .../jclouds/azurecompute/features/ServiceCertificatesApi.java | 4 ++-- .../org/jclouds/azurecompute/features/SubscriptionApi.java | 3 +-- .../java/org/jclouds/azurecompute/features/VMImageApi.java | 4 ++-- .../org/jclouds/azurecompute/features/VirtualMachineApi.java | 3 +-- .../org/jclouds/azurecompute/features/VirtualNetworkApi.java | 5 ++--- .../org/jclouds/azurecompute/xml/AddressSpaceHandler.java | 2 +- .../main/java/org/jclouds/azurecompute/xml/SubnetHandler.java | 2 +- .../azurecompute/internal/BaseAzureComputeApiLiveTest.java | 3 ++- .../java/org/jclouds/snia/cdmi/v1/features/ContainerApi.java | 2 +- .../main/java/org/jclouds/snia/cdmi/v1/features/DataApi.java | 4 ++-- .../snia/cdmi/v1/features/DataNonCDMIContentTypeApi.java | 4 ++-- .../jclouds/joyent/cloudapi/v6_5/features/DatacenterApi.java | 2 +- .../org/jclouds/joyent/cloudapi/v6_5/features/DatasetApi.java | 4 ++-- .../org/jclouds/joyent/cloudapi/v6_5/features/KeyApi.java | 7 +++---- .../org/jclouds/joyent/cloudapi/v6_5/features/MachineApi.java | 6 +++--- .../org/jclouds/joyent/cloudapi/v6_5/features/PackageApi.java | 4 ++-- 26 files changed, 43 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/35c68cd7/azurecompute/src/main/java/org/jclouds/azurecompute/compute/strategy/GetOrCreateStorageServiceAndVirtualNetworkThenCreateNodes.java ---------------------------------------------------------------------- diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/compute/strategy/GetOrCreateStorageServiceAndVirtualNetworkThenCreateNodes.java b/azurecompute/src/main/java/org/jclouds/azurecompute/compute/strategy/GetOrCreateStorageServiceAndVirtualNetworkThenCreateNodes.java index 0b49637..184bfb0 100644 --- a/azurecompute/src/main/java/org/jclouds/azurecompute/compute/strategy/GetOrCreateStorageServiceAndVirtualNetworkThenCreateNodes.java +++ b/azurecompute/src/main/java/org/jclouds/azurecompute/compute/strategy/GetOrCreateStorageServiceAndVirtualNetworkThenCreateNodes.java @@ -21,7 +21,6 @@ import static com.google.common.base.Predicates.and; import static com.google.common.base.Predicates.notNull; import static com.google.common.collect.Iterables.tryFind; import static java.lang.String.format; -import static org.jclouds.azurecompute.compute.config.AzureComputeServiceContextModule.AzureComputeConstants; import java.util.List; import java.util.Map; import java.util.Set; @@ -31,6 +30,7 @@ import javax.inject.Named; import javax.inject.Singleton; import org.jclouds.azurecompute.AzureComputeApi; +import org.jclouds.azurecompute.compute.config.AzureComputeServiceContextModule.AzureComputeConstants; import org.jclouds.azurecompute.compute.options.AzureComputeTemplateOptions; import org.jclouds.azurecompute.compute.predicates.StorageServicePredicates; import org.jclouds.azurecompute.config.AzureComputeProperties; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/35c68cd7/azurecompute/src/main/java/org/jclouds/azurecompute/features/AffinityGroupApi.java ---------------------------------------------------------------------- diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/features/AffinityGroupApi.java b/azurecompute/src/main/java/org/jclouds/azurecompute/features/AffinityGroupApi.java index cce1714..cb11df0 100644 --- a/azurecompute/src/main/java/org/jclouds/azurecompute/features/AffinityGroupApi.java +++ b/azurecompute/src/main/java/org/jclouds/azurecompute/features/AffinityGroupApi.java @@ -17,8 +17,6 @@ package org.jclouds.azurecompute.features; import static javax.ws.rs.core.MediaType.APPLICATION_XML; -import static org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; -import static org.jclouds.Fallbacks.NullOnNotFoundOr404; import java.util.List; @@ -32,6 +30,8 @@ import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.Produces; +import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; +import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.azurecompute.binders.CreateAffinityGroupParamsToXML; import org.jclouds.azurecompute.binders.UpdateAffinityGroupParamsToXML; import org.jclouds.azurecompute.domain.AffinityGroup; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/35c68cd7/azurecompute/src/main/java/org/jclouds/azurecompute/features/CloudServiceApi.java ---------------------------------------------------------------------- diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/features/CloudServiceApi.java b/azurecompute/src/main/java/org/jclouds/azurecompute/features/CloudServiceApi.java index c33c8b8..5a3b1ca 100644 --- a/azurecompute/src/main/java/org/jclouds/azurecompute/features/CloudServiceApi.java +++ b/azurecompute/src/main/java/org/jclouds/azurecompute/features/CloudServiceApi.java @@ -17,8 +17,6 @@ package org.jclouds.azurecompute.features; import static javax.ws.rs.core.MediaType.APPLICATION_XML; -import static org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; -import static org.jclouds.Fallbacks.NullOnNotFoundOr404; import java.util.List; @@ -31,6 +29,8 @@ import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.Produces; +import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; +import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.azurecompute.domain.CloudService; import org.jclouds.azurecompute.domain.CloudServiceProperties; import org.jclouds.azurecompute.functions.Base64EncodeLabel; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/35c68cd7/azurecompute/src/main/java/org/jclouds/azurecompute/features/DeploymentApi.java ---------------------------------------------------------------------- diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/features/DeploymentApi.java b/azurecompute/src/main/java/org/jclouds/azurecompute/features/DeploymentApi.java index 053bca8..b7afcf8 100644 --- a/azurecompute/src/main/java/org/jclouds/azurecompute/features/DeploymentApi.java +++ b/azurecompute/src/main/java/org/jclouds/azurecompute/features/DeploymentApi.java @@ -16,8 +16,6 @@ */ package org.jclouds.azurecompute.features; -import static org.jclouds.Fallbacks.NullOnNotFoundOr404; - import javax.inject.Named; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; @@ -28,6 +26,7 @@ import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.azurecompute.binders.DeploymentParamsToXML; import org.jclouds.azurecompute.domain.Deployment; import org.jclouds.azurecompute.domain.DeploymentParams; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/35c68cd7/azurecompute/src/main/java/org/jclouds/azurecompute/features/DiskApi.java ---------------------------------------------------------------------- diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/features/DiskApi.java b/azurecompute/src/main/java/org/jclouds/azurecompute/features/DiskApi.java index ca50d06..834f0d1 100644 --- a/azurecompute/src/main/java/org/jclouds/azurecompute/features/DiskApi.java +++ b/azurecompute/src/main/java/org/jclouds/azurecompute/features/DiskApi.java @@ -16,9 +16,6 @@ */ package org.jclouds.azurecompute.features; -import static org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; -import static org.jclouds.Fallbacks.NullOnNotFoundOr404; - import java.util.List; import javax.inject.Named; @@ -29,6 +26,8 @@ import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.core.MediaType; +import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; +import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.azurecompute.domain.Disk; import org.jclouds.azurecompute.functions.ParseRequestIdHeader; import org.jclouds.azurecompute.xml.ListDisksHandler; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/35c68cd7/azurecompute/src/main/java/org/jclouds/azurecompute/features/LocationApi.java ---------------------------------------------------------------------- diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/features/LocationApi.java b/azurecompute/src/main/java/org/jclouds/azurecompute/features/LocationApi.java index 4ecd5b1..60a3b1a 100644 --- a/azurecompute/src/main/java/org/jclouds/azurecompute/features/LocationApi.java +++ b/azurecompute/src/main/java/org/jclouds/azurecompute/features/LocationApi.java @@ -16,8 +16,6 @@ */ package org.jclouds.azurecompute.features; -import static org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; - import java.util.List; import javax.inject.Named; @@ -26,6 +24,7 @@ import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.core.MediaType; +import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.azurecompute.domain.Location; import org.jclouds.azurecompute.xml.ListLocationsHandler; import org.jclouds.rest.annotations.Fallback; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/35c68cd7/azurecompute/src/main/java/org/jclouds/azurecompute/features/NetworkSecurityGroupApi.java ---------------------------------------------------------------------- diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/features/NetworkSecurityGroupApi.java b/azurecompute/src/main/java/org/jclouds/azurecompute/features/NetworkSecurityGroupApi.java index aa50bf2..d709831 100644 --- a/azurecompute/src/main/java/org/jclouds/azurecompute/features/NetworkSecurityGroupApi.java +++ b/azurecompute/src/main/java/org/jclouds/azurecompute/features/NetworkSecurityGroupApi.java @@ -16,7 +16,6 @@ */ package org.jclouds.azurecompute.features; -import static org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import java.util.List; import javax.inject.Named; @@ -30,6 +29,7 @@ import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.azurecompute.binders.NetworkSecurityGroupToXML; import org.jclouds.azurecompute.binders.RuleToXML; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/35c68cd7/azurecompute/src/main/java/org/jclouds/azurecompute/features/OSImageApi.java ---------------------------------------------------------------------- diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/features/OSImageApi.java b/azurecompute/src/main/java/org/jclouds/azurecompute/features/OSImageApi.java index e171af7..aaf3ba8 100644 --- a/azurecompute/src/main/java/org/jclouds/azurecompute/features/OSImageApi.java +++ b/azurecompute/src/main/java/org/jclouds/azurecompute/features/OSImageApi.java @@ -17,8 +17,6 @@ package org.jclouds.azurecompute.features; import static javax.ws.rs.core.MediaType.APPLICATION_XML; -import static org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; -import static org.jclouds.Fallbacks.NullOnNotFoundOr404; import java.util.List; @@ -32,6 +30,8 @@ import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.Produces; +import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; +import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.azurecompute.binders.OSImageParamsToXML; import org.jclouds.azurecompute.domain.OSImage; import org.jclouds.azurecompute.domain.OSImageParams; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/35c68cd7/azurecompute/src/main/java/org/jclouds/azurecompute/features/OperationApi.java ---------------------------------------------------------------------- diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/features/OperationApi.java b/azurecompute/src/main/java/org/jclouds/azurecompute/features/OperationApi.java index ac4092b..bc5e2dc 100644 --- a/azurecompute/src/main/java/org/jclouds/azurecompute/features/OperationApi.java +++ b/azurecompute/src/main/java/org/jclouds/azurecompute/features/OperationApi.java @@ -16,8 +16,6 @@ */ package org.jclouds.azurecompute.features; -import static org.jclouds.Fallbacks.NullOnNotFoundOr404; - import javax.inject.Named; import javax.ws.rs.Consumes; import javax.ws.rs.GET; @@ -25,6 +23,7 @@ import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.core.MediaType; +import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.azurecompute.domain.Operation; import org.jclouds.azurecompute.xml.OperationHandler; import org.jclouds.rest.annotations.Fallback; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/35c68cd7/azurecompute/src/main/java/org/jclouds/azurecompute/features/ReservedIPAddressApi.java ---------------------------------------------------------------------- diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/features/ReservedIPAddressApi.java b/azurecompute/src/main/java/org/jclouds/azurecompute/features/ReservedIPAddressApi.java index 153aa7b..fd93665 100644 --- a/azurecompute/src/main/java/org/jclouds/azurecompute/features/ReservedIPAddressApi.java +++ b/azurecompute/src/main/java/org/jclouds/azurecompute/features/ReservedIPAddressApi.java @@ -17,7 +17,6 @@ package org.jclouds.azurecompute.features; import static javax.ws.rs.core.MediaType.APPLICATION_XML; -import static org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import java.util.List; @@ -29,12 +28,13 @@ import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.Produces; + +import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.azurecompute.binders.ReservedIPAddressParamsToXML; import org.jclouds.azurecompute.domain.ReservedIPAddress; import org.jclouds.azurecompute.domain.ReservedIPAddressParams; import org.jclouds.azurecompute.functions.ParseRequestIdHeader; - import org.jclouds.azurecompute.xml.ListReservedIPAddressHandler; import org.jclouds.azurecompute.xml.ReservedIPAddressHandler; import org.jclouds.rest.annotations.BinderParam; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/35c68cd7/azurecompute/src/main/java/org/jclouds/azurecompute/features/ServiceCertificatesApi.java ---------------------------------------------------------------------- diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/features/ServiceCertificatesApi.java b/azurecompute/src/main/java/org/jclouds/azurecompute/features/ServiceCertificatesApi.java index 15d940b..4ddc98e 100644 --- a/azurecompute/src/main/java/org/jclouds/azurecompute/features/ServiceCertificatesApi.java +++ b/azurecompute/src/main/java/org/jclouds/azurecompute/features/ServiceCertificatesApi.java @@ -17,7 +17,6 @@ package org.jclouds.azurecompute.features; import static javax.ws.rs.core.MediaType.APPLICATION_XML; -import static org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import java.util.List; @@ -29,12 +28,13 @@ import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.Produces; + +import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.azurecompute.binders.ServiceCertificateParamsToXML; import org.jclouds.azurecompute.domain.ServiceCertificate; import org.jclouds.azurecompute.domain.ServiceCertificateParams; import org.jclouds.azurecompute.functions.ParseRequestIdHeader; - import org.jclouds.azurecompute.xml.ListServiceCertificatesHandler; import org.jclouds.azurecompute.xml.ServiceCertificateHandler; import org.jclouds.rest.annotations.BinderParam; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/35c68cd7/azurecompute/src/main/java/org/jclouds/azurecompute/features/SubscriptionApi.java ---------------------------------------------------------------------- diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/features/SubscriptionApi.java b/azurecompute/src/main/java/org/jclouds/azurecompute/features/SubscriptionApi.java index 96161ea..c0ac9ca 100644 --- a/azurecompute/src/main/java/org/jclouds/azurecompute/features/SubscriptionApi.java +++ b/azurecompute/src/main/java/org/jclouds/azurecompute/features/SubscriptionApi.java @@ -16,8 +16,6 @@ */ package org.jclouds.azurecompute.features; -import static org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; - import java.util.List; import javax.inject.Named; @@ -26,6 +24,7 @@ import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.core.MediaType; +import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; import org.jclouds.azurecompute.domain.RoleSize; import org.jclouds.azurecompute.xml.ListRoleSizesHandler; import org.jclouds.rest.annotations.Fallback; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/35c68cd7/azurecompute/src/main/java/org/jclouds/azurecompute/features/VMImageApi.java ---------------------------------------------------------------------- diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/features/VMImageApi.java b/azurecompute/src/main/java/org/jclouds/azurecompute/features/VMImageApi.java index ecca539..6ad52b2 100644 --- a/azurecompute/src/main/java/org/jclouds/azurecompute/features/VMImageApi.java +++ b/azurecompute/src/main/java/org/jclouds/azurecompute/features/VMImageApi.java @@ -16,6 +16,8 @@ */ package org.jclouds.azurecompute.features; +import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; +import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.azurecompute.binders.VMImageParamsToXML; import org.jclouds.azurecompute.domain.VMImage; import org.jclouds.azurecompute.domain.VMImageParams; @@ -39,8 +41,6 @@ import javax.ws.rs.Produces; import java.util.List; import static javax.ws.rs.core.MediaType.APPLICATION_XML; -import static org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; -import static org.jclouds.Fallbacks.NullOnNotFoundOr404; /** * The Service Management API includes operations for managing the VM Images in your subscription. http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/35c68cd7/azurecompute/src/main/java/org/jclouds/azurecompute/features/VirtualMachineApi.java ---------------------------------------------------------------------- diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/features/VirtualMachineApi.java b/azurecompute/src/main/java/org/jclouds/azurecompute/features/VirtualMachineApi.java index 2285a9d..4065195 100644 --- a/azurecompute/src/main/java/org/jclouds/azurecompute/features/VirtualMachineApi.java +++ b/azurecompute/src/main/java/org/jclouds/azurecompute/features/VirtualMachineApi.java @@ -16,8 +16,6 @@ */ package org.jclouds.azurecompute.features; -import static org.jclouds.Fallbacks.NullOnNotFoundOr404; - import javax.inject.Named; import javax.ws.rs.Consumes; import javax.ws.rs.GET; @@ -28,6 +26,7 @@ import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.azurecompute.binders.CaptureVMImageParamsToXML; import org.jclouds.azurecompute.binders.RoleToXML; import org.jclouds.azurecompute.domain.CaptureVMImageParams; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/35c68cd7/azurecompute/src/main/java/org/jclouds/azurecompute/features/VirtualNetworkApi.java ---------------------------------------------------------------------- diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/features/VirtualNetworkApi.java b/azurecompute/src/main/java/org/jclouds/azurecompute/features/VirtualNetworkApi.java index 9cbc897..23cba78 100644 --- a/azurecompute/src/main/java/org/jclouds/azurecompute/features/VirtualNetworkApi.java +++ b/azurecompute/src/main/java/org/jclouds/azurecompute/features/VirtualNetworkApi.java @@ -16,9 +16,6 @@ */ package org.jclouds.azurecompute.features; -import static org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; -import static org.jclouds.Fallbacks.NullOnNotFoundOr404; - import java.util.List; import javax.inject.Named; @@ -29,6 +26,8 @@ import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404; +import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.azurecompute.binders.NetworkConfigurationToXML; import org.jclouds.azurecompute.domain.NetworkConfiguration; import org.jclouds.azurecompute.domain.NetworkConfiguration.VirtualNetworkSite; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/35c68cd7/azurecompute/src/main/java/org/jclouds/azurecompute/xml/AddressSpaceHandler.java ---------------------------------------------------------------------- diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/AddressSpaceHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/AddressSpaceHandler.java index af4f4fd..b9dda51 100644 --- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/AddressSpaceHandler.java +++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/AddressSpaceHandler.java @@ -16,9 +16,9 @@ */ package org.jclouds.azurecompute.xml; -import static org.jclouds.azurecompute.domain.NetworkConfiguration.AddressSpace; import static org.jclouds.util.SaxUtils.currentOrNull; +import org.jclouds.azurecompute.domain.NetworkConfiguration.AddressSpace; import org.jclouds.http.functions.ParseSax; import org.xml.sax.Attributes; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/35c68cd7/azurecompute/src/main/java/org/jclouds/azurecompute/xml/SubnetHandler.java ---------------------------------------------------------------------- diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/SubnetHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/SubnetHandler.java index aca28be..6c773e8 100644 --- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/SubnetHandler.java +++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/SubnetHandler.java @@ -16,9 +16,9 @@ */ package org.jclouds.azurecompute.xml; -import static org.jclouds.azurecompute.domain.NetworkConfiguration.Subnet; import static org.jclouds.util.SaxUtils.currentOrNull; +import org.jclouds.azurecompute.domain.NetworkConfiguration.Subnet; import org.jclouds.http.functions.ParseSax; import org.xml.sax.Attributes; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/35c68cd7/azurecompute/src/test/java/org/jclouds/azurecompute/internal/BaseAzureComputeApiLiveTest.java ---------------------------------------------------------------------- diff --git a/azurecompute/src/test/java/org/jclouds/azurecompute/internal/BaseAzureComputeApiLiveTest.java b/azurecompute/src/test/java/org/jclouds/azurecompute/internal/BaseAzureComputeApiLiveTest.java index f32f943..220b592 100644 --- a/azurecompute/src/test/java/org/jclouds/azurecompute/internal/BaseAzureComputeApiLiveTest.java +++ b/azurecompute/src/test/java/org/jclouds/azurecompute/internal/BaseAzureComputeApiLiveTest.java @@ -19,8 +19,8 @@ package org.jclouds.azurecompute.internal; import static com.google.common.collect.Iterables.find; import static com.google.common.collect.Iterables.tryFind; import static java.util.concurrent.TimeUnit.SECONDS; -import static org.jclouds.azurecompute.domain.NetworkConfiguration.VirtualNetworkSite; import static org.testng.Assert.assertTrue; + import java.util.List; import java.util.UUID; import java.util.logging.Level; @@ -36,6 +36,7 @@ import org.jclouds.azurecompute.domain.NetworkConfiguration; import org.jclouds.azurecompute.domain.NetworkConfiguration.AddressSpace; import org.jclouds.azurecompute.domain.NetworkConfiguration.Subnet; import org.jclouds.azurecompute.domain.NetworkConfiguration.VirtualNetworkConfiguration; +import org.jclouds.azurecompute.domain.NetworkConfiguration.VirtualNetworkSite; import org.jclouds.azurecompute.domain.StorageService; import org.jclouds.azurecompute.util.ConflictManagementPredicate; import org.testng.annotations.AfterClass; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/35c68cd7/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/ContainerApi.java ---------------------------------------------------------------------- diff --git a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/ContainerApi.java b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/ContainerApi.java index e4be9de..5c56fbe 100644 --- a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/ContainerApi.java +++ b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/ContainerApi.java @@ -17,7 +17,6 @@ package org.jclouds.snia.cdmi.v1.features; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static org.jclouds.Fallbacks.NullOnNotFoundOr404; import static org.jclouds.snia.cdmi.v1.ObjectTypes.CONTAINER; import java.io.Closeable; @@ -30,6 +29,7 @@ import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.Produces; +import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.rest.annotations.BinderParam; import org.jclouds.rest.annotations.Fallback; import org.jclouds.rest.annotations.Headers; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/35c68cd7/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DataApi.java ---------------------------------------------------------------------- diff --git a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DataApi.java b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DataApi.java index ef23afe..b9b33dd 100644 --- a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DataApi.java +++ b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DataApi.java @@ -18,8 +18,6 @@ package org.jclouds.snia.cdmi.v1.features; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; import static javax.ws.rs.core.MediaType.TEXT_PLAIN; -import static org.jclouds.Fallbacks.NullOnNotFoundOr404; -import static org.jclouds.Fallbacks.VoidOnNotFoundOr404; import static org.jclouds.snia.cdmi.v1.ObjectTypes.DATAOBJECT; import javax.ws.rs.Consumes; @@ -30,6 +28,8 @@ import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.Produces; +import org.jclouds.Fallbacks.NullOnNotFoundOr404; +import org.jclouds.Fallbacks.VoidOnNotFoundOr404; import org.jclouds.rest.annotations.BinderParam; import org.jclouds.rest.annotations.Fallback; import org.jclouds.rest.annotations.Headers; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/35c68cd7/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DataNonCDMIContentTypeApi.java ---------------------------------------------------------------------- diff --git a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DataNonCDMIContentTypeApi.java b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DataNonCDMIContentTypeApi.java index 16e4fff..78cfbd6 100644 --- a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DataNonCDMIContentTypeApi.java +++ b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DataNonCDMIContentTypeApi.java @@ -18,8 +18,6 @@ package org.jclouds.snia.cdmi.v1.features; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; import static javax.ws.rs.core.MediaType.TEXT_PLAIN; -import static org.jclouds.Fallbacks.NullOnNotFoundOr404; -import static org.jclouds.Fallbacks.VoidOnNotFoundOr404; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; @@ -30,6 +28,8 @@ import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.Produces; +import org.jclouds.Fallbacks.NullOnNotFoundOr404; +import org.jclouds.Fallbacks.VoidOnNotFoundOr404; import org.jclouds.io.Payload; import org.jclouds.rest.annotations.BinderParam; import org.jclouds.rest.annotations.Fallback; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/35c68cd7/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/features/DatacenterApi.java ---------------------------------------------------------------------- diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/features/DatacenterApi.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/features/DatacenterApi.java index babf198..deb9f67 100644 --- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/features/DatacenterApi.java +++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/features/DatacenterApi.java @@ -17,7 +17,6 @@ package org.jclouds.joyent.cloudapi.v6_5.features; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static org.jclouds.Fallbacks.EmptyMapOnNotFoundOr404; import java.net.URI; import java.util.Map; @@ -27,6 +26,7 @@ import javax.ws.rs.Consumes; import javax.ws.rs.GET; import javax.ws.rs.Path; +import org.jclouds.Fallbacks.EmptyMapOnNotFoundOr404; import org.jclouds.http.filters.BasicAuthentication; import org.jclouds.rest.annotations.Fallback; import org.jclouds.rest.annotations.Headers; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/35c68cd7/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/features/DatasetApi.java ---------------------------------------------------------------------- diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/features/DatasetApi.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/features/DatasetApi.java index e7de9fb..ca1719c 100644 --- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/features/DatasetApi.java +++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/features/DatasetApi.java @@ -17,8 +17,6 @@ package org.jclouds.joyent.cloudapi.v6_5.features; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; -import static org.jclouds.Fallbacks.NullOnNotFoundOr404; import java.util.Set; @@ -28,6 +26,8 @@ import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.PathParam; +import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; +import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.http.filters.BasicAuthentication; import org.jclouds.joyent.cloudapi.v6_5.domain.Dataset; import org.jclouds.rest.annotations.Fallback; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/35c68cd7/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/features/KeyApi.java ---------------------------------------------------------------------- diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/features/KeyApi.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/features/KeyApi.java index 31473d5..84d900b 100644 --- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/features/KeyApi.java +++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/features/KeyApi.java @@ -16,10 +16,6 @@ */ package org.jclouds.joyent.cloudapi.v6_5.features; -import static org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; -import static org.jclouds.Fallbacks.NullOnNotFoundOr404; -import static org.jclouds.Fallbacks.VoidOnNotFoundOr404; - import java.util.Set; import javax.inject.Named; @@ -31,6 +27,9 @@ import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.core.MediaType; +import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; +import org.jclouds.Fallbacks.NullOnNotFoundOr404; +import org.jclouds.Fallbacks.VoidOnNotFoundOr404; import org.jclouds.http.filters.BasicAuthentication; import org.jclouds.joyent.cloudapi.v6_5.domain.Key; import org.jclouds.rest.annotations.BinderParam; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/35c68cd7/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/features/MachineApi.java ---------------------------------------------------------------------- diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/features/MachineApi.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/features/MachineApi.java index c528a82..5c8979d 100644 --- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/features/MachineApi.java +++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/features/MachineApi.java @@ -18,9 +18,6 @@ package org.jclouds.joyent.cloudapi.v6_5.features; import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; -import static org.jclouds.Fallbacks.NullOnNotFoundOr404; -import static org.jclouds.Fallbacks.VoidOnNotFoundOr404; import java.util.Set; @@ -34,6 +31,9 @@ import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; +import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; +import org.jclouds.Fallbacks.NullOnNotFoundOr404; +import org.jclouds.Fallbacks.VoidOnNotFoundOr404; import org.jclouds.http.filters.BasicAuthentication; import org.jclouds.joyent.cloudapi.v6_5.domain.Machine; import org.jclouds.joyent.cloudapi.v6_5.options.CreateMachineOptions; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/35c68cd7/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/features/PackageApi.java ---------------------------------------------------------------------- diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/features/PackageApi.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/features/PackageApi.java index 7003cd2..a6067fd 100644 --- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/features/PackageApi.java +++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/features/PackageApi.java @@ -17,8 +17,6 @@ package org.jclouds.joyent.cloudapi.v6_5.features; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; -import static org.jclouds.Fallbacks.NullOnNotFoundOr404; import java.util.Set; @@ -28,6 +26,8 @@ import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.PathParam; +import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; +import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.http.filters.BasicAuthentication; import org.jclouds.joyent.cloudapi.v6_5.domain.Package; import org.jclouds.rest.annotations.Fallback;
