Repository: incubator-beam Updated Branches: refs/heads/master 8f5ce28dc -> 2596d136d
fix javadoc issue Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/1acfe33c Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/1acfe33c Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/1acfe33c Branch: refs/heads/master Commit: 1acfe33c95b0c63c34421234bb28a241e4ec2d9a Parents: 7ff15aa Author: Mark Liu <[email protected]> Authored: Wed Jul 13 12:08:19 2016 -0700 Committer: Luke Cwik <[email protected]> Committed: Wed Jul 13 12:42:07 2016 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/beam/sdk/util/IOChannelUtils.java | 2 +- .../test/java/org/apache/beam/sdk/util/IOChannelUtilsTest.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/1acfe33c/sdks/java/core/src/main/java/org/apache/beam/sdk/util/IOChannelUtils.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/IOChannelUtils.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/IOChannelUtils.java index 2994bf3..efb0ff6 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/IOChannelUtils.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/IOChannelUtils.java @@ -190,7 +190,7 @@ public class IOChannelUtils { /** * Resolve multiple {@code others} against the {@code path} sequentially. * - * Empty paths in {@code others} are ignored. If {@code others} contains one or more + * <p>Empty paths in {@code others} are ignored. If {@code others} contains one or more * absolute paths, then this method returns a path that starts with the last absolute path * in {@code others} joined with the remaining paths. Resolution of paths is highly * implementation dependent and therefore unspecified. http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/1acfe33c/sdks/java/core/src/test/java/org/apache/beam/sdk/util/IOChannelUtilsTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/IOChannelUtilsTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/util/IOChannelUtilsTest.java index eb35cbe..8db2f75 100644 --- a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/IOChannelUtilsTest.java +++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/util/IOChannelUtilsTest.java @@ -95,10 +95,10 @@ public class IOChannelUtilsTest { } @Test - public void testResolveMultiplePaths() throws IOException { + public void testResolveMultiplePaths() throws Exception { String expected = - tmpFolder.getRoot().toPath().resolve("aa").resolve("bb").resolve("cc").toString(); + tmpFolder.getRoot().toPath().resolve("aa").resolve("bb").resolve("cc").toString(); assertEquals(expected, - IOChannelUtils.resolve(tmpFolder.getRoot().getPath(), "aa", "bb", "cc")); + IOChannelUtils.resolve(tmpFolder.getRoot().getPath(), "aa", "bb", "cc")); } }
