From fb4f259a3ce69ee24370d3366e88742e8a26d047 Mon Sep 17 00:00:00 2001
From: Vikas Kedigehalli <vikasrk@google.com>
Date: Fri, 28 Apr 2017 12:12:43 -0700
Subject: [PATCH 1/2] Remove IOChannelUtils from a few ITs

---
 .../apache/beam/examples/WindowedWordCountIT.java  | 13 +++++++------
 .../java/org/apache/beam/examples/WordCountIT.java | 14 +++++++-------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/examples/java/src/test/java/org/apache/beam/examples/WindowedWordCountIT.java b/examples/java/src/test/java/org/apache/beam/examples/WindowedWordCountIT.java
index a53a1513f7e5..b5eddb5d17e7 100644
--- a/examples/java/src/test/java/org/apache/beam/examples/WindowedWordCountIT.java
+++ b/examples/java/src/test/java/org/apache/beam/examples/WindowedWordCountIT.java
@@ -34,6 +34,8 @@
 import org.apache.beam.examples.common.ExampleUtils;
 import org.apache.beam.examples.common.WriteOneFilePerWindow.PerWindowFiles;
 import org.apache.beam.sdk.PipelineResult;
+import org.apache.beam.sdk.io.FileSystems;
+import org.apache.beam.sdk.io.fs.ResolveOptions.StandardResolveOptions;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
 import org.apache.beam.sdk.options.StreamingOptions;
 import org.apache.beam.sdk.testing.FileChecksumMatcher;
@@ -44,7 +46,6 @@
 import org.apache.beam.sdk.transforms.windowing.IntervalWindow;
 import org.apache.beam.sdk.util.ExplicitShardedFile;
 import org.apache.beam.sdk.util.FluentBackoff;
-import org.apache.beam.sdk.util.IOChannelUtils;
 import org.apache.beam.sdk.util.NumberedShardedFile;
 import org.apache.beam.sdk.util.ShardedFile;
 import org.hamcrest.Description;
@@ -107,13 +108,13 @@ private WindowedWordCountITOptions defaultOptions() throws Exception {
     options.setWindowSize(10);
 
     options.setOutput(
-        IOChannelUtils.resolve(
-            options.getTempRoot(),
-            String.format(
+        FileSystems.matchNewResource(options.getTempRoot(), true)
+            .resolve(String.format(
                 "WindowedWordCountIT.%s-%tFT%<tH:%<tM:%<tS.%<tL+%s",
                 testName.getMethodName(), new Date(), ThreadLocalRandom.current().nextInt()),
-            "output",
-            "results"));
+                StandardResolveOptions.RESOLVE_DIRECTORY)
+            .resolve("output", StandardResolveOptions.RESOLVE_DIRECTORY)
+            .resolve("results", StandardResolveOptions.RESOLVE_FILE).toString());
     return options;
   }
 
diff --git a/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java b/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java
index 01438de336b0..1660b61d1672 100644
--- a/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java
+++ b/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java
@@ -20,11 +20,12 @@
 
 import java.util.Date;
 import org.apache.beam.examples.WordCount.WordCountOptions;
+import org.apache.beam.sdk.io.FileSystems;
+import org.apache.beam.sdk.io.fs.ResolveOptions.StandardResolveOptions;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
 import org.apache.beam.sdk.testing.FileChecksumMatcher;
 import org.apache.beam.sdk.testing.TestPipeline;
 import org.apache.beam.sdk.testing.TestPipelineOptions;
-import org.apache.beam.sdk.util.IOChannelUtils;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -35,7 +36,6 @@
  */
 @RunWith(JUnit4.class)
 public class WordCountIT {
-
   private static final String DEFAULT_INPUT =
       "gs://apache-beam-samples/shakespeare/winterstale-personae";
   private static final String DEFAULT_OUTPUT_CHECKSUM = "508517575eba8d8d5a54f7f0080a00951cfe84ca";
@@ -59,11 +59,11 @@ public void testE2EWordCount() throws Exception {
     WordCountITOptions options = TestPipeline.testingPipelineOptions().as(WordCountITOptions.class);
 
     options.setInputFile(DEFAULT_INPUT);
-    options.setOutput(IOChannelUtils.resolve(
-        options.getTempRoot(),
-        String.format("WordCountIT-%tF-%<tH-%<tM-%<tS-%<tL", new Date()),
-        "output",
-        "results"));
+    options.setOutput(FileSystems.matchNewResource(options.getTempRoot(), true)
+        .resolve(String.format("WordCountIT-%tF-%<tH-%<tM-%<tS-%<tL", new Date()),
+            StandardResolveOptions.RESOLVE_DIRECTORY)
+        .resolve("output", StandardResolveOptions.RESOLVE_DIRECTORY)
+        .resolve("results", StandardResolveOptions.RESOLVE_FILE).toString());
     options.setOnSuccessMatcher(
         new FileChecksumMatcher(DEFAULT_OUTPUT_CHECKSUM, options.getOutput() + "*-of-*"));
 

From 840c8e761a0902f32022d0ea360831c7d020cacc Mon Sep 17 00:00:00 2001
From: Vikas Kedigehalli <vikasrk@google.com>
Date: Fri, 28 Apr 2017 12:14:24 -0700
Subject: [PATCH 2/2] Use getFileName in NumberedShardedFile

---
 .../java/org/apache/beam/sdk/util/NumberedShardedFile.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/NumberedShardedFile.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/NumberedShardedFile.java
index fa22586deff0..e90438242409 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/NumberedShardedFile.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/NumberedShardedFile.java
@@ -195,8 +195,7 @@ List<String> readLines(Collection<Metadata> files) throws IOException {
   @VisibleForTesting
   boolean checkTotalNumOfFiles(Collection<Metadata> files) {
     for (Metadata fileMedadata : files) {
-      String fileName = fileMedadata.resourceId().toString().substring(
-          fileMedadata.resourceId().getCurrentDirectory().toString().length());
+      String fileName = fileMedadata.resourceId().getFilename();
 
       if (fileName == null) {
         // this path has zero elements