---

mziccard · mziccard · commit 1de040ea521c · 2016-04-29T09:51:22.000+02:00
yaml --- r: 4341 b: refs/heads/gcs-nio c: de30a25 h: refs/heads/master i: 4339: 308f77a
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: ba4fcf01983f61df06ab07734944c2408e6932f2
+refs/heads/gcs-nio: de30a254b7e9e994bbf87644f5a0a0bf41ed97f4
 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/Compute.java b/branches/gcs-nio/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Compute.java
@@ -1092,7 +1092,8 @@ public static OperationListOption fields(OperationField... fields) {
   Page<Operation> listZoneOperations(String zone, OperationListOption... options);
 
   /**
-   * Deletes the requested operation.
+   * Deletes the requested operation. Delete is only possible for operations that have completed
+   * their execution. Any attempt to delete a running operation will fail.
    *
    * @return {@code true} if operation was deleted, {@code false} if it was not found
    * @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
@@ -542,8 +542,10 @@ public com.google.api.services.compute.model.Operation call() {
                   ZoneOperationId zoneOperationId = (ZoneOperationId) operationId;
                   return computeRpc.getZoneOperation(zoneOperationId.zone(),
                       zoneOperationId.operation(), optionsMap);
-                default:
+                case GLOBAL:
                   return computeRpc.getGlobalOperation(operationId.operation(), optionsMap);
+                default:
+                  throw new IllegalArgumentException("Unexpected operation identity type");
               }
             }
           }, options().retryParams(), EXCEPTION_HANDLER);
@@ -670,8 +672,10 @@ public Boolean call() {
               ZoneOperationId zoneOperationId = (ZoneOperationId) operation;
               return computeRpc.deleteZoneOperation(zoneOperationId.zone(),
                   zoneOperationId.operation());
-            default:
+            case GLOBAL:
               return computeRpc.deleteGlobalOperation(operation.operation());
+            default:
+              throw new IllegalArgumentException("Unexpected operation identity type");
           }
         }
       }, options().retryParams(), EXCEPTION_HANDLER);
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
@@ -692,7 +692,8 @@ public Operation reload(Compute.OperationOption... options) throws ComputeExcept
   }
 
   /**
-   * Deletes this operation.
+   * Deletes this operation. Delete is only possible for operations that have completed their
+   * execution. Any attempt to delete a running operation will fail.
    *
    * @return {@code true} if operation was deleted, {@code false} if it was not found
    * @throws ComputeException upon failure

Original file line number	Diff line number	Diff line change
`@@ -1092,7 +1092,8 @@ public static OperationListOption fields(OperationField... fields) {`
`1092`	`1092`	`Page<Operation> listZoneOperations(String zone, OperationListOption... options);`
`1093`	`1093`
`1094`	`1094`	`/**`
`1095`		`- * Deletes the requested operation.`
	`1095`	`+ * Deletes the requested operation. Delete is only possible for operations that have completed`
	`1096`	`+ * their execution. Any attempt to delete a running operation will fail.`
`1096`	`1097`	`*`
`1097`	`1098`	`* @return {@code true} if operation was deleted, {@code false} if it was not found`
`1098`	`1099`	`* @throws ComputeException upon failure`
Original file line number	Diff line number	Diff line change
`@@ -542,8 +542,10 @@ public com.google.api.services.compute.model.Operation call() {`
`542`	`542`	`ZoneOperationId zoneOperationId = (ZoneOperationId) operationId;`
`543`	`543`	`return computeRpc.getZoneOperation(zoneOperationId.zone(),`
`544`	`544`	`zoneOperationId.operation(), optionsMap);`
`545`		`- default:`
	`545`	`+ case GLOBAL:`
`546`	`546`	`return computeRpc.getGlobalOperation(operationId.operation(), optionsMap);`
	`547`	`+ default:`
	`548`	`+ throw new IllegalArgumentException("Unexpected operation identity type");`
`547`	`549`	`}`
`548`	`550`	`}`
`549`	`551`	`}, options().retryParams(), EXCEPTION_HANDLER);`
`@@ -670,8 +672,10 @@ public Boolean call() {`
`670`	`672`	`ZoneOperationId zoneOperationId = (ZoneOperationId) operation;`
`671`	`673`	`return computeRpc.deleteZoneOperation(zoneOperationId.zone(),`
`672`	`674`	`zoneOperationId.operation());`
`673`		`- default:`
	`675`	`+ case GLOBAL:`
`674`	`676`	`return computeRpc.deleteGlobalOperation(operation.operation());`
	`677`	`+ default:`
	`678`	`+ throw new IllegalArgumentException("Unexpected operation identity type");`
`675`	`679`	`}`
`676`	`680`	`}`
`677`	`681`	`}, options().retryParams(), EXCEPTION_HANDLER);`
Original file line number	Diff line number	Diff line change
`@@ -692,7 +692,8 @@ public Operation reload(Compute.OperationOption... options) throws ComputeExcept`
`692`	`692`	`}`
`693`	`693`
`694`	`694`	`/**`
`695`		`- * Deletes this operation.`
	`695`	`+ * Deletes this operation. Delete is only possible for operations that have completed their`
	`696`	`+ * execution. Any attempt to delete a running operation will fail.`
`696`	`697`	`*`
`697`	`698`	`* @return {@code true} if operation was deleted, {@code false} if it was not found`
`698`	`699`	`* @throws ComputeException upon failure`