Clean up test code and javadoc formatting

Ajay Kannan · Ajay Kannan · commit 15865ccc54d2 · 2016-03-01T09:42:10.000-08:00
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreHelper.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreHelper.java
@@ -56,22 +56,19 @@ static KeyFactory newKeyFactory(DatastoreOptions options) {
   }
 
   /**
-   * Returns a list with a value for each given key (ordered by input).
-   * {@code null} values are returned for nonexistent keys.
+   * Returns a list with a value for each given key (ordered by input). {@code null} values are
+   * returned for nonexistent keys.
    */
   static List<Entity> fetch(Transaction reader, Key... keys) {
-    Iterator<Entity> entities = reader.get(keys);
-    return compileEntities(keys, entities);
+    return compileEntities(keys, reader.get(keys));
   }
 
   /**
-   * Returns a list with a value for each given key (ordered by input).
-   * {@code null} values are returned for nonexistent keys.
+   * Returns a list with a value for each given key (ordered by input). {@code null} values are
+   * returned for nonexistent keys.
    */
   static List<Entity> fetch(Datastore reader, Key[] keys, ReadOption... options) {
-    Iterator<Entity> entities;
-    entities = reader.get(Arrays.asList(keys), options);
-    return compileEntities(keys, entities);
+    return compileEntities(keys, reader.get(Arrays.asList(keys), options));
   }
 
   private static List<Entity> compileEntities(Key[] keys, Iterator<Entity> entities) {
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreImpl.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreImpl.java
@@ -210,16 +210,11 @@ public Iterator<Entity> get(Iterable<Key> keys, ReadOption... options) {
 
   private static com.google.datastore.v1beta3.ReadOptions toReadOptionsPb(ReadOption... options) {
     com.google.datastore.v1beta3.ReadOptions readOptionsPb = null;
-    if (options != null) {
-      Map<Class<? extends ReadOption>, ReadOption> optionsMap = ReadOption.asImmutableMap(options);
-      EventualConsistency eventualConsistency =
-          (EventualConsistency) optionsMap.get(EventualConsistency.class);
-      if (eventualConsistency != null) {
-        readOptionsPb =
-            com.google.datastore.v1beta3.ReadOptions.newBuilder()
-                .setReadConsistency(ReadConsistency.EVENTUAL)
-                .build();
-      }
+    if (options != null
+        && ReadOption.asImmutableMap(options).containsKey(EventualConsistency.class)) {
+      readOptionsPb = com.google.datastore.v1beta3.ReadOptions.newBuilder()
+          .setReadConsistency(ReadConsistency.EVENTUAL)
+          .build();
     }
     return readOptionsPb;
   }
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/ReadOption.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/ReadOption.java
@@ -47,7 +47,7 @@ public boolean isEventual() {
     }
   }
 
-  ReadOption() {}
+  private ReadOption() {}
 
   /**
    * Returns a {@code ReadOption} that specifies eventual consistency.
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public boolean isEventual() {`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`50`		`- ReadOption() {}`
	`50`	`+ private ReadOption() {}`
`51`	`51`
`52`	`52`	`/**`
`53`	`53`	`* Returns a {@code ReadOption} that specifies eventual consistency.`