Merge pull request #979 from andrewgaul/checkstyle-address-existing-warnings

Address all existing Checkstyle violations

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<OsFamily, Map<String, String>> osFamilyMap = new HashMap<OsFamily, Map<String, String>>();
+      Map<OsFamily, Map<String, String>> 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<OsFamily, Map<String, String>> osFamilyMap = new HashMap<OsFamily, Map<String, String>>();
+      Map<OsFamily, Map<String, String>> osFamilyMap = Maps.newHashMap();
       osFamilyMap.put(OsFamily.WINDOWS, ImmutableMap.of("98", "98"));
 
       ImageToOperatingSystem converter = new ImageToOperatingSystem(osFamilyMap);

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;
+
 /**
  * <p>Java class for cimAnySimpleType complex type.
  *
@@ -45,7 +46,7 @@ public class CimAnySimpleType {
     @XmlSchemaType(name = "anySimpleType")
     protected String value;
     @XmlAnyAttribute
-    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+    private Map<QName, String> otherAttributes = Maps.newHashMap();
 
     /**
      * Gets the value of the value property.

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<QName, String> otherAttributes = new HashMap<QName, String>();
+    private Map<QName, String> otherAttributes = Maps.newHashMap();
 
     /**
      * Gets the value of the value property.

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<QName, String> otherAttributes = new HashMap<QName, String>();
+   private Map<QName, String> otherAttributes = Maps.newHashMap();
 
    /**
     * Gets the value of the value property.

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<QName, String> otherAttributes = new HashMap<QName, String>();
+    private Map<QName, String> otherAttributes = Maps.newHashMap();
 
     /**
      * Gets the value of the value property.

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<QName, String> otherAttributes = new HashMap<QName, String>();
+    private Map<QName, String> otherAttributes = Maps.newHashMap();
 
     /**
      * Gets the value of the value property.

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;
+
 /**
  * <p>Java class for cimUnsignedShort complex type.
  * 
@@ -39,7 +40,7 @@ public class CimUnsignedShort {
     @XmlSchemaType(name = "unsignedShort")
     protected int value;
     @XmlAnyAttribute
-    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+    private Map<QName, String> otherAttributes = Maps.newHashMap();
 
     /**
      * Gets the value of the value property.

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<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected String id;

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<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected String id;

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<T extends Builder<T>>  {
+   public abstract static class Builder<T extends Builder<T>>  {
       protected abstract T self();
 
       protected String id;

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;