googleapis · mziccard · Aug 23, 2016 · Aug 18, 2016
diff --git a/gcloud-java-datastore/pom.xml b/gcloud-java-datastore/pom.xml
@@ -24,13 +24,13 @@
     </dependency>
     <dependency>
       <groupId>com.google.cloud.datastore</groupId>
-      <artifactId>datastore-v1beta3-protos</artifactId>
-      <version>1.0.0-beta</version>
+      <artifactId>datastore-v1-protos</artifactId>
+      <version>1.0.1</version>
     </dependency>
     <dependency>
       <groupId>com.google.cloud.datastore</groupId>
-      <artifactId>datastore-v1beta3-proto-client</artifactId>
-      <version>1.0.0-beta.2</version>
+      <artifactId>datastore-v1-proto-client</artifactId>
+      <version>1.1.0</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/BaseDatastoreBatchWriter.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/BaseDatastoreBatchWriter.java
@@ -246,28 +246,26 @@ protected DatastoreException newInvalidRequest(String msg, Object... params) {
     return DatastoreException.throwInvalidRequest(String.format(msg, params));
   }
 
-  protected List<com.google.datastore.v1beta3.Mutation> toMutationPbList() {
-    List<com.google.datastore.v1beta3.Mutation> mutationsPb = 
-        new ArrayList<>();
+  protected List<com.google.datastore.v1.Mutation> toMutationPbList() {
+    List<com.google.datastore.v1.Mutation> mutationsPb = new ArrayList<>();
     for (FullEntity<IncompleteKey> entity : toAddAutoId()) {
       mutationsPb.add(
-          com.google.datastore.v1beta3.Mutation.newBuilder().setInsert(entity.toPb()).build());
+          com.google.datastore.v1.Mutation.newBuilder().setInsert(entity.toPb()).build());
     }
     for (FullEntity<Key> entity : toAdd().values()) {
       mutationsPb.add(
-          com.google.datastore.v1beta3.Mutation.newBuilder().setInsert(entity.toPb()).build());
+          com.google.datastore.v1.Mutation.newBuilder().setInsert(entity.toPb()).build());
     }
     for (FullEntity<Key> entity : toUpdate().values()) {
       mutationsPb.add(
-          com.google.datastore.v1beta3.Mutation.newBuilder().setUpdate(entity.toPb()).build());
+          com.google.datastore.v1.Mutation.newBuilder().setUpdate(entity.toPb()).build());
     }
     for (FullEntity<Key> entity : toPut().values()) {
       mutationsPb.add(
-          com.google.datastore.v1beta3.Mutation.newBuilder().setUpsert(entity.toPb()).build());
+          com.google.datastore.v1.Mutation.newBuilder().setUpsert(entity.toPb()).build());
     }
     for (Key key : toDelete()) {
-      mutationsPb.add(
-          com.google.datastore.v1beta3.Mutation.newBuilder().setDelete(key.toPb()).build());
+      mutationsPb.add(com.google.datastore.v1.Mutation.newBuilder().setDelete(key.toPb()).build());
     }
     return mutationsPb;
   }

diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/BaseEntity.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/BaseEntity.java
@@ -50,7 +50,7 @@
  *     Entities, Properties, and Keys</a>
  */
 public abstract class BaseEntity<K extends IncompleteKey>
-    extends Serializable<com.google.datastore.v1beta3.Entity> {
+    extends Serializable<com.google.datastore.v1.Entity> {
 
   private static final long serialVersionUID = 8175618724683792766L;
 
@@ -92,10 +92,10 @@ private B self() {
     }
 
     @SuppressWarnings("unchecked")
-    B fill(com.google.datastore.v1beta3.Entity entityPb) {
+    B fill(com.google.datastore.v1.Entity entityPb) {
       Map<String, Value<?>> copiedProperties = Maps.newHashMap();
-      for (Map.Entry<String, com.google.datastore.v1beta3.Value> entry :
-        entityPb.getProperties().entrySet()) {
+      for (Map.Entry<String, com.google.datastore.v1.Value> entry :
+          entityPb.getProperties().entrySet()) {
         copiedProperties.put(entry.getKey(), Value.fromPb(entry.getValue()));
       }
       properties(copiedProperties);
@@ -646,17 +646,16 @@ ImmutableSortedMap<String, Value<?>> properties() {
   @Override
   Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
     Builder<?, ?> builder = emptyBuilder();
-    builder.fill(com.google.datastore.v1beta3.Entity.parseFrom(bytesPb));
+    builder.fill(com.google.datastore.v1.Entity.parseFrom(bytesPb));
     return builder.build();
   }
 
   protected abstract Builder<?, ?> emptyBuilder();
 
   @Override
-  final com.google.datastore.v1beta3.Entity toPb() {
-    com.google.datastore.v1beta3.Entity.Builder entityPb =
-        com.google.datastore.v1beta3.Entity.newBuilder();
-    Map<String, com.google.datastore.v1beta3.Value> propertiesPb = entityPb.getMutableProperties();
+  final com.google.datastore.v1.Entity toPb() {
+    com.google.datastore.v1.Entity.Builder entityPb = com.google.datastore.v1.Entity.newBuilder();
+    Map<String, com.google.datastore.v1.Value> propertiesPb = entityPb.getMutableProperties();
     for (Map.Entry<String, Value<?>> entry : properties.entrySet()) {
       propertiesPb.put(entry.getKey(), entry.getValue().toPb());
     }

diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/BaseKey.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/BaseKey.java
@@ -30,7 +30,7 @@
 /**
  * Base class for keys.
  */
-public abstract class BaseKey extends Serializable<com.google.datastore.v1beta3.Key> {
+public abstract class BaseKey extends Serializable<com.google.datastore.v1.Key> {
 
   private static final long serialVersionUID = -4671243265877410635L;
 
@@ -178,10 +178,10 @@ public boolean equals(Object obj) {
   }
 
   @Override
-  com.google.datastore.v1beta3.Key toPb() {
-    com.google.datastore.v1beta3.Key.Builder keyPb = com.google.datastore.v1beta3.Key.newBuilder();
-    com.google.datastore.v1beta3.PartitionId.Builder partitionIdPb =
-        com.google.datastore.v1beta3.PartitionId.newBuilder();
+  com.google.datastore.v1.Key toPb() {
+    com.google.datastore.v1.Key.Builder keyPb = com.google.datastore.v1.Key.newBuilder();
+    com.google.datastore.v1.PartitionId.Builder partitionIdPb =
+        com.google.datastore.v1.PartitionId.newBuilder();
     partitionIdPb.setProjectId(projectId);
     partitionIdPb.setNamespaceId(namespace);
     keyPb.setPartitionId(partitionIdPb.build());

diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/BatchImpl.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/BatchImpl.java
@@ -20,24 +20,23 @@
 import java.util.Iterator;
 import java.util.List;
 
-
 class BatchImpl extends BaseDatastoreBatchWriter implements Batch {
 
   private final DatastoreImpl datastore;
 
   static class ResponseImpl implements Batch.Response {
 
-    private final com.google.datastore.v1beta3.CommitResponse response;
+    private final com.google.datastore.v1.CommitResponse response;
     private final int numAutoAllocatedIds;
 
-    ResponseImpl(com.google.datastore.v1beta3.CommitResponse response, int numAutoAllocatedIds) {
+    ResponseImpl(com.google.datastore.v1.CommitResponse response, int numAutoAllocatedIds) {
       this.response = response;
       this.numAutoAllocatedIds = numAutoAllocatedIds;
     }
 
     @Override
     public List<Key> generatedKeys() {
-      Iterator<com.google.datastore.v1beta3.MutationResult> results = 
+      Iterator<com.google.datastore.v1.MutationResult> results =
           response.getMutationResultsList().iterator();
       List<Key> generated = new ArrayList<>(numAutoAllocatedIds);
       for (int i = 0; i < numAutoAllocatedIds; i++) {
@@ -55,12 +54,12 @@ public List<Key> generatedKeys() {
   @Override
   public Batch.Response submit() {
     validateActive();
-    List<com.google.datastore.v1beta3.Mutation> mutationsPb = toMutationPbList();
-    com.google.datastore.v1beta3.CommitRequest.Builder requestPb = 
-        com.google.datastore.v1beta3.CommitRequest.newBuilder();
-    requestPb.setMode(com.google.datastore.v1beta3.CommitRequest.Mode.NON_TRANSACTIONAL);
+    List<com.google.datastore.v1.Mutation> mutationsPb = toMutationPbList();
+    com.google.datastore.v1.CommitRequest.Builder requestPb =
+        com.google.datastore.v1.CommitRequest.newBuilder();
+    requestPb.setMode(com.google.datastore.v1.CommitRequest.Mode.NON_TRANSACTIONAL);
     requestPb.addAllMutations(mutationsPb);
-    com.google.datastore.v1beta3.CommitResponse responsePb = datastore.commit(requestPb.build());
+    com.google.datastore.v1.CommitResponse responsePb = datastore.commit(requestPb.build());
     deactivate();
     return new ResponseImpl(responsePb, toAddAutoId().size());
   }

diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/Blob.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/Blob.java
@@ -36,7 +36,7 @@
  * @see <a href="https://cloud.google.com/datastore/docs/concepts/entities">
  *   Google Cloud Datastore Entities, Properties, and Keys</a>
  */
-public final class Blob extends Serializable<com.google.datastore.v1beta3.Value> {
+public final class Blob extends Serializable<com.google.datastore.v1.Value> {
 
   private static final long serialVersionUID = 3835421019618247721L;
 
@@ -145,12 +145,12 @@ public static Blob copyFrom(InputStream input) throws IOException {
   }
 
   @Override
-  com.google.datastore.v1beta3.Value toPb() {
-    return com.google.datastore.v1beta3.Value.newBuilder().setBlobValue(byteString).build();
+  com.google.datastore.v1.Value toPb() {
+    return com.google.datastore.v1.Value.newBuilder().setBlobValue(byteString).build();
   }
 
   @Override
   Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
-    return new Blob(com.google.datastore.v1beta3.Value.parseFrom(bytesPb).getBlobValue());
+    return new Blob(com.google.datastore.v1.Value.parseFrom(bytesPb).getBlobValue());
   }
 }
diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/BlobValue.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/BlobValue.java
@@ -16,7 +16,7 @@
 
 package com.google.cloud.datastore;
 
-import static com.google.datastore.v1beta3.Value.BLOB_VALUE_FIELD_NUMBER;
+import static com.google.datastore.v1.Value.BLOB_VALUE_FIELD_NUMBER;
 
 public final class BlobValue extends Value<Blob> {
 
@@ -38,12 +38,12 @@ public Builder newBuilder(Blob value) {
         }
 
         @Override
-        protected Blob getValue(com.google.datastore.v1beta3.Value from) {
+        protected Blob getValue(com.google.datastore.v1.Value from) {
           return new Blob(from.getBlobValue());
         }
 
         @Override
-        protected void setValue(BlobValue from, com.google.datastore.v1beta3.Value.Builder to) {
+        protected void setValue(BlobValue from, com.google.datastore.v1.Value.Builder to) {
           to.setBlobValue(from.get().byteString());
         }
       };

diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/BooleanValue.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/BooleanValue.java
@@ -16,7 +16,7 @@
 
 package com.google.cloud.datastore;
 
-import static com.google.datastore.v1beta3.Value.BOOLEAN_VALUE_FIELD_NUMBER;
+import static com.google.datastore.v1.Value.BOOLEAN_VALUE_FIELD_NUMBER;
 
 public final class BooleanValue extends Value<Boolean> {
 
@@ -38,12 +38,12 @@ public Builder newBuilder(Boolean value) {
         }
 
         @Override
-        protected Boolean getValue(com.google.datastore.v1beta3.Value from) {
+        protected Boolean getValue(com.google.datastore.v1.Value from) {
           return from.getBooleanValue();
         }
 
         @Override
-        protected void setValue(BooleanValue from, com.google.datastore.v1beta3.Value.Builder to) {
+        protected void setValue(BooleanValue from, com.google.datastore.v1.Value.Builder to) {
           to.setBooleanValue(from.get());
         }
       };

diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/Cursor.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/Cursor.java
@@ -28,7 +28,7 @@
  * A Google Cloud Datastore cursor.
  * The cursor can be used to as a starting point or an ending point for a {@link Query}
  */
-public final class Cursor extends Serializable<com.google.datastore.v1beta3.Value> {
+public final class Cursor extends Serializable<com.google.datastore.v1.Value> {
 
   private static final long serialVersionUID = -1423744878777486541L;
 
@@ -85,16 +85,16 @@ public static Cursor copyFrom(byte[] bytes) {
   }
 
   @Override
-  com.google.datastore.v1beta3.Value toPb() {
-    return com.google.datastore.v1beta3.Value.newBuilder().setBlobValue(byteString).build();
+  com.google.datastore.v1.Value toPb() {
+    return com.google.datastore.v1.Value.newBuilder().setBlobValue(byteString).build();
   }
 
   @Override
   Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
-    return fromPb(com.google.datastore.v1beta3.Value.parseFrom(bytesPb));
+    return fromPb(com.google.datastore.v1.Value.parseFrom(bytesPb));
   }
 
-  static Cursor fromPb(com.google.datastore.v1beta3.Value valuePb) {
+  static Cursor fromPb(com.google.datastore.v1.Value valuePb) {
     return new Cursor(valuePb.getBlobValue());
   }
 }