Merge branch 'master' into samples-speech-beta

Author: chingor13

.kokoro/release/publish_javadoc.cfg

@@ -1,14 +1,24 @@
 # Format: //devtools/kokoro/config/proto/build.proto
+
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/doc-templates/"
+
 env_vars: {
   key: "STAGING_BUCKET"
   value: "docs-staging"
 }
 
+env_vars: {
+  key: "STAGING_BUCKET_V2"
+  value: "docs-staging-v2-staging"
+  # Production will be at: docs-staging-v2
+}
+
 env_vars: {
   key: "TRAMPOLINE_BUILD_FILE"
   value: "github/java-speech/.kokoro/release/publish_javadoc.sh"
 }
 
+
 before_action {
   fetch_keystore {
     keystore_resource {

.kokoro/release/publish_javadoc.sh

@@ -24,20 +24,25 @@ if [[ -z "${STAGING_BUCKET}" ]]; then
   exit 1
 fi
 
+if [[ -z "${STAGING_BUCKET_V2}" ]]; then
+  echo "Need to set STAGING_BUCKET_V2 environment variable"
+  exit 1
+fi
+
 # work from the git root directory
 pushd $(dirname "$0")/../../
 
 # install docuploader package
 python3 -m pip install gcp-docuploader
 
 # compile all packages
-mvn clean install -B -DskipTests=true
+mvn clean install -B -q -DskipTests=true
 
 NAME=google-cloud-speech
 VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)
 
 # build the docs
-mvn site -B
+mvn site -B -q
 
 pushd target/site/apidocs
 
@@ -53,3 +58,19 @@ python3 -m docuploader upload . \
   --staging-bucket ${STAGING_BUCKET}
 
 popd
+
+# V2
+mvn clean site -B -q -Ddevsite.template="${KOKORO_GFILE_DIR}/java/"
+
+pushd target/devsite
+
+# create metadata
+python3 -m docuploader create-metadata \
+  --name ${NAME} \
+  --version ${VERSION} \
+  --language java
+
+# upload docs
+python3 -m docuploader upload . \
+  --credentials ${CREDENTIALS} \
+  --staging-bucket ${STAGING_BUCKET_V2}

README.md

@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>libraries-bom</artifactId>
-      <version>8.0.0</version>
+      <version>8.1.0</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>

google-cloud-speech/src/test/java/com/google/cloud/speech/v1/SpeechSmokeTest.java

@@ -28,14 +28,14 @@ public class SpeechSmokeTest {
 
   @Test
   public void run() {
+    // Skip smoke tests if running in VPCSC because our V1 integration tests
+    // cover VPC-SC.
+    Assume.assumeTrue(System.getenv("GOOGLE_CLOUD_TESTS_IN_VPCSC") == null);
     main(null);
   }
 
   public static void main(String args[]) {
     Logger.getLogger("").setLevel(Level.WARNING);
-    // Skip smoke tests if running in VPCSC because our V1 integration tests
-    // cover VPC-SC.
-    Assume.assumeTrue(System.getenv("GOOGLE_CLOUD_TESTS_IN_VPCSC") == null);
     try {
       executeNoCatch();
       System.out.println("OK");

google-cloud-speech/src/test/java/com/google/cloud/speech/v1/it/ITSpeechTest.java

@@ -52,7 +52,7 @@ public static void tearDownClass() throws Exception {
 
   @Test
   public void syncRecognize() {
-    RecognizeResponse response = speechClient.recognize(config(), audio());
+    RecognizeResponse response = speechClient.recognize(config(2), audio());
 
     Truth.assertThat(response.getResultsCount()).isGreaterThan(0);
     Truth.assertThat(response.getResults(0).getAlternativesCount()).isGreaterThan(0);
@@ -63,7 +63,7 @@ public void syncRecognize() {
   @Test
   public void longrunningRecognize() throws Exception {
     LongRunningRecognizeResponse response =
-        speechClient.longRunningRecognizeAsync(config(), audio()).get();
+        speechClient.longRunningRecognizeAsync(config(2), audio()).get();
 
     Truth.assertThat(response.getResultsCount()).isGreaterThan(0);
     Truth.assertThat(response.getResults(0).getAlternativesCount()).isGreaterThan(0);
@@ -78,7 +78,7 @@ public void streamingRecognize() throws Exception {
             .toByteArray();
 
     StreamingRecognitionConfig streamingConfig =
-        StreamingRecognitionConfig.newBuilder().setConfig(config()).build();
+        StreamingRecognitionConfig.newBuilder().setConfig(config(1)).build();
 
     ResponseApiStreamingObserver<StreamingRecognizeResponse> responseObserver =
         new ResponseApiStreamingObserver<>();
@@ -133,7 +133,7 @@ public SettableFuture<List<T>> future() {
     }
   }
 
-  private RecognitionConfig config() {
+  private RecognitionConfig config(int channels) {
     String languageCode = "en-US";
     int sampleRateHertz = 44100;
     RecognitionConfig.AudioEncoding encoding = RecognitionConfig.AudioEncoding.FLAC;
@@ -142,6 +142,7 @@ private RecognitionConfig config() {
             .setLanguageCode(languageCode)
             .setSampleRateHertz(sampleRateHertz)
             .setEncoding(encoding)
+            .setAudioChannelCount(channels)
             .build();
     return config;
   }
@@ -151,6 +152,8 @@ public RecognitionAudio audio() {
     if (audio_gcs_uri != null) {
       return RecognitionAudio.newBuilder().setUri(audio_gcs_uri).build();
     }
-    return RecognitionAudio.newBuilder().setUri("gs://gapic-toolkit/hello.flac").build();
+    return RecognitionAudio.newBuilder()
+        .setUri("gs://cloud-samples-data/speech/hello.flac")
+        .build();
   }
 }

google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/SpeechSmokeTest.java

@@ -28,14 +28,14 @@ public class SpeechSmokeTest {
 
   @Test
   public void run() {
+    // Skip smoke tests if running in VPCSC because our V1 integration tests
+    // cover VPC-SC.
+    Assume.assumeTrue(System.getenv("GOOGLE_CLOUD_TESTS_IN_VPCSC") == null);
     main(null);
   }
 
   public static void main(String args[]) {
     Logger.getLogger("").setLevel(Level.WARNING);
-    // Skip smoke tests if running in VPCSC because our V1 integration tests
-    // cover VPC-SC.
-    Assume.assumeTrue(System.getenv("GOOGLE_CLOUD_TESTS_IN_VPCSC") == null);
     try {
       executeNoCatch();
       System.out.println("OK");

samples/install-without-bom/pom.xml

@@ -32,7 +32,11 @@
       <version>1.24.0</version>
     </dependency>
     <!-- [END speech_install_without_bom] -->
-
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+      <version>1.4</version>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

samples/snapshot/pom.xml

@@ -32,6 +32,11 @@
       <version>1.24.1-SNAPSHOT</version>
     </dependency>
     <!-- {x-version-update-end} -->
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+      <version>1.4</version>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

samples/snippets/pom.xml

@@ -42,8 +42,12 @@
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-speech</artifactId>
     </dependency>
-    <!-- [END speech_install_with_bom] -->
-
+    <!-- [START_EXCLUDE] -->
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+      <version>1.4</version>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -56,5 +60,7 @@
       <version>1.0.1</version>
       <scope>test</scope>
     </dependency>
+    <!-- [END_EXCLUDE] -->
   </dependencies>
+  <!-- [END speech_install_with_bom] -->
 </project>