Enforce Override annotation via Checkstyle

Also remove bogus inheritDoc on base and static methods.
This commit is contained in:
Andrew Gaul 2014-08-31 13:34:46 -07:00
parent fdef97d527
commit 34cfdbe266
17 changed files with 40 additions and 13 deletions

View File

@ -31,6 +31,7 @@ public class BundleTask implements Comparable<BundleTask> {
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override
public int compareTo(BundleTask o) { public int compareTo(BundleTask o) {
return (this == o) ? 0 : getBundleId().compareTo(o.getBundleId()); return (this == o) ? 0 : getBundleId().compareTo(o.getBundleId());
} }

View File

@ -353,6 +353,7 @@ public class Image implements Comparable<Image> {
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override
public int compareTo(Image o) { public int compareTo(Image o) {
return (this == o) ? 0 : getId().compareTo(o.getId()); return (this == o) ? 0 : getId().compareTo(o.getId());
} }

View File

@ -113,6 +113,7 @@ public class KeyPair implements Comparable<KeyPair> {
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override
public int compareTo(KeyPair o) { public int compareTo(KeyPair o) {
return (this == o) ? 0 : getKeyName().compareTo(o.getKeyName()); return (this == o) ? 0 : getKeyName().compareTo(o.getKeyName());
} }

View File

@ -52,6 +52,7 @@ public class PublicIpInstanceIdPair implements Comparable<PublicIpInstanceIdPair
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override
public int compareTo(PublicIpInstanceIdPair o) { public int compareTo(PublicIpInstanceIdPair o) {
return (this == o) ? 0 : getPublicIp().compareTo(o.getPublicIp()); return (this == o) ? 0 : getPublicIp().compareTo(o.getPublicIp());
} }

View File

@ -43,6 +43,7 @@ public class UserIdGroupPair implements Comparable<UserIdGroupPair> {
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override
public int compareTo(UserIdGroupPair o) { public int compareTo(UserIdGroupPair o) {
return (this == o) ? 0 : getUserId().compareTo(o.getUserId()); return (this == o) ? 0 : getUserId().compareTo(o.getUserId());
} }

View File

@ -164,6 +164,7 @@ public class ObjectInfoImpl implements ObjectInfo {
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override
public String getName() { public String getName() {
return this.name; return this.name;
} }
@ -172,6 +173,7 @@ public class ObjectInfoImpl implements ObjectInfo {
* {@inheritDoc} * {@inheritDoc}
*/ */
@Nullable @Nullable
@Override
public String getContainer() { public String getContainer() {
return this.container; return this.container;
} }
@ -180,6 +182,7 @@ public class ObjectInfoImpl implements ObjectInfo {
* {@inheritDoc} * {@inheritDoc}
*/ */
@Nullable @Nullable
@Override
public URI getUri() { public URI getUri() {
return this.uri; return this.uri;
} }
@ -188,6 +191,7 @@ public class ObjectInfoImpl implements ObjectInfo {
* {@inheritDoc} * {@inheritDoc}
*/ */
@Nullable @Nullable
@Override
public byte[] getHash() { public byte[] getHash() {
return this.hash; return this.hash;
} }
@ -196,6 +200,7 @@ public class ObjectInfoImpl implements ObjectInfo {
* {@inheritDoc} * {@inheritDoc}
*/ */
@Nullable @Nullable
@Override
public Long getBytes() { public Long getBytes() {
return this.bytes; return this.bytes;
} }
@ -204,6 +209,7 @@ public class ObjectInfoImpl implements ObjectInfo {
* {@inheritDoc} * {@inheritDoc}
*/ */
@Nullable @Nullable
@Override
public String getContentType() { public String getContentType() {
return this.contentType; return this.contentType;
} }
@ -212,6 +218,7 @@ public class ObjectInfoImpl implements ObjectInfo {
* {@inheritDoc} * {@inheritDoc}
*/ */
@Nullable @Nullable
@Override
public Date getLastModified() { public Date getLastModified() {
return this.lastModified; return this.lastModified;
} }

View File

@ -86,6 +86,7 @@ public class CatalogImpl extends LinkedHashMap<String, ReferenceType> implements
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override
public String getDescription() { public String getDescription() {
return description; return description;
} }

View File

@ -72,9 +72,6 @@ public class CloneVAppOptions extends CloneOptions {
return new CloneVAppOptions().powerOn(); return new CloneVAppOptions().powerOn();
} }
/**
* {@inheritDoc}
*/
public static CloneVAppOptions description(String description) { public static CloneVAppOptions description(String description) {
return new CloneVAppOptions().description(description); return new CloneVAppOptions().description(description);
} }

View File

@ -26,9 +26,6 @@ public class CloneVAppTemplateOptions extends CloneOptions {
} }
public static class Builder { public static class Builder {
/**
* {@inheritDoc}
*/
public static CloneVAppTemplateOptions description(String description) { public static CloneVAppTemplateOptions description(String description) {
return new CloneVAppTemplateOptions().description(description); return new CloneVAppTemplateOptions().description(description);
} }

View File

@ -145,6 +145,7 @@ public class ListContainerOptions extends ListOptions implements Cloneable {
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override
public ListContainerOptions afterMarker(String marker) { public ListContainerOptions afterMarker(String marker) {
return (ListContainerOptions) super.afterMarker(marker); return (ListContainerOptions) super.afterMarker(marker);
} }
@ -152,6 +153,7 @@ public class ListContainerOptions extends ListOptions implements Cloneable {
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override
public ListContainerOptions maxResults(int maxKeys) { public ListContainerOptions maxResults(int maxKeys) {
return (ListContainerOptions) super.maxResults(maxKeys); return (ListContainerOptions) super.maxResults(maxKeys);
} }

View File

@ -168,6 +168,7 @@ public class IpPermission implements Comparable<IpPermission> {
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override
public int compareTo(IpPermission o) { public int compareTo(IpPermission o) {
return (this == o) ? 0 : getIpProtocol().compareTo(o.getIpProtocol()); return (this == o) ? 0 : getIpProtocol().compareTo(o.getIpProtocol());
} }

View File

@ -30,6 +30,7 @@ public class Envelope extends BaseEnvelope<VirtualSystem, Envelope> {
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override
public Builder toBuilder() { public Builder toBuilder() {
return new Builder().fromEnvelope(this); return new Builder().fromEnvelope(this);
} }
@ -39,6 +40,7 @@ public class Envelope extends BaseEnvelope<VirtualSystem, Envelope> {
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override
public Envelope build() { public Envelope build() {
return new Envelope(diskSections, networkSections, additionalSections, virtualSystem); return new Envelope(diskSections, networkSections, additionalSections, virtualSystem);
} }

View File

@ -36,9 +36,6 @@ public class BaseEnvelope<V extends BaseVirtualSystem<V>, E extends BaseEnvelope
return new Builder<V, E>(); return new Builder<V, E>();
} }
/**
* {@inheritDoc}
*/
public Builder<V, E> toBuilder() { public Builder<V, E> toBuilder() {
return new Builder<V, E>().fromEnvelope(this); return new Builder<V, E>().fromEnvelope(this);
} }
@ -109,9 +106,6 @@ public class BaseEnvelope<V extends BaseVirtualSystem<V>, E extends BaseEnvelope
return this; return this;
} }
/**
* {@inheritDoc}
*/
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public E build() { public E build() {
return (E) new BaseEnvelope<V, E>(diskSections, networkSections, additionalSections, virtualSystem); return (E) new BaseEnvelope<V, E>(diskSections, networkSections, additionalSections, virtualSystem);

View File

@ -61,6 +61,7 @@ public class BaseHttpRequestOptions implements HttpRequestOptions {
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override
public Multimap<String, String> buildRequestHeaders() { public Multimap<String, String> buildRequestHeaders() {
return headers; return headers;
} }
@ -68,6 +69,7 @@ public class BaseHttpRequestOptions implements HttpRequestOptions {
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override
public Multimap<String, String> buildQueryParameters() { public Multimap<String, String> buildQueryParameters() {
return queryParameters; return queryParameters;
} }

View File

@ -71,7 +71,7 @@ public class MutableBlobPropertiesImpl implements MutableBlobProperties {
} }
/** /**
*{@inheritDoc} * Set the blob type.
*/ */
public void setType(BlobType type) { public void setType(BlobType type) {
this.type = type; this.type = type;
@ -80,6 +80,7 @@ public class MutableBlobPropertiesImpl implements MutableBlobProperties {
/** /**
*{@inheritDoc} *{@inheritDoc}
*/ */
@Override
public String getName() { public String getName() {
return name; return name;
} }
@ -87,6 +88,7 @@ public class MutableBlobPropertiesImpl implements MutableBlobProperties {
/** /**
*{@inheritDoc} *{@inheritDoc}
*/ */
@Override
public Date getLastModified() { public Date getLastModified() {
return lastModified; return lastModified;
} }
@ -94,6 +96,7 @@ public class MutableBlobPropertiesImpl implements MutableBlobProperties {
/** /**
*{@inheritDoc} *{@inheritDoc}
*/ */
@Override
public String getETag() { public String getETag() {
return eTag; return eTag;
} }
@ -101,6 +104,7 @@ public class MutableBlobPropertiesImpl implements MutableBlobProperties {
/** /**
*{@inheritDoc} *{@inheritDoc}
*/ */
@Override
public int compareTo(BlobProperties o) { public int compareTo(BlobProperties o) {
return (this == o) ? 0 : getName().compareTo(o.getName()); return (this == o) ? 0 : getName().compareTo(o.getName());
} }
@ -108,6 +112,7 @@ public class MutableBlobPropertiesImpl implements MutableBlobProperties {
/** /**
*{@inheritDoc} *{@inheritDoc}
*/ */
@Override
public Map<String, String> getMetadata() { public Map<String, String> getMetadata() {
return metadata; return metadata;
} }
@ -123,6 +128,7 @@ public class MutableBlobPropertiesImpl implements MutableBlobProperties {
/** /**
*{@inheritDoc} *{@inheritDoc}
*/ */
@Override
public void setETag(String eTag) { public void setETag(String eTag) {
this.eTag = eTag; this.eTag = eTag;
} }
@ -130,6 +136,7 @@ public class MutableBlobPropertiesImpl implements MutableBlobProperties {
/** /**
*{@inheritDoc} *{@inheritDoc}
*/ */
@Override
public void setName(String name) { public void setName(String name) {
this.name = name; this.name = name;
} }
@ -137,6 +144,7 @@ public class MutableBlobPropertiesImpl implements MutableBlobProperties {
/** /**
*{@inheritDoc} *{@inheritDoc}
*/ */
@Override
public void setLastModified(Date lastModified) { public void setLastModified(Date lastModified) {
this.lastModified = lastModified; this.lastModified = lastModified;
} }
@ -144,6 +152,7 @@ public class MutableBlobPropertiesImpl implements MutableBlobProperties {
/** /**
*{@inheritDoc} *{@inheritDoc}
*/ */
@Override
public void setMetadata(Map<String, String> metadata) { public void setMetadata(Map<String, String> metadata) {
this.metadata = metadata; this.metadata = metadata;
} }

View File

@ -44,6 +44,7 @@ public class MutableContainerPropertiesWithMetadataImpl implements
/** /**
*{@inheritDoc} *{@inheritDoc}
*/ */
@Override
public String getName() { public String getName() {
return name; return name;
} }
@ -51,6 +52,7 @@ public class MutableContainerPropertiesWithMetadataImpl implements
/** /**
*{@inheritDoc} *{@inheritDoc}
*/ */
@Override
public Date getLastModified() { public Date getLastModified() {
return lastModified; return lastModified;
} }
@ -58,6 +60,7 @@ public class MutableContainerPropertiesWithMetadataImpl implements
/** /**
*{@inheritDoc} *{@inheritDoc}
*/ */
@Override
public String getETag() { public String getETag() {
return eTag; return eTag;
} }
@ -65,6 +68,7 @@ public class MutableContainerPropertiesWithMetadataImpl implements
/** /**
*{@inheritDoc} *{@inheritDoc}
*/ */
@Override
public int compareTo(ContainerProperties o) { public int compareTo(ContainerProperties o) {
return (this == o) ? 0 : getName().compareTo(o.getName()); return (this == o) ? 0 : getName().compareTo(o.getName());
} }
@ -72,6 +76,7 @@ public class MutableContainerPropertiesWithMetadataImpl implements
/** /**
*{@inheritDoc} *{@inheritDoc}
*/ */
@Override
public Map<String, String> getMetadata() { public Map<String, String> getMetadata() {
return metadata; return metadata;
} }
@ -79,6 +84,7 @@ public class MutableContainerPropertiesWithMetadataImpl implements
/** /**
*{@inheritDoc} *{@inheritDoc}
*/ */
@Override
public void setETag(String eTag) { public void setETag(String eTag) {
this.eTag = eTag; this.eTag = eTag;
} }
@ -86,6 +92,7 @@ public class MutableContainerPropertiesWithMetadataImpl implements
/** /**
*{@inheritDoc} *{@inheritDoc}
*/ */
@Override
public void setName(String name) { public void setName(String name) {
this.name = name; this.name = name;
} }
@ -93,6 +100,7 @@ public class MutableContainerPropertiesWithMetadataImpl implements
/** /**
*{@inheritDoc} *{@inheritDoc}
*/ */
@Override
public void setLastModified(Date lastModified) { public void setLastModified(Date lastModified) {
this.lastModified = lastModified; this.lastModified = lastModified;
} }
@ -100,6 +108,7 @@ public class MutableContainerPropertiesWithMetadataImpl implements
/** /**
*{@inheritDoc} *{@inheritDoc}
*/ */
@Override
public void setMetadata(Map<String, String> metadata) { public void setMetadata(Map<String, String> metadata) {
this.metadata = metadata; this.metadata = metadata;
} }

View File

@ -36,6 +36,7 @@
<property name="max" value="120"/> <property name="max" value="120"/>
</module> </module>
--> -->
<module name="MissingOverride"/>
<module name="ModifierOrder"/> <module name="ModifierOrder"/>
<module name="MultipleVariableDeclarations"/> <module name="MultipleVariableDeclarations"/>
<module name="NoWhitespaceAfter"> <module name="NoWhitespaceAfter">