Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add dlp-v2 and video-intelligence v1p1beta1 #3053

Merged
merged 1 commit into from
Mar 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
* <code>
* DataTransferServiceSettings.Builder dataTransferServiceSettingsBuilder =
* DataTransferServiceSettings.newBuilder();
* dataTransferServiceSettingsBuilder.getDataSourceSettings().getRetrySettingsBuilder()
* dataTransferServiceSettingsBuilder.getDataSourceSettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30));
* DataTransferServiceSettings dataTransferServiceSettings = dataTransferServiceSettingsBuilder.build();
* </code>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
* <code>
* DataTransferServiceStubSettings.Builder dataTransferServiceSettingsBuilder =
* DataTransferServiceStubSettings.newBuilder();
* dataTransferServiceSettingsBuilder.getDataSourceSettings().getRetrySettingsBuilder()
* dataTransferServiceSettingsBuilder.getDataSourceSettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30));
* DataTransferServiceStubSettings dataTransferServiceSettings = dataTransferServiceSettingsBuilder.build();
* </code>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
* <code>
* BaseBigtableDataSettings.Builder baseBigtableDataSettingsBuilder =
* BaseBigtableDataSettings.newBuilder();
* baseBigtableDataSettingsBuilder.mutateRowSettings().getRetrySettingsBuilder()
* baseBigtableDataSettingsBuilder.mutateRowSettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30));
* BaseBigtableDataSettings baseBigtableDataSettings = baseBigtableDataSettingsBuilder.build();
* </code>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
* <code>
* BigtableStubSettings.Builder baseBigtableDataSettingsBuilder =
* BigtableStubSettings.newBuilder();
* baseBigtableDataSettingsBuilder.mutateRowSettings().getRetrySettingsBuilder()
* baseBigtableDataSettingsBuilder.mutateRowSettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30));
* BigtableStubSettings baseBigtableDataSettings = baseBigtableDataSettingsBuilder.build();
* </code>
Expand Down
24 changes: 22 additions & 2 deletions google-cloud-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@
<gax.version>1.20.0</gax.version>
<gax-grpc.version>1.20.0</gax-grpc.version>
<gax-httpjson.version>0.37.0</gax-httpjson.version>
<generated-proto-beta.version>0.4.0</generated-proto-beta.version>
<generated-proto-ga.version>1.3.0</generated-proto-ga.version>
<generated-proto-beta.version>0.5.0</generated-proto-beta.version>
<generated-proto-ga.version>1.4.0</generated-proto-ga.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -397,6 +397,16 @@
<artifactId>grpc-google-cloud-dlp-v2beta1</artifactId>
<version>${generated-proto-beta.version}</version>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-dlp-v2</artifactId>
<version>${generated-proto-beta.version}</version>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-dlp-v2</artifactId>
<version>${generated-proto-beta.version}</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-dialogflow</artifactId>
Expand Down Expand Up @@ -816,6 +826,11 @@
<artifactId>proto-google-cloud-video-intelligence-v1</artifactId>
<version>${generated-proto-beta.version}</version>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-video-intelligence-v1p1beta1</artifactId>
<version>${generated-proto-beta.version}</version>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-video-intelligence-v1beta1</artifactId>
Expand All @@ -831,6 +846,11 @@
<artifactId>grpc-google-cloud-video-intelligence-v1</artifactId>
<version>${generated-proto-beta.version}</version>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-video-intelligence-v1p1beta1</artifactId>
<version>${generated-proto-beta.version}</version>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-common-protos</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
* <code>
* ClusterManagerSettings.Builder clusterManagerSettingsBuilder =
* ClusterManagerSettings.newBuilder();
* clusterManagerSettingsBuilder.listClustersSettings().getRetrySettingsBuilder()
* clusterManagerSettingsBuilder.listClustersSettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30));
* ClusterManagerSettings clusterManagerSettings = clusterManagerSettingsBuilder.build();
* </code>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
* <code>
* ClusterManagerStubSettings.Builder clusterManagerSettingsBuilder =
* ClusterManagerStubSettings.newBuilder();
* clusterManagerSettingsBuilder.listClustersSettings().getRetrySettingsBuilder()
* clusterManagerSettingsBuilder.listClustersSettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30));
* ClusterManagerStubSettings clusterManagerSettings = clusterManagerSettingsBuilder.build();
* </code>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
* <code>
* ClusterControllerSettings.Builder clusterControllerSettingsBuilder =
* ClusterControllerSettings.newBuilder();
* clusterControllerSettingsBuilder.getClusterSettings().getRetrySettingsBuilder()
* clusterControllerSettingsBuilder.getClusterSettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30));
* ClusterControllerSettings clusterControllerSettings = clusterControllerSettingsBuilder.build();
* </code>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
* <code>
* JobControllerSettings.Builder jobControllerSettingsBuilder =
* JobControllerSettings.newBuilder();
* jobControllerSettingsBuilder.submitJobSettings().getRetrySettingsBuilder()
* jobControllerSettingsBuilder.submitJobSettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30));
* JobControllerSettings jobControllerSettings = jobControllerSettingsBuilder.build();
* </code>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
* <code>
* ClusterControllerStubSettings.Builder clusterControllerSettingsBuilder =
* ClusterControllerStubSettings.newBuilder();
* clusterControllerSettingsBuilder.getClusterSettings().getRetrySettingsBuilder()
* clusterControllerSettingsBuilder.getClusterSettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30));
* ClusterControllerStubSettings clusterControllerSettings = clusterControllerSettingsBuilder.build();
* </code>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
* <code>
* JobControllerStubSettings.Builder jobControllerSettingsBuilder =
* JobControllerStubSettings.newBuilder();
* jobControllerSettingsBuilder.submitJobSettings().getRetrySettingsBuilder()
* jobControllerSettingsBuilder.submitJobSettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30));
* JobControllerStubSettings jobControllerSettings = jobControllerSettingsBuilder.build();
* </code>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
* <code>
* AgentsSettings.Builder agentsSettingsBuilder =
* AgentsSettings.newBuilder();
* agentsSettingsBuilder.getAgentSettings().getRetrySettingsBuilder()
* agentsSettingsBuilder.getAgentSettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30));
* AgentsSettings agentsSettings = agentsSettingsBuilder.build();
* </code>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
* <code>
* ContextsSettings.Builder contextsSettingsBuilder =
* ContextsSettings.newBuilder();
* contextsSettingsBuilder.getContextSettings().getRetrySettingsBuilder()
* contextsSettingsBuilder.getContextSettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30));
* ContextsSettings contextsSettings = contextsSettingsBuilder.build();
* </code>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
* <code>
* EntityTypesSettings.Builder entityTypesSettingsBuilder =
* EntityTypesSettings.newBuilder();
* entityTypesSettingsBuilder.getEntityTypeSettings().getRetrySettingsBuilder()
* entityTypesSettingsBuilder.getEntityTypeSettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30));
* EntityTypesSettings entityTypesSettings = entityTypesSettingsBuilder.build();
* </code>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
* <code>
* IntentsSettings.Builder intentsSettingsBuilder =
* IntentsSettings.newBuilder();
* intentsSettingsBuilder.getIntentSettings().getRetrySettingsBuilder()
* intentsSettingsBuilder.getIntentSettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30));
* IntentsSettings intentsSettings = intentsSettingsBuilder.build();
* </code>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
* <code>
* SessionEntityTypesSettings.Builder sessionEntityTypesSettingsBuilder =
* SessionEntityTypesSettings.newBuilder();
* sessionEntityTypesSettingsBuilder.getSessionEntityTypeSettings().getRetrySettingsBuilder()
* sessionEntityTypesSettingsBuilder.getSessionEntityTypeSettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30));
* SessionEntityTypesSettings sessionEntityTypesSettings = sessionEntityTypesSettingsBuilder.build();
* </code>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
* <code>
* SessionsSettings.Builder sessionsSettingsBuilder =
* SessionsSettings.newBuilder();
* sessionsSettingsBuilder.detectIntentSettings().getRetrySettingsBuilder()
* sessionsSettingsBuilder.detectIntentSettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30));
* SessionsSettings sessionsSettings = sessionsSettingsBuilder.build();
* </code>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
* <code>
* AgentsStubSettings.Builder agentsSettingsBuilder =
* AgentsStubSettings.newBuilder();
* agentsSettingsBuilder.getAgentSettings().getRetrySettingsBuilder()
* agentsSettingsBuilder.getAgentSettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30));
* AgentsStubSettings agentsSettings = agentsSettingsBuilder.build();
* </code>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
* <code>
* ContextsStubSettings.Builder contextsSettingsBuilder =
* ContextsStubSettings.newBuilder();
* contextsSettingsBuilder.getContextSettings().getRetrySettingsBuilder()
* contextsSettingsBuilder.getContextSettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30));
* ContextsStubSettings contextsSettings = contextsSettingsBuilder.build();
* </code>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
* <code>
* EntityTypesStubSettings.Builder entityTypesSettingsBuilder =
* EntityTypesStubSettings.newBuilder();
* entityTypesSettingsBuilder.getEntityTypeSettings().getRetrySettingsBuilder()
* entityTypesSettingsBuilder.getEntityTypeSettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30));
* EntityTypesStubSettings entityTypesSettings = entityTypesSettingsBuilder.build();
* </code>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
* <code>
* IntentsStubSettings.Builder intentsSettingsBuilder =
* IntentsStubSettings.newBuilder();
* intentsSettingsBuilder.getIntentSettings().getRetrySettingsBuilder()
* intentsSettingsBuilder.getIntentSettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30));
* IntentsStubSettings intentsSettings = intentsSettingsBuilder.build();
* </code>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
* <code>
* SessionEntityTypesStubSettings.Builder sessionEntityTypesSettingsBuilder =
* SessionEntityTypesStubSettings.newBuilder();
* sessionEntityTypesSettingsBuilder.getSessionEntityTypeSettings().getRetrySettingsBuilder()
* sessionEntityTypesSettingsBuilder.getSessionEntityTypeSettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30));
* SessionEntityTypesStubSettings sessionEntityTypesSettings = sessionEntityTypesSettingsBuilder.build();
* </code>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
* <code>
* SessionsStubSettings.Builder sessionsSettingsBuilder =
* SessionsStubSettings.newBuilder();
* sessionsSettingsBuilder.detectIntentSettings().getRetrySettingsBuilder()
* sessionsSettingsBuilder.detectIntentSettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30));
* SessionsStubSettings sessionsSettings = sessionsSettingsBuilder.build();
* </code>
Expand Down
11 changes: 10 additions & 1 deletion google-cloud-dlp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<name>Google Cloud Data Loss Prevention API</name>
<url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dlp</url>
<description>
Java idiomatic client for Cloud Data Loss Prevention API v2beta1.
Java idiomatic client for Cloud Data Loss Prevention API v2.
</description>
<parent>
<groupId>com.google.cloud</groupId>
Expand All @@ -30,6 +30,10 @@
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-dlp-v2beta1</artifactId>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-dlp-v2</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty-shaded</artifactId>
Expand Down Expand Up @@ -68,6 +72,11 @@
<artifactId>grpc-google-cloud-dlp-v2beta1</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-dlp-v2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax-grpc</artifactId>
Expand Down
Loading