[BEAM-256] Address wrong import order and add millis to output path for WordCountIT
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/3f0eead5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/3f0eead5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/3f0eead5 Branch: refs/heads/master Commit: 3f0eead50525604221c5dc094d82d19d5230c4c5 Parents: 8fce48b Author: Luke Cwik <[email protected]> Authored: Tue May 3 20:02:28 2016 -0700 Committer: Luke Cwik <[email protected]> Committed: Tue May 3 20:02:28 2016 -0700 ---------------------------------------------------------------------- .../java/src/test/java/org/apache/beam/examples/WordCountIT.java | 2 +- .../main/java/org/apache/beam/sdk/testing/MatcherSerializer.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/3f0eead5/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java ---------------------------------------------------------------------- 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 a09ec02..503445e 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 @@ -47,7 +47,7 @@ public class WordCountIT { PipelineOptionsFactory.register(WordCountITOptions.class); WordCountITOptions options = TestPipeline.testingPipelineOptions().as(WordCountITOptions.class); options.setOutput(Joiner.on("/").join(new String[]{options.getTempRoot(), - String.format("WordCountIT-%tF-%<tH-%<tM-%<tS", new Date()), "output", "results"})); + String.format("WordCountIT-%tF-%<tH-%<tM-%<tS-%<tL", new Date()), "output", "results"})); WordCount.main(TestPipeline.convertToArgs(options)); } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/3f0eead5/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/MatcherSerializer.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/MatcherSerializer.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/MatcherSerializer.java index 0feeae0..8452486 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/MatcherSerializer.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/MatcherSerializer.java @@ -17,10 +17,10 @@ */ package org.apache.beam.sdk.testing; -import com.google.api.client.util.Base64; - import org.apache.beam.sdk.util.SerializableUtils; +import com.google.api.client.util.Base64; + import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonSerializer;
