Merge branch 'master' of git://github.com/GoogleCloudPlatform/gcloud-…

…java into temp

README.md

@@ -56,16 +56,16 @@ See the ``gcloud-java`` API [datastore documentation][datastore-api] to learn ho
 with the Cloud Datastore using this Client Library.
 
 ```java
-import com.google.gcloud.datastore.DatastoreService;
-import com.google.gcloud.datastore.DatastoreServiceFactory;
-import com.google.gcloud.datastore.DatastoreServiceOptions;
+import com.google.gcloud.datastore.Datastore;
+import com.google.gcloud.datastore.DatastoreFactory;
+import com.google.gcloud.datastore.DatastoreOptions;
 import com.google.gcloud.datastore.DateTime;
 import com.google.gcloud.datastore.Entity;
 import com.google.gcloud.datastore.Key;
 import com.google.gcloud.datastore.KeyFactory;
 
-DatastoreServiceOptions options = DatastoreServiceOptions.builder().projectId(PROJECT_ID).build();
-DatastoreService datastore = DatastoreServiceFactory.instance().get(options);
+DatastoreOptions options = DatastoreOptions.builder().projectId(PROJECT_ID).build();
+Datastore datastore = DatastoreFactory.instance().get(options);
 KeyFactory keyFactory = datastore.newKeyFactory().kind(KIND);
 Key key = keyFactory.newKey(keyName);
 Entity entity = datastore.get(key);

gcloud-java-core/pom.xml

@@ -28,13 +28,13 @@
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client</artifactId>
-      <version>1.19.0</version>
+      <version>1.20.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.google.oauth-client</groupId>
       <artifactId>google-oauth-client</artifactId>
-      <version>1.19.0</version>
+      <version>1.20.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

gcloud-java-core/src/main/java/com/google/gcloud/AuthCredentials.java

@@ -62,7 +62,7 @@ private Object readResolve() throws ObjectStreamException {
     }
   }
 
-  private static class ServiceAccountAuthCredentials extends AuthCredentials {
+  public static class ServiceAccountAuthCredentials extends AuthCredentials {
 
     private static final long serialVersionUID = 8007708734318445901L;
     private final String account;
@@ -94,6 +94,14 @@ protected HttpRequestInitializer httpRequestInitializer(
       return builder.build();
     }
 
+    public String account() {
+      return account;
+    }
+
+    public PrivateKey privateKey() {
+      return privateKey;
+    }
+
     @Override
     public int hashCode() {
       return Objects.hash(account, privateKey);
@@ -187,7 +195,7 @@ public static AuthCredentials createApplicationDefaults() throws IOException {
     return new ApplicationDefaultAuthCredentials();
   }
 
-  public static AuthCredentials createFor(String account, PrivateKey privateKey) {
+  public static ServiceAccountAuthCredentials createFor(String account, PrivateKey privateKey) {
     return new ServiceAccountAuthCredentials(account, privateKey);
   }
 

gcloud-java-datastore/README.md

@@ -40,16 +40,16 @@ See the ``gcloud-java`` API [datastore documentation][datastore-api] to learn ho
 with the Cloud Datastore using this Client Library.
 
 ```java
-import com.google.gcloud.datastore.DatastoreService;
-import com.google.gcloud.datastore.DatastoreServiceFactory;
-import com.google.gcloud.datastore.DatastoreServiceOptions;
+import com.google.gcloud.datastore.Datastore;
+import com.google.gcloud.datastore.DatastoreFactory;
+import com.google.gcloud.datastore.DatastoreOptions;
 import com.google.gcloud.datastore.DateTime;
 import com.google.gcloud.datastore.Entity;
 import com.google.gcloud.datastore.Key;
 import com.google.gcloud.datastore.KeyFactory;
 
-DatastoreServiceOptions options = DatastoreServiceOptions.builder().projectId(PROJECT_ID).build();
-DatastoreService datastore = DatastoreServiceFactory.instance().get(options);
+DatastoreOptions options = DatastoreOptions.builder().projectId(PROJECT_ID).build();
+Datastore datastore = DatastoreFactory.instance().get(options);
 KeyFactory keyFactory = datastore.newKeyFactory().kind(KIND);
 Key key = keyFactory.newKey(keyName);
 Entity entity = datastore.get(key);

gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BaseDatastoreBatchWriter.java

@@ -195,8 +195,8 @@ protected void validateActive() {
     }
   }
 
-  protected DatastoreServiceException newInvalidRequest(String msg, Object... params) {
-    return DatastoreServiceException.throwInvalidRequest(String.format(msg, params));
+  protected DatastoreException newInvalidRequest(String msg, Object... params) {
+    return DatastoreException.throwInvalidRequest(String.format(msg, params));
   }
 
   protected DatastoreV1.Mutation.Builder toMutationPb() {
@@ -219,5 +219,5 @@ protected DatastoreV1.Mutation.Builder toMutationPb() {
     return mutationPb;
   }
 
-  protected abstract DatastoreService datastore();
+  protected abstract Datastore datastore();
 }

gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BaseEntity.java

@@ -242,21 +242,21 @@ public boolean contains(String name) {
   /**
    * Returns the {@link Value} for the given property {@code name}.
    *
-   * @throws DatastoreServiceException if not such property.
+   * @throws DatastoreException if not such property.
    */
   public <V extends Value<?>> V getValue(String name) {
     @SuppressWarnings("unchecked")
     V property = (V) properties.get(name);
     if (property == null) {
-      throw DatastoreServiceException.throwInvalidRequest("No such property %s", name);
+      throw DatastoreException.throwInvalidRequest("No such property %s", name);
     }
     return property;
   }
 
   /**
    * Returns true if property is instanceof NullValue.
    *
-   * @throws DatastoreServiceException if not such property.
+   * @throws DatastoreException if not such property.
    */
   public boolean isNull(String name) {
     return getValue(name) instanceof NullValue;
@@ -266,7 +266,7 @@ public boolean isNull(String name) {
   /**
    * Returns the property value as a string.
    *
-   * @throws DatastoreServiceException if not such property.
+   * @throws DatastoreException if not such property.
    * @throws ClassCastException if value is not a string.
    */
   @SuppressWarnings("unchecked")
@@ -277,7 +277,7 @@ public String getString(String name) {
   /**
    * Returns the property value as long.
    *
-   * @throws DatastoreServiceException if not such property.
+   * @throws DatastoreException if not such property.
    * @throws ClassCastException if value is not a long.
    */
   @SuppressWarnings("unchecked")
@@ -288,7 +288,7 @@ public long getLong(String name) {
   /**
    * Returns the property value as a double.
    *
-   * @throws DatastoreServiceException if not such property.
+   * @throws DatastoreException if not such property.
    * @throws ClassCastException if value is not a double.
    */
   @SuppressWarnings("unchecked")
@@ -299,7 +299,7 @@ public double getDouble(String name) {
   /**
    * Returns the property value as a boolean.
    *
-   * @throws DatastoreServiceException if not such property.
+   * @throws DatastoreException if not such property.
    * @throws ClassCastException if value is not a boolean.
    */
   @SuppressWarnings("unchecked")
@@ -310,7 +310,7 @@ public boolean getBoolean(String name) {
   /**
    * Returns the property value as a DateTime.
    *
-   * @throws DatastoreServiceException if not such property.
+   * @throws DatastoreException if not such property.
    * @throws ClassCastException if value is not a DateTime.
    */
   @SuppressWarnings("unchecked")
@@ -321,7 +321,7 @@ public DateTime getDateTime(String name) {
   /**
    * Returns the property value as a Key.
    *
-   * @throws DatastoreServiceException if not such property.
+   * @throws DatastoreException if not such property.
    * @throws ClassCastException if value is not a Key.
    */
   @SuppressWarnings("unchecked")
@@ -332,7 +332,7 @@ public Key getKey(String name) {
   /**
    * Returns the property value as an entity.
    *
-   * @throws DatastoreServiceException if not such property.
+   * @throws DatastoreException if not such property.
    * @throws ClassCastException if value is not an entity.
    */
   @SuppressWarnings("unchecked")
@@ -343,7 +343,7 @@ public <K extends IncompleteKey> FullEntity<K> getEntity(String name) {
   /**
    * Returns the property value as a list of values.
    *
-   * @throws DatastoreServiceException if not such property.
+   * @throws DatastoreException if not such property.
    * @throws ClassCastException if value is not a list of values.
    */
   @SuppressWarnings("unchecked")
@@ -354,7 +354,7 @@ public List<? extends Value<?>> getList(String name) {
   /**
    * Returns the property value as a blob.
    *
-   * @throws DatastoreServiceException if not such property.
+   * @throws DatastoreException if not such property.
    * @throws ClassCastException if value is not a blob.
    */
   @SuppressWarnings("unchecked")

gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Batch.java

@@ -43,12 +43,12 @@ interface Response {
   /**
    * Submit the batch to the Datastore.
    *
-   * @throws DatastoreServiceException if there was any failure or if batch is not longer active
+   * @throws DatastoreException if there was any failure or if batch is not longer active
    */
   Response submit();
 
   /**
-   * Returns the batch associated {@link DatastoreService}.
+   * Returns the batch associated {@link Datastore}.
    */
-  DatastoreService datastore();
+  Datastore datastore();
 }

gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BatchImpl.java

@@ -27,7 +27,7 @@
 
 class BatchImpl extends BaseDatastoreBatchWriter implements Batch {
 
-  private final DatastoreServiceImpl datastore;
+  private final DatastoreImpl datastore;
   private final boolean force;
 
   static class ResponseImpl implements Batch.Response {
@@ -49,7 +49,7 @@ public List<Key> generatedKeys() {
     }
   }
 
-  BatchImpl(DatastoreServiceImpl datastore, BatchOption... options) {
+  BatchImpl(DatastoreImpl datastore, BatchOption... options) {
     super("batch");
     this.datastore = datastore;
     Map<Class<? extends BatchOption>, BatchOption> optionsMap = BatchOption.asImmutableMap(options);
@@ -76,7 +76,7 @@ public Batch.Response submit() {
   }
 
   @Override
-  public DatastoreService datastore() {
+  public Datastore datastore() {
     return datastore;
   }
 }

gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreService.java → gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Datastore.java

@@ -23,12 +23,12 @@
 /**
  * An interface for Google Cloud Datastore.
  */
-public interface DatastoreService extends Service<DatastoreServiceOptions>, DatastoreReaderWriter {
+public interface Datastore extends Service<DatastoreOptions>, DatastoreReaderWriter {
 
   /**
    * Returns a new Datastore transaction.
    *
-   * @throws DatastoreServiceException upon failure
+   * @throws DatastoreException upon failure
    */
   Transaction newTransaction(TransactionOption... options);
 
@@ -47,15 +47,15 @@ interface TransactionCallable<T> {
 
 
   /**
-   * Invokes the callback's {@link DatastoreService.TransactionCallable#run} method with a
+   * Invokes the callback's {@link Datastore.TransactionCallable#run} method with a
    * {@link DatastoreReaderWriter} that is associated with a new transaction.
    * The transaction will be committed upon successful invocation.
    * Any thrown exception will cause the transaction to rollback and will be propagated
-   * as a {@link DatastoreServiceException} with the original exception as its root cause.
+   * as a {@link DatastoreException} with the original exception as its root cause.
    *
    * @param callable the callback to call with a newly created transactional readerWriter
    * @param options the options for the created transaction
-   * @throws DatastoreServiceException upon failure
+   * @throws DatastoreException upon failure
    */
   <T> T runInTransaction(TransactionCallable<T> callable, TransactionOption... options);
 
@@ -69,35 +69,35 @@ interface TransactionCallable<T> {
    * The returned key will have the same information (projectId, kind, namespace and ancestors)
    * as the given key and will have a newly assigned id.
    *
-   * @throws DatastoreServiceException upon failure
+   * @throws DatastoreException upon failure
    */
   Key allocateId(IncompleteKey key);
 
   /**
    * Returns a list of keys using the allocated ids ordered by the input.
    *
-   * @throws DatastoreServiceException upon failure
+   * @throws DatastoreException upon failure
    * @see #allocateId(IncompleteKey)
    */
   List<Key> allocateId(IncompleteKey... key);
 
   /**
    * {@inheritDoc}
-   * @throws DatastoreServiceException upon failure
+   * @throws DatastoreException upon failure
    */
   @Override
   void update(Entity... entity);
 
   /**
    * {@inheritDoc}
-   * @throws DatastoreServiceException upon failure
+   * @throws DatastoreException upon failure
    */
   @Override
   void put(Entity... entity);
 
   /**
    * {@inheritDoc}
-   * @throws DatastoreServiceException upon failure
+   * @throws DatastoreException upon failure
    */
   @Override
   void delete(Key... key);

gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreBatchWriter.java

@@ -31,7 +31,7 @@ interface DatastoreBatchWriter extends DatastoreWriter {
    * to submit time.
    *
    * @throws IllegalArgumentException if any of the given entities is missing a key
-   * @throws com.google.gcloud.datastore.DatastoreServiceException if a given entity with a
+   * @throws DatastoreException if a given entity with a
    *     complete key was already added to this writer or if not active
    */
   void addWithDeferredIdAllocation(FullEntity<?>... entity);
@@ -40,7 +40,7 @@ interface DatastoreBatchWriter extends DatastoreWriter {
    * {@inheritDoc}
    * For entities with complete keys that were marked for deletion in this writer the operation
    * will be changed to {@link #put}.
-   * @throws com.google.gcloud.datastore.DatastoreServiceException if a given entity with the
+   * @throws DatastoreException if a given entity with the
    *     same complete key was already added to this writer, if writer is not active or
    *     if id allocation for an entity with an incomplete key failed.
    */
@@ -51,7 +51,7 @@ interface DatastoreBatchWriter extends DatastoreWriter {
    * {@inheritDoc}
    * This operation will be converted to {@link #put} operation for entities that were already
    *     added or put in this writer
-   * @throws com.google.gcloud.datastore.DatastoreServiceException if an entity is marked for
+   * @throws DatastoreException if an entity is marked for
    *     deletion in this writer or if not active
    */
   @Override
@@ -61,15 +61,15 @@ interface DatastoreBatchWriter extends DatastoreWriter {
    * {@inheritDoc}
    * This operation will also remove from this batch any prior writes for entities with the same
    *     keys
-   * @throws com.google.gcloud.datastore.DatastoreServiceException if not active
+   * @throws DatastoreException if not active
    */
   @Override
   void delete(Key... key);
 
   /**
    * {@inheritDoc}
    * This operation will also remove from this writer any prior writes for the same entities.
-   * @throws com.google.gcloud.datastore.DatastoreServiceException if not active
+   * @throws DatastoreException if not active
    */
   @Override
   void put(Entity... entity);