Skip to content

Commit d271404

Browse files
dependabot[bot]zhumin8
dependabot[bot]
and
zhumin8
authored
deps: bump com.google.cloud:libraries-bom from 26.48.0 to 26.49.0 (#3306)
* deps: bump com.google.cloud:libraries-bom from 26.48.0 to 26.49.0 Bumps [com.google.cloud:libraries-bom](https://github.com/googleapis/java-cloud-bom) from 26.48.0 to 26.49.0. - [Release notes](https://github.com/googleapis/java-cloud-bom/releases) - [Changelog](https://github.com/googleapis/java-cloud-bom/blob/main/release-please-config.json) - [Commits](googleapis/java-cloud-bom@v26.48.0...v26.49.0) --- updated-dependencies: - dependency-name: com.google.cloud:libraries-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * fix(test): add mock method to mock credentials. * review feedback: avoid dup in pubsub tests, abstract to util method. * chore: rm unused method in utils classes. BEGIN_COMMIT_OVERRIDE deps: bump com.google.cloud:libraries-bom from 26.48.0 to 26.49.0 fix(test): add mock method to mock credentials. END_COMMIT_OVERRIDE --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Min Zhu <[email protected]>
1 parent 8d9657b commit d271404

19 files changed

+106
-31
lines changed

‎spring-cloud-gcp-autoconfigure/src/test/java/com/google/cloud/spring/autoconfigure/TestUtils.java

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/*
2+
* Copyright 2024 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.google.cloud.spring.autoconfigure;
18+
19+
import static org.mockito.Mockito.mock;
20+
import static org.mockito.Mockito.when;
21+
22+
import com.google.auth.CredentialTypeForMetrics;
23+
import com.google.auth.Credentials;
24+
25+
public class TestUtils {
26+
public static final Credentials MOCK_CREDENTIALS = createMockCredentials();
27+
28+
private static Credentials createMockCredentials() {
29+
Credentials mockCredential = mock(Credentials.class);
30+
when(mockCredential.getMetricsCredentialType())
31+
.thenReturn(CredentialTypeForMetrics.DO_NOT_SEND);
32+
return mockCredential;
33+
}
34+
}

‎spring-cloud-gcp-autoconfigure/src/test/java/com/google/cloud/spring/autoconfigure/bigquery/GcpBigQueryAutoConfigurationTests.java

+3-6
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@
1717
package com.google.cloud.spring.autoconfigure.bigquery;
1818

1919
import static org.assertj.core.api.Assertions.assertThat;
20-
import static org.mockito.Mockito.mock;
2120

2221
import com.google.api.gax.core.CredentialsProvider;
23-
import com.google.auth.oauth2.GoogleCredentials;
2422
import com.google.cloud.bigquery.BigQuery;
2523
import com.google.cloud.bigquery.BigQueryOptions;
24+
import com.google.cloud.spring.autoconfigure.TestUtils;
2625
import com.google.cloud.spring.autoconfigure.core.GcpContextAutoConfiguration;
2726
import com.google.cloud.spring.bigquery.core.BigQueryTemplate;
2827
import org.junit.jupiter.api.Test;
@@ -33,8 +32,6 @@
3332

3433
class GcpBigQueryAutoConfigurationTests {
3534

36-
private static final GoogleCredentials MOCK_CREDENTIALS = mock(GoogleCredentials.class);
37-
3835
private ApplicationContextRunner contextRunner =
3936
new ApplicationContextRunner()
4037
.withConfiguration(
@@ -51,7 +48,7 @@ void testSettingBigQueryOptions() {
5148
context -> {
5249
BigQueryOptions bigQueryOptions = context.getBean(BigQuery.class).getOptions();
5350
assertThat(bigQueryOptions.getProjectId()).isEqualTo("test-project");
54-
assertThat(bigQueryOptions.getCredentials()).isEqualTo(MOCK_CREDENTIALS);
51+
assertThat(bigQueryOptions.getCredentials()).isEqualTo(TestUtils.MOCK_CREDENTIALS);
5552

5653
BigQueryTemplate bigQueryTemplate = context.getBean(BigQueryTemplate.class);
5754
assertThat(bigQueryTemplate.getDatasetName()).isEqualTo("test-dataset");
@@ -66,7 +63,7 @@ static class TestConfiguration {
6663

6764
@Bean
6865
public CredentialsProvider credentialsProvider() {
69-
return () -> MOCK_CREDENTIALS;
66+
return () -> TestUtils.MOCK_CREDENTIALS;
7067
}
7168
}
7269
}

‎spring-cloud-gcp-autoconfigure/src/test/java/com/google/cloud/spring/autoconfigure/core/GcpContextAutoConfigurationTests.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717
package com.google.cloud.spring.autoconfigure.core;
1818

1919
import static org.assertj.core.api.Assertions.assertThat;
20-
import static org.mockito.Mockito.mock;
2120

2221
import com.google.api.gax.core.CredentialsProvider;
23-
import com.google.auth.Credentials;
22+
import com.google.cloud.spring.autoconfigure.TestUtils;
2423
import com.google.cloud.spring.core.DefaultGcpEnvironmentProvider;
2524
import com.google.cloud.spring.core.DefaultGcpProjectIdProvider;
2625
import com.google.cloud.spring.core.GcpEnvironmentProvider;
@@ -99,7 +98,7 @@ private static class TestConfiguration {
9998

10099
@Bean
101100
public CredentialsProvider googleCredentials() {
102-
return () -> mock(Credentials.class);
101+
return () -> TestUtils.MOCK_CREDENTIALS;
103102
}
104103
}
105104
}

‎spring-cloud-gcp-autoconfigure/src/test/java/com/google/cloud/spring/autoconfigure/datastore/health/DatastoreHealthIndicatorAutoConfigurationTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import static org.mockito.Mockito.mock;
2121

2222
import com.google.api.gax.core.CredentialsProvider;
23-
import com.google.auth.Credentials;
23+
import com.google.cloud.spring.autoconfigure.TestUtils;
2424
import com.google.cloud.spring.autoconfigure.core.GcpContextAutoConfiguration;
2525
import com.google.cloud.spring.autoconfigure.datastore.GcpDatastoreAutoConfiguration;
2626
import org.junit.jupiter.api.Test;
@@ -61,7 +61,7 @@ static class TestConfiguration {
6161

6262
@Bean
6363
public CredentialsProvider credentialsProvider() {
64-
return () -> mock(Credentials.class);
64+
return () -> TestUtils.MOCK_CREDENTIALS;
6565
}
6666
}
6767
}

‎spring-cloud-gcp-autoconfigure/src/test/java/com/google/cloud/spring/autoconfigure/datastore/it/GcpDatastoreEmulatorIntegrationTests.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,15 @@
1818

1919
import static org.assertj.core.api.Assertions.assertThat;
2020
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
21-
import static org.mockito.Mockito.mock;
2221

2322
import com.google.api.gax.core.CredentialsProvider;
24-
import com.google.auth.Credentials;
2523
import com.google.cloud.datastore.Datastore;
2624
import com.google.cloud.datastore.DatastoreException;
2725
import com.google.cloud.datastore.DatastoreOptions;
2826
import com.google.cloud.datastore.EntityQuery;
2927
import com.google.cloud.datastore.Query;
3028
import com.google.cloud.datastore.StructuredQuery;
29+
import com.google.cloud.spring.autoconfigure.TestUtils;
3130
import com.google.cloud.spring.autoconfigure.core.GcpContextAutoConfiguration;
3231
import com.google.cloud.spring.autoconfigure.datastore.DatastoreRepositoriesAutoConfiguration;
3332
import com.google.cloud.spring.autoconfigure.datastore.DatastoreTransactionManagerAutoConfiguration;
@@ -118,7 +117,7 @@ static class TestConfiguration {
118117

119118
@Bean
120119
public CredentialsProvider credentialsProvider() {
121-
return () -> mock(Credentials.class);
120+
return () -> TestUtils.MOCK_CREDENTIALS;
122121
}
123122
}
124123

‎spring-cloud-gcp-autoconfigure/src/test/java/com/google/cloud/spring/autoconfigure/firestore/GcpFirestoreAutoConfigurationTests.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@
1818

1919
import static org.assertj.core.api.Assertions.assertThat;
2020
import static org.assertj.core.api.Assertions.assertThatThrownBy;
21-
import static org.mockito.Mockito.mock;
2221

2322
import com.google.api.gax.core.CredentialsProvider;
24-
import com.google.auth.oauth2.GoogleCredentials;
2523
import com.google.cloud.firestore.Firestore;
2624
import com.google.cloud.firestore.FirestoreOptions;
25+
import com.google.cloud.spring.autoconfigure.TestUtils;
2726
import com.google.cloud.spring.autoconfigure.core.GcpContextAutoConfiguration;
2827
import com.google.firestore.v1.FirestoreGrpc;
2928
import io.grpc.ClientInterceptor;
@@ -136,7 +135,7 @@ static class TestConfiguration {
136135

137136
@Bean
138137
public CredentialsProvider credentialsProvider() {
139-
return () -> mock(GoogleCredentials.class);
138+
return () -> TestUtils.MOCK_CREDENTIALS;
140139
}
141140
}
142141
}

‎spring-cloud-gcp-autoconfigure/src/test/java/com/google/cloud/spring/autoconfigure/kms/KmsAutoConfigurationTests.java

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import static org.mockito.Mockito.when;
2222

2323
import com.google.api.gax.core.CredentialsProvider;
24+
import com.google.auth.CredentialTypeForMetrics;
2425
import com.google.auth.Credentials;
2526
import com.google.auth.oauth2.ServiceAccountCredentials;
2627
import com.google.auth.oauth2.UserCredentials;
@@ -125,6 +126,7 @@ static class TestConfiguration {
125126
public static CredentialsProvider googleCredentials() {
126127
UserCredentials mockUserCredential = mock(UserCredentials.class);
127128
when(mockUserCredential.getClientId()).thenReturn(CORE_CREDENTIAL_CLIENT_ID);
129+
when(mockUserCredential.getMetricsCredentialType()).thenReturn(CredentialTypeForMetrics.DO_NOT_SEND);
128130
return () -> mockUserCredential;
129131
}
130132

‎spring-cloud-gcp-autoconfigure/src/test/java/com/google/cloud/spring/autoconfigure/logging/StackdriverLoggingAutoConfigurationTests.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717
package com.google.cloud.spring.autoconfigure.logging;
1818

1919
import static org.assertj.core.api.Assertions.assertThat;
20-
import static org.mockito.Mockito.mock;
2120

2221
import com.google.api.gax.core.CredentialsProvider;
23-
import com.google.auth.Credentials;
22+
import com.google.cloud.spring.autoconfigure.TestUtils;
2423
import com.google.cloud.spring.autoconfigure.core.GcpContextAutoConfiguration;
2524
import com.google.cloud.spring.autoconfigure.trace.StackdriverTraceAutoConfiguration;
2625
import com.google.cloud.spring.logging.TraceIdLoggingWebMvcInterceptor;
@@ -103,7 +102,7 @@ private static class TestConfiguration {
103102

104103
@Bean
105104
public CredentialsProvider googleCredentials() {
106-
return () -> mock(Credentials.class);
105+
return () -> TestUtils.MOCK_CREDENTIALS;
107106
}
108107

109108
@Bean

‎spring-cloud-gcp-autoconfigure/src/test/java/com/google/cloud/spring/autoconfigure/pubsub/GcpPubSubAutoConfigurationTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
import com.google.api.gax.retrying.RetrySettings;
3030
import com.google.api.gax.rpc.StatusCode.Code;
3131
import com.google.api.gax.rpc.TransportChannelProvider;
32-
import com.google.auth.Credentials;
3332
import com.google.cloud.pubsub.v1.Publisher;
3433
import com.google.cloud.pubsub.v1.Subscriber;
34+
import com.google.cloud.spring.autoconfigure.TestUtils;
3535
import com.google.cloud.spring.core.GcpProjectIdProvider;
3636
import com.google.cloud.spring.pubsub.core.PubSubConfiguration;
3737
import com.google.cloud.spring.pubsub.core.publisher.PublisherCustomizer;
@@ -1446,7 +1446,7 @@ public GcpProjectIdProvider projectIdProvider() {
14461446

14471447
@Bean
14481448
public CredentialsProvider googleCredentials() {
1449-
return () -> mock(Credentials.class);
1449+
return () -> TestUtils.MOCK_CREDENTIALS;
14501450
}
14511451
}
14521452
}

‎spring-cloud-gcp-autoconfigure/src/test/java/com/google/cloud/spring/autoconfigure/pubsub/GcpPubSubEmulatorAutoConfigurationTests.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import com.google.api.gax.rpc.TransportChannelProvider;
2929
import com.google.auth.Credentials;
3030
import com.google.cloud.pubsub.v1.TopicAdminSettings;
31+
import com.google.cloud.spring.autoconfigure.TestUtils;
3132
import com.google.cloud.spring.autoconfigure.core.GcpContextAutoConfiguration;
3233
import com.google.cloud.spring.pubsub.core.PubSubConfiguration;
3334
import org.assertj.core.data.Offset;
@@ -187,7 +188,7 @@ void testPublisherBatchingSettings() {
187188
private static class TestConfiguration {
188189
@Bean
189190
public CredentialsProvider googleCredentials() {
190-
return () -> mock(Credentials.class);
191+
return () -> TestUtils.MOCK_CREDENTIALS;
191192
}
192193
}
193194
}

‎spring-cloud-gcp-autoconfigure/src/test/java/com/google/cloud/spring/autoconfigure/pubsub/GcpPubSubReactiveAutoConfigurationTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
import com.google.api.gax.core.CredentialsProvider;
2424
import com.google.auth.Credentials;
25+
import com.google.cloud.spring.autoconfigure.TestUtils;
2526
import com.google.cloud.spring.core.GcpProjectIdProvider;
2627
import com.google.cloud.spring.pubsub.core.subscriber.PubSubSubscriberOperations;
2728
import com.google.cloud.spring.pubsub.core.subscriber.PubSubSubscriberTemplate;
@@ -165,7 +166,7 @@ public GcpProjectIdProvider projectIdProvider() {
165166

166167
@Bean
167168
public CredentialsProvider googleCredentials() {
168-
return () -> mock(Credentials.class);
169+
return () -> TestUtils.MOCK_CREDENTIALS;
169170
}
170171
}
171172
}

‎spring-cloud-gcp-autoconfigure/src/test/java/com/google/cloud/spring/autoconfigure/pubsub/health/PubSubHealthIndicatorAutoConfigurationTests.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import com.google.api.gax.grpc.GrpcStatusCode;
3434
import com.google.api.gax.rpc.ApiException;
3535
import com.google.auth.Credentials;
36+
import com.google.cloud.spring.autoconfigure.TestUtils;
3637
import com.google.cloud.spring.autoconfigure.pubsub.GcpPubSubAutoConfiguration;
3738
import com.google.cloud.spring.core.GcpProjectIdProvider;
3839
import com.google.cloud.spring.pubsub.core.PubSubTemplate;
@@ -63,7 +64,7 @@ class PubSubHealthIndicatorAutoConfigurationTests {
6364
AutoConfigurations.of(
6465
PubSubHealthIndicatorAutoConfiguration.class, GcpPubSubAutoConfiguration.class))
6566
.withBean(GcpProjectIdProvider.class, () -> () -> "fake project")
66-
.withBean(CredentialsProvider.class, () -> () -> mock(Credentials.class));
67+
.withBean(CredentialsProvider.class, () -> () -> TestUtils.MOCK_CREDENTIALS);
6768

6869
@SuppressWarnings("unchecked")
6970
@Test

‎spring-cloud-gcp-autoconfigure/src/test/java/com/google/cloud/spring/autoconfigure/security/FirebaseAuthenticationAutoConfigurationTests.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
import com.google.api.gax.core.CredentialsProvider;
2424
import com.google.auth.Credentials;
25+
import com.google.cloud.spring.autoconfigure.TestUtils;
2526
import com.google.cloud.spring.core.GcpProjectIdProvider;
2627
import com.google.cloud.spring.security.firebase.FirebaseJwtTokenDecoder;
2728
import org.junit.jupiter.api.Test;
@@ -72,7 +73,7 @@ public GcpProjectIdProvider projectIdProvider() {
7273

7374
@Bean
7475
public CredentialsProvider googleCredentials() {
75-
return () -> mock(Credentials.class);
76+
return () -> TestUtils.MOCK_CREDENTIALS;
7677
}
7778
}
7879
}

‎spring-cloud-gcp-autoconfigure/src/test/java/com/google/cloud/spring/autoconfigure/spanner/GcpSpannerAutoConfigurationTests.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@
2121

2222
import com.google.api.gax.core.CredentialsProvider;
2323
import com.google.api.gax.retrying.RetrySettings;
24+
import com.google.auth.CredentialTypeForMetrics;
2425
import com.google.auth.Credentials;
2526
import com.google.cloud.NoCredentials;
2627
import com.google.cloud.spanner.SpannerOptions;
28+
import com.google.cloud.spring.autoconfigure.TestUtils;
2729
import com.google.cloud.spring.autoconfigure.core.GcpContextAutoConfiguration;
2830
import com.google.cloud.spring.data.spanner.core.SpannerOperations;
2931
import com.google.cloud.spring.data.spanner.core.SpannerTransactionManager;
@@ -174,7 +176,7 @@ static class TestConfiguration {
174176
/** Mock bean for credentials provider. */
175177
@Bean
176178
public CredentialsProvider credentialsProvider() {
177-
return () -> mock(Credentials.class);
179+
return () -> TestUtils.MOCK_CREDENTIALS;
178180
}
179181

180182
/** Mock bean for Gson. */

‎spring-cloud-gcp-autoconfigure/src/test/java/com/google/cloud/spring/autoconfigure/spanner/health/SpannerHealthIndicatorAutoConfigurationTests.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.google.api.gax.core.CredentialsProvider;
2424
import com.google.auth.Credentials;
2525
import com.google.cloud.spanner.Statement;
26+
import com.google.cloud.spring.autoconfigure.TestUtils;
2627
import com.google.cloud.spring.autoconfigure.core.GcpContextAutoConfiguration;
2728
import com.google.cloud.spring.autoconfigure.spanner.GcpSpannerAutoConfiguration;
2829
import com.google.gson.Gson;
@@ -94,7 +95,7 @@ static class TestConfiguration {
9495

9596
@Bean
9697
public CredentialsProvider credentialsProvider() {
97-
return () -> mock(Credentials.class);
98+
return () -> TestUtils.MOCK_CREDENTIALS;
9899
}
99100

100101
@Bean

‎spring-cloud-gcp-dependencies/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</distributionManagement>
3030

3131
<properties>
32-
<gcp-libraries-bom.version>26.48.0</gcp-libraries-bom.version>
32+
<gcp-libraries-bom.version>26.49.0</gcp-libraries-bom.version>
3333
<cloud-sql-socket-factory.version>1.20.1</cloud-sql-socket-factory.version>
3434
<r2dbc-mysql-driver.version>0.9.7</r2dbc-mysql-driver.version>
3535
<r2dbc-postgres-driver.version>0.8.13.RELEASE</r2dbc-postgres-driver.version>

‎spring-cloud-gcp-pubsub-stream-binder/src/test/java/com/google/cloud/spring/stream/binder/pubsub/PubSubMessageChannelBinderTests.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import static org.mockito.Mockito.when;
2424

2525
import com.google.api.gax.core.CredentialsProvider;
26+
import com.google.auth.CredentialTypeForMetrics;
2627
import com.google.auth.Credentials;
2728
import com.google.cloud.spring.core.GcpProjectIdProvider;
2829
import com.google.cloud.spring.pubsub.PubSubAdmin;
@@ -389,7 +390,7 @@ public GcpProjectIdProvider projectIdProvider() {
389390

390391
@Bean
391392
public CredentialsProvider googleCredentials() {
392-
return () -> mock(Credentials.class);
393+
return () -> TestUtils.MOCK_CREDENTIALS;
393394
}
394395
}
395396
}

‎spring-cloud-gcp-pubsub-stream-binder/src/test/java/com/google/cloud/spring/stream/binder/pubsub/TestUtils.java

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/*
2+
* Copyright 2024 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.google.cloud.spring.stream.binder.pubsub;
18+
19+
import static org.mockito.Mockito.mock;
20+
import static org.mockito.Mockito.when;
21+
22+
import com.google.auth.CredentialTypeForMetrics;
23+
import com.google.auth.Credentials;
24+
25+
public class TestUtils {
26+
public static final Credentials MOCK_CREDENTIALS = createMockCredentials();
27+
28+
private static Credentials createMockCredentials() {
29+
Credentials mockCredential = mock(Credentials.class);
30+
when(mockCredential.getMetricsCredentialType())
31+
.thenReturn(CredentialTypeForMetrics.DO_NOT_SEND);
32+
return mockCredential;
33+
}
34+
}
35+

0 commit comments

Comments
 (0)