Enforce modifier order via Checkstyle

Also fix violations, via:

find -name \*.java | xargs sed -i 's/final static/static final/'
find -name \*.java | xargs sed -i 's/static private/private static/'
find -name \*.java | xargs sed -i 's/static abstract/abstract static/'

apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/reference/Region.java

@@ -43,16 +43,16 @@ public interface Region {
    /**
     * Chicago (ORD) https://ord.loadbalancers.api.rackspacecloud.com/v1.0/1234/
     */
-   public final static String ORD = "ORD";
+   public static final String ORD = "ORD";
 
    /**
     * Dallas/Ft. Worth (DFW) https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/1234/
     */
-   public final static String DFW = "DFW";
+   public static final String DFW = "DFW";
    
    /**
     * London/Slough (LON) https://lon.loadbalancers.api.rackspacecloud.com/v1.0/1234/
     */
-   public final static String LON = "LON";
+   public static final String LON = "LON";
    
 }

apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/AbsoluteLimit.java

@@ -40,7 +40,7 @@ public class AbsoluteLimit {
       return new ConcreteBuilder().fromAbsoluteLimit(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected String name;

apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Addresses.java

@@ -47,7 +47,7 @@ public class Addresses {
       return new ConcreteBuilder().fromAddresses(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected Set<String> publicAddresses;

apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/BackupSchedule.java

@@ -41,7 +41,7 @@ public class BackupSchedule {
       return new ConcreteBuilder().fromBackupSchedule(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected DailyBackup daily;

apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Flavor.java

@@ -43,7 +43,7 @@ public class Flavor {
       return new ConcreteBuilder().fromFlavor(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected int id;

apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Image.java

@@ -46,7 +46,7 @@ public class Image {
       return new ConcreteBuilder().fromImage(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected Date created;

apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Limits.java

@@ -42,7 +42,7 @@ public class Limits {
       return new ConcreteBuilder().fromLimits(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected Set<RateLimit> rate = ImmutableSet.of();

apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/RateLimit.java

@@ -53,7 +53,7 @@ public class RateLimit {
       return new ConcreteBuilder().fromRateLimit(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected String uri;

apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Server.java

@@ -45,7 +45,7 @@ public class Server {
       return new ConcreteBuilder().fromServer(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected int id;

apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/ShareIp.java

@@ -36,7 +36,7 @@ public class ShareIp {
       return new ConcreteBuilder().fromShareIp(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected boolean configureServer;

apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/SharedIpGroup.java

@@ -47,7 +47,7 @@ public class SharedIpGroup {
       return new ConcreteBuilder().fromSharedIpGroup(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected int id;

apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Version.java

@@ -40,7 +40,7 @@ public class Version {
       return new ConcreteBuilder().fromVersion(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected String docURL;

apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/Device.java

@@ -25,7 +25,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
  * @author Adrian Cole
  */
 public abstract class Device {
-   public static abstract class Builder {
+   public abstract static class Builder {
       protected String uuid;
       protected MediaType mediaType = MediaType.DISK;
 

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Account.java

@@ -117,7 +117,7 @@ public class Account extends ForwardingSet<User> {
       return new ConcreteBuilder().fromAccount(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Alert.java

@@ -43,7 +43,7 @@ public class Alert {
       return new ConcreteBuilder().fromAlert(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ApiKeyPair.java

@@ -40,7 +40,7 @@ public class ApiKeyPair {
       return new ConcreteBuilder().fromApiKeyPair(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String apiKey;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncCreateResponse.java

@@ -41,7 +41,7 @@ public class AsyncCreateResponse {
       return new ConcreteBuilder().fromAsyncCreateResponse(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJob.java

@@ -116,7 +116,7 @@ public class AsyncJob<S> {
       return new ConcreteBuilder<S>().fromAsyncJob(this);
    }
 
-   public static abstract class Builder<T extends Builder<T, S>, S> {
+   public abstract static class Builder<T extends Builder<T, S>, S> {
       protected abstract T self();
 
       protected String accountId;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJobError.java

@@ -78,7 +78,7 @@ public class AsyncJobError {
       return new ConcreteBuilder().fromAsyncJobError(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected AsyncJobError.ErrorCode errorCode;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capabilities.java

@@ -40,7 +40,7 @@ public class Capabilities {
       return new ConcreteBuilder().fromCapabilities(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String cloudStackVersion;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capacity.java

@@ -88,7 +88,7 @@ public class Capacity implements Comparable<Capacity> {
       return new ConcreteBuilder().fromCapacity(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected long capacityTotal;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Cluster.java

@@ -67,7 +67,7 @@ public class Cluster implements Comparable<Cluster> {
       return new ConcreteBuilder().fromCluster(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ConfigurationEntry.java

@@ -42,7 +42,7 @@ public class ConfigurationEntry implements Comparable<ConfigurationEntry> {
       return new ConcreteBuilder().fromConfigurationEntry(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String category;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/DiskOffering.java

@@ -45,7 +45,7 @@ public class DiskOffering implements Comparable<DiskOffering> {
       return new ConcreteBuilder().fromDiskOffering(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Domain.java

@@ -42,7 +42,7 @@ public class Domain implements Comparable<Domain> {
       return new ConcreteBuilder().fromDomain(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/EncryptedPasswordAndPrivateKey.java

@@ -40,7 +40,7 @@ public class EncryptedPasswordAndPrivateKey {
       return new ConcreteBuilder().fromEncryptedPasswordAndPrivateKey(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String encryptedPassword;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Event.java

@@ -43,7 +43,7 @@ public class Event implements Comparable<Event> {
       return new ConcreteBuilder().fromEvent(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/FirewallRule.java

@@ -90,7 +90,7 @@ public class FirewallRule implements Comparable<FirewallRule> {
       return new ConcreteBuilder().fromFirewallRule(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Host.java

@@ -130,7 +130,7 @@ public class Host implements Comparable<Host> {
       return new ConcreteBuilder().fromHost(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IPForwardingRule.java

@@ -44,7 +44,7 @@ public class IPForwardingRule implements Comparable<IPForwardingRule> {
       return new ConcreteBuilder().fromIPForwardingRule(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISO.java

@@ -58,7 +58,7 @@ public class ISO {
       return new ConcreteBuilder().fromISO(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOExtraction.java

@@ -43,7 +43,7 @@ public class ISOExtraction {
       return new ConcreteBuilder().fromISOExtraction(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOPermissions.java

@@ -44,7 +44,7 @@ public class ISOPermissions {
       return new ConcreteBuilder().fromISOPermissions(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IngressRule.java

@@ -40,7 +40,7 @@ public class IngressRule implements Comparable<IngressRule> {
       return new ConcreteBuilder().fromIngressRule(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String account;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/JobResult.java

@@ -43,7 +43,7 @@ public class JobResult {
       return new ConcreteBuilder().fromJobResult(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected boolean success;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoadBalancerRule.java

@@ -83,7 +83,7 @@ public class LoadBalancerRule {
       return new ConcreteBuilder().fromLoadBalancerRule(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoginResponse.java

@@ -40,7 +40,7 @@ public class LoginResponse {
       return new ConcreteBuilder().fromLoginResponse(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String username;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NIC.java

@@ -43,7 +43,7 @@ public class NIC {
       return new ConcreteBuilder().fromNIC(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Network.java

@@ -48,7 +48,7 @@ public class Network {
       return new ConcreteBuilder().fromNetwork(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java

@@ -45,7 +45,7 @@ public class NetworkOffering implements Comparable<NetworkOffering> {
       return new ConcreteBuilder().fromNetworkOffering(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java

@@ -50,7 +50,7 @@ public class NetworkService implements Comparable<NetworkService> {
          return new ConcreteBuilder().fromCapability(this);
       }
 
-      public static abstract class Builder<T extends Builder<T>> {
+      public abstract static class Builder<T extends Builder<T>> {
          protected abstract T self();
 
          protected String name;
@@ -149,7 +149,7 @@ public class NetworkService implements Comparable<NetworkService> {
       return new ConcreteBuilder().fromNetworkService(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String name;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/OSType.java

@@ -42,7 +42,7 @@ public class OSType implements Comparable<OSType> {
       return new ConcreteBuilder().fromOSType(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Pod.java

@@ -42,7 +42,7 @@ public class Pod implements Comparable<Pod> {
       return new ConcreteBuilder().fromPod(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PortForwardingRule.java

@@ -88,7 +88,7 @@ public class PortForwardingRule implements Comparable<PortForwardingRule> {
       return new ConcreteBuilder().fromPortForwardingRule(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PublicIPAddress.java

@@ -64,7 +64,7 @@ public class PublicIPAddress {
       return new ConcreteBuilder().fromPublicIPAddress(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ResourceLimit.java

@@ -104,7 +104,7 @@ public class ResourceLimit {
       return new ConcreteBuilder().fromResourceLimit(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String account;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SecurityGroup.java

@@ -45,7 +45,7 @@ public class SecurityGroup implements Comparable<SecurityGroup> {
       return new ConcreteBuilder().fromSecurityGroup(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ServiceOffering.java

@@ -45,7 +45,7 @@ public class ServiceOffering implements Comparable<ServiceOffering> {
       return new ConcreteBuilder().fromServiceOffering(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Snapshot.java

@@ -94,7 +94,7 @@ public class Snapshot {
       return new ConcreteBuilder().fromSnapshot(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicy.java

@@ -42,7 +42,7 @@ public class SnapshotPolicy {
       return new ConcreteBuilder().fromSnapshotPolicy(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java

@@ -41,7 +41,7 @@ public class SnapshotPolicySchedule {
       return new ConcreteBuilder().fromSnapshotPolicySchedule(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected Snapshot.Interval interval;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java

@@ -42,7 +42,7 @@ public class SshKeyPair {
       return new ConcreteBuilder().fromSshKeyPair(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String fingerprint;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/StoragePool.java

@@ -98,7 +98,7 @@ public class StoragePool implements Comparable<StoragePool> {
       return new ConcreteBuilder().fromStoragePool(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java

@@ -135,7 +135,7 @@ public class Template implements Comparable<Template> {
       return new ConcreteBuilder().fromTemplate(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateExtraction.java

@@ -41,7 +41,7 @@ public class TemplateExtraction implements Comparable<TemplateExtraction> {
       return new ConcreteBuilder().fromTemplateExtraction(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateMetadata.java

@@ -42,7 +42,7 @@ public class TemplateMetadata {
       return new ConcreteBuilder().fromTemplateMetadata(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String name;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplatePermission.java

@@ -40,7 +40,7 @@ public class TemplatePermission {
       return new ConcreteBuilder().fromTemplatePermission(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/UsageRecord.java

@@ -94,7 +94,7 @@ public class UsageRecord {
       return new ConcreteBuilder().fromUsageRecord(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/User.java

@@ -64,7 +64,7 @@ public class User {
       return new ConcreteBuilder().fromUser(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VMGroup.java

@@ -43,7 +43,7 @@ public class VMGroup {
       return new ConcreteBuilder().fromVMGroup(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java

@@ -68,7 +68,7 @@ public class VirtualMachine {
       return new ConcreteBuilder().fromVirtualMachine(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VlanIPRange.java

@@ -42,7 +42,7 @@ public class VlanIPRange implements Comparable<VlanIPRange> {
       return new ConcreteBuilder().fromVlanIPRange(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Volume.java

@@ -122,7 +122,7 @@ public class Volume {
       return new ConcreteBuilder().fromVolume(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Zone.java

@@ -42,7 +42,7 @@ public class Zone implements Comparable<Zone> {
       return new ConcreteBuilder().fromZone(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListAsyncJobsOptions.java

@@ -36,7 +36,7 @@ import com.google.common.collect.ImmutableSet;
  * @author Adrian Cole
  */
 public class ListAsyncJobsOptions extends AccountInDomainOptions {
-   private final static DateService dateService = new SimpleDateFormatDateService();
+   private static final DateService dateService = new SimpleDateFormatDateService();
 
    public static final ListAsyncJobsOptions NONE = new ListAsyncJobsOptions();
 

apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineClientLiveTest.java

@@ -75,7 +75,7 @@ import com.google.common.net.HostSpecifier;
  */
 @Test(groups = "live", singleThreaded = true, testName = "VirtualMachineClientLiveTest")
 public class VirtualMachineClientLiveTest extends BaseCloudStackClientLiveTest {
-   private final static Logger logger = Logger.getAnonymousLogger();
+   private static final Logger logger = Logger.getAnonymousLogger();
 
    private VirtualMachine vm = null;
 

apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwarePropertyHandler.java

@@ -82,7 +82,7 @@ public class HardwarePropertyHandler extends ParseSax.HandlerWithResult<Hardware
    private static final Pattern LONG = Pattern.compile("^[0-9]+$");
    private static final Pattern DOUBLE = Pattern.compile("^[0-9]+\\.[0-9]+$");
 
-   public static @Nullable
+   @Nullable public static
    Number parseNumberOrNull(String in) {
       if (DOUBLE.matcher(in).matches())
          return new Double(in);

apis/ec2/src/main/java/org/jclouds/ec2/EC2AsyncClient.java

@@ -44,7 +44,7 @@ import com.google.inject.Provides;
  * @author Adrian Cole
  */
 public interface EC2AsyncClient {
-   public final static String VERSION = "2010-06-15";
+   public static final String VERSION = "2010-06-15";
    /**
     * 
     * @return the Region codes configured

apis/ec2/src/main/java/org/jclouds/ec2/domain/SecurityGroup.java

@@ -46,7 +46,7 @@ public class SecurityGroup extends ForwardingSet<IpPermission> {
       return new ConcreteBuilder().fromSecurityGroup(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String region;

apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/Device.java

@@ -25,7 +25,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
  * @author Adrian Cole
  */
 public abstract class Device {
-   public static abstract class Builder {
+   public abstract static class Builder {
       protected String uuid;
       protected MediaType mediaType = MediaType.DISK;
 

apis/nova/src/main/java/org/jclouds/openstack/nova/domain/AbsoluteLimit.java

@@ -39,7 +39,7 @@ public class AbsoluteLimit {
       return new ConcreteBuilder().fromAbsoluteLimit(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected String name;

apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Address.java

@@ -63,7 +63,7 @@ public class Address {
       };
    }
    
-   public static abstract class Builder<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected String address;

apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Addresses.java

@@ -42,7 +42,7 @@ public class Addresses {
       return new ConcreteBuilder().fromAddresses(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected Set<Address> publicAddresses = ImmutableSet.of();

apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Flavor.java

@@ -44,7 +44,7 @@ public class Flavor extends Resource {
       return new ConcreteBuilder().fromFlavor(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> extends Resource.Builder<T> {
+   public abstract static class Builder<T extends Builder<T>> extends Resource.Builder<T> {
       protected String name;
       protected Integer disk;
       protected Integer ram;

apis/nova/src/main/java/org/jclouds/openstack/nova/domain/FloatingIP.java

@@ -44,7 +44,7 @@ public class FloatingIP extends Resource {
       return new ConcreteBuilder().fromFloatingIP(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> extends Resource.Builder<T>  {
+   public abstract static class Builder<T extends Builder<T>> extends Resource.Builder<T>  {
       protected String ip;
       protected String fixedIP;
       protected int instanceID;

apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Image.java

@@ -50,7 +50,7 @@ public class Image extends Resource {
       return new ConcreteBuilder().fromImage(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> extends Resource.Builder<T> {
+   public abstract static class Builder<T extends Builder<T>> extends Resource.Builder<T> {
       protected String name;
       protected Integer progress;
       protected String serverRef;

apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Limits.java

@@ -37,7 +37,7 @@ public class Limits {
       return new ConcreteBuilder().fromLimits(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected List<RateLimit> rate = ImmutableList.of();

apis/nova/src/main/java/org/jclouds/openstack/nova/domain/RateLimit.java

@@ -53,7 +53,7 @@ public class RateLimit {
       return new ConcreteBuilder().fromRateLimit(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected String uri;

apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Resource.java

@@ -69,7 +69,7 @@ public abstract class Resource {
       }
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected int id;

apis/nova/src/main/java/org/jclouds/openstack/nova/domain/SecurityGroup.java

@@ -42,7 +42,7 @@ public class SecurityGroup {
       return new ConcreteBuilder().fromSecurityGroup(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected int id;

apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Server.java

@@ -50,7 +50,7 @@ public class Server extends Resource {
       return new ConcreteBuilder().fromServer(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> extends Resource.Builder<T> {
+   public abstract static class Builder<T extends Builder<T>> extends Resource.Builder<T> {
       protected String name;
       protected Map<String, String> metadata = ImmutableMap.of();
       protected Addresses addresses;

apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Access.java

@@ -48,7 +48,7 @@ public class Access extends ForwardingSet<Service> implements Comparable<Access>
       return new ConcreteBuilder().fromAccess(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected Token token;

apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiAccessKeyCredentials.java

@@ -50,7 +50,7 @@ public class ApiAccessKeyCredentials {
       return new ApiAccessKeyCredentials(accessKey, secretKey);
    }
 
-   public static abstract class Builder<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected String accessKey;

apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiMetadata.java

@@ -49,7 +49,7 @@ public class ApiMetadata extends Resource {
       return new ConcreteBuilder().fromApiMetadata(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> extends Resource.Builder<T>  {
+   public abstract static class Builder<T extends Builder<T>> extends Resource.Builder<T>  {
       protected String status;
       protected Date updated;
       protected Set<MediaType> mediaTypes = ImmutableSet.of();

apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Endpoint.java

@@ -47,7 +47,7 @@ public class Endpoint {
       return new ConcreteBuilder().fromEndpoint(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/MediaType.java

@@ -38,7 +38,7 @@ public class MediaType {
       return new ConcreteBuilder().fromMediaType(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected String base;

apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/PasswordCredentials.java

@@ -49,7 +49,7 @@ public class PasswordCredentials {
       return new PasswordCredentials(username, password);
    }
 
-   public static abstract class Builder<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected String username;

apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Role.java

@@ -49,7 +49,7 @@ public class Role {
       return new ConcreteBuilder().fromRole(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
       protected String id;
       protected String name;

apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Service.java

@@ -47,7 +47,7 @@ public class Service extends ForwardingSet<Endpoint> {
       return new ConcreteBuilder().fromService(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected String type;

apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Tenant.java

@@ -45,7 +45,7 @@ public class Tenant {
       return new ConcreteBuilder().fromTenant(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected String id;

apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Token.java

@@ -49,7 +49,7 @@ public class Token implements Comparable<Token> {
       return new ConcreteBuilder().fromToken(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected String id;

apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/User.java

@@ -51,7 +51,7 @@ public class User extends ForwardingSet<Role> {
       return new ConcreteBuilder().fromUser(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> {
+   public abstract static class Builder<T extends Builder<T>> {
       protected abstract T self();
 
       protected String id;

apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Extension.java

@@ -51,7 +51,7 @@ public class Extension extends Resource {
       return new ConcreteBuilder().fromExtension(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> extends Resource.Builder<T>  {
+   public abstract static class Builder<T extends Builder<T>> extends Resource.Builder<T>  {
       protected URI namespace;
       protected String alias;
       protected Date updated;

apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Resource.java

@@ -47,7 +47,7 @@ public class Resource implements Comparable<Resource> {
       return new ConcreteBuilder().fromResource(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected String id;

apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Address.java

@@ -48,7 +48,7 @@ public class Address {
       return builder().version(6).addr(addr).build();
    }
 
-   public static abstract class Builder<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected String addr;

apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Flavor.java

@@ -49,7 +49,7 @@ public class Flavor extends Resource {
       return new ConcreteBuilder().fromFlavor(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>> extends Resource.Builder<T>  {
+   public abstract static class Builder<T extends Builder<T>> extends Resource.Builder<T>  {
       protected int ram;
       protected int disk;
       protected int vcpus;

apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/FloatingIP.java

@@ -47,7 +47,7 @@ public class FloatingIP implements Comparable<FloatingIP> {
       return new ConcreteBuilder().fromFloatingIP(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected String id;

apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Host.java

@@ -40,7 +40,7 @@ public class Host {
       return new ConcreteBuilder().fromHost(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected String name;

apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostAggregate.java

@@ -50,7 +50,7 @@ public class HostAggregate {
       return new ConcreteBuilder().fromHostAggregate(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected String id;

apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostResourceUsage.java

@@ -42,7 +42,7 @@ public class HostResourceUsage {
       return new ConcreteBuilder().fromHostResourceUsage(this);
    }
 
-   public static abstract class Builder<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected String host;