Skip to content

Commit 32b05d0

Browse files
lqiu96lqiu96
authored
Merge branch 'main' into docs-auth-impersonated-quota-project-12604
2 parents 7253c58 + 6bb477b commit 32b05d0

16 files changed

Lines changed: 143 additions & 24 deletions

File tree

‎.github/workflows/ci.yaml‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ jobs:
5656
workflows:
5757
- '.github/workflows/**'
5858
src:
59-
- '!(google-auth-library-java|grpc-gcp-java|java-bigquery|java-bigquery-jdbc|java-bigquerystorage|java-bigtable|java-cloud-bom|java-datastore|java-firestore|java-logging|java-logging-logback|java-pubsub|java-shared-config|java-showcase|java-spanner|java-storage)/**/*.java'
60-
- '!(google-auth-library-java|grpc-gcp-java|java-bigquery|java-bigquery-jdbc|java-bigquerystorage|java-bigtable|java-cloud-bom|java-datastore|java-firestore|java-logging|java-logging-logback|java-pubsub|java-shared-config|java-showcase|java-spanner|java-storage)/**/pom.xml'
59+
- '!(google-auth-library-java|grpc-gcp-java|java-bigquery|java-bigquery-jdbc|java-bigquerystorage|java-bigtable|java-cloud-bom|java-datastore|java-firestore|java-logging|java-logging-logback|java-pubsub|java-showcase|java-spanner|java-storage)/**/*.java'
60+
- '!(google-auth-library-java|grpc-gcp-java|java-bigquery|java-bigquery-jdbc|java-bigquerystorage|java-bigtable|java-cloud-bom|java-datastore|java-firestore|java-logging|java-logging-logback|java-pubsub|java-showcase|java-spanner|java-storage)/**/pom.xml'
6161
- 'pom.xml'
6262
ci:
6363
- '.github/workflows/ci.yaml'
@@ -138,6 +138,7 @@ jobs:
138138
- 'google-auth-library-java/**'
139139
grpc-gcp-java:
140140
- 'grpc-gcp-java/**'
141+
- 'java-shared-config/**/pom.xml'
141142
java-bigquery:
142143
- 'java-bigquery/**'
143144
- 'google-auth-library-java/**/*.java'
@@ -147,6 +148,7 @@ jobs:
147148
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
148149
- 'google-cloud-jar-parent/pom.xml'
149150
- 'google-cloud-pom-parent/pom.xml'
151+
- 'java-shared-config/**/pom.xml'
150152
- 'pom.xml'
151153
java-bigquerystorage:
152154
- 'java-bigquerystorage/**'
@@ -157,6 +159,7 @@ jobs:
157159
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
158160
- 'google-cloud-jar-parent/pom.xml'
159161
- 'google-cloud-pom-parent/pom.xml'
162+
- 'java-shared-config/**/pom.xml'
160163
- 'pom.xml'
161164
java-datastore:
162165
- 'java-datastore/**'
@@ -167,6 +170,7 @@ jobs:
167170
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
168171
- 'google-cloud-jar-parent/pom.xml'
169172
- 'google-cloud-pom-parent/pom.xml'
173+
- 'java-shared-config/**/pom.xml'
170174
- 'pom.xml'
171175
java-logging-logback:
172176
- 'java-logging-logback/**'
@@ -177,6 +181,7 @@ jobs:
177181
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
178182
- 'google-cloud-jar-parent/pom.xml'
179183
- 'google-cloud-pom-parent/pom.xml'
184+
- 'java-shared-config/**/pom.xml'
180185
- 'pom.xml'
181186
java-logging:
182187
- 'java-logging/**'
@@ -187,6 +192,7 @@ jobs:
187192
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
188193
- 'google-cloud-jar-parent/pom.xml'
189194
- 'google-cloud-pom-parent/pom.xml'
195+
- 'java-shared-config/**/pom.xml'
190196
- 'pom.xml'
191197
java-spanner:
192198
- 'java-spanner/**'
@@ -198,6 +204,7 @@ jobs:
198204
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
199205
- 'google-cloud-jar-parent/pom.xml'
200206
- 'google-cloud-pom-parent/pom.xml'
207+
- 'java-shared-config/**/pom.xml'
201208
- 'pom.xml'
202209
java-storage:
203210
- 'java-storage/**'
@@ -208,6 +215,7 @@ jobs:
208215
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
209216
- 'google-cloud-jar-parent/pom.xml'
210217
- 'google-cloud-pom-parent/pom.xml'
218+
- 'java-shared-config/**/pom.xml'
211219
- 'pom.xml'
212220
java-pubsub:
213221
- 'java-pubsub/**'
@@ -218,6 +226,7 @@ jobs:
218226
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
219227
- 'google-cloud-jar-parent/pom.xml'
220228
- 'google-cloud-pom-parent/pom.xml'
229+
- 'java-shared-config/**/pom.xml'
221230
- 'pom.xml'
222231
java-bigtable:
223232
- 'java-bigtable/**'
@@ -228,6 +237,7 @@ jobs:
228237
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
229238
- 'google-cloud-jar-parent/pom.xml'
230239
- 'google-cloud-pom-parent/pom.xml'
240+
- 'java-shared-config/**/pom.xml'
231241
- 'pom.xml'
232242
java-firestore:
233243
- 'java-firestore/**'
@@ -238,6 +248,7 @@ jobs:
238248
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
239249
- 'google-cloud-jar-parent/pom.xml'
240250
- 'google-cloud-pom-parent/pom.xml'
251+
- 'java-shared-config/**/pom.xml'
241252
- 'pom.xml'
242253
java-shared-config:
243254
- 'java-shared-config/**'

‎.github/workflows/java-bigquery-jdbc-ci.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ jobs:
4747
- 'sdk-platform-java/**/*.java'
4848
- 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
4949
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
50+
- 'java-shared-config/**/pom.xml'
5051
units:
5152
needs: filter
5253
if: ${{ needs.filter.outputs.library == 'true' }}

‎.github/workflows/java-cloud-bom-ci.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ jobs:
4242
- 'java-cloud-bom/**'
4343
- 'sdk-platform-java/**'
4444
- 'google-auth-library-java/**'
45+
- 'java-shared-config/**'
4546
dependencies:
4647
needs: filter
4748
if: ${{ needs.filter.outputs.library == 'true' }}

‎.github/workflows/java-spanner-jdbc-ci.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ jobs:
4545
- 'sdk-platform-java/**/*.java'
4646
- 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
4747
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
48+
- 'java-shared-config/**/pom.xml'
4849
units:
4950
needs: filter
5051
if: ${{ needs.filter.outputs.library == 'true' }}

‎.github/workflows/java-storage-nio-ci.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ jobs:
4545
- 'sdk-platform-java/**/*.java'
4646
- 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
4747
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
48+
- 'java-shared-config/**/pom.xml'
4849
units:
4950
needs: filter
5051
if: ${{ needs.filter.outputs.library == 'true' }}

‎.github/workflows/sdk-platform-java-ci.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
library:
2424
- 'sdk-platform-java/**'
2525
- 'google-auth-library-java/**'
26+
- 'java-shared-config/**'
2627
- '.github/workflows/sdk-platform-java-ci.yaml'
2728
units:
2829
needs: filter

‎.github/workflows/showcase.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
library:
2424
- 'sdk-platform-java/**'
2525
- 'google-auth-library-java/**'
26+
- 'java-shared-config/**'
2627
- 'java-showcase/**'
2728
- '.github/workflows/showcase.yaml'
2829

‎.kokoro/common.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,8 @@ function get_modified_files() {
255255
#
256256
# Monorepo-wide testing is triggered under four conditions:
257257
# 1. TEST_ALL_MODULES is set to "true" (used by nightly and scheduled CI builds).
258-
# 2. Root parent POMs (google-cloud-jar-parent or google-cloud-pom-parent) are modified,
259-
# as changes to parent POMs affect shared dependency versions and compiler/build plugins.
258+
# 2. Root parent POMs (google-cloud-jar-parent, google-cloud-pom-parent, or java-shared-config)
259+
# are modified, as changes to parent POMs affect shared dependency versions and compiler/build plugins.
260260
# 3. Core SDK platform libraries (sdk-platform-java) are modified, as gax, generators,
261261
# and core transport changes can break downstream client library integration tests.
262262
# 4. Core authentication libraries (google-auth-library-java) are modified, as auth/credential
@@ -269,6 +269,7 @@ function should_test_all_modules() {
269269
# stdin of grep, avoiding an external subshell pipeline (like 'echo "$var" | grep').
270270
if [[ "${TEST_ALL_MODULES}" == "true" ]] || \
271271
grep -q -E '^google-cloud-(pom|jar)-parent/pom.xml$' <<< "${files}" || \
272+
grep -q -E '^java-shared-config/' <<< "${files}" || \
272273
grep -q -E '^sdk-platform-java/' <<< "${files}" || \
273274
grep -q -E '^google-auth-library-java/' <<< "${files}"; then
274275
return 0

‎.kokoro/common_test.sh‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,20 @@ function test_should_test_all_modules {
184184
exit 1
185185
fi
186186

187+
# Shared config
188+
TEST_MODIFIED_FILES="java-shared-config/java-shared-config/pom.xml"
189+
if ! should_test_all_modules; then
190+
echo "should_test_all_modules should return true for java-shared-config change"
191+
exit 1
192+
fi
193+
194+
# Prefix collision check: sibling paths starting with java-shared-config must not match
195+
TEST_MODIFIED_FILES="java-shared-config-extra/pom.xml"
196+
if should_test_all_modules; then
197+
echo "should_test_all_modules should return false for java-shared-config prefix match"
198+
exit 1
199+
fi
200+
187201
# Core SDK platform
188202
TEST_MODIFIED_FILES="sdk-platform-java/gapic-generator/src/main/Foo.java"
189203
if ! should_test_all_modules; then

‎java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryBaseResultSet.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,10 @@ public QueryStatistics getQueryStatistics() {
115115
return queryStatistics;
116116
}
117117

118+
protected void setQueryStatistics(QueryStatistics queryStatistics) {
119+
this.queryStatistics = queryStatistics;
120+
}
121+
118122
public void setJobId(JobId jobId) {
119123
this.jobId = jobId;
120124
}

0 commit comments

Comments
 (0)