Added Query#fromProto to convert protobuf ReadRowsRequest

google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Query.java

@@ -260,6 +260,25 @@ public ReadRowsRequest toProto(RequestContext requestContext) {
         .build();
   }
 
+  /**
+   * Wraps the protobuf {@link ReadRowsRequest}. This method is considered an internal implementation detail
+   * and not meant to be used by applications.
+   */
+  @InternalApi
+  public static Query fromProto(ReadRowsRequest request) {
+    Preconditions.checkArgument(request != null, "ReadRowsRequest must not be null");
+
+    TableName tableName = TableName.parse(request.getTableName());
+    String tableId = "";
+    if (tableName != null) {
+      tableId = tableName.getTable();
+    }
+
+    Query query = new Query(tableId);
+    query.builder = ReadRowsRequest.newBuilder(request);
+    return query;
+  }
+
   private static ByteString wrapKey(String key) {
     if (key == null) {
       return null;

google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/QueryTest.java

@@ -227,4 +227,48 @@ private static ReadRowsRequest.Builder expectedProtoBuilder() {
         .setTableName(TABLE_NAME.toString())
         .setAppProfileId(APP_PROFILE_ID);
   }
+
+  @Test
+  public void testFromProto() {
+    ReadRowsRequest request = ReadRowsRequest.newBuilder()
+        .setTableName(TABLE_NAME.toString())
+        .setAppProfileId(APP_PROFILE_ID)
+        .setFilter(
+            RowFilter.newBuilder()
+                .setRowKeyRegexFilter(ByteString.copyFromUtf8(".*")))
+        .setRows(RowSet.newBuilder()
+                .addRowKeys(ByteString.copyFromUtf8("row-key"))
+                .addRowRanges(
+                    RowRange.newBuilder()
+                        .setStartKeyClosed(ByteString.copyFromUtf8("j"))
+                        .setEndKeyClosed(ByteString.copyFromUtf8("z"))))
+        .build();
+    Query query = Query.fromProto(request);
+
+    assertThat(query.toProto(requestContext))
+        .isEqualTo(request);
+  }
+
+  @Test
+  public void testFromProtoWithEmptyTableId() {
+	TableName EMPTY_TABLE_NAME = TableName.of("", "", "");
+	ReadRowsRequest request = ReadRowsRequest.newBuilder()
+      .setTableName(EMPTY_TABLE_NAME.toString())
+      .setFilter(
+          RowFilter.newBuilder()
+              .setRowKeyRegexFilter(
+                  ByteString.copyFromUtf8(".*")))
+      .setRows(
+          RowSet.newBuilder()
+              .addRowKeys(ByteString.copyFromUtf8("row-key"))
+              .addRowRanges(
+                  RowRange.newBuilder()
+                      .setStartKeyClosed(ByteString.copyFromUtf8("j"))
+                      .setEndKeyClosed(ByteString.copyFromUtf8("z"))))
+		  .build();
+
+	RequestContext reqContext = RequestContext.create(InstanceName.of("", ""), "");
+	assertThat(Query.fromProto(request).toProto(reqContext))
+		    .isEqualTo(request);
+  }
 }