From ee31c02454f94c9171553a18d3cb6e6b26bebd37 Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Sun, 31 Aug 2014 20:00:52 -0700 Subject: [PATCH] Add missing @Override annotations Also remove bogus inheritDoc on base methods. --- .../domain/AbstractDisk.java | 1 + .../googlecomputeengine/domain/Address.java | 1 + .../domain/Deprecated.java | 3 --- .../googlecomputeengine/domain/Disk.java | 1 + .../googlecomputeengine/domain/Firewall.java | 4 +--- .../googlecomputeengine/domain/Image.java | 4 +--- .../googlecomputeengine/domain/Instance.java | 20 ++----------------- .../domain/InstanceTemplate.java | 3 --- .../googlecomputeengine/domain/ListPage.java | 3 --- .../domain/MachineType.java | 4 +--- .../googlecomputeengine/domain/Metadata.java | 3 --- .../googlecomputeengine/domain/Network.java | 1 + .../googlecomputeengine/domain/Operation.java | 4 +--- .../googlecomputeengine/domain/Project.java | 1 + .../googlecomputeengine/domain/Quota.java | 3 --- .../googlecomputeengine/domain/Region.java | 1 + .../googlecomputeengine/domain/Resource.java | 3 --- .../googlecomputeengine/domain/Route.java | 4 +--- .../googlecomputeengine/domain/Snapshot.java | 1 + .../googlecomputeengine/domain/Zone.java | 4 +--- 20 files changed, 15 insertions(+), 54 deletions(-) diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/AbstractDisk.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/AbstractDisk.java index 4a3758d4da..a734f24bab 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/AbstractDisk.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/AbstractDisk.java @@ -59,6 +59,7 @@ public abstract class AbstractDisk extends Resource { /** * {@inheritDoc} */ + @Override protected MoreObjects.ToStringHelper string() { return super.string() .omitNullValues() diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Address.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Address.java index bc4558a201..b3d43862ab 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Address.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Address.java @@ -100,6 +100,7 @@ public final class Address extends Resource { /** * {@inheritDoc} */ + @Override protected MoreObjects.ToStringHelper string() { return super.string() .omitNullValues() diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Deprecated.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Deprecated.java index bba6aa10d0..3cb5500c01 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Deprecated.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Deprecated.java @@ -105,9 +105,6 @@ public class Deprecated { && equal(this.deleted, that.deleted); } - /** - * {@inheritDoc} - */ protected MoreObjects.ToStringHelper string() { return toStringHelper(this) .omitNullValues() diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Disk.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Disk.java index 6b18a088d2..8ce613bc42 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Disk.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Disk.java @@ -69,6 +69,7 @@ public final class Disk extends AbstractDisk { /** * {@inheritDoc} */ + @Override protected MoreObjects.ToStringHelper string() { return super.string() .omitNullValues() diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Firewall.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Firewall.java index e0d1e3d27e..a94fc7869a 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Firewall.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Firewall.java @@ -114,6 +114,7 @@ public final class Firewall extends Resource { /** * {@inheritDoc} */ + @Override protected MoreObjects.ToStringHelper string() { return super.string() .add("network", network) @@ -303,9 +304,6 @@ public final class Firewall extends Resource { && equal(this.ports, that.ports); } - /** - * {@inheritDoc} - */ public MoreObjects.ToStringHelper string() { return toStringHelper(this) .add("IpProtocol", ipProtocol).add("ports", ports); diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Image.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Image.java index b97d49d99d..777b3e73fd 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Image.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Image.java @@ -78,6 +78,7 @@ public final class Image extends Resource { /** * {@inheritDoc} */ + @Override protected MoreObjects.ToStringHelper string() { return super.string() .omitNullValues() @@ -215,9 +216,6 @@ public final class Image extends Resource { && equal(this.sha1Checksum, that.sha1Checksum); } - /** - * {@inheritDoc} - */ protected MoreObjects.ToStringHelper string() { return toStringHelper(this) .omitNullValues() diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Instance.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Instance.java index 79d8fbd724..eb7b92c1b5 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Instance.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Instance.java @@ -167,6 +167,7 @@ public class Instance extends Resource { /** * {@inheritDoc} */ + @Override protected MoreObjects.ToStringHelper string() { return super.string() .omitNullValues() @@ -387,9 +388,6 @@ public class Instance extends Resource { && equal(this.fingerprint, that.fingerprint); } - /** - * {@inheritDoc} - */ protected MoreObjects.ToStringHelper string() { return toStringHelper(this) .add("items", items) @@ -493,9 +491,6 @@ public class Instance extends Resource { return equal(this.index, that.index); } - /** - * {@inheritDoc} - */ protected MoreObjects.ToStringHelper string() { return toStringHelper(this).add("index", index); } @@ -594,6 +589,7 @@ public class Instance extends Resource { /** * {@inheritDoc} */ + @Override protected MoreObjects.ToStringHelper string() { return toStringHelper(this).add("boot", boot); } @@ -744,9 +740,6 @@ public class Instance extends Resource { && equal(this.network, that.network); } - /** - * {@inheritDoc} - */ protected MoreObjects.ToStringHelper string() { return toStringHelper(this) .add("name", name) @@ -898,9 +891,6 @@ public class Instance extends Resource { && equal(this.natIP, that.natIP); } - /** - * {@inheritDoc} - */ protected MoreObjects.ToStringHelper string() { return toStringHelper(this) .add("name", name).add("type", type).add("natIP", natIP); @@ -1016,9 +1006,6 @@ public class Instance extends Resource { return equal(this.selfLink, that.selfLink); } - /** - * {@inheritDoc} - */ protected MoreObjects.ToStringHelper string() { return toStringHelper(this).add("selfLink", selfLink).add("contents", contents); } @@ -1124,9 +1111,6 @@ public class Instance extends Resource { && equal(this.scopes, that.scopes); } - /** - * {@inheritDoc} - */ protected MoreObjects.ToStringHelper string() { return toStringHelper(this).add("email", email).add("scopes", scopes); } diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/InstanceTemplate.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/InstanceTemplate.java index aa28b8004a..6e17d750c7 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/InstanceTemplate.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/InstanceTemplate.java @@ -418,9 +418,6 @@ public class InstanceTemplate { return Objects.hashCode(description, image, disks, networkInterfaces, metadata, serviceAccounts); } - /** - * {@inheritDoc} - */ protected MoreObjects.ToStringHelper string() { MoreObjects.ToStringHelper toString = MoreObjects.toStringHelper("") .omitNullValues(); diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/ListPage.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/ListPage.java index a46cf3c8b7..227606c7c7 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/ListPage.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/ListPage.java @@ -96,9 +96,6 @@ public class ListPage extends IterableWithMarker { && equal(this.id, that.id); } - /** - * {@inheritDoc} - */ protected MoreObjects.ToStringHelper string() { return toStringHelper(this) .omitNullValues() diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/MachineType.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/MachineType.java index 819e9d41a4..cc00c25ffb 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/MachineType.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/MachineType.java @@ -142,6 +142,7 @@ public final class MachineType extends Resource { /** * {@inheritDoc} */ + @Override protected MoreObjects.ToStringHelper string() { return super.string() .add("guestCpus", guestCpus) @@ -313,9 +314,6 @@ public final class MachineType extends Resource { return equal(this.diskGb, that.diskGb); } - /** - * {@inheritDoc} - */ protected MoreObjects.ToStringHelper string() { return toStringHelper(this) .add("diskGb", diskGb); diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Metadata.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Metadata.java index 7402c12890..e96aa4022f 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Metadata.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Metadata.java @@ -78,9 +78,6 @@ public class Metadata { && equal(this.fingerprint, that.fingerprint); } - /** - * {@inheritDoc} - */ protected MoreObjects.ToStringHelper string() { return toStringHelper(this) .add("items", items) diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Network.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Network.java index 8b00bdc611..c20eee29f9 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Network.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Network.java @@ -71,6 +71,7 @@ public final class Network extends Resource { /** * {@inheritDoc} */ + @Override protected MoreObjects.ToStringHelper string() { return super.string() .omitNullValues() diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Operation.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Operation.java index d0e5ef9d2e..5f7719c9a0 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Operation.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Operation.java @@ -204,6 +204,7 @@ public class Operation extends Resource { /** * {@inheritDoc} */ + @Override protected MoreObjects.ToStringHelper string() { return super.string() .omitNullValues() @@ -487,9 +488,6 @@ public class Operation extends Resource { && equal(this.message, that.message); } - /** - * {@inheritDoc} - */ protected MoreObjects.ToStringHelper string() { return toStringHelper(this) .omitNullValues() diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Project.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Project.java index e6f8bc0df8..f2967da06e 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Project.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Project.java @@ -74,6 +74,7 @@ public class Project extends Resource { /** * {@inheritDoc} */ + @Override protected MoreObjects.ToStringHelper string() { return super.string() .add("commonInstanceMetadata", commonInstanceMetadata) diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Quota.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Quota.java index e160a3c79e..f74b938ada 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Quota.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Quota.java @@ -85,9 +85,6 @@ public class Quota { return Objects.equal(this.metric, that.metric); } - /** - * {@inheritDoc} - */ public ToStringHelper string() { return MoreObjects.toStringHelper(this) .omitNullValues() diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Region.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Region.java index b7dba2ce38..734a1dd046 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Region.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Region.java @@ -85,6 +85,7 @@ public final class Region extends Resource { /** * {@inheritDoc} */ + @Override protected MoreObjects.ToStringHelper string() { return super.string() .add("status", status) diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Resource.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Resource.java index 4aa4ea7c30..66717018b9 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Resource.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Resource.java @@ -169,9 +169,6 @@ public class Resource { && equal(this.name, that.name); } - /** - * {@inheritDoc} - */ protected ToStringHelper string() { return toStringHelper(this) .omitNullValues() diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Route.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Route.java index d7a2c8b3fb..898dae02fc 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Route.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Route.java @@ -141,6 +141,7 @@ public final class Route extends Resource { /** * {@inheritDoc} */ + @Override protected MoreObjects.ToStringHelper string() { return super.string() .add("network", network) @@ -357,9 +358,6 @@ public final class Route extends Resource { && equal(this.data, that.data); } - /** - * {@inheritDoc} - */ protected MoreObjects.ToStringHelper string() { return toStringHelper(this) .add("code", code) diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Snapshot.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Snapshot.java index c007c4a54f..c46d1cd142 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Snapshot.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Snapshot.java @@ -70,6 +70,7 @@ public final class Snapshot extends AbstractDisk { /** * {@inheritDoc} */ + @Override protected MoreObjects.ToStringHelper string() { return super.string() .omitNullValues() diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Zone.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Zone.java index de1758cc70..b2f61039ba 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Zone.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Zone.java @@ -91,6 +91,7 @@ public final class Zone extends Resource { /** * {@inheritDoc} */ + @Override protected MoreObjects.ToStringHelper string() { return super.string() .add("status", status) @@ -251,9 +252,6 @@ public final class Zone extends Resource { && equal(this.endTime, that.endTime); } - /** - * {@inheritDoc} - */ protected MoreObjects.ToStringHelper string() { return toStringHelper(this) .omitNullValues()