Repository: jclouds Updated Branches: refs/heads/master fdef97d52 -> 34cfdbe26
Enforce Override annotation via Checkstyle Also remove bogus inheritDoc on base and static methods. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/34cfdbe2 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/34cfdbe2 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/34cfdbe2 Branch: refs/heads/master Commit: 34cfdbe266c9602683165bd89a2bff53fc0ed1c2 Parents: fdef97d Author: Andrew Gaul <[email protected]> Authored: Sun Aug 31 13:34:46 2014 -0700 Committer: Andrew Gaul <[email protected]> Committed: Sun Aug 31 19:37:50 2014 -0700 ---------------------------------------------------------------------- .../src/main/java/org/jclouds/ec2/domain/BundleTask.java | 1 + apis/ec2/src/main/java/org/jclouds/ec2/domain/Image.java | 1 + .../src/main/java/org/jclouds/ec2/domain/KeyPair.java | 1 + .../org/jclouds/ec2/domain/PublicIpInstanceIdPair.java | 1 + .../java/org/jclouds/ec2/domain/UserIdGroupPair.java | 1 + .../openstack/swift/domain/internal/ObjectInfoImpl.java | 7 +++++++ .../org/jclouds/vcloud/domain/internal/CatalogImpl.java | 1 + .../org/jclouds/vcloud/options/CloneVAppOptions.java | 3 --- .../jclouds/vcloud/options/CloneVAppTemplateOptions.java | 3 --- .../jclouds/blobstore/options/ListContainerOptions.java | 2 ++ .../main/java/org/jclouds/net/domain/IpPermission.java | 1 + compute/src/main/java/org/jclouds/ovf/Envelope.java | 2 ++ .../main/java/org/jclouds/ovf/internal/BaseEnvelope.java | 6 ------ .../org/jclouds/http/options/BaseHttpRequestOptions.java | 2 ++ .../domain/internal/MutableBlobPropertiesImpl.java | 11 ++++++++++- .../MutableContainerPropertiesWithMetadataImpl.java | 9 +++++++++ resources/checkstyle.xml | 1 + 17 files changed, 40 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/34cfdbe2/apis/ec2/src/main/java/org/jclouds/ec2/domain/BundleTask.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/BundleTask.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/BundleTask.java index 2a13241..37a5c55 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/BundleTask.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/BundleTask.java @@ -31,6 +31,7 @@ public class BundleTask implements Comparable<BundleTask> { /** * {@inheritDoc} */ + @Override public int compareTo(BundleTask o) { return (this == o) ? 0 : getBundleId().compareTo(o.getBundleId()); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/34cfdbe2/apis/ec2/src/main/java/org/jclouds/ec2/domain/Image.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Image.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Image.java index 42136cd..6a037ad 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Image.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Image.java @@ -353,6 +353,7 @@ public class Image implements Comparable<Image> { /** * {@inheritDoc} */ + @Override public int compareTo(Image o) { return (this == o) ? 0 : getId().compareTo(o.getId()); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/34cfdbe2/apis/ec2/src/main/java/org/jclouds/ec2/domain/KeyPair.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/KeyPair.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/KeyPair.java index 22b15be..69231aa 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/KeyPair.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/KeyPair.java @@ -113,6 +113,7 @@ public class KeyPair implements Comparable<KeyPair> { /** * {@inheritDoc} */ + @Override public int compareTo(KeyPair o) { return (this == o) ? 0 : getKeyName().compareTo(o.getKeyName()); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/34cfdbe2/apis/ec2/src/main/java/org/jclouds/ec2/domain/PublicIpInstanceIdPair.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/PublicIpInstanceIdPair.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/PublicIpInstanceIdPair.java index b0d24bf..a44276c 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/PublicIpInstanceIdPair.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/PublicIpInstanceIdPair.java @@ -52,6 +52,7 @@ public class PublicIpInstanceIdPair implements Comparable<PublicIpInstanceIdPair /** * {@inheritDoc} */ + @Override public int compareTo(PublicIpInstanceIdPair o) { return (this == o) ? 0 : getPublicIp().compareTo(o.getPublicIp()); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/34cfdbe2/apis/ec2/src/main/java/org/jclouds/ec2/domain/UserIdGroupPair.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/UserIdGroupPair.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/UserIdGroupPair.java index 5177cb0..a285cc6 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/UserIdGroupPair.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/UserIdGroupPair.java @@ -43,6 +43,7 @@ public class UserIdGroupPair implements Comparable<UserIdGroupPair> { /** * {@inheritDoc} */ + @Override public int compareTo(UserIdGroupPair o) { return (this == o) ? 0 : getUserId().compareTo(o.getUserId()); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/34cfdbe2/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/internal/ObjectInfoImpl.java ---------------------------------------------------------------------- diff --git a/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/internal/ObjectInfoImpl.java b/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/internal/ObjectInfoImpl.java index bc46f22..1a5eb11 100644 --- a/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/internal/ObjectInfoImpl.java +++ b/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/internal/ObjectInfoImpl.java @@ -164,6 +164,7 @@ public class ObjectInfoImpl implements ObjectInfo { /** * {@inheritDoc} */ + @Override public String getName() { return this.name; } @@ -172,6 +173,7 @@ public class ObjectInfoImpl implements ObjectInfo { * {@inheritDoc} */ @Nullable + @Override public String getContainer() { return this.container; } @@ -180,6 +182,7 @@ public class ObjectInfoImpl implements ObjectInfo { * {@inheritDoc} */ @Nullable + @Override public URI getUri() { return this.uri; } @@ -188,6 +191,7 @@ public class ObjectInfoImpl implements ObjectInfo { * {@inheritDoc} */ @Nullable + @Override public byte[] getHash() { return this.hash; } @@ -196,6 +200,7 @@ public class ObjectInfoImpl implements ObjectInfo { * {@inheritDoc} */ @Nullable + @Override public Long getBytes() { return this.bytes; } @@ -204,6 +209,7 @@ public class ObjectInfoImpl implements ObjectInfo { * {@inheritDoc} */ @Nullable + @Override public String getContentType() { return this.contentType; } @@ -212,6 +218,7 @@ public class ObjectInfoImpl implements ObjectInfo { * {@inheritDoc} */ @Nullable + @Override public Date getLastModified() { return this.lastModified; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/34cfdbe2/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java index 5d0d16f..4ad9caf 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java @@ -86,6 +86,7 @@ public class CatalogImpl extends LinkedHashMap<String, ReferenceType> implements /** * {@inheritDoc} */ + @Override public String getDescription() { return description; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/34cfdbe2/apis/vcloud/src/main/java/org/jclouds/vcloud/options/CloneVAppOptions.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/options/CloneVAppOptions.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/options/CloneVAppOptions.java index 8aed313..23793ef 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/options/CloneVAppOptions.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/options/CloneVAppOptions.java @@ -72,9 +72,6 @@ public class CloneVAppOptions extends CloneOptions { return new CloneVAppOptions().powerOn(); } - /** - * {@inheritDoc} - */ public static CloneVAppOptions description(String description) { return new CloneVAppOptions().description(description); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/34cfdbe2/apis/vcloud/src/main/java/org/jclouds/vcloud/options/CloneVAppTemplateOptions.java ---------------------------------------------------------------------- diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/options/CloneVAppTemplateOptions.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/options/CloneVAppTemplateOptions.java index e10d45d..d0332ea 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/options/CloneVAppTemplateOptions.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/options/CloneVAppTemplateOptions.java @@ -26,9 +26,6 @@ public class CloneVAppTemplateOptions extends CloneOptions { } public static class Builder { - /** - * {@inheritDoc} - */ public static CloneVAppTemplateOptions description(String description) { return new CloneVAppTemplateOptions().description(description); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/34cfdbe2/blobstore/src/main/java/org/jclouds/blobstore/options/ListContainerOptions.java ---------------------------------------------------------------------- diff --git a/blobstore/src/main/java/org/jclouds/blobstore/options/ListContainerOptions.java b/blobstore/src/main/java/org/jclouds/blobstore/options/ListContainerOptions.java index aeb1e59..d366e2a 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/options/ListContainerOptions.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/options/ListContainerOptions.java @@ -145,6 +145,7 @@ public class ListContainerOptions extends ListOptions implements Cloneable { /** * {@inheritDoc} */ + @Override public ListContainerOptions afterMarker(String marker) { return (ListContainerOptions) super.afterMarker(marker); } @@ -152,6 +153,7 @@ public class ListContainerOptions extends ListOptions implements Cloneable { /** * {@inheritDoc} */ + @Override public ListContainerOptions maxResults(int maxKeys) { return (ListContainerOptions) super.maxResults(maxKeys); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/34cfdbe2/compute/src/main/java/org/jclouds/net/domain/IpPermission.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/net/domain/IpPermission.java b/compute/src/main/java/org/jclouds/net/domain/IpPermission.java index fa2cea6..6ae7209 100644 --- a/compute/src/main/java/org/jclouds/net/domain/IpPermission.java +++ b/compute/src/main/java/org/jclouds/net/domain/IpPermission.java @@ -168,6 +168,7 @@ public class IpPermission implements Comparable<IpPermission> { /** * {@inheritDoc} */ + @Override public int compareTo(IpPermission o) { return (this == o) ? 0 : getIpProtocol().compareTo(o.getIpProtocol()); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/34cfdbe2/compute/src/main/java/org/jclouds/ovf/Envelope.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/ovf/Envelope.java b/compute/src/main/java/org/jclouds/ovf/Envelope.java index 85aded1..055d56b 100644 --- a/compute/src/main/java/org/jclouds/ovf/Envelope.java +++ b/compute/src/main/java/org/jclouds/ovf/Envelope.java @@ -30,6 +30,7 @@ public class Envelope extends BaseEnvelope<VirtualSystem, Envelope> { /** * {@inheritDoc} */ + @Override public Builder toBuilder() { return new Builder().fromEnvelope(this); } @@ -39,6 +40,7 @@ public class Envelope extends BaseEnvelope<VirtualSystem, Envelope> { /** * {@inheritDoc} */ + @Override public Envelope build() { return new Envelope(diskSections, networkSections, additionalSections, virtualSystem); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/34cfdbe2/compute/src/main/java/org/jclouds/ovf/internal/BaseEnvelope.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/ovf/internal/BaseEnvelope.java b/compute/src/main/java/org/jclouds/ovf/internal/BaseEnvelope.java index 78a8794..bda96ed 100644 --- a/compute/src/main/java/org/jclouds/ovf/internal/BaseEnvelope.java +++ b/compute/src/main/java/org/jclouds/ovf/internal/BaseEnvelope.java @@ -36,9 +36,6 @@ public class BaseEnvelope<V extends BaseVirtualSystem<V>, E extends BaseEnvelope return new Builder<V, E>(); } - /** - * {@inheritDoc} - */ public Builder<V, E> toBuilder() { return new Builder<V, E>().fromEnvelope(this); } @@ -109,9 +106,6 @@ public class BaseEnvelope<V extends BaseVirtualSystem<V>, E extends BaseEnvelope return this; } - /** - * {@inheritDoc} - */ @SuppressWarnings("unchecked") public E build() { return (E) new BaseEnvelope<V, E>(diskSections, networkSections, additionalSections, virtualSystem); http://git-wip-us.apache.org/repos/asf/jclouds/blob/34cfdbe2/core/src/main/java/org/jclouds/http/options/BaseHttpRequestOptions.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/http/options/BaseHttpRequestOptions.java b/core/src/main/java/org/jclouds/http/options/BaseHttpRequestOptions.java index 776df12..7e5d918 100644 --- a/core/src/main/java/org/jclouds/http/options/BaseHttpRequestOptions.java +++ b/core/src/main/java/org/jclouds/http/options/BaseHttpRequestOptions.java @@ -61,6 +61,7 @@ public class BaseHttpRequestOptions implements HttpRequestOptions { /** * {@inheritDoc} */ + @Override public Multimap<String, String> buildRequestHeaders() { return headers; } @@ -68,6 +69,7 @@ public class BaseHttpRequestOptions implements HttpRequestOptions { /** * {@inheritDoc} */ + @Override public Multimap<String, String> buildQueryParameters() { return queryParameters; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/34cfdbe2/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/MutableBlobPropertiesImpl.java ---------------------------------------------------------------------- diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/MutableBlobPropertiesImpl.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/MutableBlobPropertiesImpl.java index 8259636..67fd62a 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/MutableBlobPropertiesImpl.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/MutableBlobPropertiesImpl.java @@ -71,7 +71,7 @@ public class MutableBlobPropertiesImpl implements MutableBlobProperties { } /** - *{@inheritDoc} + * Set the blob type. */ public void setType(BlobType type) { this.type = type; @@ -80,6 +80,7 @@ public class MutableBlobPropertiesImpl implements MutableBlobProperties { /** *{@inheritDoc} */ + @Override public String getName() { return name; } @@ -87,6 +88,7 @@ public class MutableBlobPropertiesImpl implements MutableBlobProperties { /** *{@inheritDoc} */ + @Override public Date getLastModified() { return lastModified; } @@ -94,6 +96,7 @@ public class MutableBlobPropertiesImpl implements MutableBlobProperties { /** *{@inheritDoc} */ + @Override public String getETag() { return eTag; } @@ -101,6 +104,7 @@ public class MutableBlobPropertiesImpl implements MutableBlobProperties { /** *{@inheritDoc} */ + @Override public int compareTo(BlobProperties o) { return (this == o) ? 0 : getName().compareTo(o.getName()); } @@ -108,6 +112,7 @@ public class MutableBlobPropertiesImpl implements MutableBlobProperties { /** *{@inheritDoc} */ + @Override public Map<String, String> getMetadata() { return metadata; } @@ -123,6 +128,7 @@ public class MutableBlobPropertiesImpl implements MutableBlobProperties { /** *{@inheritDoc} */ + @Override public void setETag(String eTag) { this.eTag = eTag; } @@ -130,6 +136,7 @@ public class MutableBlobPropertiesImpl implements MutableBlobProperties { /** *{@inheritDoc} */ + @Override public void setName(String name) { this.name = name; } @@ -137,6 +144,7 @@ public class MutableBlobPropertiesImpl implements MutableBlobProperties { /** *{@inheritDoc} */ + @Override public void setLastModified(Date lastModified) { this.lastModified = lastModified; } @@ -144,6 +152,7 @@ public class MutableBlobPropertiesImpl implements MutableBlobProperties { /** *{@inheritDoc} */ + @Override public void setMetadata(Map<String, String> metadata) { this.metadata = metadata; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/34cfdbe2/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/MutableContainerPropertiesWithMetadataImpl.java ---------------------------------------------------------------------- diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/MutableContainerPropertiesWithMetadataImpl.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/MutableContainerPropertiesWithMetadataImpl.java index f672025..a424b56 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/MutableContainerPropertiesWithMetadataImpl.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/MutableContainerPropertiesWithMetadataImpl.java @@ -44,6 +44,7 @@ public class MutableContainerPropertiesWithMetadataImpl implements /** *{@inheritDoc} */ + @Override public String getName() { return name; } @@ -51,6 +52,7 @@ public class MutableContainerPropertiesWithMetadataImpl implements /** *{@inheritDoc} */ + @Override public Date getLastModified() { return lastModified; } @@ -58,6 +60,7 @@ public class MutableContainerPropertiesWithMetadataImpl implements /** *{@inheritDoc} */ + @Override public String getETag() { return eTag; } @@ -65,6 +68,7 @@ public class MutableContainerPropertiesWithMetadataImpl implements /** *{@inheritDoc} */ + @Override public int compareTo(ContainerProperties o) { return (this == o) ? 0 : getName().compareTo(o.getName()); } @@ -72,6 +76,7 @@ public class MutableContainerPropertiesWithMetadataImpl implements /** *{@inheritDoc} */ + @Override public Map<String, String> getMetadata() { return metadata; } @@ -79,6 +84,7 @@ public class MutableContainerPropertiesWithMetadataImpl implements /** *{@inheritDoc} */ + @Override public void setETag(String eTag) { this.eTag = eTag; } @@ -86,6 +92,7 @@ public class MutableContainerPropertiesWithMetadataImpl implements /** *{@inheritDoc} */ + @Override public void setName(String name) { this.name = name; } @@ -93,6 +100,7 @@ public class MutableContainerPropertiesWithMetadataImpl implements /** *{@inheritDoc} */ + @Override public void setLastModified(Date lastModified) { this.lastModified = lastModified; } @@ -100,6 +108,7 @@ public class MutableContainerPropertiesWithMetadataImpl implements /** *{@inheritDoc} */ + @Override public void setMetadata(Map<String, String> metadata) { this.metadata = metadata; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/34cfdbe2/resources/checkstyle.xml ---------------------------------------------------------------------- diff --git a/resources/checkstyle.xml b/resources/checkstyle.xml index c30943d..40e734b 100644 --- a/resources/checkstyle.xml +++ b/resources/checkstyle.xml @@ -36,6 +36,7 @@ <property name="max" value="120"/> </module> --> + <module name="MissingOverride"/> <module name="ModifierOrder"/> <module name="MultipleVariableDeclarations"/> <module name="NoWhitespaceAfter">
