From ea4abcfaf6d74bd9fa8873d6c429b46fe86edecd Mon Sep 17 00:00:00 2001 From: Frank Natividad Date: Tue, 14 Nov 2017 14:36:41 -0800 Subject: [PATCH 1/5] [Endpoints] Add skeleton v2 sample (#916) * Add skeleton endpoints-frameworks v2 sample * Rename README * Fix version * Add region tag for web.xml * Add region tag around appengine-web.xml * Remove basic scaling * Add skeleton sample to parent pom * Add explicit instructions to update project id * Added more information into the MyApi.java class * Remove versions plugin from pom.xml --- .../endpoints-v2-skeleton/README.md | 7 ++ .../endpoints-v2-skeleton/build.gradle | 85 ++++++++++++++ appengine-java8/endpoints-v2-skeleton/pom.xml | 110 ++++++++++++++++++ .../main/java/com/example/skeleton/MyApi.java | 38 ++++++ .../src/main/webapp/WEB-INF/appengine-web.xml | 26 +++++ .../main/webapp/WEB-INF/logging.properties | 25 ++++ .../src/main/webapp/WEB-INF/web.xml | 38 ++++++ appengine-java8/pom.xml | 1 + 8 files changed, 330 insertions(+) create mode 100644 appengine-java8/endpoints-v2-skeleton/README.md create mode 100644 appengine-java8/endpoints-v2-skeleton/build.gradle create mode 100644 appengine-java8/endpoints-v2-skeleton/pom.xml create mode 100644 appengine-java8/endpoints-v2-skeleton/src/main/java/com/example/skeleton/MyApi.java create mode 100644 appengine-java8/endpoints-v2-skeleton/src/main/webapp/WEB-INF/appengine-web.xml create mode 100644 appengine-java8/endpoints-v2-skeleton/src/main/webapp/WEB-INF/logging.properties create mode 100644 appengine-java8/endpoints-v2-skeleton/src/main/webapp/WEB-INF/web.xml diff --git a/appengine-java8/endpoints-v2-skeleton/README.md b/appengine-java8/endpoints-v2-skeleton/README.md new file mode 100644 index 00000000000..deb996b5910 --- /dev/null +++ b/appengine-java8/endpoints-v2-skeleton/README.md @@ -0,0 +1,7 @@ +# App Engine Standard & Endpoints Frameworks skeleton + +This is a skeleton example for getting setup with Endpoints Framework v2 for +Java. + +For a more complete example of using Endpoints Framework v2 for Java review +the [backend example](/appengine-java8/endpoints-v2-backend). diff --git a/appengine-java8/endpoints-v2-skeleton/build.gradle b/appengine-java8/endpoints-v2-skeleton/build.gradle new file mode 100644 index 00000000000..bbecaa6c7b8 --- /dev/null +++ b/appengine-java8/endpoints-v2-skeleton/build.gradle @@ -0,0 +1,85 @@ +// Copyright 2017 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License.import org.apache.tools.ant.filters.ReplaceTokens + +// [START build_script] +buildscript { + repositories { + mavenCentral() + } + + dependencies { + classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:1.0.2' + classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.3.3' + } +} +// [END build_script] + +repositories { + mavenCentral() +} + +// [START plugin_applys] +apply plugin: 'java' +apply plugin: 'war' +apply plugin: 'com.google.cloud.tools.endpoints-framework-server' +apply plugin: 'com.google.cloud.tools.appengine' +// [END plugin_applys] + +// [START dependencies] +dependencies { + compile 'com.google.endpoints:endpoints-framework:2.0.9' + compile 'com.google.appengine:appengine-api-1.0-sdk:1.9.59' + + compile 'javax.inject:javax.inject:1' + compileOnly 'javax.servlet:javax.servlet-api:3.1.0' +} +// [END dependencies] + +// You must replace YOUR_PROJECT_ID with your Google Cloud Project Id +def projectId = 'YOUR_PROJECT_ID' + +// [START endpoints_server_configuration] +endpointsServer { + // Endpoints Framework Plugin server-side configuration + hostname = "${projectId}.appspot.com" +} +// [END endpoints_server_configuration] + +appengine { // App Engine tasks configuration + deploy { // deploy configuration + version = findProperty("appengine.deploy.version") + + def promoteProp = findProperty("appengine.deploy.promote") + if (promoteProp != null) { + promote = new Boolean(promoteProp) + } + } +} + +sourceCompatibility = 1.8 +targetCompatibility = 1.8 + +task wrapper(type: Wrapper) { + gradleVersion = '3.5' +} + +// this replaces the ${endpoints.project.id} in appengine-web.xml and web.xml +task replaceProjectId(type: Copy) { + from 'src/main/webapp/WEB-INF/' + include '*.xml' + into "build/exploded-${archivesBaseName}/WEB-INF" + expand(endpoints:[project:[id:projectId]]) + filteringCharset = 'UTF-8' +} +assemble.dependsOn replaceProjectId diff --git a/appengine-java8/endpoints-v2-skeleton/pom.xml b/appengine-java8/endpoints-v2-skeleton/pom.xml new file mode 100644 index 00000000000..123b4031133 --- /dev/null +++ b/appengine-java8/endpoints-v2-skeleton/pom.xml @@ -0,0 +1,110 @@ + + + 4.0.0 + war + 1.0-SNAPSHOT + + com.example.skeleton + endpoints-j8-skeleton + + + appengine-java8-samples + com.google.cloud + 1.0.0 + .. + + + + UTF-8 + + 1.8 + 1.8 + + + + + + + com.google.endpoints + endpoints-framework + 2.0.9 + + + com.google.appengine + appengine-api-1.0-sdk + 1.9.59 + + + javax.servlet + javax.servlet-api + 3.1.0 + jar + provided + + + javax.inject + javax.inject + 1 + + + + + + + + ${project.build.directory}/${project.build.finalName}/WEB-INF/classes + + + org.apache.maven.plugins + maven-war-plugin + 2.6 + + + + ${basedir}/src/main/webapp/WEB-INF + true + WEB-INF + + + + + + com.google.cloud.tools + appengine-maven-plugin + 1.3.2 + + + + + + com.google.cloud.tools + endpoints-framework-maven-plugin + 1.0.2 + + + + YOUR_PROJECT_ID.appspot.com + + + + + + + diff --git a/appengine-java8/endpoints-v2-skeleton/src/main/java/com/example/skeleton/MyApi.java b/appengine-java8/endpoints-v2-skeleton/src/main/java/com/example/skeleton/MyApi.java new file mode 100644 index 00000000000..e35c6f36a91 --- /dev/null +++ b/appengine-java8/endpoints-v2-skeleton/src/main/java/com/example/skeleton/MyApi.java @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2017 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. You may obtain a + * copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +package com.example.skeleton; + +import com.google.api.server.spi.config.Api; + +/** + * MyApi skeleton endpoints sample + * Add your first API methods in this class, or you may create another class. + * In that case, update the src/main/webapp/WEB-INF/web.xml and modify + * the class set to the services param as a comma separated list. + * + * For example: + * + * services + * com.example.skeleton.FirstApi, com.example.skeleton.SecondApi + * + * + */ +@Api(name = "skeleton-api", + version = "v1") +public class MyApi { +} + diff --git a/appengine-java8/endpoints-v2-skeleton/src/main/webapp/WEB-INF/appengine-web.xml b/appengine-java8/endpoints-v2-skeleton/src/main/webapp/WEB-INF/appengine-web.xml new file mode 100644 index 00000000000..03e9bfac4e9 --- /dev/null +++ b/appengine-java8/endpoints-v2-skeleton/src/main/webapp/WEB-INF/appengine-web.xml @@ -0,0 +1,26 @@ + + + + + java8 + true + + + + + + diff --git a/appengine-java8/endpoints-v2-skeleton/src/main/webapp/WEB-INF/logging.properties b/appengine-java8/endpoints-v2-skeleton/src/main/webapp/WEB-INF/logging.properties new file mode 100644 index 00000000000..0c2d58bdc34 --- /dev/null +++ b/appengine-java8/endpoints-v2-skeleton/src/main/webapp/WEB-INF/logging.properties @@ -0,0 +1,25 @@ +# Copyright 2017 Google Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except +# in compliance with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software distributed under the License +# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express +# or implied. See the License for the specific language governing permissions and limitations under +# the License. + +# A default java.util.logging configuration. +# (All App Engine logging is through java.util.logging by default). +# +# To use this configuration, copy it into your application's WEB-INF +# folder and add the following to your appengine-web.xml: +# +# +# +# +# + +# Set the default logging level for all loggers to WARNING +.level = WARNING diff --git a/appengine-java8/endpoints-v2-skeleton/src/main/webapp/WEB-INF/web.xml b/appengine-java8/endpoints-v2-skeleton/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 00000000000..1966288424f --- /dev/null +++ b/appengine-java8/endpoints-v2-skeleton/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,38 @@ + + + + + + + EndpointsServlet + com.google.api.server.spi.EndpointsServlet + + services + com.example.skeleton.MyApi + + + + + EndpointsServlet + /_ah/api/* + + + diff --git a/appengine-java8/pom.xml b/appengine-java8/pom.xml index 1eef6ab237b..acded09594a 100644 --- a/appengine-java8/pom.xml +++ b/appengine-java8/pom.xml @@ -48,6 +48,7 @@ endpoints-v2-backend endpoints-v2-migration endpoints-v2-guice + endpoints-v2-skeleton firebase-event-proxy From b4af8a1deb6273c1cc10a7695b5a4fdb447bf83d Mon Sep 17 00:00:00 2001 From: Kurtis Van Gent <31518063+kurtisvg@users.noreply.github.com> Date: Tue, 14 Nov 2017 15:19:07 -0800 Subject: [PATCH 2/5] Removed unused files. (#918) --- .circleci/config.yml | 21 --- .gitmodules | 0 .mvn/wrapper/maven-wrapper.jar | Bin 49519 -> 0 bytes .mvn/wrapper/maven-wrapper.properties | 1 - .travis.yml | 60 ------- checkstyle-checker.xml | 201 ---------------------- mvnw | 236 -------------------------- mvnw.cmd | 146 ---------------- 8 files changed, 665 deletions(-) delete mode 100644 .circleci/config.yml delete mode 100644 .gitmodules delete mode 100644 .mvn/wrapper/maven-wrapper.jar delete mode 100644 .mvn/wrapper/maven-wrapper.properties delete mode 100644 .travis.yml delete mode 100644 checkstyle-checker.xml delete mode 100755 mvnw delete mode 100644 mvnw.cmd diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index ba507ad0e40..00000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,21 +0,0 @@ -version: 2 -jobs: - build: - docker: - - image: circleci/openjdk:8-jdk-browsers - steps: - - checkout - - run: - name: get shellcheck expect - command: sudo apt-get update && sudo apt-get install shellcheck expect - - run: - name: service account - command: openssl aes-256-cbc -d -md md5 -in "${HOME}/project/service-account.json.enc" -k "${key}" -iv "${iv}" -out "${HOME}/google-cloud-service-key.json" && echo 'export GOOGLE_APPLICATION_CREDENTIALS="${HOME}/google-cloud-service-key.json"' >> $BASH_ENV - - run: - name: test script - command: bash "${HOME}/project/travis.sh" && bash <(curl -s https://codecov.io/bash) # If successful, run code coverage - -# - run: -# name: Gecko Driver -# command: curl -LO https://github.com/mozilla/geckodriver/releases/download/v0.15.0/geckodriver-v0.15.0-linux64.tar.gz && sudo tar -zxf geckodriver-*.tar.gz -C "${HOME}/bin" - diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index c6feb8bb6f76f2553e266ff8bf8867105154237e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49519 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%0A$pwhjXzyA0ZzErH{1@M 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 diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index c3150437037..00000000000 --- a/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1 +0,0 @@ -distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index e8082e9be43..00000000000 --- a/.travis.yml +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 2016 Google Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -sudo: true -language: java -jdk: -- oraclejdk8 -git: - # Handle git submodules ourselves. We want the samples and tests to work - # without a recursive clone. We only use submodules for an additional layer - # of localhost testing scripts. - submodules: false -addons: - apt: - sources: - # Grab shellcheck from the Debian repo. - # https://github.com/koalaman/shellcheck/wiki/TravisCI - - debian-sid - # Gradle PPA - - sourceline: 'ppa:cwchien/gradle' - packages: - - expect - - shellcheck - - gradle-3.0 -before_install: -- openssl aes-256-cbc -K $encrypted_d17a6ce39290_key -iv $encrypted_d17a6ce39290_iv - -in gae-firebase-secrets.json.enc -out appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/gae-firebase-secrets.json - -d || true -- openssl aes-256-cbc -K $encrypted_37a4f399de75_key -iv $encrypted_37a4f399de75_iv - -in service-account.json.enc -out service-account.json -d && export GOOGLE_APPLICATION_CREDENTIALS=$TRAVIS_BUILD_DIR/service-account.json - GCLOUD_PROJECT=cloud-samples-tests || true -- openssl aes-256-cbc -K $encrypted_eb858daba67b_key -iv $encrypted_eb858daba67b_iv -in secrets.env.enc -out secrets.env -d - && set +x && source secrets.env && set -x - || true -# Cross project - GOOGLE_APPLICATION_CREDENTIALS uses cloud-docs-tests, but BQ uses G_C_P (argh!) -- export GOOGLE_CLOUD_PROJECT=java-docs-samples-testing -# Skip the install step, since Maven will download the dependencies we need -# when the test build runs. -# http://stackoverflow.com/q/31945809/101923 -# https://docs.travis-ci.com/user/customizing-the-build/#Skipping-the-Installation-Step -install: true -script: ./travis.sh -after_success: -- bash <(curl -s https://codecov.io/bash) -branches: - only: - - master - - java8-master - diff --git a/checkstyle-checker.xml b/checkstyle-checker.xml deleted file mode 100644 index efb5b85c951..00000000000 --- a/checkstyle-checker.xml +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mvnw b/mvnw deleted file mode 100755 index 6ecc150ae0a..00000000000 --- a/mvnw +++ /dev/null @@ -1,236 +0,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven2 Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# M2_HOME - location of maven2's installed home dir -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # - # Look for the Apple JDKs first to preserve the existing behaviour, and then look - # for the new JDKs provided by Oracle. - # - if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then - # - # Apple JDKs - # - export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home - fi - - if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then - # - # Apple JDKs - # - export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home - fi - - if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then - # - # Oracle JDKs - # - export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home - fi - - if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then - # - # Apple JDKs - # - export JAVA_HOME=`/usr/libexec/java_home` - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# For Migwn, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" - # TODO classpath? -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="`which javac`" - if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=`which readlink` - if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then - if $darwin ; then - javaHome="`dirname \"$javaExecutable\"`" - javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" - else - javaExecutable="`readlink -f \"$javaExecutable\"`" - fi - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="`which java`" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - local basedir=$(pwd) - local wdir=$(pwd) - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - wdir=$(cd "$wdir/.."; pwd) - done - echo "${basedir}" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - echo "$(tr -s '\n' ' ' < "$1")" - fi -} - -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)} -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` -fi - -# Provide a "standardized" way to retrieve the CLI args that will -# work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" -export MAVEN_CMD_LINE_ARGS - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -# avoid using MAVEN_CMD_LINE_ARGS below since that would loose parameter escaping in $@ -exec "$JAVACMD" \ - $MAVEN_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd deleted file mode 100644 index 8e2b7459f7e..00000000000 --- a/mvnw.cmd +++ /dev/null @@ -1,146 +0,0 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Maven2 Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" -if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -set MAVEN_CMD_LINE_ARGS=%MAVEN_CONFIG% %* - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" - -set WRAPPER_JAR=""%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -# avoid using MAVEN_CMD_LINE_ARGS below since that would loose parameter escaping in %* -%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" -if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%" == "on" pause - -if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% - -exit /B %ERROR_CODE% From 0ab0faf0b91b529d60a7732c316f5e073d058b7d Mon Sep 17 00:00:00 2001 From: Frank Natividad Date: Tue, 14 Nov 2017 21:16:22 -0800 Subject: [PATCH 3/5] Fix region tags and add a new one (#919) --- appengine-java8/endpoints-v2-skeleton/build.gradle | 2 +- appengine-java8/endpoints-v2-skeleton/pom.xml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/appengine-java8/endpoints-v2-skeleton/build.gradle b/appengine-java8/endpoints-v2-skeleton/build.gradle index bbecaa6c7b8..e277cacdfd9 100644 --- a/appengine-java8/endpoints-v2-skeleton/build.gradle +++ b/appengine-java8/endpoints-v2-skeleton/build.gradle @@ -46,10 +46,10 @@ dependencies { } // [END dependencies] +// [START endpoints_server_configuration] // You must replace YOUR_PROJECT_ID with your Google Cloud Project Id def projectId = 'YOUR_PROJECT_ID' -// [START endpoints_server_configuration] endpointsServer { // Endpoints Framework Plugin server-side configuration hostname = "${projectId}.appspot.com" diff --git a/appengine-java8/endpoints-v2-skeleton/pom.xml b/appengine-java8/endpoints-v2-skeleton/pom.xml index 123b4031133..aa260fe473d 100644 --- a/appengine-java8/endpoints-v2-skeleton/pom.xml +++ b/appengine-java8/endpoints-v2-skeleton/pom.xml @@ -90,6 +90,7 @@ + com.google.cloud.tools endpoints-framework-maven-plugin @@ -103,6 +104,7 @@ YOUR_PROJECT_ID.appspot.com + From 33b2352fceaaada844af0e580a7f2f673fec0e9e Mon Sep 17 00:00:00 2001 From: Frank Natividad Date: Wed, 15 Nov 2017 10:43:49 -0600 Subject: [PATCH 4/5] [Endpoints] Update region tags (#920) * update region tags in migration guide * Update endpoints framework plugin version. --- appengine-java8/endpoints-v2-migration/build.gradle | 9 +++------ appengine-java8/endpoints-v2-migration/pom.xml | 2 +- .../migration-example/build.gradle | 9 +++------ .../endpoints-frameworks-v2/migration-example/pom.xml | 2 +- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/appengine-java8/endpoints-v2-migration/build.gradle b/appengine-java8/endpoints-v2-migration/build.gradle index e15924423c3..422641744c8 100644 --- a/appengine-java8/endpoints-v2-migration/build.gradle +++ b/appengine-java8/endpoints-v2-migration/build.gradle @@ -36,13 +36,10 @@ repositories { // repositories for Jar's you access in your code apply plugin: 'java' // standard Java tasks apply plugin: 'war' // standard Web Archive plugin -// [START apply_appengine] -apply plugin: 'com.google.cloud.tools.appengine' // App Engine tasks -// [END apply_appengine] - -// [START apply_endpoints-framework-server] +// [START apply_plugins] +apply plugin: 'com.google.cloud.tools.appengine' apply plugin: 'com.google.cloud.tools.endpoints-framework-server' -// [END apply_endpoints-framework-server] +// [END apply_plugins] dependencies { providedCompile group: 'javax.servlet', name: 'javax.servlet-api', version:'3.1.0' diff --git a/appengine-java8/endpoints-v2-migration/pom.xml b/appengine-java8/endpoints-v2-migration/pom.xml index 3e209fce71f..8d56979399f 100644 --- a/appengine-java8/endpoints-v2-migration/pom.xml +++ b/appengine-java8/endpoints-v2-migration/pom.xml @@ -71,7 +71,7 @@ limitations under the License. com.google.cloud.tools appengine-maven-plugin - 1.3.1 + 1.3.2 diff --git a/appengine/endpoints-frameworks-v2/migration-example/build.gradle b/appengine/endpoints-frameworks-v2/migration-example/build.gradle index e6947fef393..6b79f9ae08c 100644 --- a/appengine/endpoints-frameworks-v2/migration-example/build.gradle +++ b/appengine/endpoints-frameworks-v2/migration-example/build.gradle @@ -36,13 +36,10 @@ repositories { // repositories for Jar's you access in your code apply plugin: 'java' // standard Java tasks apply plugin: 'war' // standard Web Archive plugin -// [START apply_appengine] -apply plugin: 'com.google.cloud.tools.appengine' // App Engine tasks -// [END apply_appengine] - -// [START apply_endpoints-framework-server] +// [START apply_plugins] +apply plugin: 'com.google.cloud.tools.appengine' apply plugin: 'com.google.cloud.tools.endpoints-framework-server' -// [END apply_endpoints-framework-server] +// [END apply_plugins] dependencies { providedCompile group: 'javax.servlet', name: 'servlet-api', version:'2.5' diff --git a/appengine/endpoints-frameworks-v2/migration-example/pom.xml b/appengine/endpoints-frameworks-v2/migration-example/pom.xml index 1071b254435..ff74edae157 100644 --- a/appengine/endpoints-frameworks-v2/migration-example/pom.xml +++ b/appengine/endpoints-frameworks-v2/migration-example/pom.xml @@ -83,7 +83,7 @@ limitations under the License. com.google.cloud.tools appengine-maven-plugin - 1.3.1 + 1.3.2 From f64e4f374ef21852807c50acc294e65e00ac33b7 Mon Sep 17 00:00:00 2001 From: DPE bot Date: Wed, 15 Nov 2017 11:42:18 -0800 Subject: [PATCH 5/5] Auto-update dependencies. (#912) * Auto-update dependencies. * Reverted Vision API classes. * Fixed OperationalFuture references. * Fixed some more Vision classes back. * Fixed some more classes. --- appengine-java8/analytics/pom.xml | 2 +- appengine-java8/bigtable/pom.xml | 2 +- appengine-java8/endpoints-v2-backend/pom.xml | 4 +- appengine-java8/endpoints-v2-guice/pom.xml | 4 +- appengine-java8/firebase-tictactoe/pom.xml | 2 +- .../guestbook-cloud-datastore/pom.xml | 2 +- appengine-java8/pubsub/pom.xml | 6 +-- appengine-java8/spanner/pom.xml | 2 +- appengine-java8/taskqueues-deferred/pom.xml | 2 +- .../endpoints-frameworks-v2/backend/pom.xml | 6 +-- .../guice-example/pom.xml | 4 +- appengine/firebase-tictactoe/pom.xml | 2 +- appengine/pom.xml | 2 +- bigquery/cloud-client/pom.xml | 2 +- compute/cmdline/pom.xml | 2 +- datastore/cloud-client/pom.xml | 2 +- datastore/pom.xml | 2 +- dlp/pom.xml | 2 +- .../main/java/com/example/dlp/Inspect.java | 8 ++-- .../java/com/example/dlp/RiskAnalysis.java | 10 ++--- errorreporting/pom.xml | 2 +- firestore/pom.xml | 2 +- flexible/analytics/pom.xml | 2 +- flexible/async-rest/pom.xml | 2 +- flexible/cloudstorage/pom.xml | 4 +- flexible/cron/pom.xml | 2 +- flexible/datastore/pom.xml | 4 +- flexible/disk/pom.xml | 2 +- flexible/errorreporting/pom.xml | 4 +- flexible/extending-runtime/pom.xml | 2 +- flexible/helloworld/pom.xml | 2 +- flexible/mailgun/pom.xml | 2 +- flexible/mailjet/pom.xml | 2 +- flexible/memcache/pom.xml | 2 +- flexible/pubsub/pom.xml | 6 +-- flexible/sendgrid/pom.xml | 2 +- flexible/sparkjava/pom.xml | 6 +-- flexible/static-files/pom.xml | 2 +- flexible/twilio/pom.xml | 2 +- kms/pom.xml | 2 +- language/analysis/pom.xml | 2 +- language/cloud-client/pom.xml | 2 +- logging/cloud-client/pom.xml | 2 +- monitoring/cloud-client/pom.xml | 2 +- pom.xml | 2 +- pubsub/cloud-client/pom.xml | 2 +- spanner/cloud-client/pom.xml | 2 +- speech/cloud-client/pom.xml | 2 +- .../java/com/example/speech/Recognize.java | 12 ++--- storage/cloud-client/pom.xml | 2 +- storage/json-api/pom.xml | 2 +- storage/storage-transfer/pom.xml | 2 +- storage/xml-api/cmdline-sample/pom.xml | 2 +- taskqueue/deferred/pom.xml | 2 +- translate/cloud-client/pom.xml | 2 +- translate/pom.xml | 2 +- video/cloud-client/pom.xml | 2 +- .../main/java/com/example/video/Detect.java | 12 ++--- .../com/example/video/QuickstartSample.java | 5 +-- vision/cloud-client/pom.xml | 2 +- vision/face-detection/pom.xml | 2 +- .../samples/facedetect/FaceDetectApp.java | 44 +++++++++---------- .../samples/facedetect/FaceDetectAppIT.java | 4 +- .../samples/facedetect/FaceDetectAppTest.java | 30 ++++++------- vision/label/pom.xml | 2 +- .../cloud/vision/samples/label/LabelApp.java | 34 +++++++------- .../vision/samples/label/LabelAppIT.java | 6 +-- .../vision/samples/label/LabelAppTest.java | 12 ++--- vision/landmark-detection/pom.xml | 2 +- .../landmarkdetection/DetectLandmark.java | 38 ++++++++-------- .../landmarkdetection/DetectLandmarkIT.java | 4 +- vision/text/pom.xml | 2 +- .../cloud/vision/samples/text/ImageText.java | 20 ++++----- .../cloud/vision/samples/text/TextApp.java | 38 ++++++++-------- 74 files changed, 209 insertions(+), 214 deletions(-) diff --git a/appengine-java8/analytics/pom.xml b/appengine-java8/analytics/pom.xml index c2172637869..1edf5311aea 100644 --- a/appengine-java8/analytics/pom.xml +++ b/appengine-java8/analytics/pom.xml @@ -85,7 +85,7 @@ org.mockito mockito-core - 2.11.0 + 2.12.0 test diff --git a/appengine-java8/bigtable/pom.xml b/appengine-java8/bigtable/pom.xml index fb91a41bd44..5d41c9b42f2 100644 --- a/appengine-java8/bigtable/pom.xml +++ b/appengine-java8/bigtable/pom.xml @@ -31,7 +31,7 @@ limitations under the License. - 1.3.1 + 1.3.2 UTF-8 UTF-8 1.8 diff --git a/appengine-java8/endpoints-v2-backend/pom.xml b/appengine-java8/endpoints-v2-backend/pom.xml index 1a2bdf9bf4d..09e2cb2deee 100644 --- a/appengine-java8/endpoints-v2-backend/pom.xml +++ b/appengine-java8/endpoints-v2-backend/pom.xml @@ -37,7 +37,7 @@ YOUR_PROJECT_ID 1.8 1.8 - 1.3.1 + 1.3.2 @@ -50,7 +50,7 @@ com.google.endpoints endpoints-management-control-appengine-all - 1.0.5 + 1.0.6 com.google.appengine diff --git a/appengine-java8/endpoints-v2-guice/pom.xml b/appengine-java8/endpoints-v2-guice/pom.xml index 199d1512106..f14b3363af5 100644 --- a/appengine-java8/endpoints-v2-guice/pom.xml +++ b/appengine-java8/endpoints-v2-guice/pom.xml @@ -37,7 +37,7 @@ YOUR_PROJECT_ID 1.8 1.8 - 1.3.1 + 1.3.2 @@ -57,7 +57,7 @@ com.google.endpoints endpoints-management-control-appengine-all - 1.0.5 + 1.0.6 com.google.appengine diff --git a/appengine-java8/firebase-tictactoe/pom.xml b/appengine-java8/firebase-tictactoe/pom.xml index 2cc512e36eb..342f5ef7965 100644 --- a/appengine-java8/firebase-tictactoe/pom.xml +++ b/appengine-java8/firebase-tictactoe/pom.xml @@ -36,7 +36,7 @@ 4.12 1.10.19 0.36 - 1.3.1 + 1.3.2 diff --git a/appengine-java8/guestbook-cloud-datastore/pom.xml b/appengine-java8/guestbook-cloud-datastore/pom.xml index db44fdd2bee..89f2554d1b4 100644 --- a/appengine-java8/guestbook-cloud-datastore/pom.xml +++ b/appengine-java8/guestbook-cloud-datastore/pom.xml @@ -59,7 +59,7 @@ com.google.cloud google-cloud - 0.26.0-alpha + 0.29.0-alpha diff --git a/appengine-java8/pubsub/pom.xml b/appengine-java8/pubsub/pom.xml index a5fa0c027a1..06c24e3ca4a 100644 --- a/appengine-java8/pubsub/pom.xml +++ b/appengine-java8/pubsub/pom.xml @@ -32,7 +32,7 @@ 1.8 1.8 false - 1.3.1 + 1.3.2 9.4.4.v20170414 @@ -49,12 +49,12 @@ com.google.cloud google-cloud-pubsub - 0.26.0-beta + 0.29.0-beta com.google.cloud google-cloud-datastore - 1.8.0 + 1.11.0 diff --git a/appengine-java8/spanner/pom.xml b/appengine-java8/spanner/pom.xml index 72d303dde9f..308522c28cc 100644 --- a/appengine-java8/spanner/pom.xml +++ b/appengine-java8/spanner/pom.xml @@ -37,7 +37,7 @@ com.google.cloud google-cloud-spanner - 0.26.0-beta + 0.29.0-beta javax.servlet diff --git a/appengine-java8/taskqueues-deferred/pom.xml b/appengine-java8/taskqueues-deferred/pom.xml index bcb47e37962..516d51326c5 100644 --- a/appengine-java8/taskqueues-deferred/pom.xml +++ b/appengine-java8/taskqueues-deferred/pom.xml @@ -65,7 +65,7 @@ org.mockito mockito-core - 2.11.0 + 2.12.0 com.google.appengine diff --git a/appengine/endpoints-frameworks-v2/backend/pom.xml b/appengine/endpoints-frameworks-v2/backend/pom.xml index bd4cb46d1ba..85d2e7b1e97 100644 --- a/appengine/endpoints-frameworks-v2/backend/pom.xml +++ b/appengine/endpoints-frameworks-v2/backend/pom.xml @@ -36,7 +36,7 @@ YOUR_PROJECT_ID 1.7 1.7 - 1.3.1 + 1.3.2 @@ -50,12 +50,12 @@ com.google.endpoints endpoints-management-control-appengine - 1.0.5 + 1.0.6 com.google.endpoints endpoints-framework-auth - 1.0.5 + 1.0.6 diff --git a/appengine/endpoints-frameworks-v2/guice-example/pom.xml b/appengine/endpoints-frameworks-v2/guice-example/pom.xml index 95f9de69b83..230887e4e09 100644 --- a/appengine/endpoints-frameworks-v2/guice-example/pom.xml +++ b/appengine/endpoints-frameworks-v2/guice-example/pom.xml @@ -36,7 +36,7 @@ YOUR_PROJECT_ID 1.7 1.7 - 1.3.1 + 1.3.2 @@ -54,7 +54,7 @@ com.google.endpoints endpoints-management-control-appengine-all - 1.0.5 + 1.0.6 com.google.appengine diff --git a/appengine/firebase-tictactoe/pom.xml b/appengine/firebase-tictactoe/pom.xml index 36093112f3e..743a055aa3a 100644 --- a/appengine/firebase-tictactoe/pom.xml +++ b/appengine/firebase-tictactoe/pom.xml @@ -55,7 +55,7 @@ org.mockito mockito-core - 2.11.0 + 2.12.0 com.google.appengine diff --git a/appengine/pom.xml b/appengine/pom.xml index b7078227ee3..68f64300a6a 100644 --- a/appengine/pom.xml +++ b/appengine/pom.xml @@ -114,7 +114,7 @@ org.mockito mockito-core - 2.11.0 + 2.12.0 test diff --git a/bigquery/cloud-client/pom.xml b/bigquery/cloud-client/pom.xml index 6c024e1bc95..4923cf64873 100644 --- a/bigquery/cloud-client/pom.xml +++ b/bigquery/cloud-client/pom.xml @@ -37,7 +37,7 @@ com.google.cloud google-cloud-bigquery - 0.26.0-beta + 0.29.0-beta commons-cli diff --git a/compute/cmdline/pom.xml b/compute/cmdline/pom.xml index 588ea15e313..6022736a8e0 100644 --- a/compute/cmdline/pom.xml +++ b/compute/cmdline/pom.xml @@ -84,7 +84,7 @@ limitations under the License. - v1-rev160-1.23.0 + v1-rev161-1.23.0 UTF-8 diff --git a/datastore/cloud-client/pom.xml b/datastore/cloud-client/pom.xml index 5fc827d5a23..95597ff783b 100644 --- a/datastore/cloud-client/pom.xml +++ b/datastore/cloud-client/pom.xml @@ -37,7 +37,7 @@ com.google.cloud google-cloud-datastore - 1.8.0 + 1.11.0 diff --git a/datastore/pom.xml b/datastore/pom.xml index dacb284585c..63eeeae6cf8 100644 --- a/datastore/pom.xml +++ b/datastore/pom.xml @@ -41,7 +41,7 @@ com.google.cloud google-cloud-datastore - 1.8.0 + 1.11.0 diff --git a/dlp/pom.xml b/dlp/pom.xml index 5d9f75c3cd0..92bf99b53ba 100644 --- a/dlp/pom.xml +++ b/dlp/pom.xml @@ -42,7 +42,7 @@ com.google.cloud google-cloud-dlp - 0.26.0-alpha + 0.29.0-beta diff --git a/dlp/src/main/java/com/example/dlp/Inspect.java b/dlp/src/main/java/com/example/dlp/Inspect.java index b39be30adc7..28c958d0fcb 100644 --- a/dlp/src/main/java/com/example/dlp/Inspect.java +++ b/dlp/src/main/java/com/example/dlp/Inspect.java @@ -16,7 +16,7 @@ package com.example.dlp; -import com.google.api.gax.rpc.OperationFuture; +import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.ServiceOptions; import com.google.cloud.dlp.v2beta1.DlpServiceClient; import com.google.longrunning.Operation; @@ -235,7 +235,7 @@ private static void inspectGcsFile( OutputStorageConfig outputConfig = OutputStorageConfig.getDefaultInstance(); // asynchronously submit an inspect operation - OperationFuture responseFuture = + OperationFuture responseFuture = dlpServiceClient.createInspectOperationAsync(inspectConfig, storageConfig, outputConfig); // ... @@ -309,7 +309,7 @@ private static void inspectDatastore( OutputStorageConfig outputConfig = OutputStorageConfig.getDefaultInstance(); // asynchronously submit an inspect operation - OperationFuture responseFuture = + OperationFuture responseFuture = dlpServiceClient.createInspectOperationAsync(inspectConfig, storageConfig, outputConfig); // ... @@ -387,7 +387,7 @@ private static void inspectBigquery( OutputStorageConfig outputConfig = OutputStorageConfig.getDefaultInstance(); // asynchronously submit an inspect operation - OperationFuture responseFuture = + OperationFuture responseFuture = dlpServiceClient.createInspectOperationAsync( inspectConfig, storageConfig, outputConfig); diff --git a/dlp/src/main/java/com/example/dlp/RiskAnalysis.java b/dlp/src/main/java/com/example/dlp/RiskAnalysis.java index 5fc95bdec86..89cb840f2d0 100644 --- a/dlp/src/main/java/com/example/dlp/RiskAnalysis.java +++ b/dlp/src/main/java/com/example/dlp/RiskAnalysis.java @@ -16,7 +16,7 @@ package com.example.dlp; -import com.google.api.gax.rpc.OperationFuture; +import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.ServiceOptions; import com.google.cloud.dlp.v2beta1.DlpServiceClient; import com.google.longrunning.Operation; @@ -102,7 +102,7 @@ private static void calculateNumericalStats( .build(); // asynchronously submit a risk analysis operation - OperationFuture + OperationFuture responseFuture = dlpServiceClient.analyzeDataSourceRiskAsync(request); // ... @@ -180,7 +180,7 @@ private static void calculateCategoricalStats( .build(); // asynchronously submit a risk analysis operation - OperationFuture + OperationFuture responseFuture = dlpServiceClient.analyzeDataSourceRiskAsync(request); // ... @@ -259,7 +259,7 @@ private static void calculateKAnonymity( .build(); // asynchronously submit a risk analysis operation - OperationFuture + OperationFuture responseFuture = dlpServiceClient.analyzeDataSourceRiskAsync(request); // ... @@ -352,7 +352,7 @@ private static void calculateLDiversity( .build(); // asynchronously submit a risk analysis operation - OperationFuture + OperationFuture responseFuture = dlpServiceClient.analyzeDataSourceRiskAsync(request); // ... diff --git a/errorreporting/pom.xml b/errorreporting/pom.xml index ebddebee2aa..01740a5306d 100644 --- a/errorreporting/pom.xml +++ b/errorreporting/pom.xml @@ -36,7 +36,7 @@ limitations under the License. com.google.cloud google-cloud-errorreporting - 0.26.0-alpha + 0.29.0-beta diff --git a/firestore/pom.xml b/firestore/pom.xml index 0c732fc5e4a..aeabf55f4ff 100644 --- a/firestore/pom.xml +++ b/firestore/pom.xml @@ -43,7 +43,7 @@ com.google.cloud google-cloud-firestore - 0.26.0-beta + 0.29.0-beta diff --git a/flexible/analytics/pom.xml b/flexible/analytics/pom.xml index 778ec3807e4..9836503b19f 100644 --- a/flexible/analytics/pom.xml +++ b/flexible/analytics/pom.xml @@ -28,7 +28,7 @@ - 1.3.1 + 1.3.2 9.4.4.v20170414 false diff --git a/flexible/async-rest/pom.xml b/flexible/async-rest/pom.xml index 9ca1c73936b..661d9600271 100644 --- a/flexible/async-rest/pom.xml +++ b/flexible/async-rest/pom.xml @@ -33,7 +33,7 @@ false - 1.3.1 + 1.3.2 9.4.4.v20170414 1.8 diff --git a/flexible/cloudstorage/pom.xml b/flexible/cloudstorage/pom.xml index c669f2c4762..af6fcc9748d 100644 --- a/flexible/cloudstorage/pom.xml +++ b/flexible/cloudstorage/pom.xml @@ -33,7 +33,7 @@ false - 1.3.1 + 1.3.2 9.4.4.v20170414 @@ -49,7 +49,7 @@ com.google.cloud google-cloud-storage - 1.8.0 + 1.11.0 diff --git a/flexible/cron/pom.xml b/flexible/cron/pom.xml index a3735b4e763..92dc43da5cb 100644 --- a/flexible/cron/pom.xml +++ b/flexible/cron/pom.xml @@ -33,7 +33,7 @@ false - 1.3.1 + 1.3.2 9.4.4.v20170414 diff --git a/flexible/datastore/pom.xml b/flexible/datastore/pom.xml index 2838a4721fe..6502ee2c1a1 100644 --- a/flexible/datastore/pom.xml +++ b/flexible/datastore/pom.xml @@ -33,7 +33,7 @@ false - 1.3.1 + 1.3.2 9.4.4.v20170414 @@ -49,7 +49,7 @@ com.google.cloud google-cloud-datastore - 1.8.0 + 1.11.0 diff --git a/flexible/disk/pom.xml b/flexible/disk/pom.xml index dd6db190357..59f50df8821 100644 --- a/flexible/disk/pom.xml +++ b/flexible/disk/pom.xml @@ -33,7 +33,7 @@ false - 1.3.1 + 1.3.2 9.4.4.v20170414 diff --git a/flexible/errorreporting/pom.xml b/flexible/errorreporting/pom.xml index e5cbda31226..f06d5179039 100644 --- a/flexible/errorreporting/pom.xml +++ b/flexible/errorreporting/pom.xml @@ -29,7 +29,7 @@ - 1.3.1 + 1.3.2 1.8 1.8 false @@ -47,7 +47,7 @@ com.google.cloud google-cloud-errorreporting - 0.26.0-alpha + 0.29.0-beta diff --git a/flexible/extending-runtime/pom.xml b/flexible/extending-runtime/pom.xml index e98937672c2..b6259c7c636 100644 --- a/flexible/extending-runtime/pom.xml +++ b/flexible/extending-runtime/pom.xml @@ -33,7 +33,7 @@ false - 1.3.1 + 1.3.2 9.4.4.v20170414 diff --git a/flexible/helloworld/pom.xml b/flexible/helloworld/pom.xml index 992f3fc8291..0e2edccba9f 100644 --- a/flexible/helloworld/pom.xml +++ b/flexible/helloworld/pom.xml @@ -34,7 +34,7 @@ false - 1.3.1 + 1.3.2 9.4.4.v20170414 diff --git a/flexible/mailgun/pom.xml b/flexible/mailgun/pom.xml index 6e9726d3662..7b774b7c31f 100644 --- a/flexible/mailgun/pom.xml +++ b/flexible/mailgun/pom.xml @@ -33,7 +33,7 @@ false - 1.3.1 + 1.3.2 9.4.4.v20170414 diff --git a/flexible/mailjet/pom.xml b/flexible/mailjet/pom.xml index 03f51b73a22..84e13b262a7 100644 --- a/flexible/mailjet/pom.xml +++ b/flexible/mailjet/pom.xml @@ -33,7 +33,7 @@ false - 1.3.1 + 1.3.2 9.4.4.v20170414 4.1.1 diff --git a/flexible/memcache/pom.xml b/flexible/memcache/pom.xml index 11d4f837a95..761237d46ab 100644 --- a/flexible/memcache/pom.xml +++ b/flexible/memcache/pom.xml @@ -33,7 +33,7 @@ false - 1.3.1 + 1.3.2 9.4.4.v20170414 diff --git a/flexible/pubsub/pom.xml b/flexible/pubsub/pom.xml index ee83b526b7f..d5c84175eab 100644 --- a/flexible/pubsub/pom.xml +++ b/flexible/pubsub/pom.xml @@ -34,7 +34,7 @@ false - 1.3.1 + 1.3.2 9.4.4.v20170414 @@ -63,12 +63,12 @@ com.google.cloud google-cloud-pubsub - 0.26.0-beta + 0.29.0-beta com.google.cloud google-cloud-datastore - 1.8.0 + 1.11.0 diff --git a/flexible/sendgrid/pom.xml b/flexible/sendgrid/pom.xml index 2acc328df62..fd2936cffa3 100644 --- a/flexible/sendgrid/pom.xml +++ b/flexible/sendgrid/pom.xml @@ -33,7 +33,7 @@ false - 1.3.1 + 1.3.2 9.4.4.v20170414 diff --git a/flexible/sparkjava/pom.xml b/flexible/sparkjava/pom.xml index dfa3728403d..18f38eee114 100644 --- a/flexible/sparkjava/pom.xml +++ b/flexible/sparkjava/pom.xml @@ -33,7 +33,7 @@ limitations under the License. 1.8 1.8 - 1.3.1 + 1.3.2 ${project.build.directory}/spark-1.0-jar-with-dependencies.jar @@ -41,7 +41,7 @@ limitations under the License. com.sparkjava spark-core - 2.7.0 + 2.7.1 org.slf4j @@ -61,7 +61,7 @@ limitations under the License. com.google.cloud google-cloud-datastore - 1.8.0 + 1.11.0 diff --git a/flexible/static-files/pom.xml b/flexible/static-files/pom.xml index b6eae603b0c..6f9a1ad0104 100644 --- a/flexible/static-files/pom.xml +++ b/flexible/static-files/pom.xml @@ -33,7 +33,7 @@ false - 1.3.1 + 1.3.2 9.4.4.v20170414 diff --git a/flexible/twilio/pom.xml b/flexible/twilio/pom.xml index 79103067dda..e00375929ce 100644 --- a/flexible/twilio/pom.xml +++ b/flexible/twilio/pom.xml @@ -33,7 +33,7 @@ false - 1.3.1 + 1.3.2 9.4.4.v20170414 diff --git a/kms/pom.xml b/kms/pom.xml index 80005cb3929..53ba8dfc9c2 100644 --- a/kms/pom.xml +++ b/kms/pom.xml @@ -16,7 +16,7 @@ com.google.apis google-api-services-cloudkms - v1-rev26-1.23.0 + v1-rev27-1.23.0 com.google.guava diff --git a/language/analysis/pom.xml b/language/analysis/pom.xml index 7f011b43b7a..3fb783b93a5 100644 --- a/language/analysis/pom.xml +++ b/language/analysis/pom.xml @@ -32,7 +32,7 @@ limitations under the License. com.google.cloud google-cloud-language - 0.27.0-beta + 1.11.0 com.google.guava diff --git a/language/cloud-client/pom.xml b/language/cloud-client/pom.xml index 4bea420fed7..d71199673de 100644 --- a/language/cloud-client/pom.xml +++ b/language/cloud-client/pom.xml @@ -38,7 +38,7 @@ com.google.cloud google-cloud-language - 0.26.0-beta + 1.11.0 com.google.guava diff --git a/logging/cloud-client/pom.xml b/logging/cloud-client/pom.xml index bba3cac9b54..1333dcd8f88 100644 --- a/logging/cloud-client/pom.xml +++ b/logging/cloud-client/pom.xml @@ -37,7 +37,7 @@ com.google.cloud google-cloud-logging - 1.8.0 + 1.11.0 diff --git a/monitoring/cloud-client/pom.xml b/monitoring/cloud-client/pom.xml index c380c8e03a3..c81fbf39b4f 100644 --- a/monitoring/cloud-client/pom.xml +++ b/monitoring/cloud-client/pom.xml @@ -54,7 +54,7 @@ com.google.cloud google-cloud-monitoring - 0.26.0-alpha + 0.29.0-beta com.google.guava diff --git a/pom.xml b/pom.xml index a5f6da56c43..8957fedce88 100644 --- a/pom.xml +++ b/pom.xml @@ -118,7 +118,7 @@ org.mockito mockito-core - 2.11.0 + 2.12.0 test diff --git a/pubsub/cloud-client/pom.xml b/pubsub/cloud-client/pom.xml index 5a2dc93cbd1..74fe41bd632 100644 --- a/pubsub/cloud-client/pom.xml +++ b/pubsub/cloud-client/pom.xml @@ -37,7 +37,7 @@ com.google.cloud google-cloud-pubsub - 0.26.0-beta + 0.29.0-beta diff --git a/spanner/cloud-client/pom.xml b/spanner/cloud-client/pom.xml index 9a7bc82d9c8..14d72459f80 100644 --- a/spanner/cloud-client/pom.xml +++ b/spanner/cloud-client/pom.xml @@ -52,7 +52,7 @@ limitations under the License. com.google.cloud google-cloud-spanner - 0.26.0-beta + 0.29.0-beta com.google.guava diff --git a/speech/cloud-client/pom.xml b/speech/cloud-client/pom.xml index db3f4605979..6cfc13ca9db 100644 --- a/speech/cloud-client/pom.xml +++ b/speech/cloud-client/pom.xml @@ -38,7 +38,7 @@ com.google.cloud google-cloud-speech - 0.26.0-alpha + 0.29.0-alpha diff --git a/speech/cloud-client/src/main/java/com/example/speech/Recognize.java b/speech/cloud-client/src/main/java/com/example/speech/Recognize.java index ef9e5b483a8..27ef28dacb5 100644 --- a/speech/cloud-client/src/main/java/com/example/speech/Recognize.java +++ b/speech/cloud-client/src/main/java/com/example/speech/Recognize.java @@ -18,7 +18,7 @@ import com.google.api.gax.rpc.ApiStreamObserver; import com.google.api.gax.rpc.BidiStreamingCallable; -import com.google.api.gax.rpc.OperationFuture; +import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.speech.v1.LongRunningRecognizeMetadata; import com.google.cloud.speech.v1.LongRunningRecognizeResponse; import com.google.cloud.speech.v1.RecognitionAudio; @@ -34,7 +34,6 @@ import com.google.cloud.speech.v1.StreamingRecognizeResponse; import com.google.cloud.speech.v1.WordInfo; import com.google.common.util.concurrent.SettableFuture; -import com.google.longrunning.Operation; import com.google.protobuf.ByteString; import java.io.IOException; import java.nio.file.Files; @@ -221,8 +220,7 @@ public static void asyncRecognizeFile(String fileName) throws Exception, IOExcep .build(); // Use non-blocking call for getting file transcription - OperationFuture response = + OperationFuture response = speech.longRunningRecognizeAsync(config, audio); while (!response.isDone()) { @@ -263,8 +261,7 @@ public static void asyncRecognizeWords(String gcsUri) throws Exception, IOExcept .build(); // Use non-blocking call for getting file transcription - OperationFuture response = + OperationFuture response = speech.longRunningRecognizeAsync(config, audio); while (!response.isDone()) { System.out.println("Waiting for response..."); @@ -311,8 +308,7 @@ public static void asyncRecognizeGcs(String gcsUri) throws Exception, IOExceptio .build(); // Use non-blocking call for getting file transcription - OperationFuture response = + OperationFuture response = speech.longRunningRecognizeAsync(config, audio); while (!response.isDone()) { System.out.println("Waiting for response..."); diff --git a/storage/cloud-client/pom.xml b/storage/cloud-client/pom.xml index 84eb3c8b6a7..20d0beba8f2 100644 --- a/storage/cloud-client/pom.xml +++ b/storage/cloud-client/pom.xml @@ -37,7 +37,7 @@ com.google.cloud google-cloud-storage - 1.8.0 + 1.11.0 diff --git a/storage/json-api/pom.xml b/storage/json-api/pom.xml index 214e06cdd20..53f129120ca 100644 --- a/storage/json-api/pom.xml +++ b/storage/json-api/pom.xml @@ -38,7 +38,7 @@ com.google.apis google-api-services-storage - v1-rev115-1.23.0 + v1-rev116-1.23.0 com.google.guava diff --git a/storage/storage-transfer/pom.xml b/storage/storage-transfer/pom.xml index ac0b868ac6b..bca816b1bba 100644 --- a/storage/storage-transfer/pom.xml +++ b/storage/storage-transfer/pom.xml @@ -38,7 +38,7 @@ com.google.apis google-api-services-storagetransfer - v1-rev30-1.23.0 + v1-rev34-1.23.0 com.google.guava diff --git a/storage/xml-api/cmdline-sample/pom.xml b/storage/xml-api/cmdline-sample/pom.xml index 5ae94149fab..713fef07ed8 100644 --- a/storage/xml-api/cmdline-sample/pom.xml +++ b/storage/xml-api/cmdline-sample/pom.xml @@ -66,7 +66,7 @@ com.google.apis google-api-services-storage - v1-rev115-1.23.0 + v1-rev116-1.23.0 com.google.guava diff --git a/taskqueue/deferred/pom.xml b/taskqueue/deferred/pom.xml index 86c8e46c895..eff7bca920e 100644 --- a/taskqueue/deferred/pom.xml +++ b/taskqueue/deferred/pom.xml @@ -63,7 +63,7 @@ org.mockito mockito-core - 2.11.0 + 2.12.0 com.google.appengine diff --git a/translate/cloud-client/pom.xml b/translate/cloud-client/pom.xml index 85acafe290d..5f2b7bca18a 100644 --- a/translate/cloud-client/pom.xml +++ b/translate/cloud-client/pom.xml @@ -37,7 +37,7 @@ com.google.cloud google-cloud-translate - 1.8.0 + 1.11.0 diff --git a/translate/pom.xml b/translate/pom.xml index f9f6915f515..6ea04fa2810 100644 --- a/translate/pom.xml +++ b/translate/pom.xml @@ -38,7 +38,7 @@ limitations under the License. com.google.cloud google-cloud-translate - 1.8.0 + 1.11.0 junit diff --git a/video/cloud-client/pom.xml b/video/cloud-client/pom.xml index 4abefff547e..959818dcc6f 100644 --- a/video/cloud-client/pom.xml +++ b/video/cloud-client/pom.xml @@ -43,7 +43,7 @@ com.google.cloud google-cloud-video-intelligence - 0.26.0-beta + 0.29.0-beta diff --git a/video/cloud-client/src/main/java/com/example/video/Detect.java b/video/cloud-client/src/main/java/com/example/video/Detect.java index 09fd5f879e3..23043145a91 100644 --- a/video/cloud-client/src/main/java/com/example/video/Detect.java +++ b/video/cloud-client/src/main/java/com/example/video/Detect.java @@ -16,7 +16,7 @@ package com.example.video; -import com.google.api.gax.rpc.OperationFuture; +import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.videointelligence.v1beta2.AnnotateVideoProgress; import com.google.cloud.videointelligence.v1beta2.AnnotateVideoRequest; import com.google.cloud.videointelligence.v1beta2.AnnotateVideoResponse; @@ -113,7 +113,7 @@ public static void analyzeFaces(String gcsUri) throws Exception { .build(); // asynchronously perform facial analysis on videos - OperationFuture response + OperationFuture response = client.annotateVideoAsync(request); boolean faceFound = false; @@ -174,7 +174,7 @@ public static void analyzeLabels(String gcsUri) throws Exception { .addFeatures(Feature.LABEL_DETECTION) .build(); // Create an operation that will contain the response when the operation completes. - OperationFuture operation = + OperationFuture operation = client.annotateVideoAsync(request); System.out.println("Waiting for operation to complete..."); @@ -261,7 +261,7 @@ public static void analyzeLabelsFile(String filePath) throws Exception { .build(); // Create an operation that will contain the response when the operation completes. - OperationFuture operation = + OperationFuture operation = client.annotateVideoAsync(request); System.out.println("Waiting for operation to complete..."); @@ -344,7 +344,7 @@ public static void analyzeShots(String gcsUri) throws Exception { .build(); // Create an operation that will contain the response when the operation completes. - OperationFuture operation = + OperationFuture operation = client.annotateVideoAsync(request); System.out.println("Waiting for operation to complete..."); @@ -382,7 +382,7 @@ public static void analyzeExplicitContent(String gcsUri) throws Exception { .addFeatures(Feature.EXPLICIT_CONTENT_DETECTION) .build(); - OperationFuture operation = + OperationFuture operation = client.annotateVideoAsync(request); System.out.println("Waiting for operation to complete..."); diff --git a/video/cloud-client/src/main/java/com/example/video/QuickstartSample.java b/video/cloud-client/src/main/java/com/example/video/QuickstartSample.java index b6f8c8cee75..e4abed0f895 100644 --- a/video/cloud-client/src/main/java/com/example/video/QuickstartSample.java +++ b/video/cloud-client/src/main/java/com/example/video/QuickstartSample.java @@ -18,7 +18,7 @@ // [START videointelligence_quickstart] -import com.google.api.gax.rpc.OperationFuture; +import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.videointelligence.v1beta2.AnnotateVideoProgress; import com.google.cloud.videointelligence.v1beta2.AnnotateVideoRequest; import com.google.cloud.videointelligence.v1beta2.AnnotateVideoResponse; @@ -28,7 +28,6 @@ import com.google.cloud.videointelligence.v1beta2.LabelSegment; import com.google.cloud.videointelligence.v1beta2.VideoAnnotationResults; import com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceClient; -import com.google.longrunning.Operation; import java.util.List; public class QuickstartSample { @@ -48,7 +47,7 @@ public static void main(String[] args) throws Exception { .addFeatures(Feature.LABEL_DETECTION) .build(); - OperationFuture operation = + OperationFuture operation = client.annotateVideoAsync(request); System.out.println("Waiting for operation to complete..."); diff --git a/vision/cloud-client/pom.xml b/vision/cloud-client/pom.xml index 7bd288d72f2..01553939986 100644 --- a/vision/cloud-client/pom.xml +++ b/vision/cloud-client/pom.xml @@ -38,7 +38,7 @@ com.google.cloud google-cloud-vision - 0.26.0-beta + 0.29.0-beta diff --git a/vision/face-detection/pom.xml b/vision/face-detection/pom.xml index 6e2fb706b0a..4c6aa9382a3 100644 --- a/vision/face-detection/pom.xml +++ b/vision/face-detection/pom.xml @@ -39,7 +39,7 @@ com.google.apis google-api-services-vision - v1-rev365-1.23.0 + v1-rev366-1.23.0 com.google.api-client diff --git a/vision/face-detection/src/main/java/com/google/cloud/vision/samples/facedetect/FaceDetectApp.java b/vision/face-detection/src/main/java/com/google/cloud/vision/samples/facedetect/FaceDetectApp.java index aab3ebc1816..67d9999de53 100644 --- a/vision/face-detection/src/main/java/com/google/cloud/vision/samples/facedetect/FaceDetectApp.java +++ b/vision/face-detection/src/main/java/com/google/cloud/vision/samples/facedetect/FaceDetectApp.java @@ -23,14 +23,14 @@ import com.google.api.client.json.jackson2.JacksonFactory; import com.google.api.services.vision.v1.Vision; import com.google.api.services.vision.v1.VisionScopes; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1AnnotateImageRequest; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1AnnotateImageResponse; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1BatchAnnotateImagesRequest; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1BatchAnnotateImagesResponse; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1FaceAnnotation; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1Feature; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1Image; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1Vertex; +import com.google.api.services.vision.v1.model.AnnotateImageRequest; +import com.google.api.services.vision.v1.model.AnnotateImageResponse; +import com.google.api.services.vision.v1.model.BatchAnnotateImagesRequest; +import com.google.api.services.vision.v1.model.BatchAnnotateImagesResponse; +import com.google.api.services.vision.v1.model.FaceAnnotation; +import com.google.api.services.vision.v1.model.Feature; +import com.google.api.services.vision.v1.model.Image; +import com.google.api.services.vision.v1.model.Vertex; import com.google.common.collect.ImmutableList; import java.awt.BasicStroke; @@ -81,7 +81,7 @@ public static void main(String[] args) throws IOException, GeneralSecurityExcept } FaceDetectApp app = new FaceDetectApp(getVisionService()); - List faces = app.detectFaces(inputPath, MAX_RESULTS); + List faces = app.detectFaces(inputPath, MAX_RESULTS); System.out.printf("Found %d face%s\n", faces.size(), faces.size() == 1 ? "" : "s"); System.out.printf("Writing to file %s\n", outputPath); app.writeWithFaces(inputPath, outputPath, faces); @@ -115,25 +115,25 @@ public FaceDetectApp(Vision vision) { /** * Gets up to {@code maxResults} faces for an image stored at {@code path}. */ - public List detectFaces(Path path, int maxResults) throws IOException { + public List detectFaces(Path path, int maxResults) throws IOException { byte[] data = Files.readAllBytes(path); - GoogleCloudVisionV1AnnotateImageRequest request = - new GoogleCloudVisionV1AnnotateImageRequest() - .setImage(new GoogleCloudVisionV1Image().encodeContent(data)) + AnnotateImageRequest request = + new AnnotateImageRequest() + .setImage(new Image().encodeContent(data)) .setFeatures(ImmutableList.of( - new GoogleCloudVisionV1Feature() + new Feature() .setType("FACE_DETECTION") .setMaxResults(maxResults))); Vision.Images.Annotate annotate = vision.images() - .annotate(new GoogleCloudVisionV1BatchAnnotateImagesRequest().setRequests(ImmutableList.of(request))); + .annotate(new BatchAnnotateImagesRequest().setRequests(ImmutableList.of(request))); // Due to a bug: requests to Vision API containing large images fail when GZipped. annotate.setDisableGZipContent(true); - GoogleCloudVisionV1BatchAnnotateImagesResponse batchResponse = annotate.execute(); + BatchAnnotateImagesResponse batchResponse = annotate.execute(); assert batchResponse.getResponses().size() == 1; - GoogleCloudVisionV1AnnotateImageResponse response = batchResponse.getResponses().get(0); + AnnotateImageResponse response = batchResponse.getResponses().get(0); if (response.getFaceAnnotations() == null) { throw new IOException( response.getError() != null @@ -148,7 +148,7 @@ public List detectFaces(Path path, int maxRes /** * Reads image {@code inputPath} and writes {@code outputPath} with {@code faces} outlined. */ - private static void writeWithFaces(Path inputPath, Path outputPath, List faces) + private static void writeWithFaces(Path inputPath, Path outputPath, List faces) throws IOException { BufferedImage img = ImageIO.read(inputPath.toFile()); annotateWithFaces(img, faces); @@ -158,8 +158,8 @@ private static void writeWithFaces(Path inputPath, Path outputPath, List faces) { - for (GoogleCloudVisionV1FaceAnnotation face : faces) { + public static void annotateWithFaces(BufferedImage img, List faces) { + for (FaceAnnotation face : faces) { annotateWithFace(img, face); } } @@ -167,10 +167,10 @@ public static void annotateWithFaces(BufferedImage img, List faces = + List faces = appUnderTest.detectFaces(Paths.get("data/face.jpg"), MAX_RESULTS); assertThat(faces).named("face.jpg faces").isNotEmpty(); diff --git a/vision/face-detection/src/test/java/com/google/cloud/vision/samples/facedetect/FaceDetectAppTest.java b/vision/face-detection/src/test/java/com/google/cloud/vision/samples/facedetect/FaceDetectAppTest.java index bdf09524910..24642005273 100644 --- a/vision/face-detection/src/test/java/com/google/cloud/vision/samples/facedetect/FaceDetectAppTest.java +++ b/vision/face-detection/src/test/java/com/google/cloud/vision/samples/facedetect/FaceDetectAppTest.java @@ -18,9 +18,9 @@ import static com.google.common.truth.Truth.assertThat; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1BoundingPoly; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1FaceAnnotation; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1Vertex; +import com.google.api.services.vision.v1.model.BoundingPoly; +import com.google.api.services.vision.v1.model.FaceAnnotation; +import com.google.api.services.vision.v1.model.Vertex; import com.google.common.collect.ImmutableList; import org.junit.Test; @@ -36,21 +36,21 @@ public class FaceDetectAppTest { @Test public void annotateWithFaces_manyFaces_outlinesFaces() throws Exception { // Arrange - ImmutableList faces = + ImmutableList faces = ImmutableList.of( - new GoogleCloudVisionV1FaceAnnotation() + new FaceAnnotation() .setFdBoundingPoly( - new GoogleCloudVisionV1BoundingPoly().setVertices(ImmutableList.of( - new GoogleCloudVisionV1Vertex().setX(10).setY(5), - new GoogleCloudVisionV1Vertex().setX(20).setY(5), - new GoogleCloudVisionV1Vertex().setX(20).setY(25), - new GoogleCloudVisionV1Vertex().setX(10).setY(25)))), - new GoogleCloudVisionV1FaceAnnotation() + new BoundingPoly().setVertices(ImmutableList.of( + new Vertex().setX(10).setY(5), + new Vertex().setX(20).setY(5), + new Vertex().setX(20).setY(25), + new Vertex().setX(10).setY(25)))), + new FaceAnnotation() .setFdBoundingPoly( - new GoogleCloudVisionV1BoundingPoly().setVertices(ImmutableList.of( - new GoogleCloudVisionV1Vertex().setX(60).setY(50), - new GoogleCloudVisionV1Vertex().setX(70).setY(60), - new GoogleCloudVisionV1Vertex().setX(50).setY(60))))); + new BoundingPoly().setVertices(ImmutableList.of( + new Vertex().setX(60).setY(50), + new Vertex().setX(70).setY(60), + new Vertex().setX(50).setY(60))))); BufferedImage img = new BufferedImage(100, 100, BufferedImage.TYPE_INT_RGB); // Act diff --git a/vision/label/pom.xml b/vision/label/pom.xml index 0210ffd752d..445e0dd3c11 100644 --- a/vision/label/pom.xml +++ b/vision/label/pom.xml @@ -38,7 +38,7 @@ com.google.apis google-api-services-vision - v1-rev365-1.23.0 + v1-rev366-1.23.0 com.google.api-client diff --git a/vision/label/src/main/java/com/google/cloud/vision/samples/label/LabelApp.java b/vision/label/src/main/java/com/google/cloud/vision/samples/label/LabelApp.java index 16983c4f592..fd4b62233e8 100644 --- a/vision/label/src/main/java/com/google/cloud/vision/samples/label/LabelApp.java +++ b/vision/label/src/main/java/com/google/cloud/vision/samples/label/LabelApp.java @@ -23,13 +23,13 @@ import com.google.api.client.json.jackson2.JacksonFactory; import com.google.api.services.vision.v1.Vision; import com.google.api.services.vision.v1.VisionScopes; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1AnnotateImageRequest; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1AnnotateImageResponse; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1BatchAnnotateImagesRequest; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1BatchAnnotateImagesResponse; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1EntityAnnotation; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1Feature; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1Image; +import com.google.api.services.vision.v1.model.AnnotateImageRequest; +import com.google.api.services.vision.v1.model.AnnotateImageResponse; +import com.google.api.services.vision.v1.model.BatchAnnotateImagesRequest; +import com.google.api.services.vision.v1.model.BatchAnnotateImagesResponse; +import com.google.api.services.vision.v1.model.EntityAnnotation; +import com.google.api.services.vision.v1.model.Feature; +import com.google.api.services.vision.v1.model.Image; import com.google.common.collect.ImmutableList; import java.io.IOException; @@ -74,9 +74,9 @@ public static void main(String[] args) throws IOException, GeneralSecurityExcept /** * Prints the labels received from the Vision API. */ - public static void printLabels(PrintStream out, Path imagePath, List labels) { + public static void printLabels(PrintStream out, Path imagePath, List labels) { out.printf("Labels for image %s:\n", imagePath); - for (GoogleCloudVisionV1EntityAnnotation label : labels) { + for (EntityAnnotation label : labels) { out.printf( "\t%s (score: %.3f)\n", label.getDescription(), @@ -114,28 +114,28 @@ public LabelApp(Vision vision) { /** * Gets up to {@code maxResults} labels for an image stored at {@code path}. */ - public List labelImage(Path path, int maxResults) throws IOException { + public List labelImage(Path path, int maxResults) throws IOException { // [START construct_request] byte[] data = Files.readAllBytes(path); - GoogleCloudVisionV1AnnotateImageRequest request = - new GoogleCloudVisionV1AnnotateImageRequest() - .setImage(new GoogleCloudVisionV1Image().encodeContent(data)) + AnnotateImageRequest request = + new AnnotateImageRequest() + .setImage(new Image().encodeContent(data)) .setFeatures(ImmutableList.of( - new GoogleCloudVisionV1Feature() + new Feature() .setType("LABEL_DETECTION") .setMaxResults(maxResults))); Vision.Images.Annotate annotate = vision.images() - .annotate(new GoogleCloudVisionV1BatchAnnotateImagesRequest().setRequests(ImmutableList.of(request))); + .annotate(new BatchAnnotateImagesRequest().setRequests(ImmutableList.of(request))); // Due to a bug: requests to Vision API containing large images fail when GZipped. annotate.setDisableGZipContent(true); // [END construct_request] // [START parse_response] - GoogleCloudVisionV1BatchAnnotateImagesResponse batchResponse = annotate.execute(); + BatchAnnotateImagesResponse batchResponse = annotate.execute(); assert batchResponse.getResponses().size() == 1; - GoogleCloudVisionV1AnnotateImageResponse response = batchResponse.getResponses().get(0); + AnnotateImageResponse response = batchResponse.getResponses().get(0); if (response.getLabelAnnotations() == null) { throw new IOException( response.getError() != null diff --git a/vision/label/src/test/java/com/google/cloud/vision/samples/label/LabelAppIT.java b/vision/label/src/test/java/com/google/cloud/vision/samples/label/LabelAppIT.java index 18f0bcc5512..17886c77432 100644 --- a/vision/label/src/test/java/com/google/cloud/vision/samples/label/LabelAppIT.java +++ b/vision/label/src/test/java/com/google/cloud/vision/samples/label/LabelAppIT.java @@ -19,7 +19,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.fail; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1EntityAnnotation; +import com.google.api.services.vision.v1.model.EntityAnnotation; import com.google.common.collect.ImmutableSet; import org.junit.Before; @@ -46,11 +46,11 @@ public class LabelAppIT { } @Test public void labelImage_cat_returnsCatDescription() throws Exception { - List labels = + List labels = appUnderTest.labelImage(Paths.get("data/cat.jpg"), MAX_LABELS); ImmutableSet.Builder builder = ImmutableSet.builder(); - for (GoogleCloudVisionV1EntityAnnotation label : labels) { + for (EntityAnnotation label : labels) { builder.add(label.getDescription()); } ImmutableSet descriptions = builder.build(); diff --git a/vision/label/src/test/java/com/google/cloud/vision/samples/label/LabelAppTest.java b/vision/label/src/test/java/com/google/cloud/vision/samples/label/LabelAppTest.java index afda34c5985..6a238a3d248 100644 --- a/vision/label/src/test/java/com/google/cloud/vision/samples/label/LabelAppTest.java +++ b/vision/label/src/test/java/com/google/cloud/vision/samples/label/LabelAppTest.java @@ -18,7 +18,7 @@ import static com.google.common.truth.Truth.assertThat; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1EntityAnnotation; +import com.google.api.services.vision.v1.model.EntityAnnotation; import com.google.common.collect.ImmutableList; import org.junit.Test; @@ -42,7 +42,7 @@ public class LabelAppTest { // Act LabelApp.printLabels( - out, Paths.get("path/to/some/image.jpg"), ImmutableList.of()); + out, Paths.get("path/to/some/image.jpg"), ImmutableList.of()); // Assert assertThat(bout.toString()).contains("No labels found."); @@ -52,11 +52,11 @@ public class LabelAppTest { // Arrange ByteArrayOutputStream bout = new ByteArrayOutputStream(); PrintStream out = new PrintStream(bout); - ImmutableList labels = + ImmutableList labels = ImmutableList.of( - new GoogleCloudVisionV1EntityAnnotation().setDescription("dog").setScore(0.7564f), - new GoogleCloudVisionV1EntityAnnotation().setDescription("husky").setScore(0.67891f), - new GoogleCloudVisionV1EntityAnnotation().setDescription("poodle").setScore(0.1233f)); + new EntityAnnotation().setDescription("dog").setScore(0.7564f), + new EntityAnnotation().setDescription("husky").setScore(0.67891f), + new EntityAnnotation().setDescription("poodle").setScore(0.1233f)); // Act LabelApp.printLabels(out, Paths.get("path/to/some/image.jpg"), labels); diff --git a/vision/landmark-detection/pom.xml b/vision/landmark-detection/pom.xml index d6e766227d4..d1b6586e87b 100644 --- a/vision/landmark-detection/pom.xml +++ b/vision/landmark-detection/pom.xml @@ -38,7 +38,7 @@ com.google.apis google-api-services-vision - v1-rev365-1.23.0 + v1-rev366-1.23.0 com.google.api-client diff --git a/vision/landmark-detection/src/main/java/com/google/cloud/vision/samples/landmarkdetection/DetectLandmark.java b/vision/landmark-detection/src/main/java/com/google/cloud/vision/samples/landmarkdetection/DetectLandmark.java index 8b5c7b98886..8274ed88f92 100644 --- a/vision/landmark-detection/src/main/java/com/google/cloud/vision/samples/landmarkdetection/DetectLandmark.java +++ b/vision/landmark-detection/src/main/java/com/google/cloud/vision/samples/landmarkdetection/DetectLandmark.java @@ -23,14 +23,14 @@ import com.google.api.client.json.jackson2.JacksonFactory; import com.google.api.services.vision.v1.Vision; import com.google.api.services.vision.v1.VisionScopes; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1AnnotateImageRequest; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1AnnotateImageResponse; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1BatchAnnotateImagesRequest; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1BatchAnnotateImagesResponse; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1EntityAnnotation; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1Feature; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1Image; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1ImageSource; +import com.google.api.services.vision.v1.model.AnnotateImageRequest; +import com.google.api.services.vision.v1.model.AnnotateImageResponse; +import com.google.api.services.vision.v1.model.BatchAnnotateImagesRequest; +import com.google.api.services.vision.v1.model.BatchAnnotateImagesResponse; +import com.google.api.services.vision.v1.model.EntityAnnotation; +import com.google.api.services.vision.v1.model.Feature; +import com.google.api.services.vision.v1.model.Image; +import com.google.api.services.vision.v1.model.ImageSource; import com.google.common.collect.ImmutableList; import java.io.IOException; @@ -68,9 +68,9 @@ public static void main(String[] args) throws IOException, GeneralSecurityExcept } DetectLandmark app = new DetectLandmark(getVisionService()); - List landmarks = app.identifyLandmark(args[0], MAX_RESULTS); + List landmarks = app.identifyLandmark(args[0], MAX_RESULTS); System.out.printf("Found %d landmark%s\n", landmarks.size(), landmarks.size() == 1 ? "" : "s"); - for (GoogleCloudVisionV1EntityAnnotation annotation : landmarks) { + for (EntityAnnotation annotation : landmarks) { System.out.printf("\t%s\n", annotation.getDescription()); } } @@ -103,24 +103,24 @@ public DetectLandmark(Vision vision) { /** * Gets up to {@code maxResults} landmarks for an image stored at {@code uri}. */ - public List identifyLandmark(String uri, int maxResults) throws IOException { - GoogleCloudVisionV1AnnotateImageRequest request = - new GoogleCloudVisionV1AnnotateImageRequest() - .setImage(new GoogleCloudVisionV1Image().setSource( - new GoogleCloudVisionV1ImageSource().setGcsImageUri(uri))) + public List identifyLandmark(String uri, int maxResults) throws IOException { + AnnotateImageRequest request = + new AnnotateImageRequest() + .setImage(new Image().setSource( + new ImageSource().setGcsImageUri(uri))) .setFeatures(ImmutableList.of( - new GoogleCloudVisionV1Feature() + new Feature() .setType("LANDMARK_DETECTION") .setMaxResults(maxResults))); Vision.Images.Annotate annotate = vision.images() - .annotate(new GoogleCloudVisionV1BatchAnnotateImagesRequest().setRequests(ImmutableList.of(request))); + .annotate(new BatchAnnotateImagesRequest().setRequests(ImmutableList.of(request))); // Due to a bug: requests to Vision API containing large images fail when GZipped. annotate.setDisableGZipContent(true); - GoogleCloudVisionV1BatchAnnotateImagesResponse batchResponse = annotate.execute(); + BatchAnnotateImagesResponse batchResponse = annotate.execute(); assert batchResponse.getResponses().size() == 1; - GoogleCloudVisionV1AnnotateImageResponse response = batchResponse.getResponses().get(0); + AnnotateImageResponse response = batchResponse.getResponses().get(0); if (response.getLandmarkAnnotations() == null) { throw new IOException( response.getError() != null diff --git a/vision/landmark-detection/src/test/java/com/google/cloud/vision/samples/landmarkdetection/DetectLandmarkIT.java b/vision/landmark-detection/src/test/java/com/google/cloud/vision/samples/landmarkdetection/DetectLandmarkIT.java index 273156fedd2..bb4c4e04f77 100644 --- a/vision/landmark-detection/src/test/java/com/google/cloud/vision/samples/landmarkdetection/DetectLandmarkIT.java +++ b/vision/landmark-detection/src/test/java/com/google/cloud/vision/samples/landmarkdetection/DetectLandmarkIT.java @@ -19,7 +19,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.fail; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1EntityAnnotation; +import com.google.api.services.vision.v1.model.EntityAnnotation; import org.junit.Before; import org.junit.Test; @@ -49,7 +49,7 @@ public class DetectLandmarkIT { } @Test public void identifyLandmark_withLandmark_returnsKnownLandmark() throws Exception { - List landmarks = appUnderTest.identifyLandmark(LANDMARK_URI, MAX_RESULTS); + List landmarks = appUnderTest.identifyLandmark(LANDMARK_URI, MAX_RESULTS); assertThat(landmarks).named("water.jpg landmarks").isNotEmpty(); assertThat(landmarks.get(0).getDescription()) diff --git a/vision/text/pom.xml b/vision/text/pom.xml index 16cda42973e..6f12fbc60ac 100644 --- a/vision/text/pom.xml +++ b/vision/text/pom.xml @@ -38,7 +38,7 @@ com.google.apis google-api-services-vision - v1-rev365-1.23.0 + v1-rev366-1.23.0 com.google.api-client diff --git a/vision/text/src/main/java/com/google/cloud/vision/samples/text/ImageText.java b/vision/text/src/main/java/com/google/cloud/vision/samples/text/ImageText.java index afbe3c4f5b8..4d695f9401f 100644 --- a/vision/text/src/main/java/com/google/cloud/vision/samples/text/ImageText.java +++ b/vision/text/src/main/java/com/google/cloud/vision/samples/text/ImageText.java @@ -16,8 +16,8 @@ package com.google.cloud.vision.samples.text; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1EntityAnnotation; -import com.google.api.services.vision.v1.model.GoogleRpcStatus; +import com.google.api.services.vision.v1.model.EntityAnnotation; +import com.google.api.services.vision.v1.model.Status; import java.nio.file.Path; import java.util.List; @@ -29,8 +29,8 @@ */ public class ImageText { private Path pth; - private List ts; - private GoogleRpcStatus err; + private List ts; + private Status err; public static Builder builder() { return new Builder(); @@ -42,19 +42,19 @@ public Path path() { return this.pth; } - public List textAnnotations() { + public List textAnnotations() { return this.ts; } @Nullable - public GoogleRpcStatus error() { + public Status error() { return this.err; } public static class Builder { private Path pth; - private List ts; - private GoogleRpcStatus err; + private List ts; + private Status err; Builder() {} @@ -63,12 +63,12 @@ public Builder path(Path path) { return this; } - public Builder textAnnotations(List ts) { + public Builder textAnnotations(List ts) { this.ts = ts; return this; } - public Builder error(@Nullable GoogleRpcStatus err) { + public Builder error(@Nullable Status err) { this.err = err; return this; } diff --git a/vision/text/src/main/java/com/google/cloud/vision/samples/text/TextApp.java b/vision/text/src/main/java/com/google/cloud/vision/samples/text/TextApp.java index 7c29b113a8e..951dacd00f6 100644 --- a/vision/text/src/main/java/com/google/cloud/vision/samples/text/TextApp.java +++ b/vision/text/src/main/java/com/google/cloud/vision/samples/text/TextApp.java @@ -22,14 +22,14 @@ import com.google.api.client.json.jackson2.JacksonFactory; import com.google.api.services.vision.v1.Vision; import com.google.api.services.vision.v1.VisionScopes; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1AnnotateImageRequest; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1AnnotateImageResponse; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1BatchAnnotateImagesRequest; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1BatchAnnotateImagesResponse; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1EntityAnnotation; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1Feature; -import com.google.api.services.vision.v1.model.GoogleCloudVisionV1Image; -import com.google.api.services.vision.v1.model.GoogleRpcStatus; +import com.google.api.services.vision.v1.model.AnnotateImageRequest; +import com.google.api.services.vision.v1.model.AnnotateImageResponse; +import com.google.api.services.vision.v1.model.BatchAnnotateImagesRequest; +import com.google.api.services.vision.v1.model.BatchAnnotateImagesResponse; +import com.google.api.services.vision.v1.model.EntityAnnotation; +import com.google.api.services.vision.v1.model.Feature; +import com.google.api.services.vision.v1.model.Image; +import com.google.api.services.vision.v1.model.Status; import com.google.common.base.MoreObjects; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; @@ -168,39 +168,39 @@ public void indexDirectory(Path inputPath) throws IOException { * Gets up to {@code maxResults} text annotations for images stored at {@code paths}. */ public ImmutableList detectText(List paths) { - ImmutableList.Builder requests = ImmutableList.builder(); + ImmutableList.Builder requests = ImmutableList.builder(); try { for (Path path : paths) { byte[] data; data = Files.readAllBytes(path); requests.add( - new GoogleCloudVisionV1AnnotateImageRequest() - .setImage(new GoogleCloudVisionV1Image().encodeContent(data)) + new AnnotateImageRequest() + .setImage(new Image().encodeContent(data)) .setFeatures(ImmutableList.of( - new GoogleCloudVisionV1Feature() + new Feature() .setType("TEXT_DETECTION") .setMaxResults(MAX_RESULTS)))); } Vision.Images.Annotate annotate = vision.images() - .annotate(new GoogleCloudVisionV1BatchAnnotateImagesRequest().setRequests(requests.build())); + .annotate(new BatchAnnotateImagesRequest().setRequests(requests.build())); // Due to a bug: requests to Vision API containing large images fail when GZipped. annotate.setDisableGZipContent(true); - GoogleCloudVisionV1BatchAnnotateImagesResponse batchResponse = annotate.execute(); + BatchAnnotateImagesResponse batchResponse = annotate.execute(); assert batchResponse.getResponses().size() == paths.size(); ImmutableList.Builder output = ImmutableList.builder(); for (int i = 0; i < paths.size(); i++) { Path path = paths.get(i); - GoogleCloudVisionV1AnnotateImageResponse response = batchResponse.getResponses().get(i); + AnnotateImageResponse response = batchResponse.getResponses().get(i); output.add( ImageText.builder() .path(path) .textAnnotations( MoreObjects.firstNonNull( response.getTextAnnotations(), - ImmutableList.of())) + ImmutableList.of())) .error(response.getError()) .build()); } @@ -212,8 +212,8 @@ public ImmutableList detectText(List paths) { output.add( ImageText.builder() .path(path) - .textAnnotations(ImmutableList.of()) - .error(new GoogleRpcStatus().setMessage(ex.getMessage())) + .textAnnotations(ImmutableList.of()) + .error(new Status().setMessage(ex.getMessage())) .build()); } return output.build(); @@ -236,7 +236,7 @@ public boolean successfullyDetectedText(ImageText image) { */ public Word extractDescriptions(ImageText image) { String document = ""; - for (GoogleCloudVisionV1EntityAnnotation text : image.textAnnotations()) { + for (EntityAnnotation text : image.textAnnotations()) { document += text.getDescription(); } if (document.equals("")) {