Skip to content

Commit ad5f29b

Browse files
mziccardmziccard
authored
Update datastore from v1beta3 to v1 (#1169)
- Change package names - Update LocalDatastoreHelper to use new emulator (cloud-datastore-emulator >= 1.2.0) - Enable all tests in DatastoreTest
1 parent 8acf3c3 commit ad5f29b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+429
-445
lines changed

‎gcloud-java-datastore/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
</dependency>
2525
<dependency>
2626
<groupId>com.google.cloud.datastore</groupId>
27-
<artifactId>datastore-v1beta3-protos</artifactId>
28-
<version>1.0.0-beta</version>
27+
<artifactId>datastore-v1-protos</artifactId>
28+
<version>1.0.1</version>
2929
</dependency>
3030
<dependency>
3131
<groupId>com.google.cloud.datastore</groupId>
32-
<artifactId>datastore-v1beta3-proto-client</artifactId>
33-
<version>1.0.0-beta.2</version>
32+
<artifactId>datastore-v1-proto-client</artifactId>
33+
<version>1.1.0</version>
3434
</dependency>
3535
<dependency>
3636
<groupId>${project.groupId}</groupId>

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -246,28 +246,26 @@ protected DatastoreException newInvalidRequest(String msg, Object... params) {
246246
return DatastoreException.throwInvalidRequest(String.format(msg, params));
247247
}
248248

249-
protected List<com.google.datastore.v1beta3.Mutation> toMutationPbList() {
250-
List<com.google.datastore.v1beta3.Mutation> mutationsPb =
251-
new ArrayList<>();
249+
protected List<com.google.datastore.v1.Mutation> toMutationPbList() {
250+
List<com.google.datastore.v1.Mutation> mutationsPb = new ArrayList<>();
252251
for (FullEntity<IncompleteKey> entity : toAddAutoId()) {
253252
mutationsPb.add(
254-
com.google.datastore.v1beta3.Mutation.newBuilder().setInsert(entity.toPb()).build());
253+
com.google.datastore.v1.Mutation.newBuilder().setInsert(entity.toPb()).build());
255254
}
256255
for (FullEntity<Key> entity : toAdd().values()) {
257256
mutationsPb.add(
258-
com.google.datastore.v1beta3.Mutation.newBuilder().setInsert(entity.toPb()).build());
257+
com.google.datastore.v1.Mutation.newBuilder().setInsert(entity.toPb()).build());
259258
}
260259
for (FullEntity<Key> entity : toUpdate().values()) {
261260
mutationsPb.add(
262-
com.google.datastore.v1beta3.Mutation.newBuilder().setUpdate(entity.toPb()).build());
261+
com.google.datastore.v1.Mutation.newBuilder().setUpdate(entity.toPb()).build());
263262
}
264263
for (FullEntity<Key> entity : toPut().values()) {
265264
mutationsPb.add(
266-
com.google.datastore.v1beta3.Mutation.newBuilder().setUpsert(entity.toPb()).build());
265+
com.google.datastore.v1.Mutation.newBuilder().setUpsert(entity.toPb()).build());
267266
}
268267
for (Key key : toDelete()) {
269-
mutationsPb.add(
270-
com.google.datastore.v1beta3.Mutation.newBuilder().setDelete(key.toPb()).build());
268+
mutationsPb.add(com.google.datastore.v1.Mutation.newBuilder().setDelete(key.toPb()).build());
271269
}
272270
return mutationsPb;
273271
}

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
* Entities, Properties, and Keys</a>
5151
*/
5252
public abstract class BaseEntity<K extends IncompleteKey>
53-
extends Serializable<com.google.datastore.v1beta3.Entity> {
53+
extends Serializable<com.google.datastore.v1.Entity> {
5454

5555
private static final long serialVersionUID = 8175618724683792766L;
5656

@@ -92,10 +92,10 @@ private B self() {
9292
}
9393

9494
@SuppressWarnings("unchecked")
95-
B fill(com.google.datastore.v1beta3.Entity entityPb) {
95+
B fill(com.google.datastore.v1.Entity entityPb) {
9696
Map<String, Value<?>> copiedProperties = Maps.newHashMap();
97-
for (Map.Entry<String, com.google.datastore.v1beta3.Value> entry :
98-
entityPb.getProperties().entrySet()) {
97+
for (Map.Entry<String, com.google.datastore.v1.Value> entry :
98+
entityPb.getProperties().entrySet()) {
9999
copiedProperties.put(entry.getKey(), Value.fromPb(entry.getValue()));
100100
}
101101
properties(copiedProperties);
@@ -646,17 +646,16 @@ ImmutableSortedMap<String, Value<?>> properties() {
646646
@Override
647647
Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
648648
Builder<?, ?> builder = emptyBuilder();
649-
builder.fill(com.google.datastore.v1beta3.Entity.parseFrom(bytesPb));
649+
builder.fill(com.google.datastore.v1.Entity.parseFrom(bytesPb));
650650
return builder.build();
651651
}
652652

653653
protected abstract Builder<?, ?> emptyBuilder();
654654

655655
@Override
656-
final com.google.datastore.v1beta3.Entity toPb() {
657-
com.google.datastore.v1beta3.Entity.Builder entityPb =
658-
com.google.datastore.v1beta3.Entity.newBuilder();
659-
Map<String, com.google.datastore.v1beta3.Value> propertiesPb = entityPb.getMutableProperties();
656+
final com.google.datastore.v1.Entity toPb() {
657+
com.google.datastore.v1.Entity.Builder entityPb = com.google.datastore.v1.Entity.newBuilder();
658+
Map<String, com.google.datastore.v1.Value> propertiesPb = entityPb.getMutableProperties();
660659
for (Map.Entry<String, Value<?>> entry : properties.entrySet()) {
661660
propertiesPb.put(entry.getKey(), entry.getValue().toPb());
662661
}

‎gcloud-java-datastore/src/main/java/com/google/cloud/datastore/BaseKey.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
/**
3131
* Base class for keys.
3232
*/
33-
public abstract class BaseKey extends Serializable<com.google.datastore.v1beta3.Key> {
33+
public abstract class BaseKey extends Serializable<com.google.datastore.v1.Key> {
3434

3535
private static final long serialVersionUID = -4671243265877410635L;
3636

@@ -178,10 +178,10 @@ public boolean equals(Object obj) {
178178
}
179179

180180
@Override
181-
com.google.datastore.v1beta3.Key toPb() {
182-
com.google.datastore.v1beta3.Key.Builder keyPb = com.google.datastore.v1beta3.Key.newBuilder();
183-
com.google.datastore.v1beta3.PartitionId.Builder partitionIdPb =
184-
com.google.datastore.v1beta3.PartitionId.newBuilder();
181+
com.google.datastore.v1.Key toPb() {
182+
com.google.datastore.v1.Key.Builder keyPb = com.google.datastore.v1.Key.newBuilder();
183+
com.google.datastore.v1.PartitionId.Builder partitionIdPb =
184+
com.google.datastore.v1.PartitionId.newBuilder();
185185
partitionIdPb.setProjectId(projectId);
186186
partitionIdPb.setNamespaceId(namespace);
187187
keyPb.setPartitionId(partitionIdPb.build());

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,23 @@
2020
import java.util.Iterator;
2121
import java.util.List;
2222

23-
2423
class BatchImpl extends BaseDatastoreBatchWriter implements Batch {
2524

2625
private final DatastoreImpl datastore;
2726

2827
static class ResponseImpl implements Batch.Response {
2928

30-
private final com.google.datastore.v1beta3.CommitResponse response;
29+
private final com.google.datastore.v1.CommitResponse response;
3130
private final int numAutoAllocatedIds;
3231

33-
ResponseImpl(com.google.datastore.v1beta3.CommitResponse response, int numAutoAllocatedIds) {
32+
ResponseImpl(com.google.datastore.v1.CommitResponse response, int numAutoAllocatedIds) {
3433
this.response = response;
3534
this.numAutoAllocatedIds = numAutoAllocatedIds;
3635
}
3736

3837
@Override
3938
public List<Key> generatedKeys() {
40-
Iterator<com.google.datastore.v1beta3.MutationResult> results =
39+
Iterator<com.google.datastore.v1.MutationResult> results =
4140
response.getMutationResultsList().iterator();
4241
List<Key> generated = new ArrayList<>(numAutoAllocatedIds);
4342
for (int i = 0; i < numAutoAllocatedIds; i++) {
@@ -55,12 +54,12 @@ public List<Key> generatedKeys() {
5554
@Override
5655
public Batch.Response submit() {
5756
validateActive();
58-
List<com.google.datastore.v1beta3.Mutation> mutationsPb = toMutationPbList();
59-
com.google.datastore.v1beta3.CommitRequest.Builder requestPb =
60-
com.google.datastore.v1beta3.CommitRequest.newBuilder();
61-
requestPb.setMode(com.google.datastore.v1beta3.CommitRequest.Mode.NON_TRANSACTIONAL);
57+
List<com.google.datastore.v1.Mutation> mutationsPb = toMutationPbList();
58+
com.google.datastore.v1.CommitRequest.Builder requestPb =
59+
com.google.datastore.v1.CommitRequest.newBuilder();
60+
requestPb.setMode(com.google.datastore.v1.CommitRequest.Mode.NON_TRANSACTIONAL);
6261
requestPb.addAllMutations(mutationsPb);
63-
com.google.datastore.v1beta3.CommitResponse responsePb = datastore.commit(requestPb.build());
62+
com.google.datastore.v1.CommitResponse responsePb = datastore.commit(requestPb.build());
6463
deactivate();
6564
return new ResponseImpl(responsePb, toAddAutoId().size());
6665
}

‎gcloud-java-datastore/src/main/java/com/google/cloud/datastore/Blob.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
* @see <a href="https://cloud.google.com/datastore/docs/concepts/entities">
3737
* Google Cloud Datastore Entities, Properties, and Keys</a>
3838
*/
39-
public final class Blob extends Serializable<com.google.datastore.v1beta3.Value> {
39+
public final class Blob extends Serializable<com.google.datastore.v1.Value> {
4040

4141
private static final long serialVersionUID = 3835421019618247721L;
4242

@@ -145,12 +145,12 @@ public static Blob copyFrom(InputStream input) throws IOException {
145145
}
146146

147147
@Override
148-
com.google.datastore.v1beta3.Value toPb() {
149-
return com.google.datastore.v1beta3.Value.newBuilder().setBlobValue(byteString).build();
148+
com.google.datastore.v1.Value toPb() {
149+
return com.google.datastore.v1.Value.newBuilder().setBlobValue(byteString).build();
150150
}
151151

152152
@Override
153153
Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
154-
return new Blob(com.google.datastore.v1beta3.Value.parseFrom(bytesPb).getBlobValue());
154+
return new Blob(com.google.datastore.v1.Value.parseFrom(bytesPb).getBlobValue());
155155
}
156156
}

‎gcloud-java-datastore/src/main/java/com/google/cloud/datastore/BlobValue.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package com.google.cloud.datastore;
1818

19-
import static com.google.datastore.v1beta3.Value.BLOB_VALUE_FIELD_NUMBER;
19+
import static com.google.datastore.v1.Value.BLOB_VALUE_FIELD_NUMBER;
2020

2121
public final class BlobValue extends Value<Blob> {
2222

@@ -38,12 +38,12 @@ public Builder newBuilder(Blob value) {
3838
}
3939

4040
@Override
41-
protected Blob getValue(com.google.datastore.v1beta3.Value from) {
41+
protected Blob getValue(com.google.datastore.v1.Value from) {
4242
return new Blob(from.getBlobValue());
4343
}
4444

4545
@Override
46-
protected void setValue(BlobValue from, com.google.datastore.v1beta3.Value.Builder to) {
46+
protected void setValue(BlobValue from, com.google.datastore.v1.Value.Builder to) {
4747
to.setBlobValue(from.get().byteString());
4848
}
4949
};

‎gcloud-java-datastore/src/main/java/com/google/cloud/datastore/BooleanValue.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package com.google.cloud.datastore;
1818

19-
import static com.google.datastore.v1beta3.Value.BOOLEAN_VALUE_FIELD_NUMBER;
19+
import static com.google.datastore.v1.Value.BOOLEAN_VALUE_FIELD_NUMBER;
2020

2121
public final class BooleanValue extends Value<Boolean> {
2222

@@ -38,12 +38,12 @@ public Builder newBuilder(Boolean value) {
3838
}
3939

4040
@Override
41-
protected Boolean getValue(com.google.datastore.v1beta3.Value from) {
41+
protected Boolean getValue(com.google.datastore.v1.Value from) {
4242
return from.getBooleanValue();
4343
}
4444

4545
@Override
46-
protected void setValue(BooleanValue from, com.google.datastore.v1beta3.Value.Builder to) {
46+
protected void setValue(BooleanValue from, com.google.datastore.v1.Value.Builder to) {
4747
to.setBooleanValue(from.get());
4848
}
4949
};

‎gcloud-java-datastore/src/main/java/com/google/cloud/datastore/Cursor.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* A Google Cloud Datastore cursor.
2929
* The cursor can be used to as a starting point or an ending point for a {@link Query}
3030
*/
31-
public final class Cursor extends Serializable<com.google.datastore.v1beta3.Value> {
31+
public final class Cursor extends Serializable<com.google.datastore.v1.Value> {
3232

3333
private static final long serialVersionUID = -1423744878777486541L;
3434

@@ -85,16 +85,16 @@ public static Cursor copyFrom(byte[] bytes) {
8585
}
8686

8787
@Override
88-
com.google.datastore.v1beta3.Value toPb() {
89-
return com.google.datastore.v1beta3.Value.newBuilder().setBlobValue(byteString).build();
88+
com.google.datastore.v1.Value toPb() {
89+
return com.google.datastore.v1.Value.newBuilder().setBlobValue(byteString).build();
9090
}
9191

9292
@Override
9393
Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
94-
return fromPb(com.google.datastore.v1beta3.Value.parseFrom(bytesPb));
94+
return fromPb(com.google.datastore.v1.Value.parseFrom(bytesPb));
9595
}
9696

97-
static Cursor fromPb(com.google.datastore.v1beta3.Value valuePb) {
97+
static Cursor fromPb(com.google.datastore.v1.Value valuePb) {
9898
return new Cursor(valuePb.getBlobValue());
9999
}
100100
}

0 commit comments

Comments
 (0)