docs: regenerate javadoc, update common templates (#16)

googleapis · Nov 19, 2019 · 6c82ba0 · 6c82ba0
1 parent 1202142
commit 6c82ba0
Show file tree

Hide file tree

Showing 25 changed files with 61 additions and 36 deletions.
diff --git a/.github/release-please.yml b/.github/release-please.yml
@@ -1 +1,2 @@
 releaseType: java-yoshi
+bumpMinorPreMajor: true
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
@@ -27,6 +27,7 @@ echo ${JOB_TYPE}
 mvn install -B -V \
   -DskipTests=true \
   -Dclirr.skip=true \
+  -Denforcer.skip=true \
   -Dmaven.javadoc.skip=true \
   -Dgcloud.download.skip=true \
   -T 1C
@@ -38,7 +39,7 @@ fi
 
 case ${JOB_TYPE} in
 test)
-    mvn test -B -Dclirr.skip=true
+    mvn test -B -Dclirr.skip=true -Denforcer.skip=true
     bash ${KOKORO_GFILE_DIR}/codecov.sh
     bash .kokoro/coerce_logs.sh
     ;;
@@ -49,12 +50,17 @@ javadoc)
     mvn javadoc:javadoc javadoc:test-javadoc
     ;;
 integration)
-    mvn -B ${INTEGRATION_TEST_ARGS} -DtrimStackTrace=false -Dclirr.skip=true -fae verify
+    mvn -B ${INTEGRATION_TEST_ARGS} \
+      -DtrimStackTrace=false \
+      -Dclirr.skip=true \
+      -Denforcer.skip=true \
+      -fae \
+      verify
     bash .kokoro/coerce_logs.sh
     ;;
 clirr)
-    mvn -B clirr:check
+    mvn -B -Denforcer.skip=true clirr:check
     ;;
 *)
     ;;
-esac
+esac
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
@@ -23,5 +23,9 @@ echo $JOB_TYPE
 
 export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
 
-mvn install -DskipTests=true -B -V
+# this should run maven enforcer
+mvn install -B -V \
+  -DskipTests=true \
+  -Dclirr.skip=true
+
 mvn -B dependency:analyze -DfailOnWarning=true
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/AgentsClientTest.java b/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/AgentsClientTest.java
@@ -35,6 +35,7 @@
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import org.junit.After;
 import org.junit.AfterClass;
@@ -65,7 +66,7 @@ public static void startStaticServer() {
     mockSessions = new MockSessions();
     serviceHelper =
         new MockServiceHelper(
-            "in-process-1",
+            UUID.randomUUID().toString(),
             Arrays.<MockGrpcService>asList(
                 mockAgents,
                 mockContexts,

diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/ContextsClientTest.java b/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/ContextsClientTest.java
@@ -32,6 +32,7 @@
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -61,7 +62,7 @@ public static void startStaticServer() {
     mockSessions = new MockSessions();
     serviceHelper =
         new MockServiceHelper(
-            "in-process-1",
+            UUID.randomUUID().toString(),
             Arrays.<MockGrpcService>asList(
                 mockAgents,
                 mockContexts,

diff --git a/...-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/EntityTypesClientTest.java b/...-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/EntityTypesClientTest.java
@@ -36,6 +36,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import org.junit.After;
 import org.junit.AfterClass;
@@ -66,7 +67,7 @@ public static void startStaticServer() {
     mockSessions = new MockSessions();
     serviceHelper =
         new MockServiceHelper(
-            "in-process-1",
+            UUID.randomUUID().toString(),
             Arrays.<MockGrpcService>asList(
                 mockAgents,
                 mockContexts,

diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/IntentsClientTest.java b/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/IntentsClientTest.java
@@ -37,6 +37,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import org.junit.After;
 import org.junit.AfterClass;
@@ -67,7 +68,7 @@ public static void startStaticServer() {
     mockSessions = new MockSessions();
     serviceHelper =
         new MockServiceHelper(
-            "in-process-1",
+            UUID.randomUUID().toString(),
             Arrays.<MockGrpcService>asList(
                 mockAgents,
                 mockContexts,

diff --git a/...dialogflow/src/test/java/com/google/cloud/dialogflow/v2/SessionEntityTypesClientTest.java b/...dialogflow/src/test/java/com/google/cloud/dialogflow/v2/SessionEntityTypesClientTest.java
@@ -32,6 +32,7 @@
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -61,7 +62,7 @@ public static void startStaticServer() {
     mockSessions = new MockSessions();
     serviceHelper =
         new MockServiceHelper(
-            "in-process-1",
+            UUID.randomUUID().toString(),
             Arrays.<MockGrpcService>asList(
                 mockAgents,
                 mockContexts,

diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/SessionsClientTest.java b/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/SessionsClientTest.java
@@ -33,6 +33,7 @@
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import org.junit.After;
 import org.junit.AfterClass;
@@ -63,7 +64,7 @@ public static void startStaticServer() {
     mockSessions = new MockSessions();
     serviceHelper =
         new MockServiceHelper(
-            "in-process-1",
+            UUID.randomUUID().toString(),
             Arrays.<MockGrpcService>asList(
                 mockAgents,
                 mockContexts,

diff --git a/...-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/AgentsClientTest.java b/...-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/AgentsClientTest.java
@@ -35,6 +35,7 @@
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import org.junit.After;
 import org.junit.AfterClass;
@@ -69,7 +70,7 @@ public static void startStaticServer() {
     mockSessions = new MockSessions();
     serviceHelper =
         new MockServiceHelper(
-            "in-process-1",
+            UUID.randomUUID().toString(),
             Arrays.<MockGrpcService>asList(
                 mockAgents,
                 mockContexts,

diff --git a/...loud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/ContextsClientTest.java b/...loud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/ContextsClientTest.java
@@ -32,6 +32,7 @@
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -65,7 +66,7 @@ public static void startStaticServer() {
     mockSessions = new MockSessions();
     serviceHelper =
         new MockServiceHelper(
-            "in-process-1",
+            UUID.randomUUID().toString(),
             Arrays.<MockGrpcService>asList(
                 mockAgents,
                 mockContexts,

diff --git a/...oud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/DocumentsClientTest.java b/...oud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/DocumentsClientTest.java
@@ -35,6 +35,7 @@
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import org.junit.After;
 import org.junit.AfterClass;
@@ -69,7 +70,7 @@ public static void startStaticServer() {
     mockSessions = new MockSessions();
     serviceHelper =
         new MockServiceHelper(
-            "in-process-1",
+            UUID.randomUUID().toString(),
             Arrays.<MockGrpcService>asList(
                 mockAgents,
                 mockContexts,

diff --git a/...d-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/EntityTypesClientTest.java b/...d-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/EntityTypesClientTest.java
@@ -36,6 +36,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import org.junit.After;
 import org.junit.AfterClass;
@@ -70,7 +71,7 @@ public static void startStaticServer() {
     mockSessions = new MockSessions();
     serviceHelper =
         new MockServiceHelper(
-            "in-process-1",
+            UUID.randomUUID().toString(),
             Arrays.<MockGrpcService>asList(
                 mockAgents,
                 mockContexts,

diff --git a/...cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/IntentsClientTest.java b/...cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/IntentsClientTest.java
@@ -37,6 +37,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import org.junit.After;
 import org.junit.AfterClass;
@@ -71,7 +72,7 @@ public static void startStaticServer() {
     mockSessions = new MockSessions();
     serviceHelper =
         new MockServiceHelper(
-            "in-process-1",
+            UUID.randomUUID().toString(),
             Arrays.<MockGrpcService>asList(
                 mockAgents,
                 mockContexts,

diff --git a/...ialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/KnowledgeBasesClientTest.java b/...ialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/KnowledgeBasesClientTest.java
@@ -32,6 +32,7 @@
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -65,7 +66,7 @@ public static void startStaticServer() {
     mockSessions = new MockSessions();
     serviceHelper =
         new MockServiceHelper(
-            "in-process-1",
+            UUID.randomUUID().toString(),
             Arrays.<MockGrpcService>asList(
                 mockAgents,
                 mockContexts,

diff --git a/...gflow/src/test/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesClientTest.java b/...gflow/src/test/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesClientTest.java
@@ -32,6 +32,7 @@
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -65,7 +66,7 @@ public static void startStaticServer() {
     mockSessions = new MockSessions();
     serviceHelper =
         new MockServiceHelper(
-            "in-process-1",
+            UUID.randomUUID().toString(),
             Arrays.<MockGrpcService>asList(
                 mockAgents,
                 mockContexts,

diff --git a/...loud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/SessionsClientTest.java b/...loud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/SessionsClientTest.java
@@ -33,6 +33,7 @@
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import org.junit.After;
 import org.junit.AfterClass;
@@ -67,7 +68,7 @@ public static void startStaticServer() {
     mockSessions = new MockSessions();
     serviceHelper =
         new MockServiceHelper(
-            "in-process-1",
+            UUID.randomUUID().toString(),
             Arrays.<MockGrpcService>asList(
                 mockAgents,
                 mockContexts,

diff --git a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Intent.java b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Intent.java
@@ -45563,7 +45563,7 @@ public boolean getIsFallback() {
    *
    * <pre>
    * Optional. Indicates whether Machine Learning is disabled for the intent.
-   * Note: If `ml_diabled` setting is set to true, then this intent is not
+   * Note: If `ml_disabled` setting is set to true, then this intent is not
    * taken into account during inference in `ML ONLY` match mode. Also,
    * auto-markup in the UI is turned off.
    * </pre>
@@ -47611,7 +47611,7 @@ public Builder clearIsFallback() {
      *
      * <pre>
      * Optional. Indicates whether Machine Learning is disabled for the intent.
-     * Note: If `ml_diabled` setting is set to true, then this intent is not
+     * Note: If `ml_disabled` setting is set to true, then this intent is not
      * taken into account during inference in `ML ONLY` match mode. Also,
      * auto-markup in the UI is turned off.
      * </pre>
@@ -47626,7 +47626,7 @@ public boolean getMlDisabled() {
      *
      * <pre>
      * Optional. Indicates whether Machine Learning is disabled for the intent.
-     * Note: If `ml_diabled` setting is set to true, then this intent is not
+     * Note: If `ml_disabled` setting is set to true, then this intent is not
      * taken into account during inference in `ML ONLY` match mode. Also,
      * auto-markup in the UI is turned off.
      * </pre>
@@ -47644,7 +47644,7 @@ public Builder setMlDisabled(boolean value) {
      *
      * <pre>
      * Optional. Indicates whether Machine Learning is disabled for the intent.
-     * Note: If `ml_diabled` setting is set to true, then this intent is not
+     * Note: If `ml_disabled` setting is set to true, then this intent is not
      * taken into account during inference in `ML ONLY` match mode. Also,
      * auto-markup in the UI is turned off.
      * </pre>

diff --git a/...gle-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentOrBuilder.java b/...gle-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentOrBuilder.java
@@ -129,7 +129,7 @@ public interface IntentOrBuilder
    *
    * <pre>
    * Optional. Indicates whether Machine Learning is disabled for the intent.
-   * Note: If `ml_diabled` setting is set to true, then this intent is not
+   * Note: If `ml_disabled` setting is set to true, then this intent is not
    * taken into account during inference in `ML ONLY` match mode. Also,
    * auto-markup in the UI is turned off.
    * </pre>

diff --git a/...cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/OutputAudioEncoding.java b/...cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/OutputAudioEncoding.java
@@ -53,7 +53,7 @@ public enum OutputAudioEncoding implements com.google.protobuf.ProtocolMessageEn
    *
    *
    * <pre>
-   * MP3 audio.
+   * MP3 audio at 32kbps.
    * </pre>
    *
    * <code>OUTPUT_AUDIO_ENCODING_MP3 = 2;</code>
@@ -100,7 +100,7 @@ public enum OutputAudioEncoding implements com.google.protobuf.ProtocolMessageEn
    *
    *
    * <pre>
-   * MP3 audio.
+   * MP3 audio at 32kbps.
    * </pre>
    *
    * <code>OUTPUT_AUDIO_ENCODING_MP3 = 2;</code>

diff --git a/...o-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/audio_config.proto b/...o-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/audio_config.proto
@@ -254,7 +254,7 @@ enum OutputAudioEncoding {
   // Audio content returned as LINEAR16 also contains a WAV header.
   OUTPUT_AUDIO_ENCODING_LINEAR_16 = 1;
 
-  // MP3 audio.
+  // MP3 audio at 32kbps.
   OUTPUT_AUDIO_ENCODING_MP3 = 2;
 
   // Opus encoded audio wrapped in an ogg container. The result will be a

diff --git a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/intent.proto b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/intent.proto
@@ -844,7 +844,7 @@ message Intent {
   bool is_fallback = 4 [(google.api.field_behavior) = OPTIONAL];
 
   // Optional. Indicates whether Machine Learning is disabled for the intent.
-  // Note: If `ml_diabled` setting is set to true, then this intent is not
+  // Note: If `ml_disabled` setting is set to true, then this intent is not
   // taken into account during inference in `ML ONLY` match mode. Also,
   // auto-markup in the UI is turned off.
   bool ml_disabled = 19 [(google.api.field_behavior) = OPTIONAL];

diff --git a/...ogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/OutputAudioEncoding.java b/...ogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/OutputAudioEncoding.java
@@ -53,7 +53,7 @@ public enum OutputAudioEncoding implements com.google.protobuf.ProtocolMessageEn
    *
    *
    * <pre>
-   * MP3 audio.
+   * MP3 audio at 32kbps.
    * </pre>
    *
    * <code>OUTPUT_AUDIO_ENCODING_MP3 = 2;</code>
@@ -100,7 +100,7 @@ public enum OutputAudioEncoding implements com.google.protobuf.ProtocolMessageEn
    *
    *
    * <pre>
-   * MP3 audio.
+   * MP3 audio at 32kbps.
    * </pre>
    *
    * <code>OUTPUT_AUDIO_ENCODING_MP3 = 2;</code>

diff --git a/...loud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/audio_config.proto b/...loud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/audio_config.proto
@@ -317,7 +317,7 @@ enum OutputAudioEncoding {
   // Audio content returned as LINEAR16 also contains a WAV header.
   OUTPUT_AUDIO_ENCODING_LINEAR_16 = 1;
 
-  // MP3 audio.
+  // MP3 audio at 32kbps.
   OUTPUT_AUDIO_ENCODING_MP3 = 2;
 
   // Opus encoded audio wrapped in an ogg container. The result will be a