chore: update common templates, regenerate tests (#23)

googleapis · Nov 19, 2019 · 03ceaae · 03ceaae
1 parent a307222
commit 03ceaae
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 18 deletions.
diff --git a/.github/release-please.yml b/.github/release-please.yml
@@ -1,2 +1,2 @@
 releaseType: java-yoshi
-bumpMinorPreMajor: true
+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/...c/test/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceClientTest.java b/...c/test/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceClientTest.java
@@ -31,6 +31,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;
@@ -51,7 +52,8 @@ public static void startStaticServer() {
     mockVideoIntelligenceService = new MockVideoIntelligenceService();
     serviceHelper =
         new MockServiceHelper(
-            "in-process-1", Arrays.<MockGrpcService>asList(mockVideoIntelligenceService));
+            UUID.randomUUID().toString(),
+            Arrays.<MockGrpcService>asList(mockVideoIntelligenceService));
     serviceHelper.start();
   }
 

diff --git a/...t/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceClientTest.java b/...t/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceClientTest.java
@@ -31,6 +31,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;
@@ -51,7 +52,8 @@ public static void startStaticServer() {
     mockVideoIntelligenceService = new MockVideoIntelligenceService();
     serviceHelper =
         new MockServiceHelper(
-            "in-process-1", Arrays.<MockGrpcService>asList(mockVideoIntelligenceService));
+            UUID.randomUUID().toString(),
+            Arrays.<MockGrpcService>asList(mockVideoIntelligenceService));
     serviceHelper.start();
   }
 

diff --git a/...java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceClientTest.java b/...java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceClientTest.java
@@ -31,6 +31,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;
@@ -51,7 +52,8 @@ public static void startStaticServer() {
     mockVideoIntelligenceService = new MockVideoIntelligenceService();
     serviceHelper =
         new MockServiceHelper(
-            "in-process-1", Arrays.<MockGrpcService>asList(mockVideoIntelligenceService));
+            UUID.randomUUID().toString(),
+            Arrays.<MockGrpcService>asList(mockVideoIntelligenceService));
     serviceHelper.start();
   }
 

diff --git a/...java/com/google/cloud/videointelligence/v1p2beta1/VideoIntelligenceServiceClientTest.java b/...java/com/google/cloud/videointelligence/v1p2beta1/VideoIntelligenceServiceClientTest.java
@@ -31,6 +31,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;
@@ -51,7 +52,8 @@ public static void startStaticServer() {
     mockVideoIntelligenceService = new MockVideoIntelligenceService();
     serviceHelper =
         new MockServiceHelper(
-            "in-process-1", Arrays.<MockGrpcService>asList(mockVideoIntelligenceService));
+            UUID.randomUUID().toString(),
+            Arrays.<MockGrpcService>asList(mockVideoIntelligenceService));
     serviceHelper.start();
   }
 

diff --git a/...google/cloud/videointelligence/v1p3beta1/StreamingVideoIntelligenceServiceClientTest.java b/...google/cloud/videointelligence/v1p3beta1/StreamingVideoIntelligenceServiceClientTest.java
@@ -29,6 +29,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;
@@ -51,7 +52,7 @@ public static void startStaticServer() {
     mockStreamingVideoIntelligenceService = new MockStreamingVideoIntelligenceService();
     serviceHelper =
         new MockServiceHelper(
-            "in-process-1",
+            UUID.randomUUID().toString(),
             Arrays.<MockGrpcService>asList(
                 mockVideoIntelligenceService, mockStreamingVideoIntelligenceService));
     serviceHelper.start();

diff --git a/...java/com/google/cloud/videointelligence/v1p3beta1/VideoIntelligenceServiceClientTest.java b/...java/com/google/cloud/videointelligence/v1p3beta1/VideoIntelligenceServiceClientTest.java
@@ -31,6 +31,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;
@@ -53,7 +54,7 @@ public static void startStaticServer() {
     mockStreamingVideoIntelligenceService = new MockStreamingVideoIntelligenceService();
     serviceHelper =
         new MockServiceHelper(
-            "in-process-1",
+            UUID.randomUUID().toString(),
             Arrays.<MockGrpcService>asList(
                 mockVideoIntelligenceService, mockStreamingVideoIntelligenceService));
     serviceHelper.start();

diff --git a/.../main/java/com/google/cloud/examples/videointelligence/v1p3beta1/VideoDetectLogoBeta.java b/.../main/java/com/google/cloud/examples/videointelligence/v1p3beta1/VideoDetectLogoBeta.java
@@ -78,6 +78,12 @@ public class VideoDetectLogoBeta {
    * import java.util.List;
    */
 
+  public static void sampleAnnotateVideo() {
+    // TODO(developer): Replace these variables before running the sample.
+    String localFilePath = "resources/googlework_short.mp4";
+    sampleAnnotateVideo(localFilePath);
+  }
+
   /**
    * Performs asynchronous video annotation for logo recognition from inline video content.
    *
@@ -86,7 +92,6 @@ public class VideoDetectLogoBeta {
   public static void sampleAnnotateVideo(String localFilePath) {
     try (VideoIntelligenceServiceClient videoIntelligenceServiceClient =
         VideoIntelligenceServiceClient.create()) {
-      // localFilePath = "resources/googlework_short.mp4";
       Path path = Paths.get(localFilePath);
       byte[] data = Files.readAllBytes(path);
       ByteString inputContent = ByteString.copyFrom(data);

diff --git a/synth.metadata b/synth.metadata
@@ -1,19 +1,19 @@
 {
-  "updateTime": "2019-11-14T09:04:19.758989Z",
+  "updateTime": "2019-11-19T20:04:44.279167Z",
   "sources": [
     {
       "generator": {
         "name": "artman",
-        "version": "0.41.1",
-        "dockerImage": "googleapis/artman@sha256:545c758c76c3f779037aa259023ec3d1ef2d57d2c8cd00a222cb187d63ceac5e"
+        "version": "0.42.1",
+        "dockerImage": "googleapis/artman@sha256:c773192618c608a7a0415dd95282f841f8e6bcdef7dd760a988c93b77a64bd57"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "bc76ffd87360ce1cd34e3a6eac28afd5e1efda76",
-        "internalRef": "280356106"
+        "sha": "5af83f47b9656261cafcf88b0b3334521ab266b3",
+        "internalRef": "281334391"
       }
     },
     {