Revert "chore: update Java and Python dependencies" (#39)

Reverts #32

Fixes [#1300](googleapis/synthtool#1300)

.github/.OwlBot.lock.yaml

@@ -1,3 +1,3 @@
 docker:
-  image: gcr.io/repo-automation-bots/owlbot-java:latest
+  image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
   digest: sha256:a744afda1956beb7bd6dc8d0b740a7839bbe402e34e2f4ef24589074db53ceb0

.github/.OwlBot.yaml

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 docker:
-  image: "gcr.io/repo-automation-bots/owlbot-java:latest"
+  image: "gcr.io/cloud-devrel-public-resources/owlbot-java:latest"
 
 deep-remove-regex:
 - "/grpc-google-.*/src"

README.md

@@ -30,13 +30,13 @@ If you are using Maven, add this to your pom.xml file:
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-deploy:0.1.0'
+implementation 'com.google.cloud:google-cloud-deploy:0.1.2'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-deploy" % "0.1.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-deploy" % "0.1.2"
 ```
 
 ## Authentication

google-cloud-deploy/pom.xml

@@ -16,6 +16,74 @@
   <properties>
     <site.installationModule>google-cloud-deploy</site.installationModule>
   </properties>
+  <dependencies>
+    <dependency>
+      <groupId>io.grpc</groupId>
+      <artifactId>grpc-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.grpc</groupId>
+      <artifactId>grpc-stub</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.grpc</groupId>
+      <artifactId>grpc-protobuf</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.api</groupId>
+      <artifactId>api-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.api.grpc</groupId>
+      <artifactId>proto-google-common-protos</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.api.grpc</groupId>
+      <artifactId>proto-google-cloud-deploy-v1</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.api</groupId>
+      <artifactId>gax</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.api</groupId>
+      <artifactId>gax-grpc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.threeten</groupId>
+      <artifactId>threetenbp</artifactId>
+    </dependency>
+
+    <!-- Test dependencies -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+      <version>4.13.2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.api.grpc</groupId>
+      <artifactId>grpc-google-cloud-deploy-v1</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <!-- Need testing utility classes for generated gRPC clients tests -->
+    <dependency>
+      <groupId>com.google.api</groupId>
+      <artifactId>gax-grpc</artifactId>
+      <classifier>testlib</classifier>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
   <profiles>
     <profile>

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

@@ -62,13 +62,13 @@
  * methods:
  *
  * <ol>
- *   <li> A "flattened" method. With this type of method, the fields of the request type have been
+ *   <li>A "flattened" method. With this type of method, the fields of the request type have been
  *       converted into function parameters. It may be the case that not all fields are available as
  *       parameters, and not every API method will have a flattened method entry point.
- *   <li> A "request object" method. This type of method only takes one parameter, a request object,
+ *   <li>A "request object" method. This type of method only takes one parameter, a request object,
  *       which must be constructed before the call. Not every API method will have a request object
  *       method.
- *   <li> A "callable" method. This type of method takes no parameters and returns an immutable API
+ *   <li>A "callable" method. This type of method takes no parameters and returns an immutable API
  *       callable object, which can be used to initiate calls to the service.
  * </ol>
  *
@@ -200,7 +200,8 @@ public final ListDeliveryPipelinesPagedResponse listDeliveryPipelines(LocationNa
    *
    * <pre>{@code
    * try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
-   *   String parent = LocationName.of("[PROJECT]", "[LOCATION]").toString();
+   *   String parent =
+   *       DeliveryPipelineName.of("[PROJECT]", "[LOCATION]", "[DELIVERY_PIPELINE]").toString();
    *   for (DeliveryPipeline element :
    *       cloudDeployClient.listDeliveryPipelines(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -228,7 +229,9 @@ public final ListDeliveryPipelinesPagedResponse listDeliveryPipelines(String par
    * try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
    *   ListDeliveryPipelinesRequest request =
    *       ListDeliveryPipelinesRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(
+   *               DeliveryPipelineName.of("[PROJECT]", "[LOCATION]", "[DELIVERY_PIPELINE]")
+   *                   .toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .setFilter("filter-1274492040")
@@ -259,7 +262,9 @@ public final ListDeliveryPipelinesPagedResponse listDeliveryPipelines(
    * try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
    *   ListDeliveryPipelinesRequest request =
    *       ListDeliveryPipelinesRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(
+   *               DeliveryPipelineName.of("[PROJECT]", "[LOCATION]", "[DELIVERY_PIPELINE]")
+   *                   .toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .setFilter("filter-1274492040")
@@ -289,7 +294,9 @@ public final ListDeliveryPipelinesPagedResponse listDeliveryPipelines(
    * try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
    *   ListDeliveryPipelinesRequest request =
    *       ListDeliveryPipelinesRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(
+   *               DeliveryPipelineName.of("[PROJECT]", "[LOCATION]", "[DELIVERY_PIPELINE]")
+   *                   .toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .setFilter("filter-1274492040")
@@ -460,7 +467,8 @@ public final OperationFuture<DeliveryPipeline, OperationMetadata> createDelivery
    *
    * <pre>{@code
    * try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
-   *   String parent = LocationName.of("[PROJECT]", "[LOCATION]").toString();
+   *   String parent =
+   *       DeliveryPipelineName.of("[PROJECT]", "[LOCATION]", "[DELIVERY_PIPELINE]").toString();
    *   DeliveryPipeline deliveryPipeline = DeliveryPipeline.newBuilder().build();
    *   String deliveryPipelineId = "deliveryPipelineId-632411535";
    *   DeliveryPipeline response =
@@ -497,7 +505,9 @@ public final OperationFuture<DeliveryPipeline, OperationMetadata> createDelivery
    * try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
    *   CreateDeliveryPipelineRequest request =
    *       CreateDeliveryPipelineRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(
+   *               DeliveryPipelineName.of("[PROJECT]", "[LOCATION]", "[DELIVERY_PIPELINE]")
+   *                   .toString())
    *           .setDeliveryPipelineId("deliveryPipelineId-632411535")
    *           .setDeliveryPipeline(DeliveryPipeline.newBuilder().build())
    *           .setRequestId("requestId693933066")
@@ -525,7 +535,9 @@ public final OperationFuture<DeliveryPipeline, OperationMetadata> createDelivery
    * try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
    *   CreateDeliveryPipelineRequest request =
    *       CreateDeliveryPipelineRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(
+   *               DeliveryPipelineName.of("[PROJECT]", "[LOCATION]", "[DELIVERY_PIPELINE]")
+   *                   .toString())
    *           .setDeliveryPipelineId("deliveryPipelineId-632411535")
    *           .setDeliveryPipeline(DeliveryPipeline.newBuilder().build())
    *           .setRequestId("requestId693933066")
@@ -553,7 +565,9 @@ public final OperationFuture<DeliveryPipeline, OperationMetadata> createDelivery
    * try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
    *   CreateDeliveryPipelineRequest request =
    *       CreateDeliveryPipelineRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(
+   *               DeliveryPipelineName.of("[PROJECT]", "[LOCATION]", "[DELIVERY_PIPELINE]")
+   *                   .toString())
    *           .setDeliveryPipelineId("deliveryPipelineId-632411535")
    *           .setDeliveryPipeline(DeliveryPipeline.newBuilder().build())
    *           .setRequestId("requestId693933066")
@@ -866,7 +880,7 @@ public final ListTargetsPagedResponse listTargets(LocationName parent) {
    *
    * <pre>{@code
    * try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
-   *   String parent = LocationName.of("[PROJECT]", "[LOCATION]").toString();
+   *   String parent = TargetName.of("[PROJECT]", "[LOCATION]", "[TARGET]").toString();
    *   for (Target element : cloudDeployClient.listTargets(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
@@ -892,7 +906,7 @@ public final ListTargetsPagedResponse listTargets(String parent) {
    * try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
    *   ListTargetsRequest request =
    *       ListTargetsRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(TargetName.of("[PROJECT]", "[LOCATION]", "[TARGET]").toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .setFilter("filter-1274492040")
@@ -921,7 +935,7 @@ public final ListTargetsPagedResponse listTargets(ListTargetsRequest request) {
    * try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
    *   ListTargetsRequest request =
    *       ListTargetsRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(TargetName.of("[PROJECT]", "[LOCATION]", "[TARGET]").toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .setFilter("filter-1274492040")
@@ -950,7 +964,7 @@ public final ListTargetsPagedResponse listTargets(ListTargetsRequest request) {
    * try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
    *   ListTargetsRequest request =
    *       ListTargetsRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(TargetName.of("[PROJECT]", "[LOCATION]", "[TARGET]").toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .setFilter("filter-1274492040")
@@ -1105,7 +1119,7 @@ public final OperationFuture<Target, OperationMetadata> createTargetAsync(
    *
    * <pre>{@code
    * try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
-   *   String parent = LocationName.of("[PROJECT]", "[LOCATION]").toString();
+   *   String parent = TargetName.of("[PROJECT]", "[LOCATION]", "[TARGET]").toString();
    *   Target target = Target.newBuilder().build();
    *   String targetId = "targetId-441951604";
    *   Target response = cloudDeployClient.createTargetAsync(parent, target, targetId).get();
@@ -1139,7 +1153,7 @@ public final OperationFuture<Target, OperationMetadata> createTargetAsync(
    * try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
    *   CreateTargetRequest request =
    *       CreateTargetRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(TargetName.of("[PROJECT]", "[LOCATION]", "[TARGET]").toString())
    *           .setTargetId("targetId-441951604")
    *           .setTarget(Target.newBuilder().build())
    *           .setRequestId("requestId693933066")
@@ -1167,7 +1181,7 @@ public final OperationFuture<Target, OperationMetadata> createTargetAsync(
    * try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
    *   CreateTargetRequest request =
    *       CreateTargetRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(TargetName.of("[PROJECT]", "[LOCATION]", "[TARGET]").toString())
    *           .setTargetId("targetId-441951604")
    *           .setTarget(Target.newBuilder().build())
    *           .setRequestId("requestId693933066")
@@ -1195,7 +1209,7 @@ public final OperationFuture<Target, OperationMetadata> createTargetAsync(
    * try (CloudDeployClient cloudDeployClient = CloudDeployClient.create()) {
    *   CreateTargetRequest request =
    *       CreateTargetRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(TargetName.of("[PROJECT]", "[LOCATION]", "[TARGET]").toString())
    *           .setTargetId("targetId-441951604")
    *           .setTarget(Target.newBuilder().build())
    *           .setRequestId("requestId693933066")
@@ -2498,8 +2512,11 @@ public boolean awaitTermination(long duration, TimeUnit unit) throws Interrupted
 
   public static class ListDeliveryPipelinesPagedResponse
       extends AbstractPagedListResponse<
-          ListDeliveryPipelinesRequest, ListDeliveryPipelinesResponse, DeliveryPipeline,
-          ListDeliveryPipelinesPage, ListDeliveryPipelinesFixedSizeCollection> {
+          ListDeliveryPipelinesRequest,
+          ListDeliveryPipelinesResponse,
+          DeliveryPipeline,
+          ListDeliveryPipelinesPage,
+          ListDeliveryPipelinesFixedSizeCollection> {
 
     public static ApiFuture<ListDeliveryPipelinesPagedResponse> createAsync(
         PageContext<ListDeliveryPipelinesRequest, ListDeliveryPipelinesResponse, DeliveryPipeline>
@@ -2520,7 +2537,9 @@ private ListDeliveryPipelinesPagedResponse(ListDeliveryPipelinesPage page) {
 
   public static class ListDeliveryPipelinesPage
       extends AbstractPage<
-          ListDeliveryPipelinesRequest, ListDeliveryPipelinesResponse, DeliveryPipeline,
+          ListDeliveryPipelinesRequest,
+          ListDeliveryPipelinesResponse,
+          DeliveryPipeline,
           ListDeliveryPipelinesPage> {
 
     private ListDeliveryPipelinesPage(
@@ -2553,8 +2572,11 @@ public ApiFuture<ListDeliveryPipelinesPage> createPageAsync(
 
   public static class ListDeliveryPipelinesFixedSizeCollection
       extends AbstractFixedSizeCollection<
-          ListDeliveryPipelinesRequest, ListDeliveryPipelinesResponse, DeliveryPipeline,
-          ListDeliveryPipelinesPage, ListDeliveryPipelinesFixedSizeCollection> {
+          ListDeliveryPipelinesRequest,
+          ListDeliveryPipelinesResponse,
+          DeliveryPipeline,
+          ListDeliveryPipelinesPage,
+          ListDeliveryPipelinesFixedSizeCollection> {
 
     private ListDeliveryPipelinesFixedSizeCollection(
         List<ListDeliveryPipelinesPage> pages, int collectionSize) {
@@ -2574,7 +2596,10 @@ protected ListDeliveryPipelinesFixedSizeCollection createCollection(
 
   public static class ListTargetsPagedResponse
       extends AbstractPagedListResponse<
-          ListTargetsRequest, ListTargetsResponse, Target, ListTargetsPage,
+          ListTargetsRequest,
+          ListTargetsResponse,
+          Target,
+          ListTargetsPage,
           ListTargetsFixedSizeCollection> {
 
     public static ApiFuture<ListTargetsPagedResponse> createAsync(
@@ -2621,7 +2646,10 @@ public ApiFuture<ListTargetsPage> createPageAsync(
 
   public static class ListTargetsFixedSizeCollection
       extends AbstractFixedSizeCollection<
-          ListTargetsRequest, ListTargetsResponse, Target, ListTargetsPage,
+          ListTargetsRequest,
+          ListTargetsResponse,
+          Target,
+          ListTargetsPage,
           ListTargetsFixedSizeCollection> {
 
     private ListTargetsFixedSizeCollection(List<ListTargetsPage> pages, int collectionSize) {
@@ -2641,7 +2669,10 @@ protected ListTargetsFixedSizeCollection createCollection(
 
   public static class ListReleasesPagedResponse
       extends AbstractPagedListResponse<
-          ListReleasesRequest, ListReleasesResponse, Release, ListReleasesPage,
+          ListReleasesRequest,
+          ListReleasesResponse,
+          Release,
+          ListReleasesPage,
           ListReleasesFixedSizeCollection> {
 
     public static ApiFuture<ListReleasesPagedResponse> createAsync(
@@ -2690,7 +2721,10 @@ public ApiFuture<ListReleasesPage> createPageAsync(
 
   public static class ListReleasesFixedSizeCollection
       extends AbstractFixedSizeCollection<
-          ListReleasesRequest, ListReleasesResponse, Release, ListReleasesPage,
+          ListReleasesRequest,
+          ListReleasesResponse,
+          Release,
+          ListReleasesPage,
           ListReleasesFixedSizeCollection> {
 
     private ListReleasesFixedSizeCollection(List<ListReleasesPage> pages, int collectionSize) {
@@ -2710,7 +2744,10 @@ protected ListReleasesFixedSizeCollection createCollection(
 
   public static class ListRolloutsPagedResponse
       extends AbstractPagedListResponse<
-          ListRolloutsRequest, ListRolloutsResponse, Rollout, ListRolloutsPage,
+          ListRolloutsRequest,
+          ListRolloutsResponse,
+          Rollout,
+          ListRolloutsPage,
           ListRolloutsFixedSizeCollection> {
 
     public static ApiFuture<ListRolloutsPagedResponse> createAsync(
@@ -2759,7 +2796,10 @@ public ApiFuture<ListRolloutsPage> createPageAsync(
 
   public static class ListRolloutsFixedSizeCollection
       extends AbstractFixedSizeCollection<
-          ListRolloutsRequest, ListRolloutsResponse, Rollout, ListRolloutsPage,
+          ListRolloutsRequest,
+          ListRolloutsResponse,
+          Rollout,
+          ListRolloutsPage,
           ListRolloutsFixedSizeCollection> {
 
     private ListRolloutsFixedSizeCollection(List<ListRolloutsPage> pages, int collectionSize) {