From 450a61b473e49fba977638e9aef035afef3a5d39 Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Wed, 8 Apr 2026 13:52:04 -0400 Subject: [PATCH 1/3] DataConnectGrpcClient.kt: rename "requestName" to "connectorResourceName" [skip actions] --- firebase-dataconnect/CHANGELOG.md | 2 ++ .../firebase/dataconnect/core/DataConnectGrpcClient.kt | 6 +++--- .../dataconnect/core/DataConnectGrpcClientUnitTest.kt | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/firebase-dataconnect/CHANGELOG.md b/firebase-dataconnect/CHANGELOG.md index 78097416fc2..55cccdd9d4e 100644 --- a/firebase-dataconnect/CHANGELOG.md +++ b/firebase-dataconnect/CHANGELOG.md @@ -7,6 +7,8 @@ ([#7910](https://github.com/firebase/firebase-android-sdk/pull/7910)) - [changed] Internal refactor to use immutable byte arrays. ([#7957](https://github.com/firebase/firebase-android-sdk/pull/7957)) +- [changed] Internal refactor to use more descriptive variable names. + ([#NNNN](https://github.com/firebase/firebase-android-sdk/pull/NNNN)) # 17.2.0 diff --git a/firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/core/DataConnectGrpcClient.kt b/firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/core/DataConnectGrpcClient.kt index ecb783e163f..6e8c59761c5 100644 --- a/firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/core/DataConnectGrpcClient.kt +++ b/firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/core/DataConnectGrpcClient.kt @@ -47,7 +47,7 @@ internal class DataConnectGrpcClient( val instanceId: String get() = logger.nameWithId - private val requestName = + private val connectorResourceName = "projects/$projectId/" + "locations/${connector.location}" + "/services/${connector.serviceId}" + @@ -67,7 +67,7 @@ internal class DataConnectGrpcClient( fetchPolicy: FetchPolicy, ): OperationResult { val request = executeQueryRequest { - this.name = requestName + this.name = connectorResourceName this.operationName = operationName this.variables = variables } @@ -87,7 +87,7 @@ internal class DataConnectGrpcClient( callerSdkType: FirebaseDataConnect.CallerSdkType, ): OperationResult { val request = executeMutationRequest { - this.name = requestName + this.name = connectorResourceName this.operationName = operationName this.variables = variables } diff --git a/firebase-dataconnect/src/test/kotlin/com/google/firebase/dataconnect/core/DataConnectGrpcClientUnitTest.kt b/firebase-dataconnect/src/test/kotlin/com/google/firebase/dataconnect/core/DataConnectGrpcClientUnitTest.kt index 8b0bd30c92f..873a28697d2 100644 --- a/firebase-dataconnect/src/test/kotlin/com/google/firebase/dataconnect/core/DataConnectGrpcClientUnitTest.kt +++ b/firebase-dataconnect/src/test/kotlin/com/google/firebase/dataconnect/core/DataConnectGrpcClientUnitTest.kt @@ -170,14 +170,14 @@ class DataConnectGrpcClientUnitTest { fetchPolicy ) - val expectedName = + val expectedConnectorResourceName = "projects/${projectId}" + "/locations/${connectorConfig.location}" + "/services/${connectorConfig.serviceId}" + "/connectors/${connectorConfig.connector}" val expectedRequest = ExecuteQueryRequest.newBuilder() - .setName(expectedName) + .setName(expectedConnectorResourceName) .setOperationName(operationName) .setVariables(variables) .build() @@ -200,14 +200,14 @@ class DataConnectGrpcClientUnitTest { fun `executeMutation() should send the right ExecuteMutationRequest`() = runTest { dataConnectGrpcClient.executeMutation(requestId, operationName, variables, callerSdkType) - val expectedName = + val expectedConnectorResourceName = "projects/${projectId}" + "/locations/${connectorConfig.location}" + "/services/${connectorConfig.serviceId}" + "/connectors/${connectorConfig.connector}" val expectedRequest = ExecuteMutationRequest.newBuilder() - .setName(expectedName) + .setName(expectedConnectorResourceName) .setOperationName(operationName) .setVariables(variables) .build() From 53737e1fc3fad1817fb981fdf161f8e95392125d Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Wed, 8 Apr 2026 13:54:59 -0400 Subject: [PATCH 2/3] CHANGELOG.md: update PR number --- firebase-dataconnect/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firebase-dataconnect/CHANGELOG.md b/firebase-dataconnect/CHANGELOG.md index 55cccdd9d4e..4865e825354 100644 --- a/firebase-dataconnect/CHANGELOG.md +++ b/firebase-dataconnect/CHANGELOG.md @@ -8,7 +8,7 @@ - [changed] Internal refactor to use immutable byte arrays. ([#7957](https://github.com/firebase/firebase-android-sdk/pull/7957)) - [changed] Internal refactor to use more descriptive variable names. - ([#NNNN](https://github.com/firebase/firebase-android-sdk/pull/NNNN)) + ([#8025](https://github.com/firebase/firebase-android-sdk/pull/8025)) # 17.2.0 From 7633a7637f2bf525fa9b0413271a5bcccbaa1e59 Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Wed, 8 Apr 2026 16:48:54 -0400 Subject: [PATCH 3/3] CHANGELOG.md: fix bad merge --- firebase-dataconnect/CHANGELOG.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/firebase-dataconnect/CHANGELOG.md b/firebase-dataconnect/CHANGELOG.md index c242f10debf..9470b414112 100644 --- a/firebase-dataconnect/CHANGELOG.md +++ b/firebase-dataconnect/CHANGELOG.md @@ -7,13 +7,10 @@ ([#7910](https://github.com/firebase/firebase-android-sdk/pull/7910)) - [changed] Internal refactor to use immutable byte arrays. ([#7957](https://github.com/firebase/firebase-android-sdk/pull/7957)) -<<<<<<< dconeybe/dataconnect/ConnectorResourceName -- [changed] Internal refactor to use more descriptive variable names. - ([#8025](https://github.com/firebase/firebase-android-sdk/pull/8025)) -======= - [changed] Internal refactor for calculating debug logging strings. ([#8024](https://github.com/firebase/firebase-android-sdk/pull/8024)) ->>>>>>> main +- [changed] Internal refactor to use more descriptive variable names. + ([#8025](https://github.com/firebase/firebase-android-sdk/pull/8025)) # 17.2.0