Revert "fix: change app_profile_id to the correct header app_profile (#…

…318)" (#335) This reverts commit 237b15d.
googleapis · Jun 9, 2020 · 200cfac · 200cfac
1 parent fa0b558
commit 200cfac
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/...d-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java b/...d-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java
@@ -303,7 +303,7 @@ private <ReqT, RowT> ServerStreamingCallable<ReadRowsRequest, RowT> createReadRo
                       public Map<String, String> extract(ReadRowsRequest readRowsRequest) {
                         return ImmutableMap.of(
                             "table_name", readRowsRequest.getTableName(),
-                            "app_profile", readRowsRequest.getAppProfileId());
+                            "app_profile_id", readRowsRequest.getAppProfileId());
                       }
                     })
                 .build(),
@@ -360,7 +360,7 @@ public Map<String, String> extract(
                           SampleRowKeysRequest sampleRowKeysRequest) {
                         return ImmutableMap.of(
                             "table_name", sampleRowKeysRequest.getTableName(),
-                            "app_profile", sampleRowKeysRequest.getAppProfileId());
+                            "app_profile_id", sampleRowKeysRequest.getAppProfileId());
                       }
                     })
                 .build(),
@@ -394,7 +394,7 @@ private UnaryCallable<RowMutation, Void> createMutateRowCallable() {
                       public Map<String, String> extract(MutateRowRequest mutateRowRequest) {
                         return ImmutableMap.of(
                             "table_name", mutateRowRequest.getTableName(),
-                            "app_profile", mutateRowRequest.getAppProfileId());
+                            "app_profile_id", mutateRowRequest.getAppProfileId());
                       }
                     })
                 .build(),
@@ -507,7 +507,7 @@ private UnaryCallable<MutateRowsRequest, Void> createMutateRowsBaseCallable() {
                       public Map<String, String> extract(MutateRowsRequest mutateRowsRequest) {
                         return ImmutableMap.of(
                             "table_name", mutateRowsRequest.getTableName(),
-                            "app_profile", mutateRowsRequest.getAppProfileId());
+                            "app_profile_id", mutateRowsRequest.getAppProfileId());
                       }
                     })
                 .build(),
@@ -549,7 +549,7 @@ public Map<String, String> extract(
                           CheckAndMutateRowRequest checkAndMutateRowRequest) {
                         return ImmutableMap.of(
                             "table_name", checkAndMutateRowRequest.getTableName(),
-                            "app_profile", checkAndMutateRowRequest.getAppProfileId());
+                            "app_profile_id", checkAndMutateRowRequest.getAppProfileId());
                       }
                     })
                 .build(),
@@ -583,7 +583,7 @@ private UnaryCallable<ReadModifyWriteRow, Row> createReadModifyWriteRowCallable(
                       public Map<String, String> extract(ReadModifyWriteRowRequest request) {
                         return ImmutableMap.of(
                             "table_name", request.getTableName(),
-                            "app_profile", request.getAppProfileId());
+                            "app_profile_id", request.getAppProfileId());
                       }
                     })
                 .build(),

diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/HeadersTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/HeadersTest.java
@@ -175,7 +175,7 @@ private void verifyHeaderSent() {
     String requestParamsvalue = metadata.get(X_GOOG_REQUEST_PARAMS_KEY);
     assertThat(requestParamsvalue).containsMatch("(^|.*&)table_name=" + TABLE_NAME + "($|&.*)");
     assertThat(requestParamsvalue)
-        .containsMatch("(^|.*&)app_profile=" + APP_PROFILE_ID + "($|&.*)");
+        .containsMatch("(^|.*&)app_profile_id=" + APP_PROFILE_ID + "($|&.*)");
 
     String apiClientValue = metadata.get(API_CLIENT_HEADER_KEY);
     assertThat(apiClientValue).containsMatch("gl-java/[.\\d_]+");