diff --git a/gcloud-java-datastore/pom.xml b/gcloud-java-datastore/pom.xml index 92631b8da3eb..4045c404541a 100644 --- a/gcloud-java-datastore/pom.xml +++ b/gcloud-java-datastore/pom.xml @@ -24,13 +24,13 @@ com.google.cloud.datastore - datastore-v1beta3-protos - 1.0.0-beta + datastore-v1-protos + 1.0.1 com.google.cloud.datastore - datastore-v1beta3-proto-client - 1.0.0-beta.2 + datastore-v1-proto-client + 1.1.0 ${project.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 index 59a2a033d015..e91bef5842d0 100644 --- 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 toMutationPbList() { - List mutationsPb = - new ArrayList<>(); + protected List toMutationPbList() { + List mutationsPb = new ArrayList<>(); for (FullEntity 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 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 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 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 index c7417faa79f3..aec0d41c0202 100644 --- 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 */ public abstract class BaseEntity - extends Serializable { + extends Serializable { 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> copiedProperties = Maps.newHashMap(); - for (Map.Entry entry : - entityPb.getProperties().entrySet()) { + for (Map.Entry entry : + entityPb.getProperties().entrySet()) { copiedProperties.put(entry.getKey(), Value.fromPb(entry.getValue())); } properties(copiedProperties); @@ -646,17 +646,16 @@ ImmutableSortedMap> 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 propertiesPb = entityPb.getMutableProperties(); + final com.google.datastore.v1.Entity toPb() { + com.google.datastore.v1.Entity.Builder entityPb = com.google.datastore.v1.Entity.newBuilder(); + Map propertiesPb = entityPb.getMutableProperties(); for (Map.Entry> 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 index 73f98562e0e5..c04dc6500581 100644 --- 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 { +public abstract class BaseKey extends Serializable { 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 index 603e9464c9c1..f61c0ae846d4 100644 --- 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 generatedKeys() { - Iterator results = + Iterator results = response.getMutationResultsList().iterator(); List generated = new ArrayList<>(numAutoAllocatedIds); for (int i = 0; i < numAutoAllocatedIds; i++) { @@ -55,12 +54,12 @@ public List generatedKeys() { @Override public Batch.Response submit() { validateActive(); - List 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 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 index 0fd7213d7be3..7d4ea1bb5d0c 100644 --- 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 * Google Cloud Datastore Entities, Properties, and Keys */ -public final class Blob extends Serializable { +public final class Blob extends Serializable { 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 index d65bb6ee8652..d1e9fbbf0693 100644 --- 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 { @@ -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 index c5d7910b5984..a2b70f0bb974 100644 --- 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 { @@ -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 index f9d51638b35b..8a68b213965f 100644 --- 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 { +public final class Cursor extends Serializable { 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()); } } diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java index 69a6c72ce83f..842e5f2eb5c3 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java @@ -28,7 +28,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; -import com.google.datastore.v1beta3.ReadOptions.ReadConsistency; +import com.google.datastore.v1.ReadOptions.ReadConsistency; import com.google.protobuf.ByteString; import java.util.ArrayList; @@ -78,17 +78,17 @@ public QueryResults run(Query query, ReadOption... options) { return run(toReadOptionsPb(options), query); } - QueryResults run(com.google.datastore.v1beta3.ReadOptions readOptionsPb, Query query) { + QueryResults run(com.google.datastore.v1.ReadOptions readOptionsPb, Query query) { return new QueryResultsImpl<>(this, readOptionsPb, query); } - com.google.datastore.v1beta3.RunQueryResponse runQuery( - final com.google.datastore.v1beta3.RunQueryRequest requestPb) { + com.google.datastore.v1.RunQueryResponse runQuery( + final com.google.datastore.v1.RunQueryRequest requestPb) { try { return RetryHelper.runWithRetries( - new Callable() { + new Callable() { @Override - public com.google.datastore.v1beta3.RunQueryResponse call() + public com.google.datastore.v1.RunQueryResponse call() throws DatastoreException { return datastoreRpc.runQuery(requestPb); } @@ -108,26 +108,26 @@ public List allocateId(IncompleteKey... keys) { if (keys.length == 0) { return Collections.emptyList(); } - com.google.datastore.v1beta3.AllocateIdsRequest.Builder requestPb = - com.google.datastore.v1beta3.AllocateIdsRequest.newBuilder(); + com.google.datastore.v1.AllocateIdsRequest.Builder requestPb = + com.google.datastore.v1.AllocateIdsRequest.newBuilder(); for (IncompleteKey key : keys) { requestPb.addKeys(trimNameOrId(key).toPb()); } - com.google.datastore.v1beta3.AllocateIdsResponse responsePb = allocateIds(requestPb.build()); + com.google.datastore.v1.AllocateIdsResponse responsePb = allocateIds(requestPb.build()); ImmutableList.Builder keyList = ImmutableList.builder(); - for (com.google.datastore.v1beta3.Key keyPb : responsePb.getKeysList()) { + for (com.google.datastore.v1.Key keyPb : responsePb.getKeysList()) { keyList.add(Key.fromPb(keyPb)); } return keyList.build(); } - com.google.datastore.v1beta3.AllocateIdsResponse allocateIds( - final com.google.datastore.v1beta3.AllocateIdsRequest requestPb) { + com.google.datastore.v1.AllocateIdsResponse allocateIds( + final com.google.datastore.v1.AllocateIdsRequest requestPb) { try { return RetryHelper.runWithRetries( - new Callable() { + new Callable() { @Override - public com.google.datastore.v1beta3.AllocateIdsResponse call() + public com.google.datastore.v1.AllocateIdsResponse call() throws DatastoreException { return datastoreRpc.allocateIds(requestPb); } @@ -155,7 +155,7 @@ public List add(FullEntity... entities) { if (entities.length == 0) { return Collections.emptyList(); } - List mutationsPb = new ArrayList<>(); + List mutationsPb = new ArrayList<>(); Map completeEntities = new LinkedHashMap<>(); for (FullEntity entity : entities) { Entity completeEntity = null; @@ -170,11 +170,11 @@ public List add(FullEntity... entities) { } else { Preconditions.checkArgument(entity.hasKey(), "Entity %s is missing a key", entity); } - mutationsPb.add(com.google.datastore.v1beta3.Mutation.newBuilder() + mutationsPb.add(com.google.datastore.v1.Mutation.newBuilder() .setInsert(entity.toPb()).build()); } - com.google.datastore.v1beta3.CommitResponse commitResponse = commitMutation(mutationsPb); - Iterator mutationResults = + com.google.datastore.v1.CommitResponse commitResponse = commitMutation(mutationsPb); + Iterator mutationResults = commitResponse.getMutationResultsList().iterator(); ImmutableList.Builder responseBuilder = ImmutableList.builder(); for (FullEntity entity : entities) { @@ -210,11 +210,11 @@ public Iterator get(Iterable keys, ReadOption... options) { return get(toReadOptionsPb(options), Iterables.toArray(keys, Key.class)); } - private static com.google.datastore.v1beta3.ReadOptions toReadOptionsPb(ReadOption... options) { - com.google.datastore.v1beta3.ReadOptions readOptionsPb = null; + private static com.google.datastore.v1.ReadOptions toReadOptionsPb(ReadOption... options) { + com.google.datastore.v1.ReadOptions readOptionsPb = null; if (options != null && ReadOption.asImmutableMap(options).containsKey(EventualConsistency.class)) { - readOptionsPb = com.google.datastore.v1beta3.ReadOptions.newBuilder() + readOptionsPb = com.google.datastore.v1.ReadOptions.newBuilder() .setReadConsistency(ReadConsistency.EVENTUAL) .build(); } @@ -231,12 +231,12 @@ public List fetch(Iterable keys, ReadOption... options) { return DatastoreHelper.fetch(this, Iterables.toArray(keys, Key.class), options); } - Iterator get(com.google.datastore.v1beta3.ReadOptions readOptionsPb, final Key... keys) { + Iterator get(com.google.datastore.v1.ReadOptions readOptionsPb, final Key... keys) { if (keys.length == 0) { return Collections.emptyIterator(); } - com.google.datastore.v1beta3.LookupRequest.Builder requestPb = - com.google.datastore.v1beta3.LookupRequest.newBuilder(); + com.google.datastore.v1.LookupRequest.Builder requestPb = + com.google.datastore.v1.LookupRequest.newBuilder(); if (readOptionsPb != null) { requestPb.setReadOptions(readOptionsPb); } @@ -248,16 +248,16 @@ Iterator get(com.google.datastore.v1beta3.ReadOptions readOptionsPb, fin final class ResultsIterator extends AbstractIterator { - private final com.google.datastore.v1beta3.LookupRequest.Builder requestPb; - Iterator iter; + private final com.google.datastore.v1.LookupRequest.Builder requestPb; + Iterator iter; - ResultsIterator(com.google.datastore.v1beta3.LookupRequest.Builder requestPb) { + ResultsIterator(com.google.datastore.v1.LookupRequest.Builder requestPb) { this.requestPb = requestPb; loadResults(); } private void loadResults() { - com.google.datastore.v1beta3.LookupResponse responsePb = lookup(requestPb.build()); + com.google.datastore.v1.LookupResponse responsePb = lookup(requestPb.build()); iter = responsePb.getFoundList().iterator(); requestPb.clearKeys(); if (responsePb.getDeferredCount() > 0) { @@ -278,13 +278,13 @@ protected Entity computeNext() { } } - com.google.datastore.v1beta3.LookupResponse lookup( - final com.google.datastore.v1beta3.LookupRequest requestPb) { + com.google.datastore.v1.LookupResponse lookup( + final com.google.datastore.v1.LookupRequest requestPb) { try { return RetryHelper.runWithRetries( - new Callable() { + new Callable() { @Override - public com.google.datastore.v1beta3.LookupResponse call() + public com.google.datastore.v1.LookupResponse call() throws DatastoreException { return datastoreRpc.lookup(requestPb); } @@ -297,15 +297,14 @@ public com.google.datastore.v1beta3.LookupResponse call() @Override public void update(Entity... entities) { if (entities.length > 0) { - List mutationsPb = - new ArrayList<>(); + List mutationsPb = new ArrayList<>(); Map dedupEntities = new LinkedHashMap<>(); for (Entity entity : entities) { dedupEntities.put(entity.key(), entity); } for (Entity entity : dedupEntities.values()) { mutationsPb.add( - com.google.datastore.v1beta3.Mutation.newBuilder().setUpdate(entity.toPb()).build()); + com.google.datastore.v1.Mutation.newBuilder().setUpdate(entity.toPb()).build()); } commitMutation(mutationsPb); } @@ -322,7 +321,7 @@ public List put(FullEntity... entities) { if (entities.length == 0) { return Collections.emptyList(); } - List mutationsPb = new ArrayList<>(); + List mutationsPb = new ArrayList<>(); Map dedupEntities = new LinkedHashMap<>(); for (FullEntity entity : entities) { Preconditions.checkArgument(entity.hasKey(), "Entity %s is missing a key", entity); @@ -331,15 +330,15 @@ public List put(FullEntity... entities) { dedupEntities.put(completeEntity.key(), completeEntity); } else { mutationsPb.add( - com.google.datastore.v1beta3.Mutation.newBuilder().setUpsert(entity.toPb()).build()); + com.google.datastore.v1.Mutation.newBuilder().setUpsert(entity.toPb()).build()); } } for (Entity entity : dedupEntities.values()) { mutationsPb.add( - com.google.datastore.v1beta3.Mutation.newBuilder().setUpsert(entity.toPb()).build()); + com.google.datastore.v1.Mutation.newBuilder().setUpsert(entity.toPb()).build()); } - com.google.datastore.v1beta3.CommitResponse commitResponse = commitMutation(mutationsPb); - Iterator mutationResults = + com.google.datastore.v1.CommitResponse commitResponse = commitMutation(mutationsPb); + Iterator mutationResults = commitResponse.getMutationResultsList().iterator(); ImmutableList.Builder responseBuilder = ImmutableList.builder(); for (FullEntity entity : entities) { @@ -357,11 +356,11 @@ public List put(FullEntity... entities) { @Override public void delete(Key... keys) { if (keys.length > 0) { - List mutationsPb = new ArrayList<>(); + List mutationsPb = new ArrayList<>(); Set dedupKeys = new LinkedHashSet<>(Arrays.asList(keys)); for (Key key : dedupKeys) { mutationsPb.add( - com.google.datastore.v1beta3.Mutation.newBuilder().setDelete(key.toPb()).build()); + com.google.datastore.v1.Mutation.newBuilder().setDelete(key.toPb()).build()); } commitMutation(mutationsPb); } @@ -372,22 +371,22 @@ public KeyFactory newKeyFactory() { return DatastoreHelper.newKeyFactory(options()); } - private com.google.datastore.v1beta3.CommitResponse commitMutation( - List mutationsPb) { - com.google.datastore.v1beta3.CommitRequest.Builder requestPb = - com.google.datastore.v1beta3.CommitRequest.newBuilder(); - requestPb.setMode(com.google.datastore.v1beta3.CommitRequest.Mode.NON_TRANSACTIONAL); + private com.google.datastore.v1.CommitResponse commitMutation( + List mutationsPb) { + 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); return commit(requestPb.build()); } - com.google.datastore.v1beta3.CommitResponse commit( - final com.google.datastore.v1beta3.CommitRequest requestPb) { + com.google.datastore.v1.CommitResponse commit( + final com.google.datastore.v1.CommitRequest requestPb) { try { return RetryHelper.runWithRetries( - new Callable() { + new Callable() { @Override - public com.google.datastore.v1beta3.CommitResponse call() throws DatastoreException { + public com.google.datastore.v1.CommitResponse call() throws DatastoreException { return datastoreRpc.commit(requestPb); } }, @@ -399,17 +398,17 @@ public com.google.datastore.v1beta3.CommitResponse call() throws DatastoreExcept } ByteString requestTransactionId( - com.google.datastore.v1beta3.BeginTransactionRequest.Builder requestPb) { + com.google.datastore.v1.BeginTransactionRequest.Builder requestPb) { return beginTransaction(requestPb.build()).getTransaction(); } - com.google.datastore.v1beta3.BeginTransactionResponse beginTransaction( - final com.google.datastore.v1beta3.BeginTransactionRequest requestPb) { + com.google.datastore.v1.BeginTransactionResponse beginTransaction( + final com.google.datastore.v1.BeginTransactionRequest requestPb) { try { return RetryHelper.runWithRetries( - new Callable() { + new Callable() { @Override - public com.google.datastore.v1beta3.BeginTransactionResponse call() + public com.google.datastore.v1.BeginTransactionResponse call() throws DatastoreException { return datastoreRpc.beginTransaction(requestPb); } @@ -422,13 +421,13 @@ public com.google.datastore.v1beta3.BeginTransactionResponse call() } void rollbackTransaction(ByteString transaction) { - com.google.datastore.v1beta3.RollbackRequest.Builder requestPb = - com.google.datastore.v1beta3.RollbackRequest.newBuilder(); + com.google.datastore.v1.RollbackRequest.Builder requestPb = + com.google.datastore.v1.RollbackRequest.newBuilder(); requestPb.setTransaction(transaction); rollback(requestPb.build()); } - void rollback(final com.google.datastore.v1beta3.RollbackRequest requestPb) { + void rollback(final com.google.datastore.v1.RollbackRequest requestPb) { try { RetryHelper.runWithRetries(new Callable() { @Override public Void call() throws DatastoreException { diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java index 3b6f85600d8f..ddd32c3d7adf 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java @@ -93,16 +93,16 @@ private DatastoreOptions(Builder builder) { @Override protected String defaultHost() { String host = System.getProperty( - com.google.datastore.v1beta3.client.DatastoreHelper.LOCAL_HOST_ENV_VAR, - System.getenv(com.google.datastore.v1beta3.client.DatastoreHelper.LOCAL_HOST_ENV_VAR)); - return host != null ? host : com.google.datastore.v1beta3.client.DatastoreFactory.DEFAULT_HOST; + com.google.datastore.v1.client.DatastoreHelper.LOCAL_HOST_ENV_VAR, + System.getenv(com.google.datastore.v1.client.DatastoreHelper.LOCAL_HOST_ENV_VAR)); + return host != null ? host : com.google.datastore.v1.client.DatastoreFactory.DEFAULT_HOST; } @Override protected String defaultProject() { String projectId = System.getProperty( - com.google.datastore.v1beta3.client.DatastoreHelper.PROJECT_ID_ENV_VAR, - System.getenv(com.google.datastore.v1beta3.client.DatastoreHelper.PROJECT_ID_ENV_VAR)); + com.google.datastore.v1.client.DatastoreHelper.PROJECT_ID_ENV_VAR, + System.getenv(com.google.datastore.v1.client.DatastoreHelper.PROJECT_ID_ENV_VAR)); return projectId != null ? projectId : super.defaultProject(); } diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DateTimeValue.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DateTimeValue.java index 8ffa98ea5e74..3efeccf7e904 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DateTimeValue.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DateTimeValue.java @@ -16,7 +16,7 @@ package com.google.cloud.datastore; -import static com.google.datastore.v1beta3.Value.TIMESTAMP_VALUE_FIELD_NUMBER; +import static com.google.datastore.v1.Value.TIMESTAMP_VALUE_FIELD_NUMBER; public final class DateTimeValue extends Value { @@ -38,12 +38,12 @@ public Builder newBuilder(DateTime value) { } @Override - protected DateTime getValue(com.google.datastore.v1beta3.Value from) { + protected DateTime getValue(com.google.datastore.v1.Value from) { return new DateTime(DateTime.timestampPbToMicroseconds(from.getTimestampValue())); } @Override - protected void setValue(DateTimeValue from, com.google.datastore.v1beta3.Value.Builder to) { + protected void setValue(DateTimeValue from, com.google.datastore.v1.Value.Builder to) { to.setTimestampValue(DateTime.microsecondsToTimestampPb(from.get() .timestampMicroseconds())); } diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DoubleValue.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DoubleValue.java index 51d175bb51c4..8217cec55bcd 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DoubleValue.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DoubleValue.java @@ -16,7 +16,7 @@ package com.google.cloud.datastore; -import static com.google.datastore.v1beta3.Value.DOUBLE_VALUE_FIELD_NUMBER; +import static com.google.datastore.v1.Value.DOUBLE_VALUE_FIELD_NUMBER; public final class DoubleValue extends Value { @@ -38,12 +38,12 @@ public Builder newBuilder(Double value) { } @Override - protected Double getValue(com.google.datastore.v1beta3.Value from) { + protected Double getValue(com.google.datastore.v1.Value from) { return from.getDoubleValue(); } @Override - protected void setValue(DoubleValue from, com.google.datastore.v1beta3.Value.Builder to) { + protected void setValue(DoubleValue from, com.google.datastore.v1.Value.Builder to) { to.setDoubleValue(from.get()); } }; diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/Entity.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/Entity.java index 3449693fe521..0a8db7618a94 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/Entity.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/Entity.java @@ -92,7 +92,7 @@ public static Builder builder(Key key, FullEntity copyFrom) { return new Builder(key, copyFrom); } - static Entity fromPb(com.google.datastore.v1beta3.Entity entityPb) { + static Entity fromPb(com.google.datastore.v1.Entity entityPb) { return new Builder().fill(entityPb).build(); } } diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/EntityQuery.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/EntityQuery.java index 40249b7ff26b..f2e0f9e035da 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/EntityQuery.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/EntityQuery.java @@ -41,7 +41,7 @@ public static final class Builder extends StructuredQuery.BuilderImpl> { @@ -38,12 +38,12 @@ public Builder newBuilder(FullEntity value) { } @Override - protected FullEntity getValue(com.google.datastore.v1beta3.Value from) { + protected FullEntity getValue(com.google.datastore.v1.Value from) { return FullEntity.fromPb(from.getEntityValue()); } @Override - protected void setValue(EntityValue from, com.google.datastore.v1beta3.Value.Builder to) { + protected void setValue(EntityValue from, com.google.datastore.v1.Value.Builder to) { to.setEntityValue(from.get().toPb()); } }; diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/FullEntity.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/FullEntity.java index aa88a92d3554..31cb7b9518e1 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/FullEntity.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/FullEntity.java @@ -68,8 +68,7 @@ public static Builder builder(FullEntity copyFro return new Builder<>(copyFrom); } - - static FullEntity fromPb(com.google.datastore.v1beta3.Entity entityPb) { + static FullEntity fromPb(com.google.datastore.v1.Entity entityPb) { return new Builder<>().fill(entityPb).build(); } } diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java index 2af3559f6899..8724362dd89e 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java @@ -77,7 +77,7 @@ public final class GqlQuery extends Query { private final transient ImmutableMap namedBindings; private final transient ImmutableList positionalBindings; - static final class Binding extends Serializable { + static final class Binding extends Serializable { private static final long serialVersionUID = 1976895435257636275L; @@ -116,9 +116,9 @@ public boolean equals(Object obj) { } @Override - com.google.datastore.v1beta3.GqlQueryParameter toPb() { - com.google.datastore.v1beta3.GqlQueryParameter.Builder argPb = - com.google.datastore.v1beta3.GqlQueryParameter.newBuilder(); + com.google.datastore.v1.GqlQueryParameter toPb() { + com.google.datastore.v1.GqlQueryParameter.Builder argPb = + com.google.datastore.v1.GqlQueryParameter.newBuilder(); if (cursor != null) { argPb.setCursor(cursor.byteString()); } @@ -130,10 +130,10 @@ com.google.datastore.v1beta3.GqlQueryParameter toPb() { @Override Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException { - return fromPb(com.google.datastore.v1beta3.GqlQueryParameter.parseFrom(bytesPb)); + return fromPb(com.google.datastore.v1.GqlQueryParameter.parseFrom(bytesPb)); } - static Binding fromPb(com.google.datastore.v1beta3.GqlQueryParameter argPb) { + static Binding fromPb(com.google.datastore.v1.GqlQueryParameter argPb) { switch (argPb.getParameterTypeCase()) { case CURSOR: return new Binding(new Cursor(argPb.getCursor())); @@ -357,12 +357,12 @@ public boolean equals(Object obj) { } @Override - com.google.datastore.v1beta3.GqlQuery toPb() { - com.google.datastore.v1beta3.GqlQuery.Builder queryPb = - com.google.datastore.v1beta3.GqlQuery.newBuilder(); + com.google.datastore.v1.GqlQuery toPb() { + com.google.datastore.v1.GqlQuery.Builder queryPb = + com.google.datastore.v1.GqlQuery.newBuilder(); queryPb.setQueryString(queryString); queryPb.setAllowLiterals(allowLiteral); - Map namedBindingsPb = + Map namedBindingsPb = queryPb.getMutableNamedBindings(); for (Map.Entry entry : namedBindings.entrySet()) { namedBindingsPb.put(entry.getKey(), entry.getValue().toPb()); @@ -374,12 +374,12 @@ com.google.datastore.v1beta3.GqlQuery toPb() { } @Override - void populatePb(com.google.datastore.v1beta3.RunQueryRequest.Builder requestPb) { + void populatePb(com.google.datastore.v1.RunQueryRequest.Builder requestPb) { requestPb.setGqlQuery(toPb()); } @Override - Query nextQuery(com.google.datastore.v1beta3.RunQueryResponse responsePb) { + Query nextQuery(com.google.datastore.v1.RunQueryResponse responsePb) { return StructuredQuery.fromPb(type(), namespace(), responsePb.getQuery()) .nextQuery(responsePb); } @@ -387,20 +387,20 @@ Query nextQuery(com.google.datastore.v1beta3.RunQueryResponse responsePb) { @Override Object fromPb(ResultType resultType, String namespace, byte[] bytesPb) throws InvalidProtocolBufferException { - return fromPb(resultType, namespace, com.google.datastore.v1beta3.GqlQuery.parseFrom(bytesPb)); + return fromPb(resultType, namespace, com.google.datastore.v1.GqlQuery.parseFrom(bytesPb)); } private static GqlQuery fromPb( - ResultType resultType, String ns, com.google.datastore.v1beta3.GqlQuery queryPb) { + ResultType resultType, String ns, com.google.datastore.v1.GqlQuery queryPb) { Builder builder = new Builder<>(resultType, queryPb.getQueryString()); builder.namespace(ns); builder.allowLiteral = queryPb.getAllowLiterals(); - for (Map.Entry nameArg + for (Map.Entry nameArg : queryPb.getNamedBindings().entrySet()) { Binding currBinding = Binding.fromPb(nameArg.getValue()); builder.namedBindings.put(nameArg.getKey(), currBinding); } - for (com.google.datastore.v1beta3.GqlQueryParameter numberArg + for (com.google.datastore.v1.GqlQueryParameter numberArg : queryPb.getPositionalBindingsList()) { Binding currBinding = Binding.fromPb(numberArg); builder.positionalBindings.add(currBinding); diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/IncompleteKey.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/IncompleteKey.java index 18959005596c..46c3b91b4d09 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/IncompleteKey.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/IncompleteKey.java @@ -54,21 +54,21 @@ public IncompleteKey build() { @Override Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException { - return fromPb(com.google.datastore.v1beta3.Key.parseFrom(bytesPb)); + return fromPb(com.google.datastore.v1.Key.parseFrom(bytesPb)); } - static IncompleteKey fromPb(com.google.datastore.v1beta3.Key keyPb) { + static IncompleteKey fromPb(com.google.datastore.v1.Key keyPb) { String projectId = ""; String namespace = ""; if (keyPb.hasPartitionId()) { - com.google.datastore.v1beta3.PartitionId partitionIdPb = keyPb.getPartitionId(); + com.google.datastore.v1.PartitionId partitionIdPb = keyPb.getPartitionId(); projectId = partitionIdPb.getProjectId(); namespace = partitionIdPb.getNamespaceId(); } - List pathElementsPb = keyPb.getPathList(); + List pathElementsPb = keyPb.getPathList(); Preconditions.checkArgument(!pathElementsPb.isEmpty(), "Path must not be empty"); ImmutableList.Builder pathBuilder = ImmutableList.builder(); - for (com.google.datastore.v1beta3.Key.PathElement pathElementPb : pathElementsPb) { + for (com.google.datastore.v1.Key.PathElement pathElementPb : pathElementsPb) { pathBuilder.add(PathElement.fromPb(pathElementPb)); } ImmutableList path = pathBuilder.build(); diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/Key.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/Key.java index 7cb70d259e82..c71a5a7909f3 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/Key.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/Key.java @@ -152,8 +152,7 @@ public String toUrlSafe() { public static Key fromUrlSafe(String urlSafe) { try { String utf8Str = URLDecoder.decode(urlSafe, UTF_8.name()); - com.google.datastore.v1beta3.Key.Builder builder = - com.google.datastore.v1beta3.Key.newBuilder(); + com.google.datastore.v1.Key.Builder builder = com.google.datastore.v1.Key.newBuilder(); TextFormat.merge(utf8Str, builder); return fromPb(builder.build()); } catch (UnsupportedEncodingException e) { @@ -165,10 +164,10 @@ public static Key fromUrlSafe(String urlSafe) { @Override Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException { - return fromPb(com.google.datastore.v1beta3.Key.parseFrom(bytesPb)); + return fromPb(com.google.datastore.v1.Key.parseFrom(bytesPb)); } - static Key fromPb(com.google.datastore.v1beta3.Key keyPb) { + static Key fromPb(com.google.datastore.v1.Key keyPb) { IncompleteKey key = IncompleteKey.fromPb(keyPb); Preconditions.checkState(key instanceof Key, "Key is not complete"); return (Key) key; diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/KeyQuery.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/KeyQuery.java index d84dd5b26c20..9616141b3fd6 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/KeyQuery.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/KeyQuery.java @@ -42,7 +42,7 @@ public static final class Builder extends StructuredQuery.BuilderImpl { @@ -38,12 +38,12 @@ public Builder newBuilder(Key key) { } @Override - protected Key getValue(com.google.datastore.v1beta3.Value from) { + protected Key getValue(com.google.datastore.v1.Value from) { return Key.fromPb(from.getKeyValue()); } @Override - protected void setValue(KeyValue from, com.google.datastore.v1beta3.Value.Builder to) { + protected void setValue(KeyValue from, com.google.datastore.v1.Value.Builder to) { to.setKeyValue(from.get().toPb()); } }; diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/LatLngValue.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/LatLngValue.java index 80faa427cf28..96f369f7c1ba 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/LatLngValue.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/LatLngValue.java @@ -16,7 +16,7 @@ package com.google.cloud.datastore; -import static com.google.datastore.v1beta3.Value.GEO_POINT_VALUE_FIELD_NUMBER; +import static com.google.datastore.v1.Value.GEO_POINT_VALUE_FIELD_NUMBER; public final class LatLngValue extends Value { @@ -38,13 +38,13 @@ public Builder newBuilder(LatLng value) { } @Override - protected LatLng getValue(com.google.datastore.v1beta3.Value from) { + protected LatLng getValue(com.google.datastore.v1.Value from) { return new LatLng( from.getGeoPointValue().getLatitude(), from.getGeoPointValue().getLongitude()); } @Override - protected void setValue(LatLngValue from, com.google.datastore.v1beta3.Value.Builder to) { + protected void setValue(LatLngValue from, com.google.datastore.v1.Value.Builder to) { to.setGeoPointValue(from.get().toPb()); } }; diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/ListValue.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/ListValue.java index d43b78053df7..7ca1991bc490 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/ListValue.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/ListValue.java @@ -16,7 +16,7 @@ package com.google.cloud.datastore; -import static com.google.datastore.v1beta3.Value.ARRAY_VALUE_FIELD_NUMBER; +import static com.google.datastore.v1.Value.ARRAY_VALUE_FIELD_NUMBER; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; @@ -47,22 +47,21 @@ public Builder newBuilder(List> values) { } @Override - protected List> getValue(com.google.datastore.v1beta3.Value from) { + protected List> getValue(com.google.datastore.v1.Value from) { List> properties = new ArrayList<>(from.getArrayValue().getValuesCount()); - for (com.google.datastore.v1beta3.Value valuePb : from.getArrayValue().getValuesList()) { + for (com.google.datastore.v1.Value valuePb : from.getArrayValue().getValuesList()) { properties.add(Value.fromPb(valuePb)); } return properties; } @Override - protected void setValue(ListValue from, com.google.datastore.v1beta3.Value.Builder to) { - List propertiesPb = - new ArrayList(); + protected void setValue(ListValue from, com.google.datastore.v1.Value.Builder to) { + List propertiesPb = new ArrayList(); for (Value property : from.get()) { propertiesPb.add(property.toPb()); } - to.setArrayValue(com.google.datastore.v1beta3.ArrayValue.newBuilder() + to.setArrayValue(com.google.datastore.v1.ArrayValue.newBuilder() .addAllValues(propertiesPb)); } }; diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/LongValue.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/LongValue.java index ba79af7fb233..e05a3307b7e8 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/LongValue.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/LongValue.java @@ -16,7 +16,7 @@ package com.google.cloud.datastore; -import static com.google.datastore.v1beta3.Value.INTEGER_VALUE_FIELD_NUMBER; +import static com.google.datastore.v1.Value.INTEGER_VALUE_FIELD_NUMBER; public final class LongValue extends Value { @@ -38,12 +38,12 @@ public Builder newBuilder(Long value) { } @Override - protected Long getValue(com.google.datastore.v1beta3.Value from) { + protected Long getValue(com.google.datastore.v1.Value from) { return from.getIntegerValue(); } @Override - protected void setValue(LongValue from, com.google.datastore.v1beta3.Value.Builder to) { + protected void setValue(LongValue from, com.google.datastore.v1.Value.Builder to) { to.setIntegerValue(from.get()); } }; diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/NullValue.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/NullValue.java index 4721e572215f..b80f34fbfb9a 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/NullValue.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/NullValue.java @@ -17,7 +17,7 @@ package com.google.cloud.datastore; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.datastore.v1beta3.Value.NULL_VALUE_FIELD_NUMBER; +import static com.google.datastore.v1.Value.NULL_VALUE_FIELD_NUMBER; public final class NullValue extends Value { @@ -39,12 +39,12 @@ public int getProtoFieldId() { } @Override - protected Void getValue(com.google.datastore.v1beta3.Value from) { + protected Void getValue(com.google.datastore.v1.Value from) { return null; } @Override - protected void setValue(NullValue from, com.google.datastore.v1beta3.Value.Builder to) { + protected void setValue(NullValue from, com.google.datastore.v1.Value.Builder to) { to.setNullValue(com.google.protobuf.NullValue.NULL_VALUE); } }; diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/PathElement.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/PathElement.java index 413b0786e021..03ee54286b37 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/PathElement.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/PathElement.java @@ -27,7 +27,7 @@ /** * Represents a single element in a key's path. */ -public final class PathElement extends Serializable { +public final class PathElement extends Serializable { private static final long serialVersionUID = -7968078857690784595L; @@ -85,9 +85,9 @@ public boolean equals(Object obj) { } @Override - com.google.datastore.v1beta3.Key.PathElement toPb() { - com.google.datastore.v1beta3.Key.PathElement.Builder pathElementPb = - com.google.datastore.v1beta3.Key.PathElement.newBuilder(); + com.google.datastore.v1.Key.PathElement toPb() { + com.google.datastore.v1.Key.PathElement.Builder pathElementPb = + com.google.datastore.v1.Key.PathElement.newBuilder(); pathElementPb.setKind(kind); if (id != null) { pathElementPb.setId(id); @@ -99,10 +99,10 @@ com.google.datastore.v1beta3.Key.PathElement toPb() { @Override Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException { - return fromPb(com.google.datastore.v1beta3.Key.PathElement.parseFrom(bytesPb)); + return fromPb(com.google.datastore.v1.Key.PathElement.parseFrom(bytesPb)); } - static PathElement fromPb(com.google.datastore.v1beta3.Key.PathElement pathElementPb) { + static PathElement fromPb(com.google.datastore.v1.Key.PathElement pathElementPb) { String kind = pathElementPb.getKind(); switch (pathElementPb.getIdTypeCase()) { case ID: diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntity.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntity.java index 519262a2e9c6..07dfc51e54a5 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntity.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntity.java @@ -71,7 +71,7 @@ public Blob getBlob(String name) { return ((Value) value).get(); } - static ProjectionEntity fromPb(com.google.datastore.v1beta3.Entity entityPb) { + static ProjectionEntity fromPb(com.google.datastore.v1.Entity entityPb) { return new Builder().fill(entityPb).build(); } diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/Query.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/Query.java index c37e784d04ee..eb33c02b107b 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/Query.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/Query.java @@ -54,68 +54,64 @@ public abstract class Query extends Serializable { public abstract static class ResultType implements java.io.Serializable { private static final long serialVersionUID = 2104157695425806623L; - private static final Map> + private static final Map> PB_TO_INSTANCE = Maps.newEnumMap( - com.google.datastore.v1beta3.EntityResult.ResultType.class); + com.google.datastore.v1.EntityResult.ResultType.class); - static final ResultType UNKNOWN = - new ResultType(null, Object.class) { + static final ResultType UNKNOWN = new ResultType(null, Object.class) { - private static final long serialVersionUID = 1602329532153860907L; + private static final long serialVersionUID = 1602329532153860907L; - @Override - Object convert(com.google.datastore.v1beta3.Entity entityPb) { - if (entityPb.getProperties().isEmpty()) { - if (!entityPb.hasKey()) { - return null; - } - return Key.fromPb(entityPb.getKey()); - } - return ProjectionEntity.fromPb(entityPb); + @Override + Object convert(com.google.datastore.v1.Entity entityPb) { + if (entityPb.getProperties().isEmpty()) { + if (!entityPb.hasKey()) { + return null; } - }; + return Key.fromPb(entityPb.getKey()); + } + return ProjectionEntity.fromPb(entityPb); + } + }; public static final ResultType ENTITY = - new ResultType( - com.google.datastore.v1beta3.EntityResult.ResultType.FULL, Entity.class) { + new ResultType(com.google.datastore.v1.EntityResult.ResultType.FULL, Entity.class) { private static final long serialVersionUID = 7712959777507168274L; @Override - Entity convert(com.google.datastore.v1beta3.Entity entityPb) { + Entity convert(com.google.datastore.v1.Entity entityPb) { return Entity.fromPb(entityPb); } }; public static final ResultType KEY = - new ResultType( - com.google.datastore.v1beta3.EntityResult.ResultType.KEY_ONLY, Key.class) { + new ResultType(com.google.datastore.v1.EntityResult.ResultType.KEY_ONLY, Key.class) { private static final long serialVersionUID = -8514289244104446252L; @Override - Key convert(com.google.datastore.v1beta3.Entity entityPb) { + Key convert(com.google.datastore.v1.Entity entityPb) { return Key.fromPb(entityPb.getKey()); } }; public static final ResultType PROJECTION_ENTITY = - new ResultType( - com.google.datastore.v1beta3.EntityResult.ResultType.PROJECTION, + new ResultType(com.google.datastore.v1.EntityResult.ResultType.PROJECTION, ProjectionEntity.class) { private static final long serialVersionUID = -7591409419690650246L; @Override - ProjectionEntity convert(com.google.datastore.v1beta3.Entity entityPb) { + ProjectionEntity convert(com.google.datastore.v1.Entity entityPb) { return ProjectionEntity.fromPb(entityPb); } }; private final Class resultClass; - private final com.google.datastore.v1beta3.EntityResult.ResultType queryType; + private final com.google.datastore.v1.EntityResult.ResultType queryType; - private ResultType(com.google.datastore.v1beta3.EntityResult.ResultType queryType, + private ResultType(com.google.datastore.v1.EntityResult.ResultType queryType, Class resultClass) { this.queryType = queryType; this.resultClass = resultClass; @@ -157,9 +153,9 @@ boolean isAssignableFrom(ResultType otherResultType) { return resultClass.isAssignableFrom(otherResultType.resultClass); } - abstract V convert(com.google.datastore.v1beta3.Entity entityPb); + abstract V convert(com.google.datastore.v1.Entity entityPb); - static ResultType fromPb(com.google.datastore.v1beta3.EntityResult.ResultType typePb) { + static ResultType fromPb(com.google.datastore.v1.EntityResult.ResultType typePb) { return MoreObjects.firstNonNull(PB_TO_INSTANCE.get(typePb), UNKNOWN); } } @@ -194,9 +190,9 @@ Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException { abstract Object fromPb(ResultType resultType, String namespace, byte[] bytesPb) throws InvalidProtocolBufferException; - abstract void populatePb(com.google.datastore.v1beta3.RunQueryRequest.Builder requestPb); + abstract void populatePb(com.google.datastore.v1.RunQueryRequest.Builder requestPb); - abstract Query nextQuery(com.google.datastore.v1beta3.RunQueryResponse responsePb); + abstract Query nextQuery(com.google.datastore.v1.RunQueryResponse responsePb); /** * Returns a new {@link GqlQuery} builder. diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/QueryResultsImpl.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/QueryResultsImpl.java index f049ef9edde2..f23ff846a652 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/QueryResultsImpl.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/QueryResultsImpl.java @@ -19,7 +19,7 @@ import com.google.cloud.datastore.Query.ResultType; import com.google.common.base.Preconditions; import com.google.common.collect.AbstractIterator; -import com.google.datastore.v1beta3.QueryResultBatch.MoreResultsType; +import com.google.datastore.v1.QueryResultBatch.MoreResultsType; import com.google.protobuf.ByteString; import java.util.Iterator; @@ -28,25 +28,25 @@ class QueryResultsImpl extends AbstractIterator implements QueryResults { private final DatastoreImpl datastore; - private final com.google.datastore.v1beta3.ReadOptions readOptionsPb; - private final com.google.datastore.v1beta3.PartitionId partitionIdPb; + private final com.google.datastore.v1.ReadOptions readOptionsPb; + private final com.google.datastore.v1.PartitionId partitionIdPb; private final ResultType queryResultType; private Query query; private ResultType actualResultType; - private com.google.datastore.v1beta3.RunQueryResponse runQueryResponsePb; - private com.google.datastore.v1beta3.Query mostRecentQueryPb; + private com.google.datastore.v1.RunQueryResponse runQueryResponsePb; + private com.google.datastore.v1.Query mostRecentQueryPb; private boolean lastBatch; - private Iterator entityResultPbIter; + private Iterator entityResultPbIter; private ByteString cursor; - QueryResultsImpl(DatastoreImpl datastore, com.google.datastore.v1beta3.ReadOptions readOptionsPb, + QueryResultsImpl(DatastoreImpl datastore, com.google.datastore.v1.ReadOptions readOptionsPb, Query query) { this.datastore = datastore; this.readOptionsPb = readOptionsPb; this.query = query; queryResultType = query.type(); - com.google.datastore.v1beta3.PartitionId.Builder pbBuilder = - com.google.datastore.v1beta3.PartitionId.newBuilder(); + com.google.datastore.v1.PartitionId.Builder pbBuilder = + com.google.datastore.v1.PartitionId.newBuilder(); pbBuilder.setProjectId(datastore.options().projectId()); if (query.namespace() != null) { pbBuilder.setNamespaceId(query.namespace()); @@ -63,8 +63,8 @@ class QueryResultsImpl extends AbstractIterator implements QueryResults } private void sendRequest() { - com.google.datastore.v1beta3.RunQueryRequest.Builder requestPb = - com.google.datastore.v1beta3.RunQueryRequest.newBuilder(); + com.google.datastore.v1.RunQueryRequest.Builder requestPb = + com.google.datastore.v1.RunQueryRequest.newBuilder(); if (readOptionsPb != null) { requestPb.setReadOptions(readOptionsPb); } @@ -96,7 +96,7 @@ protected T computeNext() { cursor = runQueryResponsePb.getBatch().getEndCursor(); return endOfData(); } - com.google.datastore.v1beta3.EntityResult entityResultPb = entityResultPbIter.next(); + com.google.datastore.v1.EntityResult entityResultPb = entityResultPbIter.next(); cursor = entityResultPb.getCursor(); @SuppressWarnings("unchecked") T result = (T) actualResultType.convert(entityResultPb.getEntity()); diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/RawValue.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/RawValue.java index 81fec851a6dd..f02f32eb3e73 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/RawValue.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/RawValue.java @@ -16,17 +16,17 @@ package com.google.cloud.datastore; -public final class RawValue extends Value { +public final class RawValue extends Value { private static final long serialVersionUID = -3359604598651897941L; - static final BaseMarshaller MARSHALLER = - new BaseMarshaller() { + static final BaseMarshaller MARSHALLER = + new BaseMarshaller() { private static final long serialVersionUID = 5320642719486106244L; @Override - public Builder newBuilder(com.google.datastore.v1beta3.Value value) { + public Builder newBuilder(com.google.datastore.v1.Value value) { return builder(value); } @@ -36,19 +36,19 @@ public int getProtoFieldId() { } @Override - protected com.google.datastore.v1beta3.Value getValue( - com.google.datastore.v1beta3.Value from) { + protected com.google.datastore.v1.Value getValue( + com.google.datastore.v1.Value from) { return from; } @Override - protected void setValue(RawValue from, com.google.datastore.v1beta3.Value.Builder to) { + protected void setValue(RawValue from, com.google.datastore.v1.Value.Builder to) { to.mergeFrom(from.get()); } }; public static final class Builder - extends Value.BaseBuilder { + extends Value.BaseBuilder { private Builder() { super(ValueType.RAW_VALUE); @@ -64,7 +64,7 @@ private RawValue(Builder builder) { super(builder); } - RawValue(com.google.datastore.v1beta3.Value valuePb) { + RawValue(com.google.datastore.v1.Value valuePb) { this(builder(valuePb)); } @@ -73,11 +73,11 @@ public Builder toBuilder() { return new Builder().mergeFrom(this); } - static RawValue of(com.google.datastore.v1beta3.Value valuePb) { + static RawValue of(com.google.datastore.v1.Value valuePb) { return new RawValue(valuePb); } - static Builder builder(com.google.datastore.v1beta3.Value valuePb) { + static Builder builder(com.google.datastore.v1.Value valuePb) { Builder builder = new Builder(); builder.excludeFromIndexes(valuePb.getExcludeFromIndexes()); builder.meaning(valuePb.getMeaning()); diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/StringValue.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/StringValue.java index c47d2d9a61a4..e9d43d11a662 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/StringValue.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/StringValue.java @@ -16,7 +16,7 @@ package com.google.cloud.datastore; -import static com.google.datastore.v1beta3.Value.STRING_VALUE_FIELD_NUMBER; +import static com.google.datastore.v1.Value.STRING_VALUE_FIELD_NUMBER; public final class StringValue extends Value { @@ -38,12 +38,12 @@ public Builder newBuilder(String value) { } @Override - protected String getValue(com.google.datastore.v1beta3.Value from) { + protected String getValue(com.google.datastore.v1.Value from) { return from.getStringValue(); } @Override - protected void setValue(StringValue from, com.google.datastore.v1beta3.Value.Builder to) { + protected void setValue(StringValue from, com.google.datastore.v1.Value.Builder to) { to.setStringValue(from.get()); } }; diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java index 442df20c8027..eb9629a8e6fb 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java @@ -102,9 +102,9 @@ public abstract static class Filter implements Serializable { Filter() { } - abstract com.google.datastore.v1beta3.Filter toPb(); + abstract com.google.datastore.v1.Filter toPb(); - static Filter fromPb(com.google.datastore.v1beta3.Filter filterPb) { + static Filter fromPb(com.google.datastore.v1.Filter filterPb) { switch (filterPb.getFilterTypeCase()) { case COMPOSITE_FILTER: return CompositeFilter.fromPb(filterPb.getCompositeFilter()); @@ -128,11 +128,11 @@ public static final class CompositeFilter extends Filter { enum Operator { AND; - com.google.datastore.v1beta3.CompositeFilter.Operator toPb() { - return com.google.datastore.v1beta3.CompositeFilter.Operator.valueOf(name()); + com.google.datastore.v1.CompositeFilter.Operator toPb() { + return com.google.datastore.v1.CompositeFilter.Operator.valueOf(name()); } - static Operator fromPb(com.google.datastore.v1beta3.CompositeFilter.Operator operatorPb) { + static Operator fromPb(com.google.datastore.v1.CompositeFilter.Operator operatorPb) { return valueOf(operatorPb.name()); } } @@ -175,10 +175,10 @@ public boolean equals(Object obj) { && filters.equals(other.filters); } - static CompositeFilter fromPb(com.google.datastore.v1beta3.CompositeFilter compositeFilterPb) { + static CompositeFilter fromPb(com.google.datastore.v1.CompositeFilter compositeFilterPb) { Operator operator = Operator.fromPb(compositeFilterPb.getOp()); ImmutableList.Builder filters = ImmutableList.builder(); - for (com.google.datastore.v1beta3.Filter filterPb : compositeFilterPb.getFiltersList()) { + for (com.google.datastore.v1.Filter filterPb : compositeFilterPb.getFiltersList()) { Filter currFilter = Filter.fromPb(filterPb); if (currFilter != null) { filters.add(currFilter); @@ -192,10 +192,9 @@ public static CompositeFilter and(Filter first, Filter... other) { } @Override - com.google.datastore.v1beta3.Filter toPb() { - com.google.datastore.v1beta3.Filter.Builder filterPb = - com.google.datastore.v1beta3.Filter.newBuilder(); - com.google.datastore.v1beta3.CompositeFilter.Builder compositeFilterPb = + com.google.datastore.v1.Filter toPb() { + com.google.datastore.v1.Filter.Builder filterPb = com.google.datastore.v1.Filter.newBuilder(); + com.google.datastore.v1.CompositeFilter.Builder compositeFilterPb = filterPb.getCompositeFilterBuilder(); compositeFilterPb.setOp(operator.toPb()); for (Filter filter : filters) { @@ -224,11 +223,11 @@ enum Operator { EQUAL, HAS_ANCESTOR; - com.google.datastore.v1beta3.PropertyFilter.Operator toPb() { - return com.google.datastore.v1beta3.PropertyFilter.Operator.valueOf(name()); + com.google.datastore.v1.PropertyFilter.Operator toPb() { + return com.google.datastore.v1.PropertyFilter.Operator.valueOf(name()); } - static Operator fromPb(com.google.datastore.v1beta3.PropertyFilter.Operator operatorPb) { + static Operator fromPb(com.google.datastore.v1.PropertyFilter.Operator operatorPb) { return valueOf(operatorPb.name()); } } @@ -239,7 +238,7 @@ private PropertyFilter(String property, Operator operator, Value value) { this.value = checkNotNull(value); } - static PropertyFilter fromPb(com.google.datastore.v1beta3.PropertyFilter propertyFilterPb) { + static PropertyFilter fromPb(com.google.datastore.v1.PropertyFilter propertyFilterPb) { String property = propertyFilterPb.getProperty().getName(); Operator operator = Operator.fromPb(propertyFilterPb.getOp()); Value value = Value.fromPb(propertyFilterPb.getValue()); @@ -443,10 +442,9 @@ public static PropertyFilter isNull(String property) { } @Override - com.google.datastore.v1beta3.Filter toPb() { - com.google.datastore.v1beta3.Filter.Builder filterPb = - com.google.datastore.v1beta3.Filter.newBuilder(); - com.google.datastore.v1beta3.PropertyFilter.Builder propertyFilterPb = + com.google.datastore.v1.Filter toPb() { + com.google.datastore.v1.Filter.Builder filterPb = com.google.datastore.v1.Filter.newBuilder(); + com.google.datastore.v1.PropertyFilter.Builder propertyFilterPb = filterPb.getPropertyFilterBuilder(); propertyFilterPb.getPropertyBuilder().setName(property); propertyFilterPb.setOp(operator.toPb()); @@ -468,11 +466,11 @@ public enum Direction { ASCENDING, DESCENDING; - com.google.datastore.v1beta3.PropertyOrder.Direction toPb() { - return com.google.datastore.v1beta3.PropertyOrder.Direction.valueOf(name()); + com.google.datastore.v1.PropertyOrder.Direction toPb() { + return com.google.datastore.v1.PropertyOrder.Direction.valueOf(name()); } - static Direction fromPb(com.google.datastore.v1beta3.PropertyOrder.Direction directionPb) { + static Direction fromPb(com.google.datastore.v1.PropertyOrder.Direction directionPb) { return valueOf(directionPb.name()); } } @@ -508,10 +506,10 @@ public Direction direction() { return direction; } - com.google.datastore.v1beta3.PropertyOrder toPb() { - return com.google.datastore.v1beta3.PropertyOrder.newBuilder() + com.google.datastore.v1.PropertyOrder toPb() { + return com.google.datastore.v1.PropertyOrder.newBuilder() .setDirection(direction.toPb()) - .setProperty(com.google.datastore.v1beta3.PropertyReference.newBuilder() + .setProperty(com.google.datastore.v1.PropertyReference.newBuilder() .setName(property).build()) .build(); } @@ -524,7 +522,7 @@ public static OrderBy desc(String property) { return new OrderBy(property, OrderBy.Direction.DESCENDING); } - static OrderBy fromPb(com.google.datastore.v1beta3.PropertyOrder propertyOrderPb) { + static OrderBy fromPb(com.google.datastore.v1.PropertyOrder propertyOrderPb) { String property = propertyOrderPb.getProperty().getName(); Direction direction = Direction.fromPb(propertyOrderPb.getDirection()); return new OrderBy(property, direction); @@ -707,7 +705,7 @@ B addDistinctOn(String property, String... others) { return self(); } - B mergeFrom(com.google.datastore.v1beta3.Query queryPb) { + B mergeFrom(com.google.datastore.v1.Query queryPb) { if (queryPb.getKindCount() > 0) { kind(queryPb.getKind(0).getName()); } @@ -727,15 +725,13 @@ B mergeFrom(com.google.datastore.v1beta3.Query queryPb) { filter(currFilter); } } - for (com.google.datastore.v1beta3.PropertyOrder orderByPb : queryPb.getOrderList()) { + for (com.google.datastore.v1.PropertyOrder orderByPb : queryPb.getOrderList()) { addOrderBy(OrderBy.fromPb(orderByPb)); } - for (com.google.datastore.v1beta3.Projection projectionPb - : queryPb.getProjectionList()) { + for (com.google.datastore.v1.Projection projectionPb : queryPb.getProjectionList()) { addProjection(projectionPb.getProperty().getName()); } - for (com.google.datastore.v1beta3.PropertyReference distinctOnPb : - queryPb.getDistinctOnList()) { + for (com.google.datastore.v1.PropertyReference distinctOnPb : queryPb.getDistinctOnList()) { addDistinctOn(distinctOnPb.getName()); } return self(); @@ -758,7 +754,7 @@ B mergeFrom(com.google.datastore.v1beta3.Query queryPb) { @Override public int hashCode() { return Objects.hash(namespace(), kind, startCursor, endCursor, offset, limit, filter, orderBy, -distinctOn()); + distinctOn()); } @Override @@ -826,12 +822,12 @@ public Integer limit() { public abstract Builder toBuilder(); @Override - void populatePb(com.google.datastore.v1beta3.RunQueryRequest.Builder requestPb) { + void populatePb(com.google.datastore.v1.RunQueryRequest.Builder requestPb) { requestPb.setQuery(toPb()); } @Override - StructuredQuery nextQuery(com.google.datastore.v1beta3.RunQueryResponse responsePb) { + StructuredQuery nextQuery(com.google.datastore.v1.RunQueryResponse responsePb) { Builder builder = toBuilder(); builder.startCursor(new Cursor(responsePb.getBatch().getEndCursor())); if (offset > 0 && responsePb.getBatch().getSkippedResults() < offset) { @@ -846,9 +842,8 @@ StructuredQuery nextQuery(com.google.datastore.v1beta3.RunQueryResponse respo } @Override - com.google.datastore.v1beta3.Query toPb() { - com.google.datastore.v1beta3.Query.Builder queryPb = - com.google.datastore.v1beta3.Query.newBuilder(); + com.google.datastore.v1.Query toPb() { + com.google.datastore.v1.Query.Builder queryPb = com.google.datastore.v1.Query.newBuilder(); if (kind != null) { queryPb.addKindBuilder().setName(kind); } @@ -871,14 +866,14 @@ com.google.datastore.v1beta3.Query toPb() { queryPb.addOrder(value.toPb()); } for (String value : distinctOn) { - queryPb.addDistinctOn(com.google.datastore.v1beta3.PropertyReference.newBuilder() + queryPb.addDistinctOn(com.google.datastore.v1.PropertyReference.newBuilder() .setName(value).build()); } for (String value : projection) { - com.google.datastore.v1beta3.Projection.Builder expressionPb = - com.google.datastore.v1beta3.Projection.newBuilder(); + com.google.datastore.v1.Projection.Builder expressionPb = + com.google.datastore.v1.Projection.newBuilder(); expressionPb.setProperty( - com.google.datastore.v1beta3.PropertyReference.newBuilder().setName(value).build()); + com.google.datastore.v1.PropertyReference.newBuilder().setName(value).build()); queryPb.addProjection(expressionPb.build()); } return queryPb.build(); @@ -887,12 +882,12 @@ com.google.datastore.v1beta3.Query toPb() { @Override Object fromPb(ResultType resultType, String namespace, byte[] bytesPb) throws InvalidProtocolBufferException { - return fromPb(resultType, namespace, com.google.datastore.v1beta3.Query.parseFrom(bytesPb)); + return fromPb(resultType, namespace, com.google.datastore.v1.Query.parseFrom(bytesPb)); } @SuppressWarnings("unchecked") static StructuredQuery fromPb(ResultType resultType, String namespace, - com.google.datastore.v1beta3.Query queryPb) { + com.google.datastore.v1.Query queryPb) { BuilderImpl builder; if (resultType.equals(ResultType.ENTITY)) { builder = new EntityQuery.Builder(); diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/TransactionImpl.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/TransactionImpl.java index 9016d561905a..8b398cb68cff 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/TransactionImpl.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/TransactionImpl.java @@ -30,17 +30,17 @@ final class TransactionImpl extends BaseDatastoreBatchWriter implements Transact static class ResponseImpl implements Transaction.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 generatedKeys() { - Iterator results = + Iterator results = response.getMutationResultsList().iterator(); List generated = new ArrayList<>(numAutoAllocatedIds); for (int i = 0; i < numAutoAllocatedIds; i++) { @@ -53,8 +53,8 @@ public List generatedKeys() { TransactionImpl(DatastoreImpl datastore) { super("transaction"); this.datastore = datastore; - com.google.datastore.v1beta3.BeginTransactionRequest.Builder requestPb = - com.google.datastore.v1beta3.BeginTransactionRequest.newBuilder(); + com.google.datastore.v1.BeginTransactionRequest.Builder requestPb = + com.google.datastore.v1.BeginTransactionRequest.newBuilder(); transaction = datastore.requestTransactionId(requestPb); } @@ -66,8 +66,8 @@ public Entity get(Key key) { @Override public Iterator get(Key... keys) { validateActive(); - com.google.datastore.v1beta3.ReadOptions.Builder readOptionsPb = - com.google.datastore.v1beta3.ReadOptions.newBuilder(); + com.google.datastore.v1.ReadOptions.Builder readOptionsPb = + com.google.datastore.v1.ReadOptions.newBuilder(); readOptionsPb.setTransaction(transaction); return datastore.get(readOptionsPb.build(), keys); } @@ -81,8 +81,8 @@ public List fetch(Key... keys) { @Override public QueryResults run(Query query) { validateActive(); - com.google.datastore.v1beta3.ReadOptions.Builder readOptionsPb = - com.google.datastore.v1beta3.ReadOptions.newBuilder(); + com.google.datastore.v1.ReadOptions.Builder readOptionsPb = + com.google.datastore.v1.ReadOptions.newBuilder(); readOptionsPb.setTransaction(transaction); return datastore.run(readOptionsPb.build(), query); } @@ -90,13 +90,13 @@ public QueryResults run(Query query) { @Override public Transaction.Response commit() { validateActive(); - List mutationsPb = toMutationPbList(); - com.google.datastore.v1beta3.CommitRequest.Builder requestPb = - com.google.datastore.v1beta3.CommitRequest.newBuilder(); - requestPb.setMode(com.google.datastore.v1beta3.CommitRequest.Mode.TRANSACTIONAL); + List mutationsPb = toMutationPbList(); + com.google.datastore.v1.CommitRequest.Builder requestPb = + com.google.datastore.v1.CommitRequest.newBuilder(); + requestPb.setMode(com.google.datastore.v1.CommitRequest.Mode.TRANSACTIONAL); requestPb.setTransaction(transaction); 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/Value.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/Value.java index c2c503c8f9db..7cd96bc29c33 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/Value.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/Value.java @@ -18,7 +18,7 @@ import static com.google.common.base.Preconditions.checkNotNull; -import com.google.datastore.v1beta3.Value.ValueTypeCase; +import com.google.datastore.v1.Value.ValueTypeCase; import com.google.protobuf.InvalidProtocolBufferException; import java.util.Objects; @@ -31,7 +31,7 @@ * * @param the type of the content for this value */ -public abstract class Value extends Serializable { +public abstract class Value extends Serializable { private static final long serialVersionUID = -1899638277588872742L; @@ -52,7 +52,7 @@ abstract static class BaseMarshaller, B extends ValueBuild @SuppressWarnings("deprecation") @Override - public final B fromProto(com.google.datastore.v1beta3.Value proto) { + public final B fromProto(com.google.datastore.v1.Value proto) { B builder = newBuilder(getValue(proto)); builder.excludeFromIndexes(proto.getExcludeFromIndexes()); builder.meaning(proto.getMeaning()); @@ -61,18 +61,17 @@ public final B fromProto(com.google.datastore.v1beta3.Value proto) { @SuppressWarnings("deprecation") @Override - public final com.google.datastore.v1beta3.Value toProto(P value) { - com.google.datastore.v1beta3.Value.Builder builder = - com.google.datastore.v1beta3.Value.newBuilder(); + public final com.google.datastore.v1.Value toProto(P value) { + com.google.datastore.v1.Value.Builder builder = com.google.datastore.v1.Value.newBuilder(); builder.setExcludeFromIndexes(value.excludeFromIndexes()); builder.setMeaning(value.meaning()); setValue(value, builder); return builder.build(); } - protected abstract V getValue(com.google.datastore.v1beta3.Value from); + protected abstract V getValue(com.google.datastore.v1.Value from); - protected abstract void setValue(P from, com.google.datastore.v1beta3.Value.Builder to); + protected abstract void setValue(P from, com.google.datastore.v1.Value.Builder to); } abstract static class BaseBuilder, B extends BaseBuilder> @@ -194,11 +193,11 @@ public boolean equals(Object obj) { @Override @SuppressWarnings("unchecked") - com.google.datastore.v1beta3.Value toPb() { + com.google.datastore.v1.Value toPb() { return type().getMarshaller().toProto(this); } - static Value fromPb(com.google.datastore.v1beta3.Value proto) { + static Value fromPb(com.google.datastore.v1.Value proto) { ValueTypeCase descriptorId = proto.getValueTypeCase(); ValueType valueType = ValueType.getByDescriptorId(descriptorId.getNumber()); return valueType == null ? RawValue.MARSHALLER.fromProto(proto).build() @@ -207,6 +206,6 @@ static Value fromPb(com.google.datastore.v1beta3.Value proto) { @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)); } } diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/ValueMarshaller.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/ValueMarshaller.java index 89aeede965e5..c0ce439c6bef 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/ValueMarshaller.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/ValueMarshaller.java @@ -22,9 +22,9 @@ interface ValueMarshaller, B extends ValueBuilder> extends java.io.Serializable { - B fromProto(com.google.datastore.v1beta3.Value proto); + B fromProto(com.google.datastore.v1.Value proto); - com.google.datastore.v1beta3.Value toProto(P value); + com.google.datastore.v1.Value toProto(P value); int getProtoFieldId(); } diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpc.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpc.java index d7d8aae673ba..cbcdc59000e0 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpc.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpc.java @@ -17,18 +17,18 @@ package com.google.cloud.datastore.spi; import com.google.cloud.datastore.DatastoreException; -import com.google.datastore.v1beta3.AllocateIdsRequest; -import com.google.datastore.v1beta3.AllocateIdsResponse; -import com.google.datastore.v1beta3.BeginTransactionRequest; -import com.google.datastore.v1beta3.BeginTransactionResponse; -import com.google.datastore.v1beta3.CommitRequest; -import com.google.datastore.v1beta3.CommitResponse; -import com.google.datastore.v1beta3.LookupRequest; -import com.google.datastore.v1beta3.LookupResponse; -import com.google.datastore.v1beta3.RollbackRequest; -import com.google.datastore.v1beta3.RollbackResponse; -import com.google.datastore.v1beta3.RunQueryRequest; -import com.google.datastore.v1beta3.RunQueryResponse; +import com.google.datastore.v1.AllocateIdsRequest; +import com.google.datastore.v1.AllocateIdsResponse; +import com.google.datastore.v1.BeginTransactionRequest; +import com.google.datastore.v1.BeginTransactionResponse; +import com.google.datastore.v1.CommitRequest; +import com.google.datastore.v1.CommitResponse; +import com.google.datastore.v1.LookupRequest; +import com.google.datastore.v1.LookupResponse; +import com.google.datastore.v1.RollbackRequest; +import com.google.datastore.v1.RollbackResponse; +import com.google.datastore.v1.RunQueryRequest; +import com.google.datastore.v1.RunQueryResponse; /** * Provides access to the remote Datastore service. diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/spi/DefaultDatastoreRpc.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/spi/DefaultDatastoreRpc.java index 9df21d595fb5..cbb2436c82e6 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/spi/DefaultDatastoreRpc.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/spi/DefaultDatastoreRpc.java @@ -19,18 +19,18 @@ import com.google.api.client.http.HttpTransport; import com.google.cloud.datastore.DatastoreException; import com.google.cloud.datastore.DatastoreOptions; -import com.google.datastore.v1beta3.AllocateIdsRequest; -import com.google.datastore.v1beta3.AllocateIdsResponse; -import com.google.datastore.v1beta3.BeginTransactionRequest; -import com.google.datastore.v1beta3.BeginTransactionResponse; -import com.google.datastore.v1beta3.CommitRequest; -import com.google.datastore.v1beta3.CommitResponse; -import com.google.datastore.v1beta3.LookupRequest; -import com.google.datastore.v1beta3.LookupResponse; -import com.google.datastore.v1beta3.RollbackRequest; -import com.google.datastore.v1beta3.RollbackResponse; -import com.google.datastore.v1beta3.RunQueryRequest; -import com.google.datastore.v1beta3.RunQueryResponse; +import com.google.datastore.v1.AllocateIdsRequest; +import com.google.datastore.v1.AllocateIdsResponse; +import com.google.datastore.v1.BeginTransactionRequest; +import com.google.datastore.v1.BeginTransactionResponse; +import com.google.datastore.v1.CommitRequest; +import com.google.datastore.v1.CommitResponse; +import com.google.datastore.v1.LookupRequest; +import com.google.datastore.v1.LookupResponse; +import com.google.datastore.v1.RollbackRequest; +import com.google.datastore.v1.RollbackResponse; +import com.google.datastore.v1.RunQueryRequest; +import com.google.datastore.v1.RunQueryResponse; import java.io.IOException; import java.net.InetAddress; @@ -38,19 +38,19 @@ public class DefaultDatastoreRpc implements DatastoreRpc { - private final com.google.datastore.v1beta3.client.Datastore client; + private final com.google.datastore.v1.client.Datastore client; public DefaultDatastoreRpc(DatastoreOptions options) { HttpTransport transport = options.httpTransportFactory().create(); - com.google.datastore.v1beta3.client.DatastoreOptions.Builder clientBuilder = - new com.google.datastore.v1beta3.client.DatastoreOptions.Builder() + com.google.datastore.v1.client.DatastoreOptions.Builder clientBuilder = + new com.google.datastore.v1.client.DatastoreOptions.Builder() .projectId(options.projectId()) .initializer(options.httpRequestInitializer()) .transport(transport); String normalizedHost = options.host() != null ? options.host().toLowerCase() : ""; if (isLocalHost(normalizedHost)) { clientBuilder = clientBuilder.localHost(removeScheme(normalizedHost)); - } else if (!removeScheme(com.google.datastore.v1beta3.client.DatastoreFactory.DEFAULT_HOST) + } else if (!removeScheme(com.google.datastore.v1.client.DatastoreFactory.DEFAULT_HOST) .equals(removeScheme(normalizedHost)) && !normalizedHost.isEmpty()) { String fullURL = normalizedHost; @@ -58,12 +58,12 @@ public DefaultDatastoreRpc(DatastoreOptions options) { fullURL = fullURL + '/'; } fullURL = fullURL - + com.google.datastore.v1beta3.client.DatastoreFactory.VERSION + + com.google.datastore.v1.client.DatastoreFactory.VERSION + "/projects/" + options.projectId(); clientBuilder = clientBuilder.projectId(null).projectEndpoint(fullURL); } - client = com.google.datastore.v1beta3.client.DatastoreFactory.get() + client = com.google.datastore.v1.client.DatastoreFactory.get() .create(clientBuilder.build()); } @@ -92,7 +92,7 @@ private static String removeScheme(String url) { } private static DatastoreException translate( - com.google.datastore.v1beta3.client.DatastoreException exception) { + com.google.datastore.v1.client.DatastoreException exception) { String reason = ""; if (exception.getCode() != null) { reason = exception.getCode().name(); @@ -110,7 +110,7 @@ private static DatastoreException translate( public AllocateIdsResponse allocateIds(AllocateIdsRequest request) { try { return client.allocateIds(request); - } catch (com.google.datastore.v1beta3.client.DatastoreException ex) { + } catch (com.google.datastore.v1.client.DatastoreException ex) { throw translate(ex); } @@ -120,7 +120,7 @@ public AllocateIdsResponse allocateIds(AllocateIdsRequest request) { public BeginTransactionResponse beginTransaction(BeginTransactionRequest request) { try { return client.beginTransaction(request); - } catch (com.google.datastore.v1beta3.client.DatastoreException ex) { + } catch (com.google.datastore.v1.client.DatastoreException ex) { throw translate(ex); } } @@ -129,7 +129,7 @@ public BeginTransactionResponse beginTransaction(BeginTransactionRequest request public CommitResponse commit(CommitRequest request) { try { return client.commit(request); - } catch (com.google.datastore.v1beta3.client.DatastoreException ex) { + } catch (com.google.datastore.v1.client.DatastoreException ex) { throw translate(ex); } } @@ -138,7 +138,7 @@ public CommitResponse commit(CommitRequest request) { public LookupResponse lookup(LookupRequest request) { try { return client.lookup(request); - } catch (com.google.datastore.v1beta3.client.DatastoreException ex) { + } catch (com.google.datastore.v1.client.DatastoreException ex) { throw translate(ex); } } @@ -147,7 +147,7 @@ public LookupResponse lookup(LookupRequest request) { public RollbackResponse rollback(RollbackRequest request) { try { return client.rollback(request); - } catch (com.google.datastore.v1beta3.client.DatastoreException ex) { + } catch (com.google.datastore.v1.client.DatastoreException ex) { throw translate(ex); } } @@ -156,7 +156,7 @@ public RollbackResponse rollback(RollbackRequest request) { public RunQueryResponse runQuery(RunQueryRequest request) { try { return client.runQuery(request); - } catch (com.google.datastore.v1beta3.client.DatastoreException ex) { + } catch (com.google.datastore.v1.client.DatastoreException ex) { throw translate(ex); } } diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java index 3c831afdfbbe..3c54357de9d7 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java @@ -66,16 +66,15 @@ */ public class LocalDatastoreHelper { private static final Logger log = Logger.getLogger(LocalDatastoreHelper.class.getName()); - private static final String GCD_VERSION = "v1beta3"; - private static final String GCD_BUILD = "1.0.1"; + private static final String GCD_VERSION = "1.2.0"; private static final double DEFAULT_CONSISTENCY = 0.9; - private static final String GCD_BASENAME = "gcd-" + GCD_VERSION + "-" + GCD_BUILD; + private static final String GCD_BASENAME = "cloud-datastore-emulator-" + GCD_VERSION; private static final String GCD_FILENAME = GCD_BASENAME + ".zip"; - private static final String MD5_CHECKSUM = "df876ba8f054d69acff30ec9540ec386"; + private static final String MD5_CHECKSUM = "e68695ff005421ccb7144689d9633df1"; private static final URL GCD_URL; private static final String GCLOUD = "gcloud"; private static final Path INSTALLED_GCD_PATH; - private static final String GCD_VERSION_PREFIX = "gcd-emulator "; + private static final String GCD_VERSION_PREFIX = "cloud-datastore-emulator "; private static final String PROJECT_ID_PREFIX = "test-project-"; private final String projectId; @@ -117,7 +116,7 @@ private static Path installedGcdPath() { if (log.isLoggable(Level.FINE)) { log.fine("SDK found, looking for datastore emulator"); } - Path installedGcdPath = gcloudPath.resolve("platform").resolve("gcd"); + Path installedGcdPath = gcloudPath.resolve("platform").resolve("cloud-datastore-emulator"); if (Files.exists(installedGcdPath)) { try { String installedVersion = installedGcdVersion(); @@ -175,10 +174,16 @@ private static class ProcessStreamReader extends Thread { private final BufferedReader reader; private volatile boolean terminated; - ProcessStreamReader(InputStream inputStream) { + ProcessStreamReader(InputStream inputStream, String blockUntil) throws IOException { super("Local GCD InputStream reader"); setDaemon(true); reader = new BufferedReader(new InputStreamReader(inputStream)); + if (!Strings.isNullOrEmpty(blockUntil)) { + String line; + do { + line = reader.readLine(); + } while (line != null && !line.contains(blockUntil)); + } } void terminate() throws IOException { @@ -200,8 +205,9 @@ public void run() { } } - public static ProcessStreamReader start(InputStream inputStream) { - ProcessStreamReader thread = new ProcessStreamReader(inputStream); + public static ProcessStreamReader start(InputStream inputStream, String blockUntil) + throws IOException { + ProcessStreamReader thread = new ProcessStreamReader(inputStream, blockUntil); thread.start(); return thread; } @@ -218,16 +224,10 @@ private static class ProcessErrorStreamReader extends Thread { private boolean collectionMode; private volatile boolean terminated; - ProcessErrorStreamReader(InputStream errorStream, String blockUntil) throws IOException { + ProcessErrorStreamReader(InputStream errorStream) { super("Local GCD ErrorStream reader"); setDaemon(true); errorReader = new BufferedReader(new InputStreamReader(errorStream)); - if (!Strings.isNullOrEmpty(blockUntil)) { - String line; - do { - line = errorReader.readLine(); - } while (line != null && !line.contains(blockUntil)); - } } void terminate() throws IOException { @@ -296,9 +296,8 @@ private static Level getLevel(String line) { } } - public static ProcessErrorStreamReader start(InputStream errorStream, String blockUntil) - throws IOException { - ProcessErrorStreamReader thread = new ProcessErrorStreamReader(errorStream, blockUntil); + public static ProcessErrorStreamReader start(InputStream errorStream) { + ProcessErrorStreamReader thread = new ProcessErrorStreamReader(errorStream); thread.start(); return thread; } @@ -422,9 +421,9 @@ private void startGcd(Path executablePath, double consistency) // Get path to cmd executable Path gcdAbsolutePath; if (isWindows()) { - gcdAbsolutePath = executablePath.toAbsolutePath().resolve("gcd.cmd"); + gcdAbsolutePath = executablePath.toAbsolutePath().resolve("cloud_datastore_emulator.cmd"); } else { - gcdAbsolutePath = executablePath.toAbsolutePath().resolve("gcd.sh"); + gcdAbsolutePath = executablePath.toAbsolutePath().resolve("cloud_datastore_emulator"); } // create the datastore for the project @@ -433,7 +432,7 @@ private void startGcd(Path executablePath, double consistency) } Process createProcess = CommandWrapper.create() - .command(gcdAbsolutePath.toString(), "create", "-p", projectId, projectId) + .command(gcdAbsolutePath.toString(), "create", projectId) .redirectErrorInherit() .directory(gcdPath) .redirectOutputToNull() @@ -446,14 +445,14 @@ private void startGcd(Path executablePath, double consistency) } startProcess = CommandWrapper.create() - .command(gcdAbsolutePath.toString(), "start", "--testing", "--allow_remote_shutdown", + .command(gcdAbsolutePath.toString(), "start", "--testing", "--port=" + Integer.toString(port), "--consistency=" + Double.toString(consistency), projectId) .directory(gcdPath) .start(); - processReader = ProcessStreamReader.start(startProcess.getInputStream()); - processErrorReader = ProcessErrorStreamReader.start( - startProcess.getErrorStream(), "Dev App Server is now running"); + processReader = ProcessStreamReader.start(startProcess.getInputStream(), + "Dev App Server is now running"); + processErrorReader = ProcessErrorStreamReader.start(startProcess.getErrorStream()); } private static String md5(File gcdZipFile) throws IOException { @@ -638,7 +637,7 @@ public void start() throws IOException, InterruptedException { // If cloud is available we use it, otherwise we download and start gcd if (INSTALLED_GCD_PATH == null) { downloadGcd(); - gcdExecutablePath = gcdPath.resolve("gcd"); + gcdExecutablePath = gcdPath.resolve("cloud-datastore-emulator"); } else { gcdExecutablePath = INSTALLED_GCD_PATH; } diff --git a/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/BaseDatastoreBatchWriterTest.java b/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/BaseDatastoreBatchWriterTest.java index 9fc7fb0a6dc2..a1ae3f28dd5b 100644 --- a/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/BaseDatastoreBatchWriterTest.java +++ b/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/BaseDatastoreBatchWriterTest.java @@ -84,13 +84,13 @@ public void tearDown() { public void testAdd() throws Exception { Entity entity2 = Entity.builder(ENTITY2).key(Key.builder(KEY1).name("name2").build()).build(); - List pbs = new LinkedList<>(); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder().setInsert(ENTITY1.toPb()).build()); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder() + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setInsert(ENTITY1.toPb()).build()); + pbs.add(com.google.datastore.v1.Mutation.newBuilder() .setInsert(Entity.builder(KEY2, INCOMPLETE_ENTITY_1).build().toPb()).build()); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder() + pbs.add(com.google.datastore.v1.Mutation.newBuilder() .setInsert(Entity.builder(KEY3, INCOMPLETE_ENTITY_2).build().toPb()).build()); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder().setInsert(entity2.toPb()).build()); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setInsert(entity2.toPb()).build()); List entities = batchWriter .add(ENTITY1, INCOMPLETE_ENTITY_1, INCOMPLETE_ENTITY_2, entity2); assertEquals(pbs, batchWriter.toMutationPbList()); @@ -102,8 +102,8 @@ public void testAdd() throws Exception { @Test public void testAddAfterDelete() throws Exception { - List pbs = new LinkedList<>(); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder().setUpsert(ENTITY1.toPb()).build()); + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(ENTITY1.toPb()).build()); batchWriter.delete(KEY1); batchWriter.add(ENTITY1); assertEquals(pbs, batchWriter.toMutationPbList()); @@ -135,12 +135,12 @@ public void testAddWhenNotActive() throws Exception { @Test public void testAddWithDeferredAllocation() throws Exception { - List pbs = new LinkedList<>(); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder() + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder() .setInsert(INCOMPLETE_ENTITY_1.toPb()).build()); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder() + pbs.add(com.google.datastore.v1.Mutation.newBuilder() .setInsert(INCOMPLETE_ENTITY_2.toPb()).build()); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder().setInsert(ENTITY1.toPb()).build()); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setInsert(ENTITY1.toPb()).build()); batchWriter.addWithDeferredIdAllocation(ENTITY1, INCOMPLETE_ENTITY_1); batchWriter.addWithDeferredIdAllocation(INCOMPLETE_ENTITY_2); assertEquals(pbs, batchWriter.toMutationPbList()); @@ -154,10 +154,10 @@ public void testAddWithDeferredAllocationWhenNotActive() throws Exception { @Test public void testUpdate() throws Exception { - List pbs = new LinkedList<>(); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder().setUpdate(ENTITY1.toPb()).build()); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder().setUpdate(ENTITY2.toPb()).build()); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder().setUpdate(ENTITY3.toPb()).build()); + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpdate(ENTITY1.toPb()).build()); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpdate(ENTITY2.toPb()).build()); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpdate(ENTITY3.toPb()).build()); batchWriter.update(ENTITY1, ENTITY2); batchWriter.update(ENTITY3); assertEquals(pbs, batchWriter.toMutationPbList()); @@ -166,8 +166,8 @@ public void testUpdate() throws Exception { @Test public void testUpdateAfterUpdate() throws Exception { Entity entity = Entity.builder(ENTITY1).set("foo", "bar").build(); - List pbs = new LinkedList<>(); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder().setUpdate(entity.toPb()).build()); + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpdate(entity.toPb()).build()); batchWriter.update(ENTITY1); batchWriter.update(entity); assertEquals(pbs, batchWriter.toMutationPbList()); @@ -176,8 +176,8 @@ public void testUpdateAfterUpdate() throws Exception { @Test public void testUpdateAfterAdd() throws Exception { Entity entity = Entity.builder(ENTITY1).set("foo", "bar").build(); - List pbs = new LinkedList<>(); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder().setUpsert(entity.toPb()).build()); + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(entity.toPb()).build()); batchWriter.add(ENTITY1); batchWriter.update(entity); assertEquals(pbs, batchWriter.toMutationPbList()); @@ -186,8 +186,8 @@ public void testUpdateAfterAdd() throws Exception { @Test public void testUpdateAfterPut() throws Exception { Entity entity = Entity.builder(ENTITY1).set("foo", "bar").build(); - List pbs = new LinkedList<>(); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder().setUpsert(entity.toPb()).build()); + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(entity.toPb()).build()); batchWriter.put(ENTITY1); batchWriter.update(entity); assertEquals(pbs, batchWriter.toMutationPbList()); @@ -207,10 +207,10 @@ public void testUpdateWhenNotActive() throws Exception { @Test public void testPut() throws Exception { - List pbs = new LinkedList<>(); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder().setUpsert(ENTITY1.toPb()).build()); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder().setUpsert(ENTITY2.toPb()).build()); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder().setUpsert(ENTITY3.toPb()).build()); + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(ENTITY1.toPb()).build()); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(ENTITY2.toPb()).build()); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(ENTITY3.toPb()).build()); List putEntities = batchWriter.put(ENTITY1, ENTITY2); Entity putEntity = batchWriter.put(ENTITY3); assertEquals(ENTITY1, putEntities.get(0)); @@ -221,12 +221,12 @@ public void testPut() throws Exception { @Test public void testPutIncompleteKey() throws Exception { - List pbs = new LinkedList<>(); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder().setUpsert(ENTITY1.toPb()).build()); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder() + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(ENTITY1.toPb()).build()); + pbs.add(com.google.datastore.v1.Mutation.newBuilder() .setUpsert(Entity.builder(KEY2, INCOMPLETE_ENTITY_1).build().toPb()) .build()); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder() + pbs.add(com.google.datastore.v1.Mutation.newBuilder() .setUpsert(Entity.builder(KEY3, INCOMPLETE_ENTITY_2).build().toPb()) .build()); Entity putEntity = batchWriter.put(ENTITY1); @@ -239,14 +239,14 @@ public void testPutIncompleteKey() throws Exception { @Test public void testPutWithDeferredAllocation() throws Exception { - List pbs = new LinkedList<>(); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder() + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder() .setInsert(INCOMPLETE_ENTITY_1.toPb()) .build()); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder() + pbs.add(com.google.datastore.v1.Mutation.newBuilder() .setInsert(INCOMPLETE_ENTITY_2.toPb()) .build()); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder().setUpsert(ENTITY1.toPb()).build()); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(ENTITY1.toPb()).build()); batchWriter.put(ENTITY1); batchWriter.putWithDeferredIdAllocation(INCOMPLETE_ENTITY_1, INCOMPLETE_ENTITY_2); assertEquals(pbs, batchWriter.toMutationPbList()); @@ -255,8 +255,8 @@ public void testPutWithDeferredAllocation() throws Exception { @Test public void testPutAfterPut() throws Exception { Entity entity = Entity.builder(ENTITY1).set("foo", "bar").build(); - List pbs = new LinkedList<>(); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder().setUpsert(entity.toPb()).build()); + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(entity.toPb()).build()); Entity putEntity1 = batchWriter.put(ENTITY1); Entity putEntity2 = batchWriter.put(entity); assertEquals(ENTITY1, putEntity1); @@ -267,8 +267,8 @@ public void testPutAfterPut() throws Exception { @Test public void testPutAfterAdd() throws Exception { Entity entity = Entity.builder(ENTITY1).set("foo", "bar").build(); - List pbs = new LinkedList<>(); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder().setUpsert(entity.toPb()).build()); + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(entity.toPb()).build()); batchWriter.add(ENTITY1); batchWriter.put(entity); assertEquals(pbs, batchWriter.toMutationPbList()); @@ -277,8 +277,8 @@ public void testPutAfterAdd() throws Exception { @Test public void testPutAfterUpdate() throws Exception { Entity entity = Entity.builder(ENTITY1).set("foo", "bar").build(); - List pbs = new LinkedList<>(); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder().setUpsert(entity.toPb()).build()); + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(entity.toPb()).build()); batchWriter.update(ENTITY1); Entity putEntity = batchWriter.put(entity); assertEquals(entity, putEntity); @@ -288,8 +288,8 @@ public void testPutAfterUpdate() throws Exception { @Test public void testPutAfterDelete() throws Exception { Entity entity = Entity.builder(ENTITY1).set("foo", "bar").build(); - List pbs = new LinkedList<>(); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder().setUpsert(entity.toPb()).build()); + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setUpsert(entity.toPb()).build()); batchWriter.delete(KEY1); Entity putEntity = batchWriter.put(entity); assertEquals(entity, putEntity); @@ -304,10 +304,10 @@ public void testPutWhenNotActive() throws Exception { @Test public void testDelete() throws Exception { - List pbs = new LinkedList<>(); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder().setDelete(KEY1.toPb()).build()); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder().setDelete(KEY2.toPb()).build()); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder().setDelete(KEY3.toPb()).build()); + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setDelete(KEY1.toPb()).build()); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setDelete(KEY2.toPb()).build()); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setDelete(KEY3.toPb()).build()); batchWriter.delete(KEY1, KEY2); batchWriter.delete(KEY3); assertEquals(pbs, batchWriter.toMutationPbList()); @@ -315,10 +315,10 @@ public void testDelete() throws Exception { @Test public void testDeleteAfterAdd() throws Exception { - List pbs = new LinkedList<>(); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder() + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder() .setInsert(INCOMPLETE_ENTITY_1.toPb()).build()); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder().setDelete(KEY1.toPb()).build()); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setDelete(KEY1.toPb()).build()); batchWriter.add(ENTITY1); batchWriter.addWithDeferredIdAllocation(INCOMPLETE_ENTITY_1); batchWriter.delete(KEY1); @@ -328,8 +328,8 @@ public void testDeleteAfterAdd() throws Exception { @Test public void testDeleteAfterUpdate() throws Exception { - List pbs = new LinkedList<>(); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder().setDelete(KEY1.toPb()).build()); + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setDelete(KEY1.toPb()).build()); batchWriter.update(ENTITY1); batchWriter.delete(KEY1); assertEquals(pbs, batchWriter.toMutationPbList()); @@ -337,8 +337,8 @@ public void testDeleteAfterUpdate() throws Exception { @Test public void testDeleteAfterPut() throws Exception { - List pbs = new LinkedList<>(); - pbs.add(com.google.datastore.v1beta3.Mutation.newBuilder().setDelete(KEY1.toPb()).build()); + List pbs = new LinkedList<>(); + pbs.add(com.google.datastore.v1.Mutation.newBuilder().setDelete(KEY1.toPb()).build()); batchWriter.put(ENTITY1); batchWriter.delete(KEY1); assertEquals(pbs, batchWriter.toMutationPbList()); diff --git a/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java b/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java index 75a4d00883d5..8e8b52fce5ed 100644 --- a/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java +++ b/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java @@ -35,15 +35,15 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; -import com.google.datastore.v1beta3.EntityResult; -import com.google.datastore.v1beta3.LookupRequest; -import com.google.datastore.v1beta3.LookupResponse; -import com.google.datastore.v1beta3.PartitionId; -import com.google.datastore.v1beta3.QueryResultBatch; -import com.google.datastore.v1beta3.ReadOptions; -import com.google.datastore.v1beta3.ReadOptions.ReadConsistency; -import com.google.datastore.v1beta3.RunQueryRequest; -import com.google.datastore.v1beta3.RunQueryResponse; +import com.google.datastore.v1.EntityResult; +import com.google.datastore.v1.LookupRequest; +import com.google.datastore.v1.LookupResponse; +import com.google.datastore.v1.PartitionId; +import com.google.datastore.v1.QueryResultBatch; +import com.google.datastore.v1.ReadOptions; +import com.google.datastore.v1.ReadOptions.ReadConsistency; +import com.google.datastore.v1.RunQueryRequest; +import com.google.datastore.v1.RunQueryResponse; import com.google.protobuf.ByteString; import org.easymock.EasyMock; @@ -550,6 +550,7 @@ private List buildResponsesForQueryPagination() { return responses; } + @Test public void testQueryPaginationWithLimit() throws DatastoreException { List responses = buildResponsesForQueryPaginationWithLimit(); List endCursors = Lists.newArrayListWithCapacity(responses.size()); @@ -638,7 +639,7 @@ private List buildResponsesForQueryPaginationWithLimit() { public void testEventualConsistencyQuery() { ReadOptions readOption = ReadOptions.newBuilder().setReadConsistencyValue(ReadConsistency.EVENTUAL_VALUE).build(); - com.google.datastore.v1beta3.GqlQuery query = com.google.datastore.v1beta3.GqlQuery.newBuilder() + com.google.datastore.v1.GqlQuery query = com.google.datastore.v1.GqlQuery.newBuilder() .setQueryString("FROM * SELECT *") .build(); RunQueryRequest.Builder expectedRequest = RunQueryRequest.newBuilder() @@ -736,9 +737,9 @@ public void testGet() { public void testLookupEventualConsistency() { ReadOptions readOption = ReadOptions.newBuilder().setReadConsistencyValue(ReadConsistency.EVENTUAL_VALUE).build(); - com.google.datastore.v1beta3.Key key = com.google.datastore.v1beta3.Key.newBuilder() + com.google.datastore.v1.Key key = com.google.datastore.v1.Key.newBuilder() .setPartitionId(PartitionId.newBuilder().setProjectId(PROJECT_ID).build()) - .addPath(com.google.datastore.v1beta3.Key.PathElement.newBuilder() + .addPath(com.google.datastore.v1.Key.PathElement.newBuilder() .setKind("kind1").setName("name").build()) .build(); LookupRequest lookupRequest = @@ -785,6 +786,7 @@ public void testGetArrayNoDeferredResults() { assertFalse(result.hasNext()); } + @Test public void testGetArrayDeferredResults() throws DatastoreException { Set requestedKeys = new HashSet<>(); requestedKeys.add(KEY1); @@ -800,6 +802,7 @@ public void testGetArrayDeferredResults() throws DatastoreException { assertEquals(requestedKeys, keysOfFoundEntities); } + @Test public void testFetchArrayDeferredResults() throws DatastoreException { List foundEntities = createDatastoreForDeferredLookup().fetch(KEY1, KEY2, KEY3, KEY4, KEY5); @@ -812,7 +815,7 @@ public void testFetchArrayDeferredResults() throws DatastoreException { } private Datastore createDatastoreForDeferredLookup() throws DatastoreException { - List keysPb = new ArrayList<>(); + List keysPb = new ArrayList<>(); keysPb.add(KEY1.toPb()); keysPb.add(KEY2.toPb()); keysPb.add(KEY3.toPb()); @@ -822,11 +825,11 @@ private Datastore createDatastoreForDeferredLookup() throws DatastoreException { lookupRequests.add(LookupRequest.newBuilder().addAllKeys(keysPb).build()); lookupRequests.add( LookupRequest.newBuilder() + .addKeys(keysPb.get(1)) .addKeys(keysPb.get(2)) - .addKeys(keysPb.get(3)) - .addKeys(keysPb.get(5)) + .addKeys(keysPb.get(4)) .build()); - lookupRequests.add(LookupRequest.newBuilder().addKeys(keysPb.get(5)).build()); + lookupRequests.add(LookupRequest.newBuilder().addKeys(keysPb.get(4)).build()); Entity entity4 = Entity.builder(KEY4).set("value", StringValue.of("value")).build(); Entity entity5 = Entity.builder(KEY5).set("value", "value").build(); List lookupResponses = new ArrayList<>(); @@ -834,15 +837,15 @@ private Datastore createDatastoreForDeferredLookup() throws DatastoreException { LookupResponse.newBuilder() .addFound(EntityResult.newBuilder().setEntity(ENTITY1.toPb())) .addFound(EntityResult.newBuilder().setEntity(entity4.toPb())) + .addDeferred(keysPb.get(1)) .addDeferred(keysPb.get(2)) - .addDeferred(keysPb.get(3)) - .addDeferred(keysPb.get(5)) + .addDeferred(keysPb.get(4)) .build()); lookupResponses.add( LookupResponse.newBuilder() + .addFound(EntityResult.newBuilder().setEntity(ENTITY2.toPb())) .addFound(EntityResult.newBuilder().setEntity(ENTITY3.toPb())) - .addFound(EntityResult.newBuilder().setEntity(entity4.toPb())) - .addDeferred(keysPb.get(5)) + .addDeferred(keysPb.get(4)) .build()); lookupResponses.add( LookupResponse.newBuilder() diff --git a/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/RawValueTest.java b/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/RawValueTest.java index 1d603888b5d1..4c82b6d888e0 100644 --- a/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/RawValueTest.java +++ b/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/RawValueTest.java @@ -24,7 +24,7 @@ public class RawValueTest { - private static final com.google.datastore.v1beta3.Value CONTENT = StringValue.of("hello").toPb(); + private static final com.google.datastore.v1.Value CONTENT = StringValue.of("hello").toPb(); @Test public void testToBuilder() throws Exception { diff --git a/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/SerializationTest.java b/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/SerializationTest.java index ab771f0118a1..07f94255c985 100644 --- a/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/SerializationTest.java +++ b/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/SerializationTest.java @@ -79,7 +79,7 @@ public class SerializationTest extends BaseSerializationTest { private static final DateTimeValue DATE_AND_TIME_VALUE = DateTimeValue.of(DateTime.now()); private static final BlobValue BLOB_VALUE = BlobValue.of(BLOB1); private static final RawValue RAW_VALUE = - RawValue.of(com.google.datastore.v1beta3.Value.newBuilder().setMeaning(18).build()); + RawValue.of(com.google.datastore.v1.Value.newBuilder().setMeaning(18).build()); private static final LatLngValue LAT_LNG_VALUE = LatLngValue.of(LAT_LNG); private static final Entity ENTITY1 = Entity.builder(KEY1).build(); private static final Entity ENTITY2 =