Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Address all existing Checkstyle violations
This commit is contained in:
Adrian Cole 2012-11-12 11:26:33 -08:00
parent 547bfcd8bc 4af8008b51
commit 570fc87160
14 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApi.java
View File

@ -88,4 +88,4 @@ public interface VolumeAttachmentApi {
* @return true if successful
*/
boolean detachVolumeFromServer(String serverId, String volumeId);
}
}

2
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentAsyncApi.java
View File

@ -103,4 +103,4 @@ public interface VolumeAttachmentAsyncApi {
ListenableFuture<Boolean> detachVolumeFromServer(
@PathParam("id") String volumeId,
@PathParam("server_id") String serverId);
}
}

5
apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystemTest.java
View File

@ -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);

5
labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleType.java
View File

@ -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.

5
labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimBoolean.java
View File

@ -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.

4
labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimString.java
View File

@ -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.

5
labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimUnsignedInt.java
View File

@ -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.

5
labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimUnsignedLong.java
View File

@ -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.

5
labs/dmtf/src/main/java/org/jclouds/dmtf/cim/CimUnsignedShort.java
View File

@ -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.

2
labs/oauth/src/main/java/org/jclouds/oauth/v2/handlers/OAuthTokenBinder.java
View File

@ -46,4 +46,4 @@ public class OAuthTokenBinder implements Binder {
public <R extends HttpRequest> R bindToRequest(R request, Object input) {
return tokenRequestFormat.formatRequest(request, (TokenRequest) input);
}
}
}

2
labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java
View File

@ -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;

2
labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java
View File

@ -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;

2
labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java
View File

@ -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;

1
labs/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java
View File

@ -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;