diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntity.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntity.java index f29975f30fbd..0c9fc2c5300a 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntity.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntity.java @@ -65,7 +65,7 @@ public DateTime getDateTime(String name) { @Override public Blob getBlob(String name) { Value value = getValue(name); - if (value.meaning() == 18 && value instanceof StringValue) { + if (value.getMeaning() == 18 && value instanceof StringValue) { return new Blob(ByteString.copyFromUtf8(getString(name))); } return ((Value) value).get(); diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Value.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Value.java index 553906ef4ea8..58cb8038e9e3 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Value.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Value.java @@ -18,6 +18,7 @@ import static com.google.common.base.Preconditions.checkNotNull; +import com.google.cloud.GcpLaunchStage; import com.google.common.base.MoreObjects; import com.google.datastore.v1.Value.ValueTypeCase; @@ -56,7 +57,7 @@ abstract static class BaseMarshaller, B extends ValueBuild public final B fromProto(com.google.datastore.v1.Value proto) { B builder = newBuilder(getValue(proto)); builder.setExcludeFromIndexes(proto.getExcludeFromIndexes()); - builder.meaning(proto.getMeaning()); + builder.setMeaning(proto.getMeaning()); return builder; } @@ -65,7 +66,7 @@ public final B fromProto(com.google.datastore.v1.Value proto) { 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()); + builder.setMeaning(value.getMeaning()); setValue(value, builder); return builder.build(); } @@ -111,19 +112,13 @@ public B setExcludeFromIndexes(boolean excludeFromIndexes) { return self(); } - @Deprecated + @GcpLaunchStage.Deprecated @Override public int getMeaning() { return meaning; } - @Deprecated - @Override - public B meaning(int meaning) { - return setMeaning(meaning); - } - - @Deprecated + @GcpLaunchStage.Deprecated @Override public B setMeaning(int meaning) { this.meaning = meaning; @@ -158,14 +153,6 @@

, B extends BaseBuilder> Value(ValueBuilder value = builder.get(); } - /** - * Returns the type of this value. - */ - @Deprecated - public final ValueType type() { - return getType(); - } - /** * Returns the type of this value. */ @@ -180,12 +167,7 @@ public final boolean excludeFromIndexes() { return excludeFromIndexes; } - @Deprecated - final int meaning() { - return getMeaning(); - } - - @Deprecated + @GcpLaunchStage.Deprecated final int getMeaning() { return meaning; } diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueBuilder.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueBuilder.java index 948f4a4b3feb..960a95074320 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueBuilder.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueBuilder.java @@ -16,6 +16,8 @@ package com.google.cloud.datastore; +import com.google.cloud.GcpLaunchStage; + /** * A common interface for Value builders. * @@ -36,19 +38,13 @@ public interface ValueBuilder, B extends ValueBuilder