Synchronize new proto/yaml changes.

PiperOrigin-RevId: 234655328
This commit is contained in:
Google APIs 2019-02-19 12:48:59 -08:00 committed by Copybara-Service
parent 4062928366
commit 96cb68536c
3 changed files with 71 additions and 67 deletions

View File

@ -97,7 +97,7 @@ maven_jar(
git_repository(
name = "com_google_api_codegen",
commit = "47ae8d82de2d46e18cbfb990a4d5dbd02c314d29",
commit = "761abebf784db7b9ec2d2e2326d90a502666fc02",
remote = "https://github.com/googleapis/gapic-generator.git",
repo_mapping = {
"@com_google_guava_guava": "@com_google_guava_guava__com_google_api_codegen",

View File

@ -25,75 +25,76 @@ proto_library_with_info(
deps = [":video_intelligence_proto"],
)
# TODO: uncomment once https://github.com/googleapis/gapic-generator/issues/1149 is fixed
##############################################################################
# Java
##############################################################################
load("@io_grpc_grpc_java//:java_grpc_library.bzl", "java_grpc_library")
load(
"@com_google_api_codegen//rules_gapic/java:java_gapic.bzl",
"java_gapic_library",
"java_resource_name_proto_library",
)
load("@com_google_api_codegen//rules_gapic/java:java_gapic_pkg.bzl", "java_gapic_assembly_gradle_pkg")
#load("@io_grpc_grpc_java//:java_grpc_library.bzl", "java_grpc_library")
#load(
# "@com_google_api_codegen//rules_gapic/java:java_gapic.bzl",
# "java_gapic_library",
# "java_resource_name_proto_library",
#)
#load("@com_google_api_codegen//rules_gapic/java:java_gapic_pkg.bzl", "java_gapic_assembly_gradle_pkg")
#
#_JAVA_GRPC_DEPS = [
# "@com_google_api_grpc_proto_google_common_protos//jar",
#]
#
#java_proto_library(
# name = "video_intelligence_java_proto",
# deps = [":video_intelligence_proto"],
#)
#
#java_grpc_library(
# name = "video_intelligence_java_grpc",
# srcs = [":video_intelligence_proto"],
# deps = [":video_intelligence_java_proto"] + _JAVA_GRPC_DEPS,
#)
#
#java_resource_name_proto_library(
# name = "video_intelligence_resource_name_java_proto",
# gapic_yaml = "videointelligence_gapic.yaml",
# deps = [":video_intelligence_proto"],
#)
#
#java_gapic_library(
# name = "video_intelligence_java_gapic",
# src = ":video_intelligence_proto_with_info",
# gapic_yaml = "videointelligence_gapic.yaml",
# service_yaml = "//google/cloud/videointelligence:videointelligence_v1p3beta1.yaml",
# test_deps = [":video_intelligence_java_grpc"],
# deps = [
# ":video_intelligence_java_proto",
# ":video_intelligence_resource_name_java_proto",
# ] + _JAVA_GRPC_DEPS,
#)
#
#[java_test(
# name = test_name,
# test_class = test_name,
# runtime_deps = [
# ":video_intelligence_java_gapic_test",
# ],
#) for test_name in [
# "com.google.cloud.videointelligence.v1p3beta1.VideoIntelligenceServiceClientTest",
#]]
_JAVA_GRPC_DEPS = [
"@com_google_api_grpc_proto_google_common_protos//jar",
]
java_proto_library(
name = "video_intelligence_java_proto",
deps = [":video_intelligence_proto"],
)
java_grpc_library(
name = "video_intelligence_java_grpc",
srcs = [":video_intelligence_proto"],
deps = [":video_intelligence_java_proto"] + _JAVA_GRPC_DEPS,
)
java_resource_name_proto_library(
name = "video_intelligence_resource_name_java_proto",
gapic_yaml = "videointelligence_gapic.yaml",
deps = [":video_intelligence_proto"],
)
java_gapic_library(
name = "video_intelligence_java_gapic",
src = ":video_intelligence_proto_with_info",
gapic_yaml = "videointelligence_gapic.yaml",
service_yaml = "//google/cloud/videointelligence:videointelligence_v1p3beta1.yaml",
test_deps = [":video_intelligence_java_grpc"],
deps = [
":video_intelligence_java_proto",
":video_intelligence_resource_name_java_proto",
] + _JAVA_GRPC_DEPS,
)
[java_test(
name = test_name,
test_class = test_name,
runtime_deps = [
":video_intelligence_java_gapic_test",
],
) for test_name in [
"com.google.cloud.videointelligence.v1p3beta1.VideoIntelligenceServiceClientTest",
]]
# Opensource Packages
java_gapic_assembly_gradle_pkg(
name = "google-cloud-video-intelligence-v1p3beta1-java",
client_deps = [":video_intelligence_java_gapic"],
client_group = "com.google.cloud",
client_test_deps = [":video_intelligence_java_gapic_test"],
grpc_deps = [":video_intelligence_java_grpc"],
grpc_group = "com.google.api.grpc",
proto_deps = [
":video_intelligence_java_proto",
":video_intelligence_proto",
":video_intelligence_resource_name_java_proto",
] + _JAVA_GRPC_DEPS,
version = "0.0.0-SNAPSHOT",
)
## Opensource Packages
#java_gapic_assembly_gradle_pkg(
# name = "google-cloud-video-intelligence-v1p3beta1-java",
# client_deps = [":video_intelligence_java_gapic"],
# client_group = "com.google.cloud",
# client_test_deps = [":video_intelligence_java_gapic_test"],
# grpc_deps = [":video_intelligence_java_grpc"],
# grpc_group = "com.google.api.grpc",
# proto_deps = [
# ":video_intelligence_java_proto",
# ":video_intelligence_proto",
# ":video_intelligence_resource_name_java_proto",
# ] + _JAVA_GRPC_DEPS,
# version = "0.0.0-SNAPSHOT",
#)
##############################################################################
# Go

View File

@ -64,7 +64,10 @@ interfaces:
sample_code_init_fields:
- input_uri=gs://demomaker/cat.mp4
- features[0]=LABEL_DETECTION
- name: google.cloud.videointelligence.v1.StreamingVideoIntelligenceService
# TODO: This config is currently broken:
# https://github.com/googleapis/gapic-generator/issues/1057
# https://github.com/googleapis/gapic-generator/issues/1149
- name: google.cloud.videointelligence.v1p3beta1.StreamingVideoIntelligenceService
collections: []
# Definition for retryable codes.
retry_codes_def: