From b0793ecfa2bdac9b0decbb81218d99f634092885 Mon Sep 17 00:00:00 2001
From: ajaaym <34161822+ajaaym@users.noreply.github.com>
Date: Tue, 4 Sep 2018 10:09:23 -0400
Subject: [PATCH] Add dependency for google cloud java bigtable client and
 deprecate filters related class  (#1917)

* Add java veneer client dependency and remove duplicate class

* Revert "Add java veneer client dependency and remove duplicate class"

This reverts commit f544a2a7dd4dea085c2701271b6fa2c6d1e33797.

* Deprecate Filters related class instead of replace

* Use non shaded google java client dependancy.
---
 .../bigtable-client-core/pom.xml                       | 10 ++++++++++
 .../cloud/bigtable/data/v2/internal/RegexUtil.java     |  2 +-
 .../cloud/bigtable/data/v2/wrappers/Filters.java       |  2 +-
 .../google/cloud/bigtable/data/v2/wrappers/Range.java  |  5 +++++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/bigtable-client-core-parent/bigtable-client-core/pom.xml b/bigtable-client-core-parent/bigtable-client-core/pom.xml
index ce22193563..5d559e784a 100644
--- a/bigtable-client-core-parent/bigtable-client-core/pom.xml
+++ b/bigtable-client-core-parent/bigtable-client-core/pom.xml
@@ -43,6 +43,16 @@ limitations under the License.
     </dependencyManagement>
 
     <dependencies>
+        <!-- Bigtable Java Veneer client -->
+        <dependency>
+            <groupId>com.google.cloud</groupId>
+            <artifactId>google-cloud-bigtable</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.cloud</groupId>
+            <artifactId>google-cloud-bigtable-admin</artifactId>
+        </dependency>
+
         <!-- Protos -->
         <dependency>
             <groupId>com.google.api.grpc</groupId>
diff --git a/bigtable-client-core-parent/bigtable-client-core/src/main/java/com/google/cloud/bigtable/data/v2/internal/RegexUtil.java b/bigtable-client-core-parent/bigtable-client-core/src/main/java/com/google/cloud/bigtable/data/v2/internal/RegexUtil.java
index 0c9b147d6c..715e69d3e2 100644
--- a/bigtable-client-core-parent/bigtable-client-core/src/main/java/com/google/cloud/bigtable/data/v2/internal/RegexUtil.java
+++ b/bigtable-client-core-parent/bigtable-client-core/src/main/java/com/google/cloud/bigtable/data/v2/internal/RegexUtil.java
@@ -22,7 +22,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-@InternalApi
+@Deprecated @InternalApi
 public final class RegexUtil {
   private static final byte[] NULL_BYTES = "\\x00".getBytes();
 
diff --git a/bigtable-client-core-parent/bigtable-client-core/src/main/java/com/google/cloud/bigtable/data/v2/wrappers/Filters.java b/bigtable-client-core-parent/bigtable-client-core/src/main/java/com/google/cloud/bigtable/data/v2/wrappers/Filters.java
index 14abbeb53a..a9fa0b52ce 100644
--- a/bigtable-client-core-parent/bigtable-client-core/src/main/java/com/google/cloud/bigtable/data/v2/wrappers/Filters.java
+++ b/bigtable-client-core-parent/bigtable-client-core/src/main/java/com/google/cloud/bigtable/data/v2/wrappers/Filters.java
@@ -47,7 +47,7 @@
  *
  * }</pre>
  */
-@InternalExtensionOnly
+@Deprecated @InternalExtensionOnly
 public final class Filters {
   /** Entry point into the DSL. */
   public static final Filters FILTERS = new Filters();
diff --git a/bigtable-client-core-parent/bigtable-client-core/src/main/java/com/google/cloud/bigtable/data/v2/wrappers/Range.java b/bigtable-client-core-parent/bigtable-client-core/src/main/java/com/google/cloud/bigtable/data/v2/wrappers/Range.java
index 6c5996976f..3f95cc4883 100644
--- a/bigtable-client-core-parent/bigtable-client-core/src/main/java/com/google/cloud/bigtable/data/v2/wrappers/Range.java
+++ b/bigtable-client-core-parent/bigtable-client-core/src/main/java/com/google/cloud/bigtable/data/v2/wrappers/Range.java
@@ -40,6 +40,7 @@
  * ByteStringRange r2 = r1.clone().endUnbounded();
  * }</pre>
  */
+@Deprecated
 abstract class Range<T, R extends Range<T, R>> {
   public enum BoundType {
     OPEN,
@@ -150,6 +151,7 @@ private R thisT() {
   }
 
   /** Abstract specialization of a {@link Range} for timestamps. */
+  @Deprecated
   abstract static class AbstractTimestampRange<R extends AbstractTimestampRange<R>>
       extends Range<Long, R> implements Cloneable {
     AbstractTimestampRange() {
@@ -175,6 +177,7 @@ protected R clone() {
    * Abstract specialization of a {@link Range} for {@link ByteString}s. Allows for easy interop
    * with simple Strings.
    */
+  @Deprecated
   abstract static class AbstractByteStringRange<R extends AbstractByteStringRange<R>>
       extends Range<ByteString, R> implements Cloneable {
     AbstractByteStringRange() {
@@ -230,6 +233,7 @@ static ByteString wrap(String str) {
   }
 
   /** Concrete Range for timestamps */
+  @Deprecated
   public static final class TimestampRange extends AbstractTimestampRange<TimestampRange> {
     public static TimestampRange unbounded() {
       return new TimestampRange(BoundType.UNBOUNDED, null, BoundType.UNBOUNDED, null);
@@ -245,6 +249,7 @@ private TimestampRange(BoundType startBound, Long start, BoundType endBound, Lon
   }
 
   /** Concrete Range for ByteStrings */
+  @Deprecated
   public static final class ByteStringRange extends AbstractByteStringRange<ByteStringRange> {
     public static ByteStringRange unbounded() {
       return new ByteStringRange(BoundType.UNBOUNDED, null, BoundType.UNBOUNDED, null);