Skip to content

Commit f1dda2c

Browse files
Neenu1995Neenu1995
authored
Revert "chore: update Java and Python dependencies" (googleapis#39)
Reverts googleapis/java-deploy#32 Fixes [googleapis#1300](googleapis/synthtool#1300)
1 parent 310700e commit f1dda2c

File tree

117 files changed

+23307
-14742
lines changed

Some content is hidden

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

117 files changed

+23307
-14742
lines changed

‎java-deploy/.github/.OwlBot.lock.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
docker:
2-
image: gcr.io/repo-automation-bots/owlbot-java:latest
2+
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
33
digest: sha256:a744afda1956beb7bd6dc8d0b740a7839bbe402e34e2f4ef24589074db53ceb0

‎java-deploy/.github/.OwlBot.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
docker:
16-
image: "gcr.io/repo-automation-bots/owlbot-java:latest"
16+
image: "gcr.io/cloud-devrel-public-resources/owlbot-java:latest"
1717

1818
deep-remove-regex:
1919
- "/grpc-google-.*/src"

‎java-deploy/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ If you are using Maven, add this to your pom.xml file:
3030
If you are using Gradle without BOM, add this to your dependencies
3131

3232
```Groovy
33-
implementation 'com.google.cloud:google-cloud-deploy:0.1.0'
33+
implementation 'com.google.cloud:google-cloud-deploy:0.1.2'
3434
```
3535

3636
If you are using SBT, add this to your dependencies
3737

3838
```Scala
39-
libraryDependencies += "com.google.cloud" % "google-cloud-deploy" % "0.1.0"
39+
libraryDependencies += "com.google.cloud" % "google-cloud-deploy" % "0.1.2"
4040
```
4141

4242
## Authentication

‎java-deploy/google-cloud-deploy/pom.xml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,74 @@
1616
<properties>
1717
<site.installationModule>google-cloud-deploy</site.installationModule>
1818
</properties>
19+
<dependencies>
20+
<dependency>
21+
<groupId>io.grpc</groupId>
22+
<artifactId>grpc-api</artifactId>
23+
</dependency>
24+
<dependency>
25+
<groupId>io.grpc</groupId>
26+
<artifactId>grpc-stub</artifactId>
27+
</dependency>
28+
<dependency>
29+
<groupId>io.grpc</groupId>
30+
<artifactId>grpc-protobuf</artifactId>
31+
</dependency>
32+
<dependency>
33+
<groupId>com.google.api</groupId>
34+
<artifactId>api-common</artifactId>
35+
</dependency>
36+
<dependency>
37+
<groupId>com.google.protobuf</groupId>
38+
<artifactId>protobuf-java</artifactId>
39+
</dependency>
40+
<dependency>
41+
<groupId>com.google.api.grpc</groupId>
42+
<artifactId>proto-google-common-protos</artifactId>
43+
</dependency>
44+
45+
<dependency>
46+
<groupId>com.google.api.grpc</groupId>
47+
<artifactId>proto-google-cloud-deploy-v1</artifactId>
48+
</dependency>
49+
<dependency>
50+
<groupId>com.google.guava</groupId>
51+
<artifactId>guava</artifactId>
52+
</dependency>
53+
<dependency>
54+
<groupId>com.google.api</groupId>
55+
<artifactId>gax</artifactId>
56+
</dependency>
57+
<dependency>
58+
<groupId>com.google.api</groupId>
59+
<artifactId>gax-grpc</artifactId>
60+
</dependency>
61+
<dependency>
62+
<groupId>org.threeten</groupId>
63+
<artifactId>threetenbp</artifactId>
64+
</dependency>
65+
66+
<!-- Test dependencies -->
67+
<dependency>
68+
<groupId>junit</groupId>
69+
<artifactId>junit</artifactId>
70+
<scope>test</scope>
71+
<version>4.13.2</version>
72+
</dependency>
73+
74+
<dependency>
75+
<groupId>com.google.api.grpc</groupId>
76+
<artifactId>grpc-google-cloud-deploy-v1</artifactId>
77+
<scope>test</scope>
78+
</dependency>
79+
<!-- Need testing utility classes for generated gRPC clients tests -->
80+
<dependency>
81+
<groupId>com.google.api</groupId>
82+
<artifactId>gax-grpc</artifactId>
83+
<classifier>testlib</classifier>
84+
<scope>test</scope>
85+
</dependency>
86+
</dependencies>
1987

2088
<profiles>
2189
<profile>

java-deploy/owl-bot-staging/v1/google-cloud-deploy/src/main/java/com/google/cloud/deploy/v1/CloudDeployClient.java renamed to java-deploy/google-cloud-deploy/src/main/java/com/google/cloud/deploy/v1/CloudDeployClient.java

Lines changed: 70 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@
6262
* methods:
6363
*
6464
* <ol>
65-
* <li> A "flattened" method. With this type of method, the fields of the request type have been
65+
* <li>A "flattened" method. With this type of method, the fields of the request type have been
6666
* converted into function parameters. It may be the case that not all fields are available as
6767
* parameters, and not every API method will have a flattened method entry point.
68-
* <li> A "request object" method. This type of method only takes one parameter, a request object,
68+
* <li>A "request object" method. This type of method only takes one parameter, a request object,
6969
* which must be constructed before the call. Not every API method will have a request object
7070
* method.
71-
* <li> A "callable" method. This type of method takes no parameters and returns an immutable API
71+
* <li>A "callable" method. This type of method takes no parameters and returns an immutable API
7272
* callable object, which can be used to initiate calls to the service.
7373
* </ol>
7474
*
@@ -200,7 +200,8 @@ public final ListDeliveryPipelinesPagedResponse listDeliveryPipelines(LocationNa
200200
*
201201
* <pre>{@code
202202
* try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
203-
* String parent = LocationName.of("[PROJECT]", "[LOCATION]").toString();
203+
* String parent =
204+
* DeliveryPipelineName.of("[PROJECT]", "[LOCATION]", "[DELIVERY_PIPELINE]").toString();
204205
* for (DeliveryPipeline element :
205206
* cloudDeployClient.listDeliveryPipelines(parent).iterateAll()) {
206207
* // doThingsWith(element);
@@ -228,7 +229,9 @@ public final ListDeliveryPipelinesPagedResponse listDeliveryPipelines(String par
228229
* try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
229230
* ListDeliveryPipelinesRequest request =
230231
* ListDeliveryPipelinesRequest.newBuilder()
231-
* .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
232+
* .setParent(
233+
* DeliveryPipelineName.of("[PROJECT]", "[LOCATION]", "[DELIVERY_PIPELINE]")
234+
* .toString())
232235
* .setPageSize(883849137)
233236
* .setPageToken("pageToken873572522")
234237
* .setFilter("filter-1274492040")
@@ -259,7 +262,9 @@ public final ListDeliveryPipelinesPagedResponse listDeliveryPipelines(
259262
* try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
260263
* ListDeliveryPipelinesRequest request =
261264
* ListDeliveryPipelinesRequest.newBuilder()
262-
* .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
265+
* .setParent(
266+
* DeliveryPipelineName.of("[PROJECT]", "[LOCATION]", "[DELIVERY_PIPELINE]")
267+
* .toString())
263268
* .setPageSize(883849137)
264269
* .setPageToken("pageToken873572522")
265270
* .setFilter("filter-1274492040")
@@ -289,7 +294,9 @@ public final ListDeliveryPipelinesPagedResponse listDeliveryPipelines(
289294
* try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
290295
* ListDeliveryPipelinesRequest request =
291296
* ListDeliveryPipelinesRequest.newBuilder()
292-
* .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
297+
* .setParent(
298+
* DeliveryPipelineName.of("[PROJECT]", "[LOCATION]", "[DELIVERY_PIPELINE]")
299+
* .toString())
293300
* .setPageSize(883849137)
294301
* .setPageToken("pageToken873572522")
295302
* .setFilter("filter-1274492040")
@@ -460,7 +467,8 @@ public final OperationFuture<DeliveryPipeline, OperationMetadata> createDelivery
460467
*
461468
* <pre>{@code
462469
* try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
463-
* String parent = LocationName.of("[PROJECT]", "[LOCATION]").toString();
470+
* String parent =
471+
* DeliveryPipelineName.of("[PROJECT]", "[LOCATION]", "[DELIVERY_PIPELINE]").toString();
464472
* DeliveryPipeline deliveryPipeline = DeliveryPipeline.newBuilder().build();
465473
* String deliveryPipelineId = "deliveryPipelineId-632411535";
466474
* DeliveryPipeline response =
@@ -497,7 +505,9 @@ public final OperationFuture<DeliveryPipeline, OperationMetadata> createDelivery
497505
* try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
498506
* CreateDeliveryPipelineRequest request =
499507
* CreateDeliveryPipelineRequest.newBuilder()
500-
* .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
508+
* .setParent(
509+
* DeliveryPipelineName.of("[PROJECT]", "[LOCATION]", "[DELIVERY_PIPELINE]")
510+
* .toString())
501511
* .setDeliveryPipelineId("deliveryPipelineId-632411535")
502512
* .setDeliveryPipeline(DeliveryPipeline.newBuilder().build())
503513
* .setRequestId("requestId693933066")
@@ -525,7 +535,9 @@ public final OperationFuture<DeliveryPipeline, OperationMetadata> createDelivery
525535
* try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
526536
* CreateDeliveryPipelineRequest request =
527537
* CreateDeliveryPipelineRequest.newBuilder()
528-
* .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
538+
* .setParent(
539+
* DeliveryPipelineName.of("[PROJECT]", "[LOCATION]", "[DELIVERY_PIPELINE]")
540+
* .toString())
529541
* .setDeliveryPipelineId("deliveryPipelineId-632411535")
530542
* .setDeliveryPipeline(DeliveryPipeline.newBuilder().build())
531543
* .setRequestId("requestId693933066")
@@ -553,7 +565,9 @@ public final OperationFuture<DeliveryPipeline, OperationMetadata> createDelivery
553565
* try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
554566
* CreateDeliveryPipelineRequest request =
555567
* CreateDeliveryPipelineRequest.newBuilder()
556-
* .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
568+
* .setParent(
569+
* DeliveryPipelineName.of("[PROJECT]", "[LOCATION]", "[DELIVERY_PIPELINE]")
570+
* .toString())
557571
* .setDeliveryPipelineId("deliveryPipelineId-632411535")
558572
* .setDeliveryPipeline(DeliveryPipeline.newBuilder().build())
559573
* .setRequestId("requestId693933066")
@@ -866,7 +880,7 @@ public final ListTargetsPagedResponse listTargets(LocationName parent) {
866880
*
867881
* <pre>{@code
868882
* try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
869-
* String parent = LocationName.of("[PROJECT]", "[LOCATION]").toString();
883+
* String parent = TargetName.of("[PROJECT]", "[LOCATION]", "[TARGET]").toString();
870884
* for (Target element : cloudDeployClient.listTargets(parent).iterateAll()) {
871885
* // doThingsWith(element);
872886
* }
@@ -892,7 +906,7 @@ public final ListTargetsPagedResponse listTargets(String parent) {
892906
* try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
893907
* ListTargetsRequest request =
894908
* ListTargetsRequest.newBuilder()
895-
* .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
909+
* .setParent(TargetName.of("[PROJECT]", "[LOCATION]", "[TARGET]").toString())
896910
* .setPageSize(883849137)
897911
* .setPageToken("pageToken873572522")
898912
* .setFilter("filter-1274492040")
@@ -921,7 +935,7 @@ public final ListTargetsPagedResponse listTargets(ListTargetsRequest request) {
921935
* try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
922936
* ListTargetsRequest request =
923937
* ListTargetsRequest.newBuilder()
924-
* .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
938+
* .setParent(TargetName.of("[PROJECT]", "[LOCATION]", "[TARGET]").toString())
925939
* .setPageSize(883849137)
926940
* .setPageToken("pageToken873572522")
927941
* .setFilter("filter-1274492040")
@@ -950,7 +964,7 @@ public final ListTargetsPagedResponse listTargets(ListTargetsRequest request) {
950964
* try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
951965
* ListTargetsRequest request =
952966
* ListTargetsRequest.newBuilder()
953-
* .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
967+
* .setParent(TargetName.of("[PROJECT]", "[LOCATION]", "[TARGET]").toString())
954968
* .setPageSize(883849137)
955969
* .setPageToken("pageToken873572522")
956970
* .setFilter("filter-1274492040")
@@ -1105,7 +1119,7 @@ public final OperationFuture<Target, OperationMetadata> createTargetAsync(
11051119
*
11061120
* <pre>{@code
11071121
* try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
1108-
* String parent = LocationName.of("[PROJECT]", "[LOCATION]").toString();
1122+
* String parent = TargetName.of("[PROJECT]", "[LOCATION]", "[TARGET]").toString();
11091123
* Target target = Target.newBuilder().build();
11101124
* String targetId = "targetId-441951604";
11111125
* Target response = cloudDeployClient.createTargetAsync(parent, target, targetId).get();
@@ -1139,7 +1153,7 @@ public final OperationFuture<Target, OperationMetadata> createTargetAsync(
11391153
* try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
11401154
* CreateTargetRequest request =
11411155
* CreateTargetRequest.newBuilder()
1142-
* .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
1156+
* .setParent(TargetName.of("[PROJECT]", "[LOCATION]", "[TARGET]").toString())
11431157
* .setTargetId("targetId-441951604")
11441158
* .setTarget(Target.newBuilder().build())
11451159
* .setRequestId("requestId693933066")
@@ -1167,7 +1181,7 @@ public final OperationFuture<Target, OperationMetadata> createTargetAsync(
11671181
* try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
11681182
* CreateTargetRequest request =
11691183
* CreateTargetRequest.newBuilder()
1170-
* .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
1184+
* .setParent(TargetName.of("[PROJECT]", "[LOCATION]", "[TARGET]").toString())
11711185
* .setTargetId("targetId-441951604")
11721186
* .setTarget(Target.newBuilder().build())
11731187
* .setRequestId("requestId693933066")
@@ -1195,7 +1209,7 @@ public final OperationFuture<Target, OperationMetadata> createTargetAsync(
11951209
* try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
11961210
* CreateTargetRequest request =
11971211
* CreateTargetRequest.newBuilder()
1198-
* .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
1212+
* .setParent(TargetName.of("[PROJECT]", "[LOCATION]", "[TARGET]").toString())
11991213
* .setTargetId("targetId-441951604")
12001214
* .setTarget(Target.newBuilder().build())
12011215
* .setRequestId("requestId693933066")
@@ -2498,8 +2512,11 @@ public boolean awaitTermination(long duration, TimeUnit unit) throws Interrupted
24982512

24992513
public static class ListDeliveryPipelinesPagedResponse
25002514
extends AbstractPagedListResponse<
2501-
ListDeliveryPipelinesRequest, ListDeliveryPipelinesResponse, DeliveryPipeline,
2502-
ListDeliveryPipelinesPage, ListDeliveryPipelinesFixedSizeCollection> {
2515+
ListDeliveryPipelinesRequest,
2516+
ListDeliveryPipelinesResponse,
2517+
DeliveryPipeline,
2518+
ListDeliveryPipelinesPage,
2519+
ListDeliveryPipelinesFixedSizeCollection> {
25032520

25042521
public static ApiFuture<ListDeliveryPipelinesPagedResponse> createAsync(
25052522
PageContext<ListDeliveryPipelinesRequest, ListDeliveryPipelinesResponse, DeliveryPipeline>
@@ -2520,7 +2537,9 @@ private ListDeliveryPipelinesPagedResponse(ListDeliveryPipelinesPage page) {
25202537

25212538
public static class ListDeliveryPipelinesPage
25222539
extends AbstractPage<
2523-
ListDeliveryPipelinesRequest, ListDeliveryPipelinesResponse, DeliveryPipeline,
2540+
ListDeliveryPipelinesRequest,
2541+
ListDeliveryPipelinesResponse,
2542+
DeliveryPipeline,
25242543
ListDeliveryPipelinesPage> {
25252544

25262545
private ListDeliveryPipelinesPage(
@@ -2553,8 +2572,11 @@ public ApiFuture<ListDeliveryPipelinesPage> createPageAsync(
25532572

25542573
public static class ListDeliveryPipelinesFixedSizeCollection
25552574
extends AbstractFixedSizeCollection<
2556-
ListDeliveryPipelinesRequest, ListDeliveryPipelinesResponse, DeliveryPipeline,
2557-
ListDeliveryPipelinesPage, ListDeliveryPipelinesFixedSizeCollection> {
2575+
ListDeliveryPipelinesRequest,
2576+
ListDeliveryPipelinesResponse,
2577+
DeliveryPipeline,
2578+
ListDeliveryPipelinesPage,
2579+
ListDeliveryPipelinesFixedSizeCollection> {
25582580

25592581
private ListDeliveryPipelinesFixedSizeCollection(
25602582
List<ListDeliveryPipelinesPage> pages, int collectionSize) {
@@ -2574,7 +2596,10 @@ protected ListDeliveryPipelinesFixedSizeCollection createCollection(
25742596

25752597
public static class ListTargetsPagedResponse
25762598
extends AbstractPagedListResponse<
2577-
ListTargetsRequest, ListTargetsResponse, Target, ListTargetsPage,
2599+
ListTargetsRequest,
2600+
ListTargetsResponse,
2601+
Target,
2602+
ListTargetsPage,
25782603
ListTargetsFixedSizeCollection> {
25792604

25802605
public static ApiFuture<ListTargetsPagedResponse> createAsync(
@@ -2621,7 +2646,10 @@ public ApiFuture<ListTargetsPage> createPageAsync(
26212646

26222647
public static class ListTargetsFixedSizeCollection
26232648
extends AbstractFixedSizeCollection<
2624-
ListTargetsRequest, ListTargetsResponse, Target, ListTargetsPage,
2649+
ListTargetsRequest,
2650+
ListTargetsResponse,
2651+
Target,
2652+
ListTargetsPage,
26252653
ListTargetsFixedSizeCollection> {
26262654

26272655
private ListTargetsFixedSizeCollection(List<ListTargetsPage> pages, int collectionSize) {
@@ -2641,7 +2669,10 @@ protected ListTargetsFixedSizeCollection createCollection(
26412669

26422670
public static class ListReleasesPagedResponse
26432671
extends AbstractPagedListResponse<
2644-
ListReleasesRequest, ListReleasesResponse, Release, ListReleasesPage,
2672+
ListReleasesRequest,
2673+
ListReleasesResponse,
2674+
Release,
2675+
ListReleasesPage,
26452676
ListReleasesFixedSizeCollection> {
26462677

26472678
public static ApiFuture<ListReleasesPagedResponse> createAsync(
@@ -2690,7 +2721,10 @@ public ApiFuture<ListReleasesPage> createPageAsync(
26902721

26912722
public static class ListReleasesFixedSizeCollection
26922723
extends AbstractFixedSizeCollection<
2693-
ListReleasesRequest, ListReleasesResponse, Release, ListReleasesPage,
2724+
ListReleasesRequest,
2725+
ListReleasesResponse,
2726+
Release,
2727+
ListReleasesPage,
26942728
ListReleasesFixedSizeCollection> {
26952729

26962730
private ListReleasesFixedSizeCollection(List<ListReleasesPage> pages, int collectionSize) {
@@ -2710,7 +2744,10 @@ protected ListReleasesFixedSizeCollection createCollection(
27102744

27112745
public static class ListRolloutsPagedResponse
27122746
extends AbstractPagedListResponse<
2713-
ListRolloutsRequest, ListRolloutsResponse, Rollout, ListRolloutsPage,
2747+
ListRolloutsRequest,
2748+
ListRolloutsResponse,
2749+
Rollout,
2750+
ListRolloutsPage,
27142751
ListRolloutsFixedSizeCollection> {
27152752

27162753
public static ApiFuture<ListRolloutsPagedResponse> createAsync(
@@ -2759,7 +2796,10 @@ public ApiFuture<ListRolloutsPage> createPageAsync(
27592796

27602797
public static class ListRolloutsFixedSizeCollection
27612798
extends AbstractFixedSizeCollection<
2762-
ListRolloutsRequest, ListRolloutsResponse, Rollout, ListRolloutsPage,
2799+
ListRolloutsRequest,
2800+
ListRolloutsResponse,
2801+
Rollout,
2802+
ListRolloutsPage,
27632803
ListRolloutsFixedSizeCollection> {
27642804

27652805
private ListRolloutsFixedSizeCollection(List<ListRolloutsPage> pages, int collectionSize) {

0 commit comments

Comments
 (0)