Skip to content

Commit a178acf

Browse files
neozwuneozwu
authored
---
yaml --- r: 9241 b: refs/heads/spanner-gapic-migration c: b0cf103 h: refs/heads/master i: 9239: f5e311b
1 parent 92efdee commit a178acf

128 files changed

Lines changed: 10690 additions & 81 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ refs/tags/v0.35.0: c28951c5f4cc97a1be07900d19df6984115a4bd6
8181
refs/tags/v0.36.0: 6b75c61f73e6827b3ca379bd54f88f750290162f
8282
refs/tags/v0.37.0: db2e142f92601709fdd48db159776f905742e30f
8383
refs/heads/mrschmidt-sizefix: 627a3bfa30bb6f4f76af47b228c38b208dd921e0
84-
refs/heads/spanner-gapic-migration: 1847a8576f29f3488bca60bc3fb401b6c57cf4af
84+
refs/heads/spanner-gapic-migration: b0cf10393236a0290fdde40c4a5f7c4abd1dd1cb
8585
refs/tags/v0.38.0: c235ee4df5e1248e1769dae3f86a0d7ab7fd8301
8686
refs/tags/v0.39.0: ab231c9d22475242a43d6d9554aa4a3f736dab01
8787
refs/tags/v0.40.0: a1d5b05206cce7734365f1b910396a2c9d6605ec

‎branches/spanner-gapic-migration/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceSettings.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
* <code>
5959
* DataTransferServiceSettings.Builder dataTransferServiceSettingsBuilder =
6060
* DataTransferServiceSettings.newBuilder();
61-
* dataTransferServiceSettingsBuilder.getDataSourceSettings().getRetrySettingsBuilder()
61+
* dataTransferServiceSettingsBuilder.getDataSourceSettings().getRetrySettings().toBuilder()
6262
* .setTotalTimeout(Duration.ofSeconds(30));
6363
* DataTransferServiceSettings dataTransferServiceSettings = dataTransferServiceSettingsBuilder.build();
6464
* </code>

‎branches/spanner-gapic-migration/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/DataTransferServiceStubSettings.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
* <code>
9797
* DataTransferServiceStubSettings.Builder dataTransferServiceSettingsBuilder =
9898
* DataTransferServiceStubSettings.newBuilder();
99-
* dataTransferServiceSettingsBuilder.getDataSourceSettings().getRetrySettingsBuilder()
99+
* dataTransferServiceSettingsBuilder.getDataSourceSettings().getRetrySettings().toBuilder()
100100
* .setTotalTimeout(Duration.ofSeconds(30));
101101
* DataTransferServiceStubSettings dataTransferServiceSettings = dataTransferServiceSettingsBuilder.build();
102102
* </code>

‎branches/spanner-gapic-migration/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataSettings.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
* <code>
6464
* BaseBigtableDataSettings.Builder baseBigtableDataSettingsBuilder =
6565
* BaseBigtableDataSettings.newBuilder();
66-
* baseBigtableDataSettingsBuilder.mutateRowSettings().getRetrySettingsBuilder()
66+
* baseBigtableDataSettingsBuilder.mutateRowSettings().getRetrySettings().toBuilder()
6767
* .setTotalTimeout(Duration.ofSeconds(30));
6868
* BaseBigtableDataSettings baseBigtableDataSettings = baseBigtableDataSettingsBuilder.build();
6969
* </code>

‎branches/spanner-gapic-migration/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableStubSettings.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
* <code>
7373
* BigtableStubSettings.Builder baseBigtableDataSettingsBuilder =
7474
* BigtableStubSettings.newBuilder();
75-
* baseBigtableDataSettingsBuilder.mutateRowSettings().getRetrySettingsBuilder()
75+
* baseBigtableDataSettingsBuilder.mutateRowSettings().getRetrySettings().toBuilder()
7676
* .setTotalTimeout(Duration.ofSeconds(30));
7777
* BigtableStubSettings baseBigtableDataSettings = baseBigtableDataSettingsBuilder.build();
7878
* </code>

‎branches/spanner-gapic-migration/google-cloud-bom/pom.xml‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@
172172
<gax.version>1.20.0</gax.version>
173173
<gax-grpc.version>1.20.0</gax-grpc.version>
174174
<gax-httpjson.version>0.37.0</gax-httpjson.version>
175-
<generated-proto-beta.version>0.4.0</generated-proto-beta.version>
176-
<generated-proto-ga.version>1.3.0</generated-proto-ga.version>
175+
<generated-proto-beta.version>0.5.0</generated-proto-beta.version>
176+
<generated-proto-ga.version>1.4.0</generated-proto-ga.version>
177177
</properties>
178178
<dependencyManagement>
179179
<dependencies>
@@ -397,6 +397,16 @@
397397
<artifactId>grpc-google-cloud-dlp-v2beta1</artifactId>
398398
<version>${generated-proto-beta.version}</version>
399399
</dependency>
400+
<dependency>
401+
<groupId>com.google.api.grpc</groupId>
402+
<artifactId>proto-google-cloud-dlp-v2</artifactId>
403+
<version>${generated-proto-beta.version}</version>
404+
</dependency>
405+
<dependency>
406+
<groupId>com.google.api.grpc</groupId>
407+
<artifactId>grpc-google-cloud-dlp-v2</artifactId>
408+
<version>${generated-proto-beta.version}</version>
409+
</dependency>
400410
<dependency>
401411
<groupId>com.google.cloud</groupId>
402412
<artifactId>google-cloud-dialogflow</artifactId>
@@ -816,6 +826,11 @@
816826
<artifactId>proto-google-cloud-video-intelligence-v1</artifactId>
817827
<version>${generated-proto-beta.version}</version>
818828
</dependency>
829+
<dependency>
830+
<groupId>com.google.api.grpc</groupId>
831+
<artifactId>proto-google-cloud-video-intelligence-v1p1beta1</artifactId>
832+
<version>${generated-proto-beta.version}</version>
833+
</dependency>
819834
<dependency>
820835
<groupId>com.google.api.grpc</groupId>
821836
<artifactId>grpc-google-cloud-video-intelligence-v1beta1</artifactId>
@@ -831,6 +846,11 @@
831846
<artifactId>grpc-google-cloud-video-intelligence-v1</artifactId>
832847
<version>${generated-proto-beta.version}</version>
833848
</dependency>
849+
<dependency>
850+
<groupId>com.google.api.grpc</groupId>
851+
<artifactId>grpc-google-cloud-video-intelligence-v1p1beta1</artifactId>
852+
<version>${generated-proto-beta.version}</version>
853+
</dependency>
834854
<dependency>
835855
<groupId>com.google.api.grpc</groupId>
836856
<artifactId>proto-google-common-protos</artifactId>

‎branches/spanner-gapic-migration/google-cloud-container/src/main/java/com/google/cloud/container/v1/ClusterManagerSettings.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
* <code>
8989
* ClusterManagerSettings.Builder clusterManagerSettingsBuilder =
9090
* ClusterManagerSettings.newBuilder();
91-
* clusterManagerSettingsBuilder.listClustersSettings().getRetrySettingsBuilder()
91+
* clusterManagerSettingsBuilder.listClustersSettings().getRetrySettings().toBuilder()
9292
* .setTotalTimeout(Duration.ofSeconds(30));
9393
* ClusterManagerSettings clusterManagerSettings = clusterManagerSettingsBuilder.build();
9494
* </code>

‎branches/spanner-gapic-migration/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/ClusterManagerStubSettings.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
* <code>
9898
* ClusterManagerStubSettings.Builder clusterManagerSettingsBuilder =
9999
* ClusterManagerStubSettings.newBuilder();
100-
* clusterManagerSettingsBuilder.listClustersSettings().getRetrySettingsBuilder()
100+
* clusterManagerSettingsBuilder.listClustersSettings().getRetrySettings().toBuilder()
101101
* .setTotalTimeout(Duration.ofSeconds(30));
102102
* ClusterManagerStubSettings clusterManagerSettings = clusterManagerSettingsBuilder.build();
103103
* </code>

‎branches/spanner-gapic-migration/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerSettings.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
* <code>
5757
* ClusterControllerSettings.Builder clusterControllerSettingsBuilder =
5858
* ClusterControllerSettings.newBuilder();
59-
* clusterControllerSettingsBuilder.getClusterSettings().getRetrySettingsBuilder()
59+
* clusterControllerSettingsBuilder.getClusterSettings().getRetrySettings().toBuilder()
6060
* .setTotalTimeout(Duration.ofSeconds(30));
6161
* ClusterControllerSettings clusterControllerSettings = clusterControllerSettingsBuilder.build();
6262
* </code>

‎branches/spanner-gapic-migration/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/JobControllerSettings.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
* <code>
5555
* JobControllerSettings.Builder jobControllerSettingsBuilder =
5656
* JobControllerSettings.newBuilder();
57-
* jobControllerSettingsBuilder.submitJobSettings().getRetrySettingsBuilder()
57+
* jobControllerSettingsBuilder.submitJobSettings().getRetrySettings().toBuilder()
5858
* .setTotalTimeout(Duration.ofSeconds(30));
5959
* JobControllerSettings jobControllerSettings = jobControllerSettingsBuilder.build();
6060
* </code>

0 commit comments

Comments
 (0)