---

mderka · mderka · commit 3c585f8d85a3 · 2016-01-29T17:50:18.000-08:00
yaml --- r: 4469 b: refs/heads/logging-alpha c: e17bedb h: refs/heads/master i: 4467: 0317bc8
diff --git a/[refs] b/[refs]
@@ -12,7 +12,7 @@ refs/heads/compute-alpha: 969cba2627f1d53d352cc4a5ffe0879dacf65e6c
 refs/heads/dns-alpha: 2f90e7e338349287ace33375896907af0f032ca1
 refs/heads/dns-alpha-batch: 17442b07867021b85d0452f5f3eda29a3413288f
 refs/heads/gcs-nio: 283aeaf15efdcf3621eb6859f05e55ad7764375d
-refs/heads/logging-alpha: 762483b94f6c95aa3f860803ead53a962f41d336
+refs/heads/logging-alpha: e17bedb4640e6d5c434670eb03a4ea6b2f9028c9
 refs/tags/v0.1.0: a615317f7424ed58621b1f65d5c4d8cbbe8a6ed8
 refs/tags/v0.1.1: 7a7f6985fe465e9dd6a075af55493f42b4933be0
 refs/tags/v0.1.2: 3eb3fe866ba22487686048f45d927b8c8638ea3f
diff --git a/branches/logging-alpha/gcloud-java-dns/src/main/java/com/google/gcloud/dns/DnsOptions.java b/branches/logging-alpha/gcloud-java-dns/src/main/java/com/google/gcloud/dns/DnsOptions.java
@@ -16,7 +16,7 @@
 
 package com.google.gcloud.dns;
 
-import com.google.common.collect.Sets;
+import com.google.common.collect.ImmutableSet;
 import com.google.gcloud.ServiceOptions;
 import com.google.gcloud.spi.DnsRpc;
 import com.google.gcloud.spi.DnsRpcFactory;
@@ -26,16 +26,28 @@
 public class DnsOptions
     extends ServiceOptions<Dns, DnsRpc, DnsOptions> {
 
-  private static final long serialVersionUID = -5311219368450107146L;
-
-  // TODO(mderka) Finish implementation. Created issue #595.
+  private static final long serialVersionUID = -519128051411747771L;
+  private static final String GC_DNS_RW = "https://www.googleapis.com/auth/ndev.clouddns.readwrite";
+  private static final String GC_DNS_R = "https://www.googleapis.com/auth/ndev.clouddns.readonly";
+  private static final Set<String> SCOPES = ImmutableSet.of(GC_DNS_RW, GC_DNS_R);
 
   public static class DefaultDnsFactory implements DnsFactory {
     private static final DnsFactory INSTANCE = new DefaultDnsFactory();
 
     @Override
     public Dns create(DnsOptions options) {
-      // TODO(mderka) Implement. Created issue #595.
+      // TODO(mderka) Implement when DnsImpl is available. Created issue #595.
+      return null;
+    }
+  }
+
+  public static class DefaultDnsRpcFactory implements DnsRpcFactory {
+
+    private static final DnsRpcFactory INSTANCE = new DefaultDnsRpcFactory();
+
+    @Override
+    public DnsRpc create(DnsOptions options) {
+      // TODO(mderka) Implement when DefaultDnsRpc is available. Created issue #595.
       return null;
     }
   }
@@ -60,22 +72,24 @@ private DnsOptions(Builder builder) {
     super(DnsFactory.class, DnsRpcFactory.class, builder);
   }
 
+  @SuppressWarnings("unchecked")
   @Override
   protected DnsFactory defaultServiceFactory() {
     return DefaultDnsFactory.INSTANCE;
   }
 
+  @SuppressWarnings("unchecked")
   @Override
   protected DnsRpcFactory defaultRpcFactory() {
     return null;
   }
 
   @Override
   protected Set<String> scopes() {
-    // TODO(mderka) Verify.
-    return Sets.newHashSet("ndev.clouddns.readwrite");
+    return SCOPES;
   }
 
+  @SuppressWarnings("unchecked")
   @Override
   public Builder toBuilder() {
     return new Builder(this);
