diff --git a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Address.java b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Address.java index b30293fb6d48..e1e70def80d5 100644 --- a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Address.java +++ b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Address.java @@ -172,8 +172,8 @@ public final int hashCode() { return Objects.hash(super.hashCode(), options); } - private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException { - in.defaultReadObject(); + private void readObject(ObjectInputStream input) throws IOException, ClassNotFoundException { + input.defaultReadObject(); this.compute = options.service(); } diff --git a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Compute.java b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Compute.java index 9b527a041bde..a0052744e3f7 100644 --- a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Compute.java +++ b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Compute.java @@ -1668,7 +1668,7 @@ public static SnapshotListOption fields(SnapshotField... fields) { Snapshot getSnapshot(String snapshot, SnapshotOption... options); /** - * Lists all snapshots. + * Lists snapshots. * * @throws ComputeException upon failure */ diff --git a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/ComputeImpl.java b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/ComputeImpl.java index 468a66eb0526..a348e1e0e253 100644 --- a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/ComputeImpl.java +++ b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/ComputeImpl.java @@ -1007,7 +1007,6 @@ public Snapshot apply(com.google.api.services.compute.model.Snapshot snapshot) { @Override public Operation deleteSnapshot(SnapshotId snapshot, OperationOption... options) { return deleteSnapshot(snapshot.snapshot(), options); - } @Override diff --git a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Operation.java b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Operation.java index ce519edc970d..78afc170f671 100644 --- a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Operation.java +++ b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Operation.java @@ -792,8 +792,8 @@ com.google.api.services.compute.model.Operation toPb() { return operationPb; } - private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException { - in.defaultReadObject(); + private void readObject(ObjectInputStream input) throws IOException, ClassNotFoundException { + input.defaultReadObject(); this.compute = options.service(); } diff --git a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Snapshot.java b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Snapshot.java index 239a257ba307..e93a419d5b4a 100644 --- a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Snapshot.java +++ b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Snapshot.java @@ -199,8 +199,8 @@ public final int hashCode() { return Objects.hash(super.hashCode(), options); } - private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException { - in.defaultReadObject(); + private void readObject(ObjectInputStream input) throws IOException, ClassNotFoundException { + input.defaultReadObject(); this.compute = options.service(); } diff --git a/gcloud-java-compute/src/test/java/com/google/gcloud/compute/AddressTest.java b/gcloud-java-compute/src/test/java/com/google/gcloud/compute/AddressTest.java index 230f603271f9..a9404a90f755 100644 --- a/gcloud-java-compute/src/test/java/com/google/gcloud/compute/AddressTest.java +++ b/gcloud-java-compute/src/test/java/com/google/gcloud/compute/AddressTest.java @@ -57,8 +57,8 @@ public class AddressTest { private static final AddressInfo.RegionForwardingUsage REGION_FORWARDING_USAGE = new AddressInfo.RegionForwardingUsage(REGION_FORWARDING_RULES); - private Compute serviceMockReturnsOptions = createStrictMock(Compute.class); - private ComputeOptions mockOptions = createMock(ComputeOptions.class); + private final Compute serviceMockReturnsOptions = createStrictMock(Compute.class); + private final ComputeOptions mockOptions = createMock(ComputeOptions.class); private Compute compute; private Address globalForwardingAddress; private Address instanceAddress; diff --git a/gcloud-java-compute/src/test/java/com/google/gcloud/compute/OperationTest.java b/gcloud-java-compute/src/test/java/com/google/gcloud/compute/OperationTest.java index 9f08491a1632..62899071ce32 100644 --- a/gcloud-java-compute/src/test/java/com/google/gcloud/compute/OperationTest.java +++ b/gcloud-java-compute/src/test/java/com/google/gcloud/compute/OperationTest.java @@ -76,8 +76,8 @@ public class OperationTest { private static final RegionOperationId REGION_OPERATION_ID = RegionOperationId.of("project", "region", "op"); - private Compute serviceMockReturnsOptions = createStrictMock(Compute.class); - private ComputeOptions mockOptions = createMock(ComputeOptions.class); + private final Compute serviceMockReturnsOptions = createStrictMock(Compute.class); + private final ComputeOptions mockOptions = createMock(ComputeOptions.class); private Compute compute; private Operation globalOperation; private Operation regionOperation; diff --git a/gcloud-java-compute/src/test/java/com/google/gcloud/compute/SnapshotTest.java b/gcloud-java-compute/src/test/java/com/google/gcloud/compute/SnapshotTest.java index d827c19213c1..ac02669d7d5c 100644 --- a/gcloud-java-compute/src/test/java/com/google/gcloud/compute/SnapshotTest.java +++ b/gcloud-java-compute/src/test/java/com/google/gcloud/compute/SnapshotTest.java @@ -49,8 +49,8 @@ public class SnapshotTest { private static final SnapshotInfo.StorageBytesStatus STORAGE_BYTES_STATUS = SnapshotInfo.StorageBytesStatus.UP_TO_DATE; - private Compute serviceMockReturnsOptions = createStrictMock(Compute.class); - private ComputeOptions mockOptions = createMock(ComputeOptions.class); + private final Compute serviceMockReturnsOptions = createStrictMock(Compute.class); + private final ComputeOptions mockOptions = createMock(ComputeOptions.class); private Compute compute; private Snapshot snapshot; private Snapshot expectedSnapshot;