From 4b5535f25d4d3a775c2f22cd426aeacb12097bae Mon Sep 17 00:00:00 2001
From: Garrett Jones <garrettjonesgoogle@users.noreply.github.com>
Date: Fri, 14 Apr 2017 14:55:55 -0700
Subject: [PATCH 1/2] Removing deprecated Value.meaning methods that were
 missed

---
 .../cloud/datastore/ProjectionEntity.java     |  2 +-
 .../com/google/cloud/datastore/Value.java     | 23 ++-----------------
 .../google/cloud/datastore/ValueBuilder.java  |  6 -----
 3 files changed, 3 insertions(+), 28 deletions(-)

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<Blob>) 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..6a242aeb3062 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
@@ -56,7 +56,7 @@ abstract static class BaseMarshaller<V, P extends Value<V>, 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 +65,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();
     }
@@ -117,12 +117,6 @@ public int getMeaning() {
       return meaning;
     }
 
-    @Deprecated
-    @Override
-    public B meaning(int meaning) {
-      return setMeaning(meaning);
-    }
-
     @Deprecated
     @Override
     public B setMeaning(int meaning) {
@@ -158,14 +152,6 @@ <P extends Value<V>, B extends BaseBuilder<V, P, B>> Value(ValueBuilder<V, P, B>
     value = builder.get();
   }
 
-  /**
-   * Returns the type of this value.
-   */
-  @Deprecated
-  public final ValueType type() {
-    return getType();
-  }
-
   /**
    * Returns the type of this value.
    */
@@ -180,11 +166,6 @@ public final boolean excludeFromIndexes() {
     return excludeFromIndexes;
   }
 
-  @Deprecated
-  final int meaning() {
-    return getMeaning();
-  }
-
   @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..08ada6732f9a 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
@@ -39,12 +39,6 @@ public interface ValueBuilder<V, P extends Value<V>, B extends ValueBuilder<V, P
   @Deprecated
   int getMeaning();
 
-  /**
-   * Deprecated. This library preserves the field for backwards compatibility.
-   */
-  @Deprecated
-  B meaning(int meaning);
-
   /**
    * Deprecated. This library preserves the field for backwards compatibility.
    */

From f72b86f4b466757f83fe72135cb204dfd75bf1dd Mon Sep 17 00:00:00 2001
From: Garrett Jones <garrettjonesgoogle@users.noreply.github.com>
Date: Fri, 14 Apr 2017 15:30:44 -0700
Subject: [PATCH 2/2] Changing @Deprecated to @GcpLaunchStage.Deprecated

---
 .../src/main/java/com/google/cloud/datastore/Value.java    | 7 ++++---
 .../main/java/com/google/cloud/datastore/ValueBuilder.java | 6 ++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

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 6a242aeb3062..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;
 
@@ -111,13 +112,13 @@ public B setExcludeFromIndexes(boolean excludeFromIndexes) {
       return self();
     }
 
-    @Deprecated
+    @GcpLaunchStage.Deprecated
     @Override
     public int getMeaning() {
       return meaning;
     }
 
-    @Deprecated
+    @GcpLaunchStage.Deprecated
     @Override
     public B setMeaning(int meaning) {
       this.meaning = meaning;
@@ -166,7 +167,7 @@ public final boolean excludeFromIndexes() {
     return excludeFromIndexes;
   }
 
-  @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 08ada6732f9a..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,13 +38,13 @@ public interface ValueBuilder<V, P extends Value<V>, B extends ValueBuilder<V, P
   /**
    * Deprecated. This library preserves the field for backwards compatibility.
    */
-  @Deprecated
+  @GcpLaunchStage.Deprecated
   int getMeaning();
 
   /**
    * Deprecated. This library preserves the field for backwards compatibility.
    */
-  @Deprecated
+  @GcpLaunchStage.Deprecated
   B setMeaning(int meaning);
 
   V get();