Skip to content

dataconnect(change): internal refactor of connectorResourceName variable names #8025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dconeybe merged 4 commits into from
Apr 8, 2026
+9 −7
Merged

dataconnect(change): internal refactor of connectorResourceName variable names #8025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
450a61b
DataConnectGrpcClient.kt: rename "requestName" to "connectorResourceN…
dconeybe Apr 8, 2026
53737e1
CHANGELOG.md: update PR number
dconeybe Apr 8, 2026
0bef483
Merge branch 'main' into dconeybe/dataconnect/ConnectorResourceName
dconeybe Apr 8, 2026
7633a76
CHANGELOG.md: fix bad merge
dconeybe Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions firebase-dataconnect/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
([#7957](https://github.com/firebase/firebase-android-sdk/pull/7957))
- [changed] Internal refactor for calculating debug logging strings.
([#8024](https://github.com/firebase/firebase-android-sdk/pull/8024))
- [changed] Internal refactor to use more descriptive variable names.
([#8025](https://github.com/firebase/firebase-android-sdk/pull/8025))

# 17.2.0

Expand Down
6 changes: 3 additions & 3 deletions ...dataconnect/src/main/kotlin/com/google/firebase/dataconnect/core/DataConnectGrpcClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}" +
Expand All @@ -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
}
Expand All @@ -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
}
Expand Down
8 changes: 4 additions & 4 deletions ...ect/src/test/kotlin/com/google/firebase/dataconnect/core/DataConnectGrpcClientUnitTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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()
Expand Down
Loading