---

mderka · mderka · commit 13e6b2b98229 · 2016-02-03T14:34:38.000-08:00
yaml --- r: 6819 b: refs/heads/tswast-patch-1 c: 896de75 h: refs/heads/master i: 6817: 4ae7336 6815: a203d4f
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: bc4b8204093d92782d04319c8efda9aae424b9cc
+refs/heads/tswast-patch-1: 896de75d1cad86e1b2cc2e82bb20700c240fd4ec
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/gcloud-java-dns/src/main/java/com/google/gcloud/spi/DefaultDnsRpc.java b/branches/tswast-patch-1/gcloud-java-dns/src/main/java/com/google/gcloud/spi/DefaultDnsRpc.java
@@ -30,6 +30,7 @@
  */
 public class DefaultDnsRpc implements DnsRpc {
 
+  private static final String SORTING_KEY = "changeSequence";
   private final Dns dns;
   private final DnsOptions options;
 
@@ -64,9 +65,14 @@ public ManagedZone getZone(String zoneName, Map<Option, ?> options) throws DnsEx
     // just fields option
     try {
       return dns.managedZones().get(this.options.projectId(), zoneName)
-          .setFields(FIELDS.getString(options)).execute();
+          .setFields(FIELDS.getString(options))
+          .execute();
     } catch (IOException ex) {
-      throw translate(ex);
+      DnsException serviceException = translate(ex);
+      if (serviceException.code() == HTTP_NOT_FOUND) {
+        return null;
+      }
+      throw serviceException;
     }
   }
 
@@ -151,7 +157,16 @@ public Change getChangeRequest(String zoneName, String changeRequestId, Map<Opti
           .setFields(FIELDS.getString(options))
           .execute();
     } catch (IOException ex) {
-      throw translate(ex);
+      DnsException serviceException = translate(ex);
+      if (serviceException.code() == HTTP_NOT_FOUND) {
+        // message format "The 'parameters.changeId' resource named '4' does not exist."
+        if (serviceException.getMessage().contains("changeId")) {
+          // the change id was not found, but the zone exists
+          return null;
+        }
+        // the zone does not exist, so throw an exception
+      }
+      throw serviceException;
     }
   }
 
@@ -165,9 +180,8 @@ public Tuple<String, Iterable<Change>> listChangeRequests(String zoneName, Map<O
           .setMaxResults(PAGE_SIZE.getInt(options))
           .setPageToken(PAGE_TOKEN.getString(options));
       if (SORTING_ORDER.getString(options) != null) {
-        // this needs to be checked and changed if more sorting options are implemented, issue #604
-        String key = "changeSequence";
-        request = request.setSortBy(key).setSortOrder(SORTING_ORDER.getString(options));
+        // todo check and change if more sorting options are implemented, issue #604
+        request = request.setSortBy(SORTING_KEY).setSortOrder(SORTING_ORDER.getString(options));
       }
       ChangesListResponse response = request.execute();
       return Tuple.<String, Iterable<Change>>of(response.getNextPageToken(), response.getChanges());
diff --git a/branches/tswast-patch-1/gcloud-java-dns/src/main/java/com/google/gcloud/spi/DnsRpc.java b/branches/tswast-patch-1/gcloud-java-dns/src/main/java/com/google/gcloud/spi/DnsRpc.java
@@ -85,7 +85,7 @@ public Y y() {
    * Creates a new zone.
    *
    * @param zone a zone to be created
-   * @return Updated {@link ManagedZone} object
+   * @return Updated {@code ManagedZone} object
    * @throws DnsException upon failure
    */
   ManagedZone create(ManagedZone zone) throws DnsException;
@@ -121,7 +121,7 @@ public Y y() {
    *
    * @param zoneName name of the zone to be listed
    * @param options a map of options for the service call
-   * @throws DnsException upon failure or if zone not found
+   * @throws DnsException upon failure or if zone was not found
    */
   Tuple<String, Iterable<ResourceRecordSet>> listDnsRecords(String zoneName,
       Map<Option, ?> options) throws DnsException;
@@ -131,40 +131,40 @@ Tuple<String, Iterable<ResourceRecordSet>> listDnsRecords(String zoneName,
    * 
    * @param options a map of options for the service call
    * @return up-to-date project information
-   * @throws DnsException upon failure
+   * @throws DnsException upon failure or if the project is not found
    */
   Project getProject(Map<Option, ?> options) throws DnsException;
 
   /**
    * Applies change request to a zone. 
    *
-   * @param zoneName the name of a zone to which the {@link Change} should be applied
+   * @param zoneName the name of a zone to which the {@code Change} should be applied
    * @param changeRequest change to be applied
    * @param options a map of options for the service call
    * @return updated change object with server-assigned ID
-   * @throws DnsException upon failure or if zone not found
+   * @throws DnsException upon failure or if zone was not found
    */
   Change applyChangeRequest(String zoneName, Change changeRequest, Map<Option, ?> options) 
       throws DnsException;
 
   /**
    * Returns an existing change request.
    *
-   * @param zoneName the name of a zone to which the {@link Change} was be applied
+   * @param zoneName the name of a zone to which the {@code Change} was be applied
    * @param changeRequestId the unique id assigned to the change by the server
    * @param options a map of options for the service call
-   * @return up-to-date change object
-   * @throws DnsException upon failure or if zone not found
+   * @return up-to-date change object or {@code null} if change was not found
+   * @throws DnsException upon failure or if zone was not found
    */
   Change getChangeRequest(String zoneName, String changeRequestId, Map<Option, ?> options) 
       throws DnsException;
 
   /**
-   * List an existing change requests for a zone.
+   * List existing change requests for a zone.
    *
-   * @param zoneName the name of a zone to which the {@link Change}s were be applied
+   * @param zoneName the name of a zone to which the {@code Change}s were be applied
    * @param options a map of options for the service call
-   * @throws DnsException upon failure or if zone not found
+   * @throws DnsException upon failure or if zone was not found
    */
   Tuple<String, Iterable<Change>> listChangeRequests(String zoneName, Map<Option, ?> options) 
       throws DnsException;
