---

mziccard · mziccard · commit 34f4959e8524 · 2016-04-29T09:51:22.000+02:00
yaml --- r: 4357 b: refs/heads/gcs-nio c: de2a6b4 h: refs/heads/master i: 4355: 90fa190
diff --git a/[refs] b/[refs]
@@ -11,7 +11,7 @@ refs/tags/v0.0.12: 2fd8066e891fb3dfea69b65f6bf6461db79342b9
 refs/heads/compute-alpha: 969cba2627f1d53d352cc4a5ffe0879dacf65e6c
 refs/heads/dns-alpha: 2f90e7e338349287ace33375896907af0f032ca1
 refs/heads/dns-alpha-batch: 17442b07867021b85d0452f5f3eda29a3413288f
-refs/heads/gcs-nio: f66ea60be34714f6279aaa4eadd3162679daee1a
+refs/heads/gcs-nio: de2a6b4c2191223e176765af43bab313f2ce3596
 refs/heads/logging-alpha: db5312bffa7fccac194f6a7feb8cc3066de16aff
 refs/tags/v0.1.0: a615317f7424ed58621b1f65d5c4d8cbbe8a6ed8
 refs/tags/v0.1.1: 7a7f6985fe465e9dd6a075af55493f42b4933be0
diff --git a/branches/gcs-nio/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Address.java b/branches/gcs-nio/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/branches/gcs-nio/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Compute.java b/branches/gcs-nio/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/branches/gcs-nio/gcloud-java-compute/src/main/java/com/google/gcloud/compute/ComputeImpl.java b/branches/gcs-nio/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/branches/gcs-nio/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Operation.java b/branches/gcs-nio/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/branches/gcs-nio/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Snapshot.java b/branches/gcs-nio/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/branches/gcs-nio/gcloud-java-compute/src/test/java/com/google/gcloud/compute/AddressTest.java b/branches/gcs-nio/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/branches/gcs-nio/gcloud-java-compute/src/test/java/com/google/gcloud/compute/OperationTest.java b/branches/gcs-nio/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/branches/gcs-nio/gcloud-java-compute/src/test/java/com/google/gcloud/compute/SnapshotTest.java b/branches/gcs-nio/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;

Original file line number	Diff line number	Diff line change
`@@ -172,8 +172,8 @@ public final int hashCode() {`
`172`	`172`	`return Objects.hash(super.hashCode(), options);`
`173`	`173`	`}`
`174`	`174`
`175`		`- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {`
`176`		`- in.defaultReadObject();`
	`175`	`+ private void readObject(ObjectInputStream input) throws IOException, ClassNotFoundException {`
	`176`	`+ input.defaultReadObject();`
`177`	`177`	`this.compute = options.service();`
`178`	`178`	`}`
`179`	`179`
Original file line number	Diff line number	Diff line change
`@@ -1668,7 +1668,7 @@ public static SnapshotListOption fields(SnapshotField... fields) {`
`1668`	`1668`	`Snapshot getSnapshot(String snapshot, SnapshotOption... options);`
`1669`	`1669`
`1670`	`1670`	`/**`
`1671`		`- * Lists all snapshots.`
	`1671`	`+ * Lists snapshots.`
`1672`	`1672`	`*`
`1673`	`1673`	`* @throws ComputeException upon failure`
`1674`	`1674`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -1007,7 +1007,6 @@ public Snapshot apply(com.google.api.services.compute.model.Snapshot snapshot) {`
`1007`	`1007`	`@Override`
`1008`	`1008`	`public Operation deleteSnapshot(SnapshotId snapshot, OperationOption... options) {`
`1009`	`1009`	`return deleteSnapshot(snapshot.snapshot(), options);`
`1010`		`-`
`1011`	`1010`	`}`
`1012`	`1011`
`1013`	`1012`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -792,8 +792,8 @@ com.google.api.services.compute.model.Operation toPb() {`
`792`	`792`	`return operationPb;`
`793`	`793`	`}`
`794`	`794`
`795`		`- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {`
`796`		`- in.defaultReadObject();`
	`795`	`+ private void readObject(ObjectInputStream input) throws IOException, ClassNotFoundException {`
	`796`	`+ input.defaultReadObject();`
`797`	`797`	`this.compute = options.service();`
`798`	`798`	`}`
`799`	`799`
Original file line number	Diff line number	Diff line change
`@@ -199,8 +199,8 @@ public final int hashCode() {`
`199`	`199`	`return Objects.hash(super.hashCode(), options);`
`200`	`200`	`}`
`201`	`201`
`202`		`- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {`
`203`		`- in.defaultReadObject();`
	`202`	`+ private void readObject(ObjectInputStream input) throws IOException, ClassNotFoundException {`
	`203`	`+ input.defaultReadObject();`
`204`	`204`	`this.compute = options.service();`
`205`	`205`	`}`
`206`	`206`