chore: moving the rest of the vision samples (#291)

* chore: moving the rest of the vision samples * fixed pom issue * deleted facedetection app sample * refactored printout stream
GoogleCloudPlatform · Nov 2, 2020 · 3b8249c · 3b8249c
1 parent 39d19d4
commit 3b8249c
Show file tree

Hide file tree

Showing 42 changed files with 442 additions and 36 deletions.
diff --git a/vision/snippets/src/test/java/com/example/vision/AsyncBatchAnnotateImagesTest.java b/vision/snippets/src/test/java/com/example/vision/AsyncBatchAnnotateImagesTest.java
@@ -46,6 +46,7 @@ public class AsyncBatchAnnotateImagesTest {
 
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
 
   private static void requireEnvVar(String varName) {
     assertNotNull(
@@ -62,12 +63,14 @@ public static void checkRequirements() {
   public void setUp() {
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
   @After
   public void tearDown() {
-    System.setOut(null);
+    System.out.flush();
+    System.setOut(originalPrintStream);
 
     Storage storage = StorageOptions.getDefaultInstance().getService();
 

diff --git a/vision/snippets/src/test/java/com/example/vision/BatchAnnotateFilesGcsTest.java b/vision/snippets/src/test/java/com/example/vision/BatchAnnotateFilesGcsTest.java
@@ -33,17 +33,20 @@
 public class BatchAnnotateFilesGcsTest {
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
 
   @Before
   public void setUp() {
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
   @After
   public void tearDown() {
-    System.setOut(null);
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test

diff --git a/vision/snippets/src/test/java/com/example/vision/BatchAnnotateFilesTest.java b/vision/snippets/src/test/java/com/example/vision/BatchAnnotateFilesTest.java
@@ -33,17 +33,20 @@
 public class BatchAnnotateFilesTest {
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
 
   @Before
   public void setUp() {
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
   @After
   public void tearDown() {
-    System.setOut(null);
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test

diff --git a/vision/snippets/src/test/java/com/example/vision/DetectBetaIT.java b/vision/snippets/src/test/java/com/example/vision/DetectBetaIT.java
@@ -43,19 +43,22 @@ public class DetectBetaIT {
   private static final String OUTPUT_PREFIX = "OUTPUT_VISION_BETA_" + UUID.randomUUID().toString();
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
   private DetectBeta app;
 
   @Before
   public void setUp() throws IOException {
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
     app = new DetectBeta();
   }
 
   @After
   public void tearDown() {
-    System.setOut(null);
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test

diff --git a/vision/snippets/src/test/java/com/example/vision/DetectCropHintsGcsTest.java b/vision/snippets/src/test/java/com/example/vision/DetectCropHintsGcsTest.java
@@ -36,17 +36,20 @@ public class DetectCropHintsGcsTest {
 
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
 
   @Before
   public void setUp() {
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
   @After
   public void tearDown() {
-    System.setOut(null);
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test

diff --git a/vision/snippets/src/test/java/com/example/vision/DetectCropHintsTest.java b/vision/snippets/src/test/java/com/example/vision/DetectCropHintsTest.java
@@ -33,17 +33,20 @@
 public class DetectCropHintsTest {
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
 
   @Before
   public void setUp() {
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
   @After
   public void tearDown() {
-    System.setOut(null);
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test

diff --git a/vision/snippets/src/test/java/com/example/vision/DetectFacesGcsTest.java b/vision/snippets/src/test/java/com/example/vision/DetectFacesGcsTest.java
@@ -35,17 +35,20 @@ public class DetectFacesGcsTest {
 
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
 
   @Before
   public void setUp() {
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
   @After
   public void tearDown() {
-    System.setOut(null);
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test

diff --git a/vision/snippets/src/test/java/com/example/vision/DetectFacesTest.java b/vision/snippets/src/test/java/com/example/vision/DetectFacesTest.java
@@ -32,17 +32,20 @@
 public class DetectFacesTest {
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
 
   @Before
   public void setUp() {
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
   @After
   public void tearDown() {
-    System.setOut(null);
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test

diff --git a/vision/snippets/src/test/java/com/example/vision/DetectIT.java b/vision/snippets/src/test/java/com/example/vision/DetectIT.java
@@ -38,6 +38,7 @@
 public class DetectIT {
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
   private static final String ASSET_BUCKET = "cloud-samples-data";
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
   private static final String OUTPUT_BUCKET = PROJECT_ID;
@@ -47,12 +48,14 @@ public class DetectIT {
   public void setUp() {
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
   @After
   public void tearDown() {
-    System.setOut(null);
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test

diff --git a/vision/snippets/src/test/java/com/example/vision/DetectLabelsGcsTest.java b/vision/snippets/src/test/java/com/example/vision/DetectLabelsGcsTest.java
@@ -34,17 +34,20 @@ public class DetectLabelsGcsTest {
 
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
 
   @Before
   public void setUp() {
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
   @After
   public void tearDown() {
-    System.setOut(null);
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test

diff --git a/vision/snippets/src/test/java/com/example/vision/DetectLabelsTest.java b/vision/snippets/src/test/java/com/example/vision/DetectLabelsTest.java
@@ -32,17 +32,20 @@
 public class DetectLabelsTest {
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
 
   @Before
   public void setUp() {
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
   @After
   public void tearDown() {
-    System.setOut(null);
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test

diff --git a/vision/snippets/src/test/java/com/example/vision/DetectLandmarksGcsTest.java b/vision/snippets/src/test/java/com/example/vision/DetectLandmarksGcsTest.java
@@ -36,17 +36,20 @@ public class DetectLandmarksGcsTest {
 
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
 
   @Before
   public void setUp() {
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
   @After
   public void tearDown() {
-    System.setOut(null);
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test

diff --git a/vision/snippets/src/test/java/com/example/vision/DetectLandmarksTest.java b/vision/snippets/src/test/java/com/example/vision/DetectLandmarksTest.java
@@ -32,17 +32,20 @@
 public class DetectLandmarksTest {
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
 
   @Before
   public void setUp() {
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
   @After
   public void tearDown() {
-    System.setOut(null);
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test

diff --git a/vision/snippets/src/test/java/com/example/vision/DetectLogosGcsTest.java b/vision/snippets/src/test/java/com/example/vision/DetectLogosGcsTest.java
@@ -35,17 +35,20 @@ public class DetectLogosGcsTest {
 
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
 
   @Before
   public void setUp() {
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
   @After
   public void tearDown() {
-    System.setOut(null);
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test

diff --git a/vision/snippets/src/test/java/com/example/vision/DetectLogosTest.java b/vision/snippets/src/test/java/com/example/vision/DetectLogosTest.java
@@ -32,17 +32,20 @@
 public class DetectLogosTest {
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
 
   @Before
   public void setUp() {
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
   @After
   public void tearDown() {
-    System.setOut(null);
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test

diff --git a/vision/snippets/src/test/java/com/example/vision/DetectPropertiesGcsTest.java b/vision/snippets/src/test/java/com/example/vision/DetectPropertiesGcsTest.java
@@ -35,17 +35,20 @@ public class DetectPropertiesGcsTest {
 
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
 
   @Before
   public void setUp() {
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
   @After
   public void tearDown() {
-    System.setOut(null);
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test

diff --git a/vision/snippets/src/test/java/com/example/vision/DetectPropertiesTest.java b/vision/snippets/src/test/java/com/example/vision/DetectPropertiesTest.java
@@ -32,17 +32,20 @@
 public class DetectPropertiesTest {
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
 
   @Before
   public void setUp() {
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
   @After
   public void tearDown() {
-    System.setOut(null);
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test