---

Ajay Kannan · Ajay Kannan · commit 785df5ddf346 · 2015-12-30T15:44:27.000-08:00
yaml --- r: 2643 b: refs/heads/update-datastore c: 2da16c7 h: refs/heads/master i: 2641: ae9c35b 2639: d80ea15
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
 refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
 refs/heads/pubsub-alpha: 1a0e970f265af871e02274085b9662b3fe29058b
 refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
-refs/heads/update-datastore: 42727c0b0097e08eb5f046f34c4733b5602c842f
+refs/heads/update-datastore: 2da16c7fbb99450b012e9924ee033d781833cc0f
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
 refs/tags/v0.0.10: 207ebd2a3472fddee69fe1298eb90429e3306efd
 refs/tags/v0.0.11: ffbfba48a6426ff63c08ff2117e58681f251fbf2
diff --git a/branches/update-datastore/CONTRIBUTING.md b/branches/update-datastore/CONTRIBUTING.md
@@ -15,6 +15,20 @@ Using maven for build/test
 After you cloned the repository use Maven for building and running the tests.
 Maven 3.0+ is required.
 
+When downloading the source, we recommend you obtain service account credentials. 
+These credentials will allow you to run integration tests using `mvn verify` in command line. 
+Follow step 2 of the [authentication instructions](https://github.com/GoogleCloudPlatform/gcloud-java#authentication) to generate and use JSON service account credentials.
+
+It's also important to test that changes don't break compatibility with App/Compute Engine and when running elsewhere. 
+To run tests on different platforms, try deploying the apps available on the [gcloud-java-examples](https://github.com/GoogleCloudPlatform/gcloud-java-examples) repository. 
+End-to-end tests should ensure that gcloud-java works when running on the
+
+* App Engine production environment (see the docs for [uploading your app to production App Engine](https://cloud.google.com/appengine/docs/java/tools/maven#uploading_your_app_to_production_app_engine))
+* App Engine development server (see the docs for [testing your app with the development server](https://cloud.google.com/appengine/docs/java/tools/maven#testing_your_app_with_the_development_server))
+* Compute Engine (see the [Getting Started Guide](https://cloud.google.com/compute/docs/quickstart), and be sure to [enable the appropriate APIs](https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/authentication#on-google-compute-engine))
+* Your desktop (using `mvn exec:java`, for example)
+
+When changes are made to authentication and project ID-related code, authentication and project ID inference should be tested using all relevant methods detailed in the [authentication docs](https://github.com/GoogleCloudPlatform/gcloud-java#authentication) and [project ID docs](https://github.com/GoogleCloudPlatform/gcloud-java#specifying-a-project-id).
 
 Adding Features
 ---------------
diff --git a/branches/update-datastore/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java b/branches/update-datastore/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java
@@ -94,12 +94,6 @@ public enum Type {
   private final Long expirationTime;
   private final Long lastModifiedTime;
 
-  /**
-   * Base builder for tables.
-   *
-   * @param <T> the table type.
-   * @param <B> the table builder.
-   */
   public abstract static class Builder<T extends BaseTableInfo, B extends Builder<T, B>> {
 
     private String etag;
diff --git a/branches/update-datastore/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java b/branches/update-datastore/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java
@@ -32,8 +32,6 @@
  * a table. Use {@link QueryJobInfo} for a job that runs a query.
  *
  * @see <a href="https://cloud.google.com/bigquery/docs/reference/v2/jobs">Jobs</a>
- *
- * @param <S> the statistics type.
  */
 public abstract class JobInfo<S extends JobStatistics> implements Serializable {
 
@@ -89,13 +87,6 @@ public enum WriteDisposition {
   private final S statistics;
   private final String userEmail;
 
-  /**
-   * Base builder for jobs.
-   *
-   * @param <T> the job type.
-   * @param <S> the job statistics type.
-   * @param <B> the job builder.
-   */
   public abstract static class Builder<T extends JobInfo, S extends JobStatistics,
       B extends Builder<T, S, B>> {
 
diff --git a/branches/update-datastore/gcloud-java-core/src/main/java/com/google/gcloud/BaseService.java b/branches/update-datastore/gcloud-java-core/src/main/java/com/google/gcloud/BaseService.java
@@ -16,11 +16,6 @@
 
 package com.google.gcloud;
 
-/**
- * Base class for service objects.
- *
- * @param <OptionsT> the {@code ServiceOptions} subclass corresponding to the service.
- */
 public abstract class BaseService<OptionsT extends ServiceOptions<?, ?, OptionsT>>
     implements Service<OptionsT> {
 
diff --git a/branches/update-datastore/gcloud-java-core/src/main/java/com/google/gcloud/Page.java b/branches/update-datastore/gcloud-java-core/src/main/java/com/google/gcloud/Page.java
@@ -40,8 +40,6 @@
  *   }
  *   page = page.nextPage();
  * }}</pre>
- *
- * @param <T> the value type that the page holds.
  */
 public interface Page<T> {
 
diff --git a/branches/update-datastore/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java b/branches/update-datastore/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java
@@ -25,8 +25,6 @@
 
 /**
  * Base implementation for Google Cloud paginated results.
- *
- * @param <T> the value type that the page holds.
  */
 public class PageImpl<T> implements Page<T>, Serializable {
 
@@ -36,11 +34,6 @@ public class PageImpl<T> implements Page<T>, Serializable {
   private final Iterable<T> results;
   private final NextPageFetcher<T> pageFetcher;
 
-  /**
-   * Interface for fetching the next page of results from the service.
-   *
-   * @param <T> the value type that the page holds.
-   */
   public interface NextPageFetcher<T> extends Serializable {
     Page<T> nextPage();
   }
diff --git a/branches/update-datastore/gcloud-java-core/src/main/java/com/google/gcloud/Restorable.java b/branches/update-datastore/gcloud-java-core/src/main/java/com/google/gcloud/Restorable.java
@@ -33,8 +33,6 @@
  * X restorableObj = state.restore();
  * ...
  * }</pre>
- *
- * @param <T> the restorable object's type.
  */
 public interface Restorable<T extends Restorable<T>> {
 
diff --git a/branches/update-datastore/gcloud-java-core/src/main/java/com/google/gcloud/RestorableState.java b/branches/update-datastore/gcloud-java-core/src/main/java/com/google/gcloud/RestorableState.java
@@ -22,8 +22,6 @@
  *
  * Implementations of this class must implement {@link java.io.Serializable} to ensure that the
  * state of a the object can be correctly serialized.
- *
- * @param <T> the restored object's type.
  */
 public interface RestorableState<T extends Restorable<T>> {
 
diff --git a/branches/update-datastore/gcloud-java-core/src/main/java/com/google/gcloud/Service.java b/branches/update-datastore/gcloud-java-core/src/main/java/com/google/gcloud/Service.java
@@ -16,11 +16,6 @@
 
 package com.google.gcloud;
 
-/**
- * Interface for service objects.
- *
- * @param <OptionsT> the {@code ServiceOptions} subclass corresponding to the service.
- */
 public interface Service<OptionsT extends ServiceOptions<?, ?, OptionsT>> {
   OptionsT options();
 }
diff --git a/branches/update-datastore/gcloud-java-core/src/main/java/com/google/gcloud/ServiceFactory.java b/branches/update-datastore/gcloud-java-core/src/main/java/com/google/gcloud/ServiceFactory.java
@@ -19,11 +19,8 @@
 /**
  * A base interface for all service factories.
  *
- * <p>Implementation must provide a public no-arg constructor.
+ * Implementation must provide a public no-arg constructor.
  * Loading of a factory implementation is done via {@link java.util.ServiceLoader}.
- *
- * @param <ServiceT> the service subclass.
- * @param <ServiceOptionsT> the {@code ServiceOptions} subclass corresponding to the service.
  */
 @SuppressWarnings("rawtypes")
 public interface ServiceFactory<ServiceT extends Service, ServiceOptionsT extends ServiceOptions> {
diff --git a/branches/update-datastore/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/branches/update-datastore/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -53,13 +53,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-/**
- * Abstract class representing service options.
- *
- * @param <ServiceT> the service subclass.
- * @param <ServiceRpcT> the spi-layer class corresponding to the service.
- * @param <OptionsT> the {@code ServiceOptions} subclass corresponding to the service.
- */
 public abstract class ServiceOptions<ServiceT extends Service<OptionsT>, ServiceRpcT,
     OptionsT extends ServiceOptions<ServiceT, ServiceRpcT, OptionsT>> implements Serializable {
 
@@ -157,14 +150,6 @@ private Object readResolve() throws ObjectStreamException {
     }
   }
 
-  /**
-   * Builder for {@code ServiceOptions}.
-   *
-   * @param <ServiceT> the service subclass.
-   * @param <ServiceRpcT> the spi-layer class corresponding to the service.
-   * @param <OptionsT> the {@code ServiceOptions} subclass corresponding to the service.
-   * @param <B> the {@code ServiceOptions} builder.
-   */
   protected abstract static class Builder<ServiceT extends Service<OptionsT>, ServiceRpcT,
       OptionsT extends ServiceOptions<ServiceT, ServiceRpcT, OptionsT>,
       B extends Builder<ServiceT, ServiceRpcT, OptionsT, B>> {
diff --git a/branches/update-datastore/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BaseKey.java b/branches/update-datastore/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BaseKey.java
@@ -31,20 +31,15 @@
 /**
  * Base class for keys.
  */
-public abstract class BaseKey extends Serializable<DatastoreV1.Key> {
+abstract class BaseKey extends Serializable<DatastoreV1.Key> {
 
   private static final long serialVersionUID = -4671243265877410635L;
 
   private final transient String projectId;
   private final transient String namespace;
   private final transient ImmutableList<PathElement> path;
 
-  /**
-   * Base class for key builders.
-   *
-   * @param <B> the key builder.
-   */
-  protected abstract static class Builder<B extends Builder<B>> {
+  abstract static class Builder<B extends Builder<B>> {
 
     String projectId;
     String namespace;
diff --git a/branches/update-datastore/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java b/branches/update-datastore/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java
@@ -609,13 +609,7 @@ public static Projection first(String property) {
     }
   }
 
-  /**
-   * Base class for StructuredQuery builders.
-   *
-   * @param <V> the type of result the query returns.
-   * @param <B> the query builder.
-   */
-  protected static class BaseBuilder<V, B extends BaseBuilder<V, B>> {
+  static class BaseBuilder<V, B extends BaseBuilder<V, B>> {
 
     private final ResultType<V> resultType;
     private String namespace;
diff --git a/branches/update-datastore/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/ValueBuilder.java b/branches/update-datastore/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/ValueBuilder.java
@@ -18,10 +18,6 @@
 
 /**
  * A common interface for Value builders.
- *
- * @param <V> the data type that the {@code Value} object holds.
- * @param <P> the value type.
- * @param <B> the value type's associated builder.
  */
 public interface ValueBuilder<V, P extends Value<V>, B extends ValueBuilder<V, P, B>> {
 

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,6 @@`
`22`	`22`	`*`
`23`	`23`	`* Implementations of this class must implement {@link java.io.Serializable} to ensure that the`
`24`	`24`	`* state of a the object can be correctly serialized.`
`25`		`- *`
`26`		`- * @param <T> the restored object's type.`
`27`	`25`	`*/`
`28`	`26`	`public interface RestorableState<T extends Restorable<T>> {`
`29`	`27`