Minor style fixes to Datastore

mziccard · mziccard · commit 5f7d381ecfb1 · 2016-09-13T08:53:58.000+02:00
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseEntity.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseEntity.java
@@ -32,6 +32,7 @@
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Maps;
 
+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -49,7 +50,7 @@
  * @see <a href="https://cloud.google.com/datastore/docs/concepts/entities">Google Cloud Datastore
  *     Entities, Properties, and Keys</a>
  */
-public abstract class BaseEntity<K extends IncompleteKey> implements java.io.Serializable {
+public abstract class BaseEntity<K extends IncompleteKey> implements Serializable {
 
   private static final long serialVersionUID = -9070588108769487081L;
   private final ImmutableSortedMap<String, Value<?>> properties;
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java
@@ -60,7 +60,7 @@ interface DatastoreBatchWriter extends DatastoreWriter {
   /**
    * {@inheritDoc}
    * This operation will also remove from this batch any prior writes for entities with the same
-   * keys
+   * keys.
    *
    * @throws DatastoreException if not active
    */
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ListValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ListValue.java
@@ -57,7 +57,7 @@ protected List<Value<?>> getValue(com.google.datastore.v1.Value from) {
 
         @Override
         protected void setValue(ListValue from, com.google.datastore.v1.Value.Builder to) {
-          List<com.google.datastore.v1.Value> propertiesPb = new ArrayList<com.google.datastore.v1.Value>();
+          List<com.google.datastore.v1.Value> propertiesPb = new ArrayList<>();
           for (Value<?> property : from.get()) {
             propertiesPb.add(property.toPb());
           }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/PathElement.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/PathElement.java
@@ -74,6 +74,7 @@ public String toString() {
         .add("name", name)
         .toString();
   }
+
   @Override
   public int hashCode() {
     return Objects.hash(kind, id, name);
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java
@@ -29,7 +29,7 @@
  * A Google Cloud Datastore query.
  * For usage examples see {@link GqlQuery} and {@link StructuredQuery}.
  *
- * Note that queries require proper indexing. See
+ * <p>Note that queries require proper indexing. See
  * <a href="https://cloud.google.com/datastore/docs/tools/indexconfig">
  * Cloud Datastore Index Configuration</a> for help configuring indexes.
  *
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
@@ -752,7 +752,7 @@ B mergeFrom(com.google.datastore.v1.Query queryPb) {
 
   @Override
   public String toString() {
-    return super.toStringHelper()
+    return toStringHelper()
         .add("kind", kind)
         .add("startCursor", startCursor)
         .add("endCursor", endCursor)
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java
@@ -81,7 +81,7 @@ public enum ValueType {
   RAW_VALUE(RawValue.MARSHALLER),
 
   /**
-   * Represents a {@link LatLng} value
+   * Represents a {@link LatLng} value.
    */
   LAT_LNG(LatLngValue.MARSHALLER);
 
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DefaultDatastoreRpc.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DefaultDatastoreRpc.java
@@ -53,15 +53,15 @@ public DefaultDatastoreRpc(DatastoreOptions options) {
     } else if (!removeScheme(com.google.datastore.v1.client.DatastoreFactory.DEFAULT_HOST)
                     .equals(removeScheme(normalizedHost))
         && !normalizedHost.isEmpty()) {
-      String fullURL = normalizedHost;
-      if (fullURL.charAt(fullURL.length() - 1) != '/') {
-        fullURL = fullURL + '/';
+      String fullUrl = normalizedHost;
+      if (fullUrl.charAt(fullUrl.length() - 1) != '/') {
+        fullUrl = fullUrl + '/';
       }
-      fullURL = fullURL
+      fullUrl = fullUrl
           + com.google.datastore.v1.client.DatastoreFactory.VERSION
           + "/projects/"
           + options.projectId();
-      clientBuilder = clientBuilder.projectId(null).projectEndpoint(fullURL);
+      clientBuilder = clientBuilder.projectId(null).projectEndpoint(fullUrl);
     }
     client = com.google.datastore.v1.client.DatastoreFactory.get()
         .create(clientBuilder.build());
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java
@@ -623,7 +623,7 @@ public static LocalDatastoreHelper create() {
    *
    * @throws InterruptedException if emulator-related tasks are interrupted
    * @throws IOException if there are socket exceptions or issues creating/deleting the temporary
-   * data folder
+   *     data folder
    */
   public void start() throws IOException, InterruptedException {
     // send a quick request in case we have a hanging process from a previous run

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ interface DatastoreBatchWriter extends DatastoreWriter {`
`60`	`60`	`/**`
`61`	`61`	`* {@inheritDoc}`
`62`	`62`	`* This operation will also remove from this batch any prior writes for entities with the same`
`63`		`- * keys`
	`63`	`+ * keys.`
`64`	`64`	`*`
`65`	`65`	`* @throws DatastoreException if not active`
`66`	`66`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ protected List<Value<?>> getValue(com.google.datastore.v1.Value from) {`
`57`	`57`
`58`	`58`	`@Override`
`59`	`59`	`protected void setValue(ListValue from, com.google.datastore.v1.Value.Builder to) {`
`60`		`- List<com.google.datastore.v1.Value> propertiesPb = new ArrayList<com.google.datastore.v1.Value>();`
	`60`	`+ List<com.google.datastore.v1.Value> propertiesPb = new ArrayList<>();`
`61`	`61`	`for (Value<?> property : from.get()) {`
`62`	`62`	`propertiesPb.add(property.toPb());`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ public String toString() {`
`74`	`74`	`.add("name", name)`
`75`	`75`	`.toString();`
`76`	`76`	`}`
	`77`	`+`
`77`	`78`	`@Override`
`78`	`79`	`public int hashCode() {`
`79`	`80`	`return Objects.hash(kind, id, name);`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`* A Google Cloud Datastore query.`
`30`	`30`	`* For usage examples see {@link GqlQuery} and {@link StructuredQuery}.`
`31`	`31`	`*`
`32`		`- * Note that queries require proper indexing. See`
	`32`	`+ * <p>Note that queries require proper indexing. See`
`33`	`33`	`* <a href="https://cloud.google.com/datastore/docs/tools/indexconfig">`
`34`	`34`	`* Cloud Datastore Index Configuration</a> for help configuring indexes.`
`35`	`35`	`*`
Original file line number	Diff line number	Diff line change
`@@ -623,7 +623,7 @@ public static LocalDatastoreHelper create() {`
`623`	`623`	`*`
`624`	`624`	`* @throws InterruptedException if emulator-related tasks are interrupted`
`625`	`625`	`* @throws IOException if there are socket exceptions or issues creating/deleting the temporary`
`626`		`- * data folder`
	`626`	`+ * data folder`
`627`	`627`	`*/`
`628`	`628`	`public void start() throws IOException, InterruptedException {`
`629`	`629`	`// send a quick request in case we have a hanging process from a previous run`