From 4af8008b51037e9327db0716df9d92fcc8980033 Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Sat, 10 Nov 2012 13:37:42 -0800 Subject: [PATCH] Address all existing Checkstyle violations --- .../openstack/nova/v2_0/extensions/VolumeAttachmentApi.java | 2 +- .../nova/v2_0/extensions/VolumeAttachmentAsyncApi.java | 2 +- .../v2_0/compute/functions/ImageToOperatingSystemTest.java | 5 +++-- .../src/main/java/org/jclouds/dmtf/cim/CimAnySimpleType.java | 5 +++-- labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimBoolean.java | 5 +++-- labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimString.java | 4 ++-- .../src/main/java/org/jclouds/dmtf/cim/CimUnsignedInt.java | 5 +++-- .../src/main/java/org/jclouds/dmtf/cim/CimUnsignedLong.java | 5 +++-- .../src/main/java/org/jclouds/dmtf/cim/CimUnsignedShort.java | 5 +++-- .../java/org/jclouds/oauth/v2/handlers/OAuthTokenBinder.java | 2 +- .../org/jclouds/openstack/cinder/v1/domain/Snapshot.java | 2 +- .../java/org/jclouds/openstack/cinder/v1/domain/Volume.java | 2 +- .../org/jclouds/openstack/cinder/v1/domain/VolumeType.java | 2 +- .../openstack/cinder/v1/options/CreateVolumeOptions.java | 1 - 14 files changed, 26 insertions(+), 21 deletions(-) diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApi.java index cecaa8da64..bc23ef19a4 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApi.java @@ -88,4 +88,4 @@ public interface VolumeAttachmentApi { * @return true if successful */ boolean detachVolumeFromServer(String serverId, String volumeId); -} \ No newline at end of file +} diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentAsyncApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentAsyncApi.java index 495ee8bba7..46aa72d952 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentAsyncApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentAsyncApi.java @@ -103,4 +103,4 @@ public interface VolumeAttachmentAsyncApi { ListenableFuture detachVolumeFromServer( @PathParam("id") String volumeId, @PathParam("server_id") String serverId); -} \ No newline at end of file +} diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystemTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystemTest.java index 1e837d3f96..fea1bb22e0 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystemTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystemTest.java @@ -35,6 +35,7 @@ import org.testng.annotations.Test; import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; +import com.google.common.collect.Maps; /** * Tests for the function for transforming a nova specific Image into a generic @@ -79,7 +80,7 @@ public class ImageToOperatingSystemTest { Image imageToConvert = Image.builder().id("id-" + name).name(name).build(); - Map> osFamilyMap = new HashMap>(); + Map> osFamilyMap = Maps.newHashMap(); osFamilyMap.put(OsFamily.WINDOWS, ImmutableMap.of("Server 2008 R2", "Server-2008-R2")); ImageToOperatingSystem converter = new ImageToOperatingSystem(osFamilyMap); @@ -100,7 +101,7 @@ public class ImageToOperatingSystemTest { Image imageToConvert = Image.builder().id("id-" + name).name(name).build(); - Map> osFamilyMap = new HashMap>(); + Map> osFamilyMap = Maps.newHashMap(); osFamilyMap.put(OsFamily.WINDOWS, ImmutableMap.of("98", "98")); ImageToOperatingSystem converter = new ImageToOperatingSystem(osFamilyMap); diff --git a/labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleType.java b/labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleType.java index 943a919bde..10dd2a72df 100644 --- a/labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleType.java +++ b/labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleType.java @@ -20,7 +20,6 @@ package org.jclouds.dmtf.cim; import static org.jclouds.dmtf.DMTFConstants.CIM_NS; -import java.util.HashMap; import java.util.Map; import javax.xml.bind.annotation.XmlAnyAttribute; @@ -30,6 +29,8 @@ import javax.xml.bind.annotation.XmlValue; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.namespace.QName; +import com.google.common.collect.Maps; + /** *

Java class for cimAnySimpleType complex type. * @@ -45,7 +46,7 @@ public class CimAnySimpleType { @XmlSchemaType(name = "anySimpleType") protected String value; @XmlAnyAttribute - private Map otherAttributes = new HashMap(); + private Map otherAttributes = Maps.newHashMap(); /** * Gets the value of the value property. diff --git a/labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimBoolean.java b/labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimBoolean.java index ea185d0c28..3102938697 100644 --- a/labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimBoolean.java +++ b/labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimBoolean.java @@ -20,7 +20,6 @@ package org.jclouds.dmtf.cim; import static org.jclouds.dmtf.DMTFConstants.CIM_NS; -import java.util.HashMap; import java.util.Map; import javax.xml.bind.annotation.XmlAnyAttribute; @@ -28,6 +27,8 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; import javax.xml.namespace.QName; +import com.google.common.collect.Maps; + /** * Java class for cimBoolean complex type. * @@ -41,7 +42,7 @@ public class CimBoolean { @XmlValue protected boolean value; @XmlAnyAttribute - private Map otherAttributes = new HashMap(); + private Map otherAttributes = Maps.newHashMap(); /** * Gets the value of the value property. diff --git a/labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimString.java b/labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimString.java index e0706e03e0..749b7b93e3 100644 --- a/labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimString.java +++ b/labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimString.java @@ -20,7 +20,6 @@ package org.jclouds.dmtf.cim; import static com.google.common.base.Objects.equal; -import java.util.HashMap; import java.util.Map; import javax.xml.bind.annotation.XmlAnyAttribute; @@ -29,6 +28,7 @@ import javax.xml.bind.annotation.XmlValue; import javax.xml.namespace.QName; import com.google.common.base.Objects; +import com.google.common.collect.Maps; /** * Java class for cimString complex type. @@ -51,7 +51,7 @@ public class CimString { @XmlValue protected String value; @XmlAnyAttribute - private Map otherAttributes = new HashMap(); + private Map otherAttributes = Maps.newHashMap(); /** * Gets the value of the value property. diff --git a/labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimUnsignedInt.java b/labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimUnsignedInt.java index 07f2bd902f..48375acc3c 100644 --- a/labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimUnsignedInt.java +++ b/labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimUnsignedInt.java @@ -18,7 +18,6 @@ */ package org.jclouds.dmtf.cim; -import java.util.HashMap; import java.util.Map; import javax.xml.bind.annotation.XmlAnyAttribute; @@ -27,6 +26,8 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; import javax.xml.namespace.QName; +import com.google.common.collect.Maps; + /** * Java class for cimUnsignedInt complex type. * @@ -41,7 +42,7 @@ public class CimUnsignedInt { @XmlSchemaType(name = "unsignedInt") protected long value; @XmlAnyAttribute - private Map otherAttributes = new HashMap(); + private Map otherAttributes = Maps.newHashMap(); /** * Gets the value of the value property. diff --git a/labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimUnsignedLong.java b/labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimUnsignedLong.java index 1102d82135..9572d9d079 100644 --- a/labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimUnsignedLong.java +++ b/labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimUnsignedLong.java @@ -19,7 +19,6 @@ package org.jclouds.dmtf.cim; import java.math.BigInteger; -import java.util.HashMap; import java.util.Map; import javax.xml.bind.annotation.XmlAnyAttribute; @@ -28,6 +27,8 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; import javax.xml.namespace.QName; +import com.google.common.collect.Maps; + /** * Java class for cimUnsignedLong complex type. * @@ -42,7 +43,7 @@ public class CimUnsignedLong { @XmlSchemaType(name = "unsignedLong") protected BigInteger value; @XmlAnyAttribute - private Map otherAttributes = new HashMap(); + private Map otherAttributes = Maps.newHashMap(); /** * Gets the value of the value property. diff --git a/labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimUnsignedShort.java b/labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimUnsignedShort.java index 47e420fbb1..928215af0a 100644 --- a/labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimUnsignedShort.java +++ b/labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimUnsignedShort.java @@ -8,7 +8,6 @@ package org.jclouds.dmtf.cim; -import java.util.HashMap; import java.util.Map; import javax.xml.bind.annotation.XmlAnyAttribute; @@ -17,6 +16,8 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; import javax.xml.namespace.QName; +import com.google.common.collect.Maps; + /** *

Java class for cimUnsignedShort complex type. * @@ -39,7 +40,7 @@ public class CimUnsignedShort { @XmlSchemaType(name = "unsignedShort") protected int value; @XmlAnyAttribute - private Map otherAttributes = new HashMap(); + private Map otherAttributes = Maps.newHashMap(); /** * Gets the value of the value property. diff --git a/labs/oauth/src/main/java/org/jclouds/oauth/v2/handlers/OAuthTokenBinder.java b/labs/oauth/src/main/java/org/jclouds/oauth/v2/handlers/OAuthTokenBinder.java index e41ebe6df7..10ba408684 100644 --- a/labs/oauth/src/main/java/org/jclouds/oauth/v2/handlers/OAuthTokenBinder.java +++ b/labs/oauth/src/main/java/org/jclouds/oauth/v2/handlers/OAuthTokenBinder.java @@ -46,4 +46,4 @@ public class OAuthTokenBinder implements Binder { public R bindToRequest(R request, Object input) { return tokenRequestFormat.formatRequest(request, (TokenRequest) input); } -} \ No newline at end of file +} diff --git a/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java b/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java index e212efe8f4..34f33d15e0 100644 --- a/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java +++ b/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java @@ -45,7 +45,7 @@ public class Snapshot { return new ConcreteBuilder().fromSnapshot(this); } - public static abstract class Builder> { + public abstract static class Builder> { protected abstract T self(); protected String id; diff --git a/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java b/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java index b280240fd3..f7c0d436eb 100644 --- a/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java +++ b/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java @@ -72,7 +72,7 @@ public class Volume { return new ConcreteBuilder().fromVolume(this); } - public static abstract class Builder> { + public abstract static class Builder> { protected abstract T self(); protected String id; diff --git a/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java b/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java index 0635fbf52b..b6d876763b 100644 --- a/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java +++ b/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java @@ -48,7 +48,7 @@ public class VolumeType { return new ConcreteBuilder().fromVolumeType(this); } - public static abstract class Builder> { + public abstract static class Builder> { protected abstract T self(); protected String id; diff --git a/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java b/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java index b56c682f77..9442e83391 100644 --- a/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java +++ b/labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java @@ -29,7 +29,6 @@ import java.util.Map.Entry; import javax.inject.Inject; import org.jclouds.http.HttpRequest; -import org.jclouds.openstack.cinder.v1.features.VolumeTypeApi; import org.jclouds.rest.MapBinder; import org.jclouds.rest.binders.BindToJsonPayload;