Regenerate gapic clients, add IoT and Web Security Scanner clients (#…

…3282) Also remove beta packages for dlp, as they are removed from googleapis. IoT packages were moved from `cloudiot` to just `iot`. Also regenerate clients with @BetaApi annotation for LRO-specific code.
googleapis · May 17, 2018 · 871b87e · 871b87e
1 parent c9fe645
commit 871b87e
Show file tree

Hide file tree

Showing 476 changed files with 21,707 additions and 112,636 deletions.
diff --git a/codacy-conf.json b/codacy-conf.json
@@ -698,7 +698,7 @@
     },
     {
       "patternId": "design_FieldDeclarationsShouldBeAtStartOfClass",
-      "enabled": true
+      "enabled": false
     },
     {
       "patternId": "unnecessary_UnnecessaryConversionTemporary",
@@ -986,15 +986,15 @@
     },
     {
       "patternId": "unnecessary_UselessParentheses",
-      "enabled": true
+      "enabled": false
     },
     {
       "patternId": "design_IdempotentOperations",
       "enabled": true
     },
     {
       "patternId": "braces_IfStmtsMustUseBraces",
-      "enabled": true
+      "enabled": false
     },
     {
       "patternId": "strings_UseIndexOfChar",

diff --git a/google-api-grpc/grpc-google-cloud-dlp-v2beta1/pom.xml b/google-api-grpc/grpc-google-cloud-dlp-v2beta1/pom.xml
diff --git a/...google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DlpServiceGrpc.java b/...google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DlpServiceGrpc.java
diff --git a/...rpc/grpc-google-cloud-cloudiot-v1/pom.xml → ...api-grpc/grpc-google-cloud-iot-v1/pom.xml b/...rpc/grpc-google-cloud-cloudiot-v1/pom.xml → ...api-grpc/grpc-google-cloud-iot-v1/pom.xml
@@ -2,10 +2,10 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>grpc-google-cloud-cloudiot-v1</artifactId>
-  <version>0.12.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-cloudiot-v1:current} -->
-  <name>grpc-google-cloud-cloudiot-v1</name>
-  <description>GRPC library for grpc-google-cloud-cloudiot-v1</description>
+  <artifactId>grpc-google-cloud-iot-v1</artifactId>
+  <version>0.12.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-iot-v1:current} -->
+  <name>grpc-google-cloud-iot-v1</name>
+  <description>GRPC library for grpc-google-cloud-iot-v1</description>
   <parent>
     <groupId>com.google.api.grpc</groupId>
     <artifactId>google-api-grpc</artifactId>
@@ -24,7 +24,7 @@
     </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>
-      <artifactId>proto-google-cloud-cloudiot-v1</artifactId>
+      <artifactId>proto-google-cloud-iot-v1</artifactId>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/...oogle/cloud/iot/v1/DeviceManagerGrpc.java → ...oogle/cloud/iot/v1/DeviceManagerGrpc.java b/...oogle/cloud/iot/v1/DeviceManagerGrpc.java → ...oogle/cloud/iot/v1/DeviceManagerGrpc.java
diff --git a/...c-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorGrpc.java b/...c-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorGrpc.java
@@ -69,6 +69,43 @@ com.google.cloud.vision.v1.BatchAnnotateImagesResponse> getBatchAnnotateImagesMe
      }
      return getBatchAnnotateImagesMethod;
   }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getAsyncBatchAnnotateFilesMethod()} instead. 
+  public static final io.grpc.MethodDescriptor<com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest,
+      com.google.longrunning.Operation> METHOD_ASYNC_BATCH_ANNOTATE_FILES = getAsyncBatchAnnotateFilesMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor<com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest,
+      com.google.longrunning.Operation> getAsyncBatchAnnotateFilesMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor<com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest,
+      com.google.longrunning.Operation> getAsyncBatchAnnotateFilesMethod() {
+    return getAsyncBatchAnnotateFilesMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor<com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest,
+      com.google.longrunning.Operation> getAsyncBatchAnnotateFilesMethodHelper() {
+    io.grpc.MethodDescriptor<com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest, com.google.longrunning.Operation> getAsyncBatchAnnotateFilesMethod;
+    if ((getAsyncBatchAnnotateFilesMethod = ImageAnnotatorGrpc.getAsyncBatchAnnotateFilesMethod) == null) {
+      synchronized (ImageAnnotatorGrpc.class) {
+        if ((getAsyncBatchAnnotateFilesMethod = ImageAnnotatorGrpc.getAsyncBatchAnnotateFilesMethod) == null) {
+          ImageAnnotatorGrpc.getAsyncBatchAnnotateFilesMethod = getAsyncBatchAnnotateFilesMethod = 
+              io.grpc.MethodDescriptor.<com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest, com.google.longrunning.Operation>newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.vision.v1.ImageAnnotator", "AsyncBatchAnnotateFiles"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.longrunning.Operation.getDefaultInstance()))
+                  .setSchemaDescriptor(new ImageAnnotatorMethodDescriptorSupplier("AsyncBatchAnnotateFiles"))
+                  .build();
+          }
+        }
+     }
+     return getAsyncBatchAnnotateFilesMethod;
+  }
 
   /**
    * Creates a new async stub that supports all call types for the service
@@ -112,6 +149,21 @@ public void batchAnnotateImages(com.google.cloud.vision.v1.BatchAnnotateImagesRe
       asyncUnimplementedUnaryCall(getBatchAnnotateImagesMethodHelper(), responseObserver);
     }
 
+    /**
+     * <pre>
+     * Run asynchronous image detection and annotation for a list of generic
+     * files, such as PDF files, which may contain multiple pages and multiple
+     * images per page. Progress and results can be retrieved through the
+     * `google.longrunning.Operations` interface.
+     * `Operation.metadata` contains `OperationMetadata` (metadata).
+     * `Operation.response` contains `AsyncBatchAnnotateFilesResponse` (results).
+     * </pre>
+     */
+    public void asyncBatchAnnotateFiles(com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest request,
+        io.grpc.stub.StreamObserver<com.google.longrunning.Operation> responseObserver) {
+      asyncUnimplementedUnaryCall(getAsyncBatchAnnotateFilesMethodHelper(), responseObserver);
+    }
+
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
       return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
           .addMethod(
@@ -121,6 +173,13 @@ public void batchAnnotateImages(com.google.cloud.vision.v1.BatchAnnotateImagesRe
                 com.google.cloud.vision.v1.BatchAnnotateImagesRequest,
                 com.google.cloud.vision.v1.BatchAnnotateImagesResponse>(
                   this, METHODID_BATCH_ANNOTATE_IMAGES)))
+          .addMethod(
+            getAsyncBatchAnnotateFilesMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest,
+                com.google.longrunning.Operation>(
+                  this, METHODID_ASYNC_BATCH_ANNOTATE_FILES)))
           .build();
     }
   }
@@ -158,6 +217,22 @@ public void batchAnnotateImages(com.google.cloud.vision.v1.BatchAnnotateImagesRe
       asyncUnaryCall(
           getChannel().newCall(getBatchAnnotateImagesMethodHelper(), getCallOptions()), request, responseObserver);
     }
+
+    /**
+     * <pre>
+     * Run asynchronous image detection and annotation for a list of generic
+     * files, such as PDF files, which may contain multiple pages and multiple
+     * images per page. Progress and results can be retrieved through the
+     * `google.longrunning.Operations` interface.
+     * `Operation.metadata` contains `OperationMetadata` (metadata).
+     * `Operation.response` contains `AsyncBatchAnnotateFilesResponse` (results).
+     * </pre>
+     */
+    public void asyncBatchAnnotateFiles(com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest request,
+        io.grpc.stub.StreamObserver<com.google.longrunning.Operation> responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getAsyncBatchAnnotateFilesMethodHelper(), getCallOptions()), request, responseObserver);
+    }
   }
 
   /**
@@ -192,6 +267,21 @@ public com.google.cloud.vision.v1.BatchAnnotateImagesResponse batchAnnotateImage
       return blockingUnaryCall(
           getChannel(), getBatchAnnotateImagesMethodHelper(), getCallOptions(), request);
     }
+
+    /**
+     * <pre>
+     * Run asynchronous image detection and annotation for a list of generic
+     * files, such as PDF files, which may contain multiple pages and multiple
+     * images per page. Progress and results can be retrieved through the
+     * `google.longrunning.Operations` interface.
+     * `Operation.metadata` contains `OperationMetadata` (metadata).
+     * `Operation.response` contains `AsyncBatchAnnotateFilesResponse` (results).
+     * </pre>
+     */
+    public com.google.longrunning.Operation asyncBatchAnnotateFiles(com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getAsyncBatchAnnotateFilesMethodHelper(), getCallOptions(), request);
+    }
   }
 
   /**
@@ -227,9 +317,26 @@ public com.google.common.util.concurrent.ListenableFuture<com.google.cloud.visio
       return futureUnaryCall(
           getChannel().newCall(getBatchAnnotateImagesMethodHelper(), getCallOptions()), request);
     }
+
+    /**
+     * <pre>
+     * Run asynchronous image detection and annotation for a list of generic
+     * files, such as PDF files, which may contain multiple pages and multiple
+     * images per page. Progress and results can be retrieved through the
+     * `google.longrunning.Operations` interface.
+     * `Operation.metadata` contains `OperationMetadata` (metadata).
+     * `Operation.response` contains `AsyncBatchAnnotateFilesResponse` (results).
+     * </pre>
+     */
+    public com.google.common.util.concurrent.ListenableFuture<com.google.longrunning.Operation> asyncBatchAnnotateFiles(
+        com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getAsyncBatchAnnotateFilesMethodHelper(), getCallOptions()), request);
+    }
   }
 
   private static final int METHODID_BATCH_ANNOTATE_IMAGES = 0;
+  private static final int METHODID_ASYNC_BATCH_ANNOTATE_FILES = 1;
 
   private static final class MethodHandlers<Req, Resp> implements
       io.grpc.stub.ServerCalls.UnaryMethod<Req, Resp>,
@@ -252,6 +359,10 @@ public void invoke(Req request, io.grpc.stub.StreamObserver<Resp> responseObserv
           serviceImpl.batchAnnotateImages((com.google.cloud.vision.v1.BatchAnnotateImagesRequest) request,
               (io.grpc.stub.StreamObserver<com.google.cloud.vision.v1.BatchAnnotateImagesResponse>) responseObserver);
           break;
+        case METHODID_ASYNC_BATCH_ANNOTATE_FILES:
+          serviceImpl.asyncBatchAnnotateFiles((com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest) request,
+              (io.grpc.stub.StreamObserver<com.google.longrunning.Operation>) responseObserver);
+          break;
         default:
           throw new AssertionError();
       }
@@ -314,6 +425,7 @@ public static io.grpc.ServiceDescriptor getServiceDescriptor() {
           serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
               .setSchemaDescriptor(new ImageAnnotatorFileDescriptorSupplier())
               .addMethod(getBatchAnnotateImagesMethodHelper())
+              .addMethod(getAsyncBatchAnnotateFilesMethodHelper())
               .build();
         }
       }

diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml
@@ -186,16 +186,6 @@
         <artifactId>proto-google-cloud-datastore-v1</artifactId>
         <version>0.12.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-v1:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.api.grpc</groupId>
-        <artifactId>proto-google-cloud-dlp-v2beta1</artifactId>
-        <version>0.12.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-dlp-v2beta1:current} -->
-      </dependency>
-      <dependency>
-        <groupId>com.google.api.grpc</groupId>
-        <artifactId>grpc-google-cloud-dlp-v2beta1</artifactId>
-        <version>0.12.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-dlp-v2beta1:current} -->
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-dlp-v2</artifactId>
@@ -468,13 +458,13 @@
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
-        <artifactId>proto-google-cloud-cloudiot-v1</artifactId>
-        <version>0.12.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-cloudiot-v1:current} -->
+        <artifactId>proto-google-cloud-iot-v1</artifactId>
+        <version>0.12.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-iot-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
-        <artifactId>grpc-google-cloud-cloudiot-v1</artifactId>
-        <version>0.12.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-cloudiot-v1:current} -->
+        <artifactId>grpc-google-cloud-iot-v1</artifactId>
+        <version>0.12.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-iot-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
@@ -508,7 +498,6 @@
     <module>grpc-google-cloud-dialogflow-v2</module>
     <module>grpc-google-cloud-dialogflow-v2beta1</module>
     <module>grpc-google-cloud-dlp-v2</module>
-    <module>grpc-google-cloud-dlp-v2beta1</module>
     <module>grpc-google-cloud-error-reporting-v1beta1</module>
     <module>grpc-google-cloud-firestore-v1beta1</module>
     <module>grpc-google-cloud-language-v1</module>
@@ -533,7 +522,7 @@
     <module>grpc-google-cloud-vision-v1</module>
     <module>grpc-google-cloud-vision-v1p1beta1</module>
     <module>grpc-google-cloud-vision-v1p2beta1</module>
-    <module>grpc-google-cloud-cloudiot-v1</module>
+    <module>grpc-google-cloud-iot-v1</module>
     <module>grpc-google-cloud-redis-v1beta1</module>
     <module>grpc-google-cloud-websecurityscanner-v1alpha</module>
     <module>proto-google-cloud-bigquerydatatransfer-v1</module>
@@ -545,7 +534,6 @@
     <module>proto-google-cloud-dialogflow-v2</module>
     <module>proto-google-cloud-dialogflow-v2beta1</module>
     <module>proto-google-cloud-dlp-v2</module>
-    <module>proto-google-cloud-dlp-v2beta1</module>
     <module>proto-google-cloud-error-reporting-v1beta1</module>
     <module>proto-google-cloud-firestore-v1beta1</module>
     <module>proto-google-cloud-language-v1</module>
@@ -570,7 +558,7 @@
     <module>proto-google-cloud-vision-v1</module>
     <module>proto-google-cloud-vision-v1p1beta1</module>
     <module>proto-google-cloud-vision-v1p2beta1</module>
-    <module>proto-google-cloud-cloudiot-v1</module>
+    <module>proto-google-cloud-iot-v1</module>
     <module>proto-google-cloud-redis-v1beta1</module>
     <module>proto-google-cloud-websecurityscanner-v1alpha</module>
   </modules>
@@ -647,7 +635,7 @@
                 <quiet>true</quiet>
                 <dependencyDetailsEnabled>true</dependencyDetailsEnabled>
                 <dependencyLocationsEnabled>true</dependencyLocationsEnabled>
-                <artifactId>google-cloud-bom</artifactId>
+                <artifactId>${project.artifactId}</artifactId>
                 <packaging>jar</packaging>
               </configuration>
             </plugin>

diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/pom.xml b/google-api-grpc/proto-google-cloud-dlp-v2beta1/pom.xml