Repository: GoogleCloudPlatform/cloud-bigtable-client
Pull request #1635 (2018-01-30 17:23:10)

Rename Filters.F -> Filters.FILTERS to avoid ambiguity


Patch:
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 e0ee6a51e..f786cd2fb 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
@@ -27,26 +27,26 @@ import com.google.protobuf.ByteString;
 /**
  * A Fluent DSL to create a hierarchy of filters for the CheckAndMutateRow RPCs and ReadRows Query.
  *
- * <p>Intended usage is to statically import, or in case of conflict assign the static variable F
+ * <p>Intended usage is to statically import, or in case of conflict assign the static variable FILTERS
  * and use its fluent API to build filters.
  *
  * <p>Sample code:
  *
  * <pre>{@code
- * import static com.google.cloud.bigtable.data.v2.wrappers.Filters.F;
+ * import static com.google.cloud.bigtable.data.v2.wrappers.Filters.FILTERS;
  *
  * void main() {
  *   // Build the filter expression
- *   RowFilter filter = F.chain()
- *     .filter(F.qualifier().regex("prefix.*"))
- *     .filter(F.limit().cellsPerRow(10));
+ *   RowFilter filter = FILTERS.chain()
+ *     .filter(FILTERS.qualifier().regex("prefix.*"))
+ *     .filter(FILTERS.limit().cellsPerRow(10));
  * }
  *
  * }</pre>
  */
 public final class Filters {
   /** Entry point into the DSL. */
-  public static final Filters F = new Filters();
+  public static final Filters FILTERS = new Filters();
 
   private static final SimpleFilter PASS =
       new SimpleFilter(RowFilter.newBuilder().setPassAllFilter(true).build());
diff --git a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/ColumnCountGetFilterAdapter.java b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/ColumnCountGetFilterAdapter.java
index 481c82052..be6f784d2 100644
--- a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/ColumnCountGetFilterAdapter.java
+++ b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/ColumnCountGetFilterAdapter.java
@@ -15,7 +15,7 @@
  */
 package com.google.cloud.bigtable.hbase.adapters.filters;
 
-import static com.google.cloud.bigtable.data.v2.wrappers.Filters.F;
+import static com.google.cloud.bigtable.data.v2.wrappers.Filters.FILTERS;
 import com.google.bigtable.v2.RowFilter;
 
 import org.apache.hadoop.hbase.filter.ColumnCountGetFilter;
@@ -37,9 +37,9 @@ public class ColumnCountGetFilterAdapter extends TypedFilterAdapterBase<ColumnCo
       throws IOException {
     // This is fairly broken for all scans, but I'm simply going for bug-for-bug
     // compatible with string reader expressions.
-    return F.chain()
-        .filter(F.limit().cellsPerColumn(1))
-        .filter(F.limit().cellsPerRow(filter.getLimit()))
+    return FILTERS.chain()
+        .filter(FILTERS.limit().cellsPerColumn(1))
+        .filter(FILTERS.limit().cellsPerRow(filter.getLimit()))
         .toProto();
   }
 
diff --git a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/ColumnPaginationFilterAdapter.java b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/ColumnPaginationFilterAdapter.java
index 9adee31d8..7327626c2 100644
--- a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/ColumnPaginationFilterAdapter.java
+++ b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/ColumnPaginationFilterAdapter.java
@@ -15,7 +15,7 @@
  */
 package com.google.cloud.bigtable.hbase.adapters.filters;
 
-import static com.google.cloud.bigtable.data.v2.wrappers.Filters.F;
+import static com.google.cloud.bigtable.data.v2.wrappers.Filters.FILTERS;
 import com.google.bigtable.v2.RowFilter;
 import com.google.cloud.bigtable.data.v2.wrappers.Filters.ChainFilter;
 import com.google.cloud.bigtable.data.v2.wrappers.Filters.Filter;
@@ -50,13 +50,13 @@ public class ColumnPaginationFilterAdapter extends TypedFilterAdapterBase<Column
       // up to limit cells.
       return createChain(
           filter,
-          F.qualifier().rangeWithinFamily(Bytes.toString(family))
+          FILTERS.qualifier().rangeWithinFamily(Bytes.toString(family))
               .startClosed(startQualifier));
     } else if (filter.getOffset() > 0) {
       // Include starting at an integer offset up to limit cells.
       return createChain(
           filter,
-          F.offset().cellsPerRow(filter.getOffset()));
+          FILTERS.offset().cellsPerRow(filter.getOffset()));
     } else {
       // No meaningful offset supplied.
       return createChain(filter, null);
@@ -70,12 +70,12 @@ public class ColumnPaginationFilterAdapter extends TypedFilterAdapterBase<Column
    */
   private RowFilter createChain(
       ColumnPaginationFilter filter, Filter intermediate) {
-    ChainFilter chain = F.chain();
-    chain.filter(F.limit().cellsPerColumn(1));
+    ChainFilter chain = FILTERS.chain();
+    chain.filter(FILTERS.limit().cellsPerColumn(1));
     if (intermediate != null) {
       chain.filter(intermediate);
     }
-    chain.filter(F.limit().cellsPerRow(filter.getLimit()));
+    chain.filter(FILTERS.limit().cellsPerRow(filter.getLimit()));
     return chain.toProto();
   }
 
diff --git a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/ColumnRangeFilterAdapter.java b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/ColumnRangeFilterAdapter.java
index 368527642..34dce7d1b 100644
--- a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/ColumnRangeFilterAdapter.java
+++ b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/ColumnRangeFilterAdapter.java
@@ -15,7 +15,7 @@
  */
 package com.google.cloud.bigtable.hbase.adapters.filters;
 
-import static com.google.cloud.bigtable.data.v2.wrappers.Filters.F;
+import static com.google.cloud.bigtable.data.v2.wrappers.Filters.FILTERS;
 
 import com.google.bigtable.v2.RowFilter;
 import com.google.cloud.bigtable.data.v2.wrappers.Filters.QualifierRangeFilter;
@@ -46,7 +46,7 @@ public class ColumnRangeFilterAdapter extends TypedFilterAdapterBase<ColumnRange
   public RowFilter adapt(FilterAdapterContext context, ColumnRangeFilter filter)
       throws IOException {
     byte[] familyName = getSingleFamily(context.getScan());
-    QualifierRangeFilter rangeBuilder = F.qualifier().rangeWithinFamily(Bytes.toString(familyName));
+    QualifierRangeFilter rangeBuilder = FILTERS.qualifier().rangeWithinFamily(Bytes.toString(familyName));
 
     if (filter.getMinColumn() != null) {
       ByteString startQualifier = ByteString.copyFrom(filter.getMinColumn());
diff --git a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/FamilyFilterAdapter.java b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/FamilyFilterAdapter.java
index aecc20c02..9279cdc44 100644
--- a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/FamilyFilterAdapter.java
+++ b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/FamilyFilterAdapter.java
@@ -15,7 +15,7 @@
  */
 package com.google.cloud.bigtable.hbase.adapters.filters;
 
-import static com.google.cloud.bigtable.data.v2.wrappers.Filters.F;
+import static com.google.cloud.bigtable.data.v2.wrappers.Filters.FILTERS;
 
 import com.google.bigtable.v2.RowFilter;
 import com.google.cloud.bigtable.hbase.adapters.read.ReaderExpressionHelper;
@@ -60,7 +60,7 @@ public class FamilyFilterAdapter extends TypedFilterAdapterBase<FamilyFilter> {
       throw new IllegalStateException(
           "Cannot adapt comparator " + comparator.getClass().getCanonicalName());
     }
-    return F.family().regex(family).toProto();
+    return FILTERS.family().regex(family).toProto();
   }
 
   /** {@inheritDoc} */
diff --git a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/FilterAdapterHelper.java b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/FilterAdapterHelper.java
index 58b8e0b73..8c33640dd 100644
--- a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/FilterAdapterHelper.java
+++ b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/FilterAdapterHelper.java
@@ -15,7 +15,7 @@
  */
 package com.google.cloud.bigtable.hbase.adapters.filters;
 
-import static com.google.cloud.bigtable.data.v2.wrappers.Filters.F;
+import static com.google.cloud.bigtable.data.v2.wrappers.Filters.FILTERS;
 
 import com.google.bigtable.v2.RowFilter;
 import com.google.common.base.Preconditions;
@@ -34,7 +34,7 @@ public class FilterAdapterHelper {
   /**
    * A RowFilter that will match all cells.
    */
-  public static final RowFilter ACCEPT_ALL_FILTER = F.pass().toProto();
+  public static final RowFilter ACCEPT_ALL_FILTER = FILTERS.pass().toProto();
 
   /**
    * Extract a single family name from a FilterAdapterContext. Throws if there
diff --git a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/FirstKeyOnlyFilterAdapter.java b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/FirstKeyOnlyFilterAdapter.java
index 7e3851c81..fd73a434e 100644
--- a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/FirstKeyOnlyFilterAdapter.java
+++ b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/FirstKeyOnlyFilterAdapter.java
@@ -15,7 +15,7 @@
  */
 package com.google.cloud.bigtable.hbase.adapters.filters;
 
-import static com.google.cloud.bigtable.data.v2.wrappers.Filters.F;
+import static com.google.cloud.bigtable.data.v2.wrappers.Filters.FILTERS;
 
 import com.google.bigtable.v2.RowFilter;
 
@@ -29,7 +29,7 @@ import org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter;
  */
 public class FirstKeyOnlyFilterAdapter extends TypedFilterAdapterBase<FirstKeyOnlyFilter> {
 
-  private static RowFilter LIMIT_ONE = F.limit().cellsPerRow(1).toProto();
+  private static RowFilter LIMIT_ONE = FILTERS.limit().cellsPerRow(1).toProto();
 
   /** {@inheritDoc} */
   @Override
diff --git a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/FuzzyRowFilterAdapter.java b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/FuzzyRowFilterAdapter.java
index 5b81a2de8..76333f80d 100644
--- a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/FuzzyRowFilterAdapter.java
+++ b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/FuzzyRowFilterAdapter.java
@@ -15,7 +15,7 @@
  */
 package com.google.cloud.bigtable.hbase.adapters.filters;
 
-import static com.google.cloud.bigtable.data.v2.wrappers.Filters.F;
+import static com.google.cloud.bigtable.data.v2.wrappers.Filters.FILTERS;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -41,7 +41,7 @@ import com.google.common.base.Preconditions;
  * @version $Id: $Id
  */
 public class FuzzyRowFilterAdapter extends TypedFilterAdapterBase<FuzzyRowFilter> {
-  private static final RowFilter ALL_VALUES_FILTER = F.pass().toProto();
+  private static final RowFilter ALL_VALUES_FILTER = FILTERS.pass().toProto();
 
   private static Field FUZZY_KEY_DATA_FIELD;
   private static Exception FUZZY_KEY_DATA_FIELD_EXCEPTION;
@@ -62,7 +62,7 @@ public class FuzzyRowFilterAdapter extends TypedFilterAdapterBase<FuzzyRowFilter
     if (pairs.isEmpty()) {
       return ALL_VALUES_FILTER;
     }
-    InterleaveFilter interleave = F.interleave();
+    InterleaveFilter interleave = FILTERS.interleave();
     for (Pair<byte[], byte[]> pair : pairs) {
       Preconditions.checkArgument(
           pair.getFirst().length == pair.getSecond().length,
@@ -87,7 +87,7 @@ public class FuzzyRowFilterAdapter extends TypedFilterAdapterBase<FuzzyRowFilter
       }
     }
     quotingStream.close();
-    return F.key().regex(Bytes.toString(baos.toByteArray()));
+    return FILTERS.key().regex(Bytes.toString(baos.toByteArray()));
   }
 
   @SuppressWarnings("unchecked")
diff --git a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/KeyOnlyFilterAdapter.java b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/KeyOnlyFilterAdapter.java
index 61ffcbea9..ecc2cd06e 100644
--- a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/KeyOnlyFilterAdapter.java
+++ b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/KeyOnlyFilterAdapter.java
@@ -15,7 +15,7 @@
  */
 package com.google.cloud.bigtable.hbase.adapters.filters;
 
-import static com.google.cloud.bigtable.data.v2.wrappers.Filters.F;
+import static com.google.cloud.bigtable.data.v2.wrappers.Filters.FILTERS;
 
 import com.google.bigtable.v2.RowFilter;
 import org.apache.hadoop.hbase.Cell;
@@ -41,9 +41,9 @@ public class KeyOnlyFilterAdapter extends TypedFilterAdapterBase<KeyOnlyFilter>
       Bytes.toBytes('v'));
 
   private static RowFilter KEY_ONLY_FILTER =
-      F.chain()
-          .filter(F.limit().cellsPerRow(1))
-          .filter(F.value().strip())
+      FILTERS.chain()
+          .filter(FILTERS.limit().cellsPerRow(1))
+          .filter(FILTERS.value().strip())
           .toProto();
 
   /** {@inheritDoc} */
diff --git a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/MultiRowRangeFilterAdapter.java b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/MultiRowRangeFilterAdapter.java
index 8ee3e13af..75347f85d 100644
--- a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/MultiRowRangeFilterAdapter.java
+++ b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/MultiRowRangeFilterAdapter.java
@@ -15,7 +15,7 @@
  */
 package com.google.cloud.bigtable.hbase.adapters.filters;
 
-import static com.google.cloud.bigtable.data.v2.wrappers.Filters.F;
+import static com.google.cloud.bigtable.data.v2.wrappers.Filters.FILTERS;
 
 import com.google.bigtable.v2.RowFilter;
 import com.google.cloud.bigtable.util.RowKeyWrapper;
@@ -44,7 +44,7 @@ public class MultiRowRangeFilterAdapter extends TypedFilterAdapterBase<MultiRowR
   public RowFilter adapt(FilterAdapterContext context, MultiRowRangeFilter filter)
       throws IOException {
 
-    return F.pass().toProto();
+    return FILTERS.pass().toProto();
   }
 
   @Override
diff --git a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/MultipleColumnPrefixFilterAdapter.java b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/MultipleColumnPrefixFilterAdapter.java
index bce3ef4eb..f5ca768db 100644
--- a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/MultipleColumnPrefixFilterAdapter.java
+++ b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/MultipleColumnPrefixFilterAdapter.java
@@ -15,7 +15,7 @@
  */
 package com.google.cloud.bigtable.hbase.adapters.filters;
 
-import static com.google.cloud.bigtable.data.v2.wrappers.Filters.F;
+import static com.google.cloud.bigtable.data.v2.wrappers.Filters.FILTERS;
 
 import com.google.bigtable.v2.RowFilter;
 import com.google.cloud.bigtable.data.v2.wrappers.Filters.InterleaveFilter;
@@ -42,7 +42,7 @@ public class MultipleColumnPrefixFilterAdapter
   public RowFilter adapt(
       FilterAdapterContext context,
       MultipleColumnPrefixFilter filter) throws IOException {
-    InterleaveFilter interleave = F.interleave();
+    InterleaveFilter interleave = FILTERS.interleave();
     ByteArrayOutputStream outputStream = null;
     for (byte[] prefix : filter.getPrefix()) {
       if (outputStream == null) {
@@ -54,7 +54,7 @@ public class MultipleColumnPrefixFilterAdapter
       ReaderExpressionHelper.writeQuotedExpression(outputStream, prefix);
       outputStream.write(ReaderExpressionHelper.ALL_QUALIFIERS_BYTES);
 
-      interleave.filter(F.qualifier().regex(ByteStringer.wrap(outputStream.toByteArray())));
+      interleave.filter(FILTERS.qualifier().regex(ByteStringer.wrap(outputStream.toByteArray())));
     }
     return interleave.toProto();
   }
diff --git a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/PrefixFilterAdapter.java b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/PrefixFilterAdapter.java
index 1a5caf862..45aa00f2d 100644
--- a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/PrefixFilterAdapter.java
+++ b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/PrefixFilterAdapter.java
@@ -15,7 +15,7 @@
  */
 package com.google.cloud.bigtable.hbase.adapters.filters;
 
-import static com.google.cloud.bigtable.data.v2.wrappers.Filters.F;
+import static com.google.cloud.bigtable.data.v2.wrappers.Filters.FILTERS;
 
 import com.google.bigtable.v2.RowFilter;
 import com.google.cloud.bigtable.hbase.adapters.read.ReaderExpressionHelper;
@@ -48,7 +48,7 @@ public class PrefixFilterAdapter extends TypedFilterAdapterBase<PrefixFilter> {
     ReaderExpressionHelper.writeQuotedRegularExpression(baos, filter.getPrefix());
     // Unquoted all bytes:
     baos.write(ReaderExpressionHelper.ALL_QUALIFIERS_BYTES);
-    return F.key().regex(ByteStringer.wrap(baos.toByteArray())).toProto();
+    return FILTERS.key().regex(ByteStringer.wrap(baos.toByteArray())).toProto();
   }
 
   /**
diff --git a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/QualifierFilterAdapter.java b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/QualifierFilterAdapter.java
index 8896569dd..57806f0b6 100644
--- a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/QualifierFilterAdapter.java
+++ b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/QualifierFilterAdapter.java
@@ -15,7 +15,7 @@
  */
 package com.google.cloud.bigtable.hbase.adapters.filters;
 
-import static com.google.cloud.bigtable.data.v2.wrappers.Filters.F;
+import static com.google.cloud.bigtable.data.v2.wrappers.Filters.FILTERS;
 
 import com.google.bigtable.v2.RowFilter;
 import com.google.cloud.bigtable.data.v2.wrappers.Filters.Filter;
@@ -79,11 +79,11 @@ public class QualifierFilterAdapter extends TypedFilterAdapterBase<QualifierFilt
       case LESS_OR_EQUAL:
         return range(context).endClosed(quotedValue);
       case EQUAL:
-        return F.qualifier().regex(quotedValue);
+        return FILTERS.qualifier().regex(quotedValue);
       case NOT_EQUAL:
         // This strictly less than + strictly greater than:
         String familyName = getFamily(context);
-        return F.interleave()
+        return FILTERS.interleave()
             .filter(range(familyName).endOpen(quotedValue))
             .filter(range(familyName).startOpen(quotedValue));
       case GREATER_OR_EQUAL:
@@ -93,7 +93,7 @@ public class QualifierFilterAdapter extends TypedFilterAdapterBase<QualifierFilt
       case NO_OP:
         // No-op always passes. Instead of attempting to return null or default instance,
         // include an always-match filter.
-        return F.pass();
+        return FILTERS.pass();
       default:
         throw new IllegalStateException(
             String.format("Cannot handle unknown compare op %s", compareOp));
@@ -105,7 +105,7 @@ public class QualifierFilterAdapter extends TypedFilterAdapterBase<QualifierFilt
   }
 
   private QualifierRangeFilter range(String family) {
-    return F.qualifier().rangeWithinFamily(family);
+    return FILTERS.qualifier().rangeWithinFamily(family);
   }
 
   private static String getFamily(FilterAdapterContext context) {
@@ -117,9 +117,9 @@ public class QualifierFilterAdapter extends TypedFilterAdapterBase<QualifierFilt
     String pattern = FilterAdapterHelper.extractRegexPattern(comparator);
     switch (compareOp) {
       case EQUAL:
-        return F.qualifier().regex(pattern);
+        return FILTERS.qualifier().regex(pattern);
       case NO_OP:
-        return F.pass();
+        return FILTERS.pass();
       case LESS:
       case LESS_OR_EQUAL:
       case NOT_EQUAL:
diff --git a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/RandomRowFilterAdapter.java b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/RandomRowFilterAdapter.java
index fb018c433..c6b5549f5 100644
--- a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/RandomRowFilterAdapter.java
+++ b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/RandomRowFilterAdapter.java
@@ -15,7 +15,7 @@
  */
 package com.google.cloud.bigtable.hbase.adapters.filters;
 
-import static com.google.cloud.bigtable.data.v2.wrappers.Filters.F;
+import static com.google.cloud.bigtable.data.v2.wrappers.Filters.FILTERS;
 
 import com.google.bigtable.v2.RowFilter;
 
@@ -34,7 +34,7 @@ public class RandomRowFilterAdapter extends TypedFilterAdapterBase<RandomRowFilt
   @Override
   public RowFilter adapt(FilterAdapterContext context, RandomRowFilter filter)
       throws IOException {
-    return F.key().sample(filter.getChance()).toProto();
+    return FILTERS.key().sample(filter.getChance()).toProto();
   }
 
   /** {@inheritDoc} */
diff --git a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/RowFilterAdapter.java b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/RowFilterAdapter.java
index 9de6776ef..5671893fb 100644
--- a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/RowFilterAdapter.java
+++ b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/RowFilterAdapter.java
@@ -15,7 +15,7 @@
  */
 package com.google.cloud.bigtable.hbase.adapters.filters;
 
-import static com.google.cloud.bigtable.data.v2.wrappers.Filters.F;
+import static com.google.cloud.bigtable.data.v2.wrappers.Filters.FILTERS;
 
 import java.io.IOException;
 
@@ -68,7 +68,7 @@ public class RowFilterAdapter
       throw new IllegalStateException(String.format("Cannot adapt comparator %s", comparator
           .getClass().getCanonicalName()));
     }
-    return F.key().regex(regexValue).toProto();
+    return FILTERS.key().regex(regexValue).toProto();
   }
   
   /** {@inheritDoc} */
diff --git a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/SingleColumnValueExcludeFilterAdapter.java b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/SingleColumnValueExcludeFilterAdapter.java
index 56ec17a3c..656793e7a 100644
--- a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/SingleColumnValueExcludeFilterAdapter.java
+++ b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/SingleColumnValueExcludeFilterAdapter.java
@@ -15,7 +15,7 @@
  */
 package com.google.cloud.bigtable.hbase.adapters.filters;
 
-import static com.google.cloud.bigtable.data.v2.wrappers.Filters.F;
+import static com.google.cloud.bigtable.data.v2.wrappers.Filters.FILTERS;
 
 import com.google.bigtable.v2.RowFilter;
 import com.google.cloud.bigtable.data.v2.wrappers.Filters.QualifierRangeFilter;
@@ -58,16 +58,16 @@ public class SingleColumnValueExcludeFilterAdapter
       throws IOException {
     String family = Bytes.toString(context.getScan().getFamilies()[0]);
     ByteString qualifier = ByteString.copyFrom(filter.getQualifier());
-    return F.chain()
+    return FILTERS.chain()
         .filter(delegateAdapter.toFilter(context, filter))
-        .filter(F.interleave()
+        .filter(FILTERS.interleave()
             .filter(range(family).endOpen(qualifier))
             .filter(range(family).startOpen(qualifier)))
         .toProto();
   }
 
   private static QualifierRangeFilter range(String family) {
-    return F.qualifier().rangeWithinFamily(family);
+    return FILTERS.qualifier().rangeWithinFamily(family);
   }
 
   /** {@inheritDoc} */
diff --git a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/SingleColumnValueFilterAdapter.java b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/SingleColumnValueFilterAdapter.java
index 9ea5eb3b2..77d64a3fe 100644
--- a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/SingleColumnValueFilterAdapter.java
+++ b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/SingleColumnValueFilterAdapter.java
@@ -15,7 +15,7 @@
  */
 package com.google.cloud.bigtable.hbase.adapters.filters;
 
-import static com.google.cloud.bigtable.data.v2.wrappers.Filters.F;
+import static com.google.cloud.bigtable.data.v2.wrappers.Filters.FILTERS;
 
 import static com.google.cloud.bigtable.hbase.adapters.read.ReaderExpressionHelper.quoteRegularExpression;
 
@@ -42,7 +42,7 @@ public class SingleColumnValueFilterAdapter
     extends TypedFilterAdapterBase<SingleColumnValueFilter> {
 
   @VisibleForTesting
-  static final Filter LATEST_ONLY_FILTER = F.limit().cellsPerColumn(1);
+  static final Filter LATEST_ONLY_FILTER = FILTERS.limit().cellsPerColumn(1);
   private final ValueFilterAdapter delegateAdapter;
 
   /**
@@ -161,14 +161,14 @@ public class SingleColumnValueFilterAdapter
 
     // filter to return the row if the condition is met
     if (filter.getFilterIfMissing()) {
-      return F.condition(addValue(context, filter, columnSpecFilter))
-               .then(F.pass());
+      return FILTERS.condition(addValue(context, filter, columnSpecFilter))
+               .then(FILTERS.pass());
     } else {
-      return F.interleave()
-          .filter(F.condition(addValue(context, filter, columnSpecFilter.clone()))
-                   .then(F.pass()))
-          .filter(F.condition(columnSpecFilter)
-                   .otherwise(F.pass()));
+      return FILTERS.interleave()
+          .filter(FILTERS.condition(addValue(context, filter, columnSpecFilter.clone()))
+                   .then(FILTERS.pass()))
+          .filter(FILTERS.condition(columnSpecFilter)
+                   .otherwise(FILTERS.pass()));
     }
   }
 
@@ -182,9 +182,9 @@ public class SingleColumnValueFilterAdapter
       throws IOException {
     ByteString wrappedQual = ByteStringer.wrap(quoteRegularExpression(qualifier));
     String wrappedFamily = Bytes.toString(quoteRegularExpression(family));
-    ChainFilter builder = F.chain()
-        .filter(F.family().regex(wrappedFamily))
-        .filter(F.qualifier().regex(wrappedQual));
+    ChainFilter builder = FILTERS.chain()
+        .filter(FILTERS.family().regex(wrappedFamily))
+        .filter(FILTERS.qualifier().regex(wrappedQual));
 
     if (latestVersionOnly) {
       builder.filter(LATEST_ONLY_FILTER);
diff --git a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/TimestampFilterUtil.java b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/TimestampFilterUtil.java
index 76a1154e8..9f4d1f140 100644
--- a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/TimestampFilterUtil.java
+++ b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/TimestampFilterUtil.java
@@ -15,7 +15,7 @@
  */
 package com.google.cloud.bigtable.hbase.adapters.filters;
 
-import static com.google.cloud.bigtable.data.v2.wrappers.Filters.F;
+import static com.google.cloud.bigtable.data.v2.wrappers.Filters.FILTERS;
 
 import com.google.cloud.bigtable.data.v2.wrappers.Filters.Filter;
 import com.google.cloud.bigtable.hbase.BigtableConstants;
@@ -48,6 +48,6 @@ public class TimestampFilterUtil {
    */
   public static Filter toTimestampRangeFilter(long bigtableStartTimestamp,
       long bigtableEndTimestamp) {
-    return F.timestamp().range(bigtableStartTimestamp, bigtableEndTimestamp);
+    return FILTERS.timestamp().range(bigtableStartTimestamp, bigtableEndTimestamp);
   }
 }
diff --git a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/TimestampsFilterAdapter.java b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/TimestampsFilterAdapter.java
index 224677f62..e2ae05a3f 100644
--- a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/TimestampsFilterAdapter.java
+++ b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/TimestampsFilterAdapter.java
@@ -15,7 +15,7 @@
  */
 package com.google.cloud.bigtable.hbase.adapters.filters;
 
-import static com.google.cloud.bigtable.data.v2.wrappers.Filters.F;
+import static com.google.cloud.bigtable.data.v2.wrappers.Filters.FILTERS;
 
 import com.google.bigtable.v2.RowFilter;
 import com.google.cloud.bigtable.data.v2.wrappers.Filters.InterleaveFilter;
@@ -35,7 +35,7 @@ public class TimestampsFilterAdapter
   /** {@inheritDoc} */
   @Override
   public RowFilter adapt(FilterAdapterContext context, TimestampsFilter filter) {
-    InterleaveFilter interleave = F.interleave();
+    InterleaveFilter interleave = FILTERS.interleave();
     for (long timestamp : filter.getTimestamps()) {
       interleave.filter(TimestampFilterUtil.hbaseToTimestampRangeFilter(timestamp, timestamp + 1));
     }
diff --git a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/ValueFilterAdapter.java b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/ValueFilterAdapter.java
index 45e2085d7..f027bd458 100644
--- a/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/ValueFilterAdapter.java
+++ b/bigtable-hbase-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/adapters/filters/ValueFilterAdapter.java
@@ -15,7 +15,7 @@
  */
 package com.google.cloud.bigtable.hbase.adapters.filters;
 
-import static com.google.cloud.bigtable.data.v2.wrappers.Filters.F;
+import static com.google.cloud.bigtable.data.v2.wrappers.Filters.FILTERS;
 
 import com.google.bigtable.v2.RowFilter;
 import com.google.cloud.bigtable.data.v2.wrappers.Filters.Filter;
@@ -83,13 +83,13 @@ public class ValueFilterAdapter extends TypedFilterAdapterBase<ValueFilter> {
         if (comparator.getValue().length == 0) {
           // The empty case does needs to use valueRegexFilter, since "end value closed" of empty
           // is not allowed by the server.
-          return F.value().regex(value);
+          return FILTERS.value().regex(value);
         } else {
           return range().startClosed(value).endClosed(value);
         }
       case NOT_EQUAL:
         // This strictly less than + strictly greater than:
-        return F.interleave()
+        return FILTERS.interleave()
             .filter(range().endOpen(value))
             .filter(range().startOpen(value));
       case GREATER_OR_EQUAL:
@@ -99,7 +99,7 @@ public class ValueFilterAdapter extends TypedFilterAdapterBase<ValueFilter> {
       case NO_OP:
         // No-op always passes. Instead of attempting to return null or default instance,
         // include an always-match filter.
-        return F.pass();
+        return FILTERS.pass();
       default:
         throw new IllegalStateException(
             String.format("Cannot handle unknown compare op %s", compareOp));
@@ -107,7 +107,7 @@ public class ValueFilterAdapter extends TypedFilterAdapterBase<ValueFilter> {
   }
 
   private static ValueRangeFilter range() {
-    return F.value().range();
+    return FILTERS.value().range();
   }
 
   private Filter adaptRegexStringComparator(
@@ -115,9 +115,9 @@ public class ValueFilterAdapter extends TypedFilterAdapterBase<ValueFilter> {
     String pattern = FilterAdapterHelper.extractRegexPattern(comparator);
     switch (compareOp) {
       case EQUAL:
-        return F.value().regex(pattern);
+        return FILTERS.value().regex(pattern);
       case NO_OP:
-        return F.pass();
+        return FILTERS.pass();
       case LESS:
       case LESS_OR_EQUAL:
       case NOT_EQUAL:


Test patch:
diff --git a/bigtable-client-core-parent/bigtable-client-core/src/test/java/com/google/cloud/bigtable/data/v2/wrappers/FiltersTest.java b/bigtable-client-core-parent/bigtable-client-core/src/test/java/com/google/cloud/bigtable/data/v2/wrappers/FiltersTest.java
index 9196ebded..f8032f967 100644
--- a/bigtable-client-core-parent/bigtable-client-core/src/test/java/com/google/cloud/bigtable/data/v2/wrappers/FiltersTest.java
+++ b/bigtable-client-core-parent/bigtable-client-core/src/test/java/com/google/cloud/bigtable/data/v2/wrappers/FiltersTest.java
@@ -15,7 +15,7 @@
  */
 package com.google.cloud.bigtable.data.v2.wrappers;
 
-import static com.google.cloud.bigtable.data.v2.wrappers.Filters.F;
+import static com.google.cloud.bigtable.data.v2.wrappers.Filters.FILTERS;
 
 import java.util.concurrent.TimeUnit;
 
@@ -37,12 +37,12 @@ public class FiltersTest {
   @Test
   public void chainTest() {
     RowFilter actualProto =
-        F.chain()
-            .filter(F.key().regex(".*"))
-            .filter(F.key().sample(0.5))
-            .filter(F.chain()
-                .filter(F.family().regex("hi$"))
-                .filter(F.qualifier().regex("^q")))
+        FILTERS.chain()
+            .filter(FILTERS.key().regex(".*"))
+            .filter(FILTERS.key().sample(0.5))
+            .filter(FILTERS.chain()
+                .filter(FILTERS.family().regex("hi$"))
+                .filter(FILTERS.qualifier().regex("^q")))
             .toProto();
 
     RowFilter expectedFilter =
@@ -69,12 +69,12 @@ public class FiltersTest {
   @Test
   public void interleaveTest() {
     RowFilter actualProto =
-        F.interleave()
-            .filter(F.key().regex(".*"))
-            .filter(F.key().sample(0.5))
-            .filter(F.interleave()
-                .filter(F.family().regex("hi$"))
-                .filter(F.qualifier().regex("^q")))
+        FILTERS.interleave()
+            .filter(FILTERS.key().regex(".*"))
+            .filter(FILTERS.key().sample(0.5))
+            .filter(FILTERS.interleave()
+                .filter(FILTERS.family().regex("hi$"))
+                .filter(FILTERS.qualifier().regex("^q")))
             .toProto();
 
     RowFilter expectedFilter =
@@ -101,9 +101,9 @@ public class FiltersTest {
   @Test
   public void conditionTest() {
     RowFilter actualProto =
-        F.condition(F.key().regex(".*"))
-            .then(F.label("true"))
-            .otherwise(F.label("false"))
+        FILTERS.condition(FILTERS.key().regex(".*"))
+            .then(FILTERS.label("true"))
+            .otherwise(FILTERS.label("false"))
             .toProto();
 
     RowFilter expectedFilter =
@@ -121,7 +121,7 @@ public class FiltersTest {
 
   @Test
   public void passTest() {
-    RowFilter actualProto = F.pass().toProto();
+    RowFilter actualProto = FILTERS.pass().toProto();
 
     RowFilter expectedFilter = RowFilter.newBuilder().setPassAllFilter(true).build();
 
@@ -130,7 +130,7 @@ public class FiltersTest {
 
   @Test
   public void blockTest() {
-    RowFilter actualProto = F.block().toProto();
+    RowFilter actualProto = FILTERS.block().toProto();
 
     RowFilter expectedFilter = RowFilter.newBuilder().setBlockAllFilter(true).build();
 
@@ -139,7 +139,7 @@ public class FiltersTest {
 
   @Test
   public void sinkTest() {
-    RowFilter actualProto = F.sink().toProto();
+    RowFilter actualProto = FILTERS.sink().toProto();
 
     RowFilter expectedFilter = RowFilter.newBuilder().setSink(true).build();
 
@@ -148,7 +148,7 @@ public class FiltersTest {
 
   @Test
   public void labelTest() {
-    RowFilter actualProto = F.label("my-label").toProto();
+    RowFilter actualProto = FILTERS.label("my-label").toProto();
 
     RowFilter expectedFilter = RowFilter.newBuilder().setApplyLabelTransformer("my-label").build();
 
@@ -157,7 +157,7 @@ public class FiltersTest {
 
   @Test
   public void keyRegexTest() {
-    RowFilter actualProto = F.key().regex(".*").toProto();
+    RowFilter actualProto = FILTERS.key().regex(".*").toProto();
 
     RowFilter expectedFilter =
         RowFilter.newBuilder().setRowKeyRegexFilter(ByteString.copyFromUtf8(".*")).build();
@@ -167,7 +167,7 @@ public class FiltersTest {
 
   @Test
   public void keyExactMatchTest() {
-    RowFilter actualProto = F.key().exactMatch(ByteString.copyFromUtf8(".*")).toProto();
+    RowFilter actualProto = FILTERS.key().exactMatch(ByteString.copyFromUtf8(".*")).toProto();
 
     RowFilter expectedFilter =
         RowFilter.newBuilder().setRowKeyRegexFilter(ByteString.copyFromUtf8("\\.\\*")).build();
@@ -177,7 +177,7 @@ public class FiltersTest {
 
   @Test
   public void keySampleTest() {
-    RowFilter actualProto = F.key().sample(0.3).toProto();
+    RowFilter actualProto = FILTERS.key().sample(0.3).toProto();
 
     RowFilter expectedFilter = RowFilter.newBuilder().setRowSampleFilter(0.3).build();
 
@@ -186,7 +186,7 @@ public class FiltersTest {
 
   @Test
   public void familyRegexTest() {
-    RowFilter actualProto = F.family().regex("^hi").toProto();
+    RowFilter actualProto = FILTERS.family().regex("^hi").toProto();
 
     RowFilter expectedFilter = RowFilter.newBuilder().setFamilyNameRegexFilter("^hi").build();
 
@@ -195,7 +195,7 @@ public class FiltersTest {
 
   @Test
   public void familyExactMatchTest() {
-    RowFilter actualProto = F.family().exactMatch("^hi").toProto();
+    RowFilter actualProto = FILTERS.family().exactMatch("^hi").toProto();
 
     RowFilter expectedFilter = RowFilter.newBuilder().setFamilyNameRegexFilter("\\^hi").build();
 
@@ -204,7 +204,7 @@ public class FiltersTest {
 
   @Test
   public void qualifierRegexTest() {
-    RowFilter actualProto = F.qualifier().regex("^hi").toProto();
+    RowFilter actualProto = FILTERS.qualifier().regex("^hi").toProto();
 
     RowFilter expectedFilter =
         RowFilter.newBuilder()
@@ -216,7 +216,7 @@ public class FiltersTest {
 
   @Test
   public void qualifierExactMatchTest() {
-    RowFilter actualProto = F.qualifier().exactMatch(ByteString.copyFromUtf8("^hi")).toProto();
+    RowFilter actualProto = FILTERS.qualifier().exactMatch(ByteString.copyFromUtf8("^hi")).toProto();
 
     RowFilter expectedFilter =
         RowFilter.newBuilder()
@@ -231,7 +231,7 @@ public class FiltersTest {
     String family = "family";
     ByteString begin = ByteString.copyFromUtf8("begin");
     ByteString end = ByteString.copyFromUtf8("end");
-    RowFilter actualProto = F.qualifier().rangeWithinFamily(family)
+    RowFilter actualProto = FILTERS.qualifier().rangeWithinFamily(family)
         .startOpen(begin)
         .endClosed(end)
         .toProto();
@@ -252,7 +252,7 @@ public class FiltersTest {
     String family = "family";
     ByteString begin = ByteString.copyFromUtf8("begin");
     ByteString end = ByteString.copyFromUtf8("end");
-    RowFilter actualProto = F.qualifier().rangeWithinFamily(family)
+    RowFilter actualProto = FILTERS.qualifier().rangeWithinFamily(family)
         .startClosed(begin)
         .endOpen(end)
         .toProto();
@@ -270,7 +270,7 @@ public class FiltersTest {
 
   @Test
   public void valueRegex() {
-    RowFilter actualProto = F.value().regex("some[0-9]regex").toProto();
+    RowFilter actualProto = FILTERS.value().regex("some[0-9]regex").toProto();
 
     RowFilter expectedFilter =
         RowFilter.newBuilder()
@@ -283,7 +283,7 @@ public class FiltersTest {
   @Test
   public void valueExactMatch() {
     RowFilter actualProto =
-        F.value().exactMatch(ByteString.copyFromUtf8("some[0-9]regex")).toProto();
+        FILTERS.value().exactMatch(ByteString.copyFromUtf8("some[0-9]regex")).toProto();
 
     RowFilter expectedFilter =
         RowFilter.newBuilder()
@@ -298,7 +298,7 @@ public class FiltersTest {
     ByteString begin = ByteString.copyFromUtf8("begin");
     ByteString end = ByteString.copyFromUtf8("end");
 
-    RowFilter actualProto = F.value().range()
+    RowFilter actualProto = FILTERS.value().range()
         .startOpen(begin)
         .endClosed(end)
         .toProto();
@@ -319,7 +319,7 @@ public class FiltersTest {
     ByteString begin = ByteString.copyFromUtf8("begin");
     ByteString end = ByteString.copyFromUtf8("end");
 
-    RowFilter actualProto = F.value().range()
+    RowFilter actualProto = FILTERS.value().range()
         .startClosed(begin)
         .endOpen(end)
         .toProto();
@@ -337,7 +337,7 @@ public class FiltersTest {
 
   @Test
   public void valueStripTest() {
-    RowFilter actualProto = F.value().strip().toProto();
+    RowFilter actualProto = FILTERS.value().strip().toProto();
 
     RowFilter expectedFilter = RowFilter.newBuilder().setStripValueTransformer(true).build();
 
@@ -346,7 +346,7 @@ public class FiltersTest {
 
   @Test
   public void offsetCellsPerRowTest() {
-    RowFilter actualProto = F.offset().cellsPerRow(10).toProto();
+    RowFilter actualProto = FILTERS.offset().cellsPerRow(10).toProto();
 
     RowFilter expectedFilter = RowFilter.newBuilder().setCellsPerRowOffsetFilter(10).build();
 
@@ -355,7 +355,7 @@ public class FiltersTest {
 
   @Test
   public void limitCellsPerRowTest() {
-    RowFilter actualProto = F.limit().cellsPerRow(10).toProto();
+    RowFilter actualProto = FILTERS.limit().cellsPerRow(10).toProto();
 
     RowFilter expectedFilter = RowFilter.newBuilder().setCellsPerRowLimitFilter(10).build();
 
@@ -364,7 +364,7 @@ public class FiltersTest {
 
   @Test
   public void limitCellsPerColumnTest() {
-    RowFilter actualProto = F.limit().cellsPerColumn(10).toProto();
+    RowFilter actualProto = FILTERS.limit().cellsPerColumn(10).toProto();
 
     RowFilter expectedFilter = RowFilter.newBuilder().setCellsPerColumnLimitFilter(10).build();
 
@@ -375,7 +375,7 @@ public class FiltersTest {
   public void timestampFullRangeTest() {
     long start = TimeUnit.MILLISECONDS.toMicros(System.currentTimeMillis() - 10000000);
     long end = TimeUnit.MILLISECONDS.toMicros(System.currentTimeMillis());
-    RowFilter actualProto = F.timestamp().range(start, end).toProto();
+    RowFilter actualProto = FILTERS.timestamp().range(start, end).toProto();
 
     RowFilter.Builder expected = RowFilter.newBuilder();
     expected.getTimestampRangeFilterBuilder()
@@ -388,7 +388,7 @@ public class FiltersTest {
   @Test
   public void timestampStartTest() {
     long start = TimeUnit.MILLISECONDS.toMicros(System.currentTimeMillis() - 10000000);
-    RowFilter actualProto = F.timestamp().range().startClosed(start).toProto();
+    RowFilter actualProto = FILTERS.timestamp().range().startClosed(start).toProto();
 
     RowFilter.Builder expected = RowFilter.newBuilder();
     expected.getTimestampRangeFilterBuilder()
@@ -400,7 +400,7 @@ public class FiltersTest {
   @Test
   public void timestampEndTest() {
     long end = TimeUnit.MILLISECONDS.toMicros(System.currentTimeMillis());
-    RowFilter actualProto = F.timestamp().range().endOpen(end).toProto();
+    RowFilter actualProto = FILTERS.timestamp().range().endOpen(end).toProto();
 
     RowFilter.Builder expected = RowFilter.newBuilder();
     expected.getTimestampRangeFilterBuilder()
diff --git a/bigtable-hbase-parent/bigtable-hbase/src/test/java/com/google/cloud/bigtable/hbase/adapters/filters/TestColumnCountGetFilterAdapter.java b/bigtable-hbase-parent/bigtable-hbase/src/test/java/com/google/cloud/bigtable/hbase/adapters/filters/TestColumnCountGetFilterAdapter.java
index a20ec53cb..1bb711e85 100644
--- a/bigtable-hbase-parent/bigtable-hbase/src/test/java/com/google/cloud/bigtable/hbase/adapters/filters/TestColumnCountGetFilterAdapter.java
+++ b/bigtable-hbase-parent/bigtable-hbase/src/test/java/com/google/cloud/bigtable/hbase/adapters/filters/TestColumnCountGetFilterAdapter.java
@@ -15,7 +15,7 @@
  */
 package com.google.cloud.bigtable.hbase.adapters.filters;
 
-import static com.google.cloud.bigtable.data.v2.wrappers.Filters.F;
+import static com.google.cloud.bigtable.data.v2.wrappers.Filters.FILTERS;
 
 import com.google.bigtable.v2.RowFilter;
 
@@ -40,9 +40,9 @@ public class TestColumnCountGetFilterAdapter {
             new FilterAdapterContext(new Scan(), null),
             new ColumnCountGetFilter(2));
     Assert.assertEquals(
-        F.chain()
-            .filter(F.limit().cellsPerColumn(1))
-            .filter(F.limit().cellsPerRow(2))
+        FILTERS.chain()
+            .filter(FILTERS.limit().cellsPerColumn(1))
+            .filter(FILTERS.limit().cellsPerRow(2))
             .toProto(),
         adaptedFilter);
   }
diff --git a/bigtable-hbase-parent/bigtable-hbase/src/test/java/com/google/cloud/bigtable/hbase/adapters/filters/TestColumnPaginationFilterAdapter.java b/bigtable-hbase-parent/bigtable-hbase/src/test/java/com/google/cloud/bigtable/hbase/adapters/filters/TestColumnPaginationFilterAdapter.java
index fc558205a..e21cc9b8f 100644
--- a/bigtable-hbase-parent/bigtable-hbase/src/test/java/com/google/cloud/bigtable/hbase/adapters/filters/TestColumnPaginationFilterAdapter.java
+++ b/bigtable-hbase-parent/bigtable-hbase/src/test/java/com/google/cloud/bigtable/hbase/adapters/filters/TestColumnPaginationFilterAdapter.java
@@ -15,7 +15,7 @@
  */
 package com.google.cloud.bigtable.hbase.adapters.filters;
 
-import static com.google.cloud.bigtable.data.v2.wrappers.Filters.F;
+import static com.google.cloud.bigtable.data.v2.wrappers.Filters.FILTERS;
 
 import com.google.bigtable.v2.RowFilter;
 import com.google.protobuf.ByteString;
@@ -40,10 +40,10 @@ public class TestColumnPaginationFilterAdapter {
     ColumnPaginationFilter filter = new ColumnPaginationFilter(10, 20);
     RowFilter adaptedFilter = adapter.adapt(
         new FilterAdapterContext(new Scan(), null), filter);
-    RowFilter expected = F.chain()
-          .filter(F.limit().cellsPerColumn(1))
-          .filter(F.offset().cellsPerRow(20))
-          .filter(F.limit().cellsPerRow(10))
+    RowFilter expected = FILTERS.chain()
+          .filter(FILTERS.limit().cellsPerColumn(1))
+          .filter(FILTERS.offset().cellsPerRow(20))
+          .filter(FILTERS.limit().cellsPerRow(10))
           .toProto();
     Assert.assertEquals(expected, adaptedFilter);
   }
@@ -53,9 +53,9 @@ public class TestColumnPaginationFilterAdapter {
     ColumnPaginationFilter filter = new ColumnPaginationFilter(10, 0);
     RowFilter adaptedFilter = adapter.adapt(
         new FilterAdapterContext(new Scan(), null), filter);
-    RowFilter expected = F.chain()
-        .filter(F.limit().cellsPerColumn(1))
-        .filter(F.limit().cellsPerRow(10))
+    RowFilter expected = FILTERS.chain()
+        .filter(FILTERS.limit().cellsPerColumn(1))
+        .filter(FILTERS.limit().cellsPerRow(10))
         .toProto();
     Assert.assertEquals(expected, adaptedFilter);
   }
@@ -66,11 +66,11 @@ public class TestColumnPaginationFilterAdapter {
     RowFilter adaptedFilter = adapter.adapt(
         new FilterAdapterContext(scan, null),
         new ColumnPaginationFilter(10, Bytes.toBytes("q1")));
-    RowFilter expected = F.chain()
-        .filter(F.limit().cellsPerColumn(1))
-        .filter(F.qualifier().rangeWithinFamily("f1")
+    RowFilter expected = FILTERS.chain()
+        .filter(FILTERS.limit().cellsPerColumn(1))
+        .filter(FILTERS.qualifier().rangeWithinFamily("f1")
             .startClosed(ByteString.copyFromUtf8("q1")))
-        .filter(F.limit().cellsPerRow(10))
+        .filter(FILTERS.limit().cellsPerRow(10))
         .toProto();
     Assert.assertEquals(expected, adaptedFilter);
   }
diff --git a/bigtable-hbase-parent/bigtable-hbase/src/test/java/com/google/cloud/bigtable/hbase/adapters/filters/TestSingleColumnValueFilterAdapter.java b/bigtable-hbase-parent/bigtable-hbase/src/test/java/com/google/cloud/bigtable/hbase/adapters/filters/TestSingleColumnValueFilterAdapter.java
index fe41fd29f..da7001902 100644
--- a/bigtable-hbase-parent/bigtable-hbase/src/test/java/com/google/cloud/bigtable/hbase/adapters/filters/TestSingleColumnValueFilterAdapter.java
+++ b/bigtable-hbase-parent/bigtable-hbase/src/test/java/com/google/cloud/bigtable/hbase/adapters/filters/TestSingleColumnValueFilterAdapter.java
@@ -15,7 +15,7 @@
  */
 package com.google.cloud.bigtable.hbase.adapters.filters;
 
-import static com.google.cloud.bigtable.data.v2.wrappers.Filters.F;
+import static com.google.cloud.bigtable.data.v2.wrappers.Filters.FILTERS;
 
 import com.google.bigtable.v2.RowFilter;
 import com.google.bigtable.v2.RowFilter.Chain;
@@ -131,13 +131,13 @@ public class TestSingleColumnValueFilterAdapter  {
             .getChain()));
 
     Assert.assertEquals(
-        F.pass().toProto(),
+        FILTERS.pass().toProto(),
         adaptedFilter.getCondition().getTrueFilter());
   }
 
   private static RowFilter createValueRangeFilter(String valueStr) {
     ByteString value = ByteString.copyFromUtf8(valueStr);
-    return F.value().range().startClosed(value).endClosed(value).toProto();
+    return FILTERS.value().range().startClosed(value).endClosed(value).toProto();
   }
 
   // Assert that the given family, qualifier and versions are applied
@@ -154,7 +154,7 @@ public class TestSingleColumnValueFilterAdapter  {
 
     if (latestOnly) {
       Assert.assertEquals(
-          F.limit().cellsPerColumn(1).toProto(),
+          FILTERS.limit().cellsPerColumn(1).toProto(),
           chain.getFilters(2));
     }
   }
@@ -180,7 +180,7 @@ public class TestSingleColumnValueFilterAdapter  {
     // Assert that the condition also includes a value filter:
     ByteString valueBS = ByteString.copyFrom(value);
     Assert.assertEquals(
-        F.value().range()
+        FILTERS.value().range()
             .startClosed(valueBS)
             .endClosed(valueBS)
             .toProto(),
@@ -197,14 +197,14 @@ public class TestSingleColumnValueFilterAdapter  {
 
     // Cell is in the row, include all cells in the true branch:
     Assert.assertEquals(
-        F.pass().toProto(),
+        FILTERS.pass().toProto(),
         cellSetCondition.getTrueFilter());
 
     Assert.assertFalse(cellSetCondition.hasFalseFilter());
 
     // Cell is not in the row, include all cells in the false branch:
     Assert.assertEquals(
-        F.pass().toProto(),
+        FILTERS.pass().toProto(),
         cellUnsetCondition.getFalseFilter());
 
     Assert.assertFalse(cellUnsetCondition.hasTrueFilter());
diff --git a/bigtable-hbase-parent/bigtable-hbase/src/test/java/com/google/cloud/bigtable/hbase/filter/TestBigtableFilter.java b/bigtable-hbase-parent/bigtable-hbase/src/test/java/com/google/cloud/bigtable/hbase/filter/TestBigtableFilter.java
index 5fadbe64f..bbacefc0c 100644
--- a/bigtable-hbase-parent/bigtable-hbase/src/test/java/com/google/cloud/bigtable/hbase/filter/TestBigtableFilter.java
+++ b/bigtable-hbase-parent/bigtable-hbase/src/test/java/com/google/cloud/bigtable/hbase/filter/TestBigtableFilter.java
@@ -33,7 +33,7 @@ import com.google.cloud.bigtable.data.v2.wrappers.Filters;
 public class TestBigtableFilter {
   @Test
   public void testSerialization() throws IOException {
-    BigtableFilter original = new BigtableFilter(Filters.F.pass());
+    BigtableFilter original = new BigtableFilter(Filters.FILTERS.pass());
     FilterProtos.Filter proto = ProtobufUtil.toFilter(original);
     Assert.assertEquals(original, ProtobufUtil.toFilter(proto));
   }