You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by bc...@apache.org on 2016/04/26 19:11:55 UTC
[1/4] incubator-beam git commit: Add super.populateDisplayData() to
standard implementations. The current super implementation is a no-op,
but this is the recommended way to implement the pattern
Repository: incubator-beam
Updated Branches:
refs/heads/master d299e2c25 -> 7dc1a4047
Add super.populateDisplayData() to standard implementations. The current super implementation is a no-op, but this is the recommended way to implement the pattern
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/c6690c18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/c6690c18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/c6690c18
Branch: refs/heads/master
Commit: c6690c18a64ec6c7971712ab43807b13c1849571
Parents: 9d45a4a
Author: Scott Wegner <sw...@google.com>
Authored: Mon Apr 25 09:41:07 2016 -0700
Committer: bchambers <bc...@google.com>
Committed: Tue Apr 26 09:39:01 2016 -0700
----------------------------------------------------------------------
.../main/java/org/apache/beam/sdk/io/DatastoreIO.java | 1 +
.../core/src/main/java/org/apache/beam/sdk/io/Read.java | 2 ++
.../core/src/main/java/org/apache/beam/sdk/io/Write.java | 1 +
.../apache/beam/sdk/transforms/ApproximateQuantiles.java | 1 +
.../apache/beam/sdk/transforms/ApproximateUnique.java | 2 ++
.../java/org/apache/beam/sdk/transforms/Combine.java | 11 +++++++++++
.../java/org/apache/beam/sdk/transforms/CombineFns.java | 4 ++++
.../apache/beam/sdk/transforms/CombineWithContext.java | 1 +
.../main/java/org/apache/beam/sdk/transforms/Filter.java | 4 ++++
.../java/org/apache/beam/sdk/transforms/GroupByKey.java | 1 +
.../beam/sdk/transforms/IntraBundleParallelization.java | 1 +
.../main/java/org/apache/beam/sdk/transforms/Max.java | 1 +
.../main/java/org/apache/beam/sdk/transforms/Min.java | 1 +
.../main/java/org/apache/beam/sdk/transforms/ParDo.java | 2 ++
.../java/org/apache/beam/sdk/transforms/Partition.java | 2 ++
.../main/java/org/apache/beam/sdk/transforms/Sample.java | 2 ++
.../main/java/org/apache/beam/sdk/transforms/Top.java | 1 +
.../beam/sdk/transforms/windowing/CalendarWindows.java | 6 ++++++
.../beam/sdk/transforms/windowing/FixedWindows.java | 1 +
.../apache/beam/sdk/transforms/windowing/Sessions.java | 1 +
.../beam/sdk/transforms/windowing/SlidingWindows.java | 1 +
.../org/apache/beam/sdk/transforms/windowing/Window.java | 1 +
.../java/org/apache/beam/sdk/util/CombineFnUtil.java | 1 +
23 files changed, 49 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6690c18/sdks/java/core/src/main/java/org/apache/beam/sdk/io/DatastoreIO.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/DatastoreIO.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/DatastoreIO.java
index 4348950..c265659 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/DatastoreIO.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/DatastoreIO.java
@@ -604,6 +604,7 @@ public class DatastoreIO {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
builder
.addIfNotDefault("host", host, DEFAULT_HOST)
.addIfNotNull("dataset", datasetId);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6690c18/sdks/java/core/src/main/java/org/apache/beam/sdk/io/Read.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/Read.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/Read.java
index 1f41e5c..05b70ac 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/Read.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/Read.java
@@ -147,6 +147,7 @@ public class Read {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
builder
.add("source", source.getClass())
.include(source);
@@ -261,6 +262,7 @@ public class Read {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
builder
.add("source", source.getClass())
.include(source);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6690c18/sdks/java/core/src/main/java/org/apache/beam/sdk/io/Write.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/Write.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/Write.java
index b8fa259..a7d182d 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/Write.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/Write.java
@@ -79,6 +79,7 @@ public class Write {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
builder
.add("sink", sink.getClass())
.include(sink);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6690c18/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/ApproximateQuantiles.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/ApproximateQuantiles.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/ApproximateQuantiles.java
index c58c736..dd99b9a 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/ApproximateQuantiles.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/ApproximateQuantiles.java
@@ -363,6 +363,7 @@ public class ApproximateQuantiles {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
builder
.add("numQuantiles", numQuantiles)
.add("comparer", compareFn.getClass());
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6690c18/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/ApproximateUnique.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/ApproximateUnique.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/ApproximateUnique.java
index 175897b..46bad0c 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/ApproximateUnique.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/ApproximateUnique.java
@@ -216,6 +216,7 @@ public class ApproximateUnique {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
ApproximateUnique.populateDisplayData(builder, sampleSize, maximumEstimationError);
}
}
@@ -289,6 +290,7 @@ public class ApproximateUnique {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
ApproximateUnique.populateDisplayData(builder, sampleSize, maximumEstimationError);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6690c18/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Combine.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Combine.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Combine.java
index 3566fa5..b13b0fc 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Combine.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Combine.java
@@ -515,6 +515,7 @@ public class Combine {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
CombineFn.this.populateDisplayData(builder);
}
};
@@ -1193,6 +1194,7 @@ public class Combine {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
KeyedCombineFn.this.populateDisplayData(builder);
}
};
@@ -1378,6 +1380,8 @@ public class Combine {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
+
Combine.populateDisplayData(builder, fn, fnClass);
Combine.populateGlobalDisplayData(builder, fanout, insertDefault);
}
@@ -1507,6 +1511,8 @@ public class Combine {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
+
Combine.populateDisplayData(builder, fn, fnClass);
Combine.populateGlobalDisplayData(builder, fanout, insertDefault);
}
@@ -1591,6 +1597,7 @@ public class Combine {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
builder.add("combineFn", combiner.getClass());
}
@@ -1772,6 +1779,7 @@ public class Combine {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
Combine.populateDisplayData(builder, fn, fnClass);
}
}
@@ -2077,6 +2085,8 @@ public class Combine {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
+
Combine.populateDisplayData(builder, fn, fnClass);
builder.add("fanoutFn", hotKeyFanout.getClass());
}
@@ -2333,6 +2343,7 @@ public class Combine {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
Combine.populateDisplayData(builder, fn, fnClass);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6690c18/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/CombineFns.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/CombineFns.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/CombineFns.java
index ed45498..a9500d8 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/CombineFns.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/CombineFns.java
@@ -464,6 +464,7 @@ public class CombineFns {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
CombineFns.populateDisplayData(builder, combineFns);
}
}
@@ -602,6 +603,7 @@ public class CombineFns {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
CombineFns.populateDisplayData(builder, combineFnWithContexts);
}
}
@@ -788,6 +790,7 @@ public class CombineFns {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
CombineFns.populateDisplayData(builder, keyedCombineFns);
}
}
@@ -939,6 +942,7 @@ public class CombineFns {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
CombineFns.populateDisplayData(builder, keyedCombineFns);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6690c18/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/CombineWithContext.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/CombineWithContext.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/CombineWithContext.java
index 9bb4a01..9722360 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/CombineWithContext.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/CombineWithContext.java
@@ -171,6 +171,7 @@ public class CombineWithContext {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
CombineFnWithContext.this.populateDisplayData(builder);
}
};
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6690c18/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Filter.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Filter.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Filter.java
index 0e5e4a6..0108958 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Filter.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Filter.java
@@ -103,6 +103,7 @@ public class Filter<T> extends PTransform<PCollection<T>, PCollection<T>> {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
Filter.populateDisplayData(builder, String.format("x < %s", value));
}
});
@@ -141,6 +142,7 @@ public class Filter<T> extends PTransform<PCollection<T>, PCollection<T>> {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
Filter.populateDisplayData(builder, String.format("x > %s", value));
}
});
@@ -178,6 +180,7 @@ public class Filter<T> extends PTransform<PCollection<T>, PCollection<T>> {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
Filter.populateDisplayData(builder, String.format("x ≤ %s", value));
}
});
@@ -215,6 +218,7 @@ public class Filter<T> extends PTransform<PCollection<T>, PCollection<T>> {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
Filter.populateDisplayData(builder, String.format("x ≥ %s", value));
}
});
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6690c18/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/GroupByKey.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/GroupByKey.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/GroupByKey.java
index 1b3c454..0e46a2a 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/GroupByKey.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/GroupByKey.java
@@ -277,6 +277,7 @@ public class GroupByKey<K, V>
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
if (fewKeys) {
builder.add("fewKeys", true);
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6690c18/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/IntraBundleParallelization.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/IntraBundleParallelization.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/IntraBundleParallelization.java
index 1b91562..36149ca 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/IntraBundleParallelization.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/IntraBundleParallelization.java
@@ -176,6 +176,7 @@ public class IntraBundleParallelization {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
builder
.add("maxParallelism", maxParallelism)
.add("fn", doFn.getClass())
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6690c18/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Max.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Max.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Max.java
index 28749d7..96900b4 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Max.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Max.java
@@ -208,6 +208,7 @@ public class Max {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
builder.add("comparer", comparator.getClass());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6690c18/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Min.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Min.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Min.java
index 8f3082e..7d69c5a 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Min.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Min.java
@@ -208,6 +208,7 @@ public class Min {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
builder.add("comparer", comparator.getClass());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6690c18/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/ParDo.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/ParDo.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/ParDo.java
index cb1df18..547486d 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/ParDo.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/ParDo.java
@@ -814,6 +814,7 @@ public class ParDo {
*/
@Override
public void populateDisplayData(Builder builder) {
+ super.populateDisplayData(builder);
ParDo.populateDisplayData(builder, fn, fnClass);
}
@@ -1051,6 +1052,7 @@ public class ParDo {
@Override
public void populateDisplayData(Builder builder) {
+ super.populateDisplayData(builder);
ParDo.populateDisplayData(builder, fn, fnClass);
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6690c18/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Partition.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Partition.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Partition.java
index 5366fd0..fbdb9be 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Partition.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Partition.java
@@ -124,6 +124,7 @@ public class Partition<T> extends PTransform<PCollection<T>, PCollectionList<T>>
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
builder.include(partitionDoFn);
}
@@ -179,6 +180,7 @@ public class Partition<T> extends PTransform<PCollection<T>, PCollectionList<T>>
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
builder
.add("numPartitions", numPartitions)
.add("partitionFn", partitionFn.getClass());
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6690c18/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Sample.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Sample.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Sample.java
index 6362bd4..2fba5e3 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Sample.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Sample.java
@@ -157,6 +157,7 @@ public class Sample {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
builder.add("sampleSize", limit);
}
}
@@ -256,6 +257,7 @@ public class Sample {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
builder.add("sampleSize", sampleSize);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6690c18/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Top.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Top.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Top.java
index 4b366bc..2d38e04 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Top.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Top.java
@@ -395,6 +395,7 @@ new TopCombineFn<>(count, new Largest<V>()).<K>asKeyedFn())
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
builder
.add("count", count)
.add("comparer", compareFn.getClass());
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6690c18/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/CalendarWindows.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/CalendarWindows.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/CalendarWindows.java
index 8656537..3084059 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/CalendarWindows.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/CalendarWindows.java
@@ -147,6 +147,8 @@ public class CalendarWindows {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
+
builder
.add("numDays", number)
.addIfNotDefault("startDate", new DateTime(startDate, timeZone).toInstant(),
@@ -242,6 +244,8 @@ public class CalendarWindows {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
+
builder
.add("numMonths", number)
.addIfNotDefault("startDate", new DateTime(startDate, timeZone).toInstant(),
@@ -346,6 +350,8 @@ public class CalendarWindows {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
+
builder
.add("numYears", number)
.addIfNotDefault("startDate", new DateTime(startDate, timeZone).toInstant(),
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6690c18/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/FixedWindows.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/FixedWindows.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/FixedWindows.java
index bba1f3b..fdffebe 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/FixedWindows.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/FixedWindows.java
@@ -85,6 +85,7 @@ public class FixedWindows extends PartitioningWindowFn<Object, IntervalWindow> {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
builder
.add("size", size)
.addIfNotDefault("offset", offset, Duration.ZERO);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6690c18/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Sessions.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Sessions.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Sessions.java
index 74ca268..7010256 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Sessions.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Sessions.java
@@ -100,6 +100,7 @@ public class Sessions extends WindowFn<Object, IntervalWindow> {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
builder.add("gapDuration", gapDuration);
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6690c18/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/SlidingWindows.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/SlidingWindows.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/SlidingWindows.java
index abb4078..bbbedad 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/SlidingWindows.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/SlidingWindows.java
@@ -142,6 +142,7 @@ public class SlidingWindows extends NonMergingWindowFn<Object, IntervalWindow> {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
builder
.add("size", size)
.add("period", period)
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6690c18/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Window.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Window.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Window.java
index da512b8..b751bec 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Window.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Window.java
@@ -598,6 +598,7 @@ public class Window {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
builder
.add("windowFn", windowFn.getClass())
.include(windowFn)
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6690c18/sdks/java/core/src/main/java/org/apache/beam/sdk/util/CombineFnUtil.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/CombineFnUtil.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/CombineFnUtil.java
index 34197f7..351a158 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/CombineFnUtil.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/CombineFnUtil.java
@@ -104,6 +104,7 @@ public class CombineFnUtil {
}
@Override
public void populateDisplayData(DisplayData.Builder builder) {
+ super.populateDisplayData(builder);
combineFn.populateDisplayData(builder);
}
};
[2/4] incubator-beam git commit: Normalize comments to refer to
'display data' rather than 'display metadata'
Posted by bc...@apache.org.
Normalize comments to refer to 'display data' rather than 'display metadata'
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/9d45a4a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/9d45a4a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/9d45a4a1
Branch: refs/heads/master
Commit: 9d45a4a11dcf66434c3d434d31900487471dcbe3
Parents: 582befd
Author: Scott Wegner <sw...@google.com>
Authored: Mon Apr 25 09:34:58 2016 -0700
Committer: bchambers <bc...@google.com>
Committed: Tue Apr 26 09:39:01 2016 -0700
----------------------------------------------------------------------
.../main/java/org/apache/beam/sdk/io/Sink.java | 2 +-
.../java/org/apache/beam/sdk/io/Source.java | 2 +-
.../beam/sdk/transforms/CombineFnBase.java | 4 +-
.../org/apache/beam/sdk/transforms/DoFn.java | 2 +-
.../beam/sdk/transforms/DoFnWithContext.java | 2 +-
.../apache/beam/sdk/transforms/PTransform.java | 2 +-
.../org/apache/beam/sdk/transforms/ParDo.java | 2 +-
.../sdk/transforms/display/ClassForDisplay.java | 4 +-
.../sdk/transforms/display/DisplayData.java | 58 ++++++++++----------
.../sdk/transforms/display/HasDisplayData.java | 8 +--
.../beam/sdk/transforms/windowing/WindowFn.java | 2 +-
11 files changed, 44 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/9d45a4a1/sdks/java/core/src/main/java/org/apache/beam/sdk/io/Sink.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/Sink.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/Sink.java
index 8b6b637..20b1631 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/Sink.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/Sink.java
@@ -139,7 +139,7 @@ public abstract class Sink<T> implements Serializable, HasDisplayData {
* {@inheritDoc}
*
* <p>By default, does not register any display data. Implementors may override this method
- * to provide their own display metadata.
+ * to provide their own display data.
*/
@Override
public void populateDisplayData(DisplayData.Builder builder) {}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/9d45a4a1/sdks/java/core/src/main/java/org/apache/beam/sdk/io/Source.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/Source.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/Source.java
index 2ab0d4e..b8902f9 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/Source.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/Source.java
@@ -72,7 +72,7 @@ public abstract class Source<T> implements Serializable, HasDisplayData {
* {@inheritDoc}
*
* <p>By default, does not register any display data. Implementors may override this method
- * to provide their own display metadata.
+ * to provide their own display data.
*/
@Override
public void populateDisplayData(DisplayData.Builder builder) {}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/9d45a4a1/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/CombineFnBase.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/CombineFnBase.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/CombineFnBase.java
index 1b64bb2..c73ba54 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/CombineFnBase.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/CombineFnBase.java
@@ -225,7 +225,7 @@ public class CombineFnBase {
* {@inheritDoc}
*
* <p>By default, does not register any display data. Implementors may override this method
- * to provide their own display metadata.
+ * to provide their own display data.
*/
@Override
public void populateDisplayData(DisplayData.Builder builder) {
@@ -300,7 +300,7 @@ public class CombineFnBase {
* {@inheritDoc}
*
* <p>By default, does not register any display data. Implementors may override this method
- * to provide their own display metadata.
+ * to provide their own display data.
*/
@Override
public void populateDisplayData(DisplayData.Builder builder) {
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/9d45a4a1/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/DoFn.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/DoFn.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/DoFn.java
index 04f272d..6d5d1ed 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/DoFn.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/DoFn.java
@@ -374,7 +374,7 @@ public abstract class DoFn<InputT, OutputT> implements Serializable, HasDisplayD
* {@inheritDoc}
*
* <p>By default, does not register any display data. Implementors may override this method
- * to provide their own display metadata.
+ * to provide their own display data.
*/
@Override
public void populateDisplayData(DisplayData.Builder builder) {
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/9d45a4a1/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/DoFnWithContext.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/DoFnWithContext.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/DoFnWithContext.java
index 7143626..8a83e44 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/DoFnWithContext.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/DoFnWithContext.java
@@ -421,7 +421,7 @@ public abstract class DoFnWithContext<InputT, OutputT> implements Serializable,
* {@inheritDoc}
*
* <p>By default, does not register any display data. Implementors may override this method
- * to provide their own display metadata.
+ * to provide their own display data.
*/
@Override
public void populateDisplayData(DisplayData.Builder builder) {
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/9d45a4a1/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/PTransform.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/PTransform.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/PTransform.java
index d502b93..4bcfb29 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/PTransform.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/PTransform.java
@@ -317,7 +317,7 @@ public abstract class PTransform<InputT extends PInput, OutputT extends POutput>
* {@inheritDoc}
*
* <p>By default, does not register any display data. Implementors may override this method
- * to provide their own display metadata.
+ * to provide their own display data.
*/
@Override
public void populateDisplayData(Builder builder) {
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/9d45a4a1/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/ParDo.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/ParDo.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/ParDo.java
index 02464ac..cb1df18 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/ParDo.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/ParDo.java
@@ -808,7 +808,7 @@ public class ParDo {
/**
* {@inheritDoc}
*
- * <p>{@link ParDo} registers its internal {@link DoFn} as a subcomponent for display metadata.
+ * <p>{@link ParDo} registers its internal {@link DoFn} as a subcomponent for display data.
* {@link DoFn} implementations can register display data by overriding
* {@link DoFn#populateDisplayData}.
*/
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/9d45a4a1/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/display/ClassForDisplay.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/display/ClassForDisplay.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/display/ClassForDisplay.java
index 455d6e1..3e31c1e 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/display/ClassForDisplay.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/display/ClassForDisplay.java
@@ -23,9 +23,9 @@ import java.io.Serializable;
import java.util.Objects;
/**
- * Display metadata representing a Java class.
+ * Display data representing a Java class.
*
- * <p>Java classes can be registered as display metadata via
+ * <p>Java classes can be registered as display data via
* {@link DisplayData.Builder#add(String, ClassForDisplay)}. {@link ClassForDisplay} is
* serializable, unlike {@link Class} which can fail to serialize for Java 8 lambda functions.
*/
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/9d45a4a1/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/display/DisplayData.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/display/DisplayData.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/display/DisplayData.java
index a1037a8..c119057 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/display/DisplayData.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/display/DisplayData.java
@@ -44,7 +44,7 @@ import java.util.Objects;
import java.util.Set;
/**
- * Static display metadata associated with a pipeline component. Display data is useful for
+ * Static display data associated with a pipeline component. Display data is useful for
* pipeline runner UIs and diagnostic dashboards to display details about
* {@link PTransform PTransforms} that make up a pipeline.
*
@@ -148,41 +148,41 @@ public class DisplayData {
}
/**
- * Utility to build up display metadata from a component and its included
+ * Utility to build up display data from a component and its included
* subcomponents.
*/
public interface Builder {
/**
- * Register display metadata from the specified subcomponent.
+ * Register display data from the specified subcomponent.
*
* @see #include(HasDisplayData, String)
*/
Builder include(HasDisplayData subComponent);
/**
- * Register display metadata from the specified subcomponent, using the specified namespace.
+ * Register display data from the specified subcomponent, using the specified namespace.
*
* @see #include(HasDisplayData, String)
*/
Builder include(HasDisplayData subComponent, Class<?> namespace);
/**
- * Register display metadata from the specified subcomponent, using the specified namespace.
+ * Register display data from the specified subcomponent, using the specified namespace.
*
* @see #include(HasDisplayData, String)
*/
Builder include(HasDisplayData subComponent, ClassForDisplay namespace);
/**
- * Register display metadata from the specified subcomponent, using the specified namespace.
+ * Register display data from the specified subcomponent, using the specified namespace.
*
- * <p>For example, a {@link ParDo} transform includes display metadata from the encapsulated
+ * <p>For example, a {@link ParDo} transform includes display data from the encapsulated
* {@link DoFn}.
*/
Builder include(HasDisplayData subComponent, String namespace);
/**
- * Register the given string display metadata. The metadata item will be registered with type
+ * Register the given string display data. The metadata item will be registered with type
* {@link DisplayData.Type#STRING}, and is identified by the specified key and namespace from
* the current transform or component.
*/
@@ -203,7 +203,7 @@ public class DisplayData {
ItemBuilder addIfNotDefault(String key, @Nullable String value, @Nullable String defaultValue);
/**
- * Register the given numeric display metadata. The metadata item will be registered with type
+ * Register the given numeric display data. The metadata item will be registered with type
* {@link DisplayData.Type#INTEGER}, and is identified by the specified key and namespace from
* the current transform or component.
*/
@@ -224,7 +224,7 @@ public class DisplayData {
ItemBuilder addIfNotDefault(String key, long value, long defaultValue);
/**
- * Register the given floating point display metadata. The metadata item will be registered with
+ * Register the given floating point display data. The metadata item will be registered with
* type {@link DisplayData.Type#FLOAT}, and is identified by the specified key and namespace
* from the current transform or component.
*/
@@ -246,7 +246,7 @@ public class DisplayData {
ItemBuilder addIfNotDefault(String key, double value, double defaultValue);
/**
- * Register the given boolean display metadata. The metadata item will be registered with
+ * Register the given boolean display data. The metadata item will be registered with
* type {@link DisplayData.Type#BOOLEAN}, and is identified by the specified key and namespace
* from the current transform or component.
*/
@@ -267,7 +267,7 @@ public class DisplayData {
ItemBuilder addIfNotDefault(String key, boolean value, boolean defaultValue);
/**
- * Register the given timestamp display metadata. The metadata item will be registered with type
+ * Register the given timestamp display data. The metadata item will be registered with type
* {@link DisplayData.Type#TIMESTAMP}, and is identified by the specified key and namespace from
* the current transform or component.
*/
@@ -290,7 +290,7 @@ public class DisplayData {
String key, @Nullable Instant value, @Nullable Instant defaultValue);
/**
- * Register the given duration display metadata. The metadata item will be registered with type
+ * Register the given duration display data. The metadata item will be registered with type
* {@link DisplayData.Type#DURATION}, and is identified by the specified key and namespace from
* the current transform or component.
*/
@@ -313,14 +313,14 @@ public class DisplayData {
String key, @Nullable Duration value, @Nullable Duration defaultValue);
/**
- * Register the given class display metadata. The metadata item will be registered with type
+ * Register the given class display data. The metadata item will be registered with type
* {@link DisplayData.Type#JAVA_CLASS}, and is identified by the specified key and namespace
* from the current transform or component.
*/
ItemBuilder add(String key, Class<?> value);
/**
- * Register the given class display metadata. The metadata item will be registered with type
+ * Register the given class display data. The metadata item will be registered with type
* {@link DisplayData.Type#JAVA_CLASS}, and is identified by the specified key and namespace
* from the current transform or component.
*/
@@ -356,7 +356,7 @@ public class DisplayData {
ItemBuilder addIfNotDefault(
String key, @Nullable ClassForDisplay value, @Nullable ClassForDisplay defaultValue);
/**
- * Register the given display metadata with the specified type.
+ * Register the given display data with the specified type.
*
* <p> The added display data is identified by the specified key and namespace from the current
* transform or component.
@@ -369,7 +369,7 @@ public class DisplayData {
}
/**
- * Utility to append optional fields to display metadata, or register additional display metadata
+ * Utility to append optional fields to display data, or register additional display data
* items.
*/
public interface ItemBuilder extends Builder {
@@ -383,7 +383,7 @@ public class DisplayData {
ItemBuilder withLabel(@Nullable String label);
/**
- * Add a link URL to the most-recently added display metadata. A link URL is optional and
+ * Add a link URL to the most-recently added display data. A link URL is optional and
* can be provided to point the reader to additional details about the metadata.
*
* <p>Specifying a null value will clear the URL if it was previously defined.
@@ -391,16 +391,16 @@ public class DisplayData {
ItemBuilder withLinkUrl(@Nullable String url);
/**
- * Adds an explicit namespace to the most-recently added display metadata. The namespace
- * and key uniquely identify the display metadata.
+ * Adds an explicit namespace to the most-recently added display data. The namespace
+ * and key uniquely identify the display data.
*
* <p>Leaving the namespace unspecified will default to the registering instance's class.
*/
ItemBuilder withNamespace(Class<?> namespace);
/**
- * Adds an explicit namespace to the most-recently added display metadata. The namespace
- * and key uniquely identify the display metadata.
+ * Adds an explicit namespace to the most-recently added display data. The namespace
+ * and key uniquely identify the display data.
*
* <p>Leaving the namespace unspecified will default to the registering instance's class.
*/
@@ -408,7 +408,7 @@ public class DisplayData {
}
/**
- * A display metadata item. DisplayData items are registered via {@link Builder#add} within
+ * A display data item. DisplayData items are registered via {@link Builder#add} within
* {@link HasDisplayData#populateDisplayData} implementations. Each metadata item is uniquely
* identified by the specified key and namespace generated from the registering component's
* class name.
@@ -456,7 +456,7 @@ public class DisplayData {
}
/**
- * Retrieve the {@link DisplayData.Type} of display metadata. All metadata conforms to a
+ * Retrieve the {@link DisplayData.Type} of display data. All metadata conforms to a
* predefined set of allowed types.
*/
@JsonGetter("type")
@@ -501,7 +501,7 @@ public class DisplayData {
/**
* Retrieve the optional link URL for an item. The URL points to an address where the reader
- * can find additional context for the display metadata.
+ * can find additional context for the display data.
*
* <p>If no URL was specified, this will return {@code null}.
*/
@@ -561,11 +561,11 @@ public class DisplayData {
}
/**
- * Unique identifier for a display metadata item within a component.
+ * Unique identifier for a display data item within a component.
* Identifiers are composed of the key they are registered with and a namespace generated from
* the class of the component which registered the item.
*
- * <p>Display metadata registered with the same key from different components will have different
+ * <p>Display data registered with the same key from different components will have different
* namespaces and thus will both be represented in the composed {@link DisplayData}. If a
* single component registers multiple metadata items with the same key, only the most recent
* item will be retained; previous versions are discarded.
@@ -618,7 +618,7 @@ public class DisplayData {
}
/**
- * Display metadata type.
+ * Display data type.
*/
public enum Type {
STRING {
@@ -689,7 +689,7 @@ public class DisplayData {
}
/**
- * Format the display metadata value into a long string representation, and optionally
+ * Format the display data value into a long string representation, and optionally
* a shorter representation for display.
*
* <p>Internal-only. Value objects can be safely cast to the expected Java type.
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/9d45a4a1/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/display/HasDisplayData.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/display/HasDisplayData.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/display/HasDisplayData.java
index b295d97..b264a14 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/display/HasDisplayData.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/display/HasDisplayData.java
@@ -21,16 +21,16 @@ import org.apache.beam.sdk.transforms.PTransform;
/**
* Marker interface for {@link PTransform PTransforms} and components used within
- * {@link PTransform PTransforms} to specify display metadata to be used within UIs and diagnostic
+ * {@link PTransform PTransforms} to specify display data to be used within UIs and diagnostic
* tools.
*
- * <p>Display metadata is optional and may be collected during pipeline construction. It should
+ * <p>Display data is optional and may be collected during pipeline construction. It should
* only be used to informational purposes. Tools and components should not assume that display data
* will always be collected, or that collected display data will always be displayed.
*/
public interface HasDisplayData {
/**
- * Register display metadata for the given transform or component. Metadata can be registered
+ * Register display data for the given transform or component. Metadata can be registered
* directly on the provided builder, as well as via included sub-components.
*
* <pre>
@@ -49,7 +49,7 @@ public interface HasDisplayData {
* }
* </pre>
*
- * @param builder The builder to populate with display metadata.
+ * @param builder The builder to populate with display data.
*/
void populateDisplayData(DisplayData.Builder builder);
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/9d45a4a1/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/WindowFn.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/WindowFn.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/WindowFn.java
index 2eac936..e291bee 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/WindowFn.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/WindowFn.java
@@ -184,7 +184,7 @@ public abstract class WindowFn<T, W extends BoundedWindow>
* {@inheritDoc}
*
* <p>By default, does not register any display data. Implementors may override this method
- * to provide their own display metadata.
+ * to provide their own display data.
*/
@Override
public void populateDisplayData(DisplayData.Builder builder) {
[3/4] incubator-beam git commit: Rename DisplayDataMatchers.includes
to includesDisplayData to clarify usage
Posted by bc...@apache.org.
Rename DisplayDataMatchers.includes to includesDisplayData to clarify usage
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/582befdc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/582befdc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/582befdc
Branch: refs/heads/master
Commit: 582befdc8aed6dc62bf1d205749d7f46d7894f97
Parents: d299e2c
Author: Scott Wegner <sw...@google.com>
Authored: Mon Apr 25 09:31:13 2016 -0700
Committer: bchambers <bc...@google.com>
Committed: Tue Apr 26 09:39:01 2016 -0700
----------------------------------------------------------------------
.../sdk/io/BoundedReadFromUnboundedSourceTest.java | 5 +++--
.../org/apache/beam/sdk/io/CompressedSourceTest.java | 5 +++--
.../test/java/org/apache/beam/sdk/io/ReadTest.java | 6 +++---
.../test/java/org/apache/beam/sdk/io/WriteTest.java | 5 +++--
.../apache/beam/sdk/transforms/CombineFnsTest.java | 6 +++---
.../org/apache/beam/sdk/transforms/CombineTest.java | 4 ++--
.../transforms/IntraBundleParallelizationTest.java | 4 ++--
.../org/apache/beam/sdk/transforms/ParDoTest.java | 8 ++++----
.../sdk/transforms/display/DisplayDataMatchers.java | 14 +++++++-------
.../transforms/display/DisplayDataMatchersTest.java | 4 ++--
.../beam/sdk/transforms/display/DisplayDataTest.java | 6 +++---
.../beam/sdk/transforms/windowing/WindowTest.java | 4 ++--
12 files changed, 37 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/582befdc/sdks/java/core/src/test/java/org/apache/beam/sdk/io/BoundedReadFromUnboundedSourceTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/BoundedReadFromUnboundedSourceTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/BoundedReadFromUnboundedSourceTest.java
index 30f3eca..f7949e7 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/BoundedReadFromUnboundedSourceTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/BoundedReadFromUnboundedSourceTest.java
@@ -17,7 +17,8 @@
*/
package org.apache.beam.sdk.io;
-import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includes;
+import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includesDisplayDataFrom;
+
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
@@ -79,7 +80,7 @@ public class BoundedReadFromUnboundedSourceTest implements Serializable{
};
BoundedReadFromUnboundedSource<KV<Integer, Integer>> read = Read.from(src).withMaxNumRecords(5);
- assertThat(DisplayData.from(read), includes(src));
+ assertThat(DisplayData.from(read), includesDisplayDataFrom(src));
}
private static class Checker
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/582befdc/sdks/java/core/src/test/java/org/apache/beam/sdk/io/CompressedSourceTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/CompressedSourceTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/CompressedSourceTest.java
index 4ad8904..36ef4b3 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/CompressedSourceTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/CompressedSourceTest.java
@@ -19,7 +19,8 @@ package org.apache.beam.sdk.io;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasDisplayItem;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasKey;
-import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includes;
+import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includesDisplayDataFrom;
+
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.instanceOf;
import static org.junit.Assert.assertFalse;
@@ -355,7 +356,7 @@ public class CompressedSourceTest {
assertThat(compressedSourceDisplayData, hasDisplayItem(hasKey("compressionMode")));
assertThat(gzipDisplayData, hasDisplayItem("compressionMode", CompressionMode.GZIP.toString()));
assertThat(compressedSourceDisplayData, hasDisplayItem("source", inputSource.getClass()));
- assertThat(compressedSourceDisplayData, includes(inputSource));
+ assertThat(compressedSourceDisplayData, includesDisplayDataFrom(inputSource));
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/582befdc/sdks/java/core/src/test/java/org/apache/beam/sdk/io/ReadTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/ReadTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/ReadTest.java
index bf18a33..dd12bf4 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/ReadTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/ReadTest.java
@@ -18,7 +18,7 @@
package org.apache.beam.sdk.io;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasDisplayItem;
-import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includes;
+import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includesDisplayDataFrom;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -92,11 +92,11 @@ public class ReadTest implements Serializable{
DisplayData boundedDisplayData = DisplayData.from(bounded);
assertThat(boundedDisplayData, hasDisplayItem("source", boundedSource.getClass()));
- assertThat(boundedDisplayData, includes(boundedSource));
+ assertThat(boundedDisplayData, includesDisplayDataFrom(boundedSource));
DisplayData unboundedDisplayData = DisplayData.from(unbounded);
assertThat(unboundedDisplayData, hasDisplayItem("source", unboundedSource.getClass()));
- assertThat(unboundedDisplayData, includes(unboundedSource));
+ assertThat(unboundedDisplayData, includesDisplayDataFrom(unboundedSource));
assertThat(unboundedDisplayData, hasDisplayItem("maxRecords", 1234));
assertThat(unboundedDisplayData, hasDisplayItem("maxReadTime", maxReadTime));
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/582befdc/sdks/java/core/src/test/java/org/apache/beam/sdk/io/WriteTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/WriteTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/WriteTest.java
index 6e66faf..a95ef95 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/WriteTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/WriteTest.java
@@ -18,7 +18,8 @@
package org.apache.beam.sdk.io;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasDisplayItem;
-import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includes;
+import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includesDisplayDataFrom;
+
import static org.hamcrest.Matchers.anyOf;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.equalTo;
@@ -170,7 +171,7 @@ public class WriteTest {
DisplayData displayData = DisplayData.from(write);
assertThat(displayData, hasDisplayItem("sink", sink.getClass()));
- assertThat(displayData, includes(sink));
+ assertThat(displayData, includesDisplayDataFrom(sink));
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/582befdc/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineFnsTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineFnsTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineFnsTest.java
index e66f13a..df5a828 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineFnsTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineFnsTest.java
@@ -18,7 +18,7 @@
package org.apache.beam.sdk.transforms;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasDisplayItem;
-import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includes;
+import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includesDisplayDataFrom;
import static org.junit.Assert.assertThat;
@@ -303,8 +303,8 @@ public class CombineFnsTest {
assertThat(displayData, hasDisplayItem("combineFn2", combineFn2.getClass()));
String nsBase = DisplayDataCombineFn.class.getName();
- assertThat(displayData, includes(combineFn1, nsBase + "#1"));
- assertThat(displayData, includes(combineFn2, nsBase + "#2"));
+ assertThat(displayData, includesDisplayDataFrom(combineFn1, nsBase + "#1"));
+ assertThat(displayData, includesDisplayDataFrom(combineFn2, nsBase + "#2"));
}
private static class DisplayDataCombineFn extends Combine.CombineFn<String, String, String> {
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/582befdc/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineTest.java
index 9fa148e..e3308e5 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/CombineTest.java
@@ -19,7 +19,7 @@ package org.apache.beam.sdk.transforms;
import static org.apache.beam.sdk.TestUtils.checkCombineFn;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasDisplayItem;
-import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includes;
+import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includesDisplayDataFrom;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -711,7 +711,7 @@ public class CombineTest implements Serializable {
assertThat(displayData, hasDisplayItem("combineFn", combineFn.getClass()));
assertThat(displayData, hasDisplayItem("emitDefaultOnEmptyInput", true));
assertThat(displayData, hasDisplayItem("fanout", 1234));
- assertThat(displayData, includes(combineFn));
+ assertThat(displayData, includesDisplayDataFrom(combineFn));
}
////////////////////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/582befdc/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/IntraBundleParallelizationTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/IntraBundleParallelizationTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/IntraBundleParallelizationTest.java
index 80f6188..4810513 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/IntraBundleParallelizationTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/IntraBundleParallelizationTest.java
@@ -19,7 +19,7 @@ package org.apache.beam.sdk.transforms;
import static org.apache.beam.sdk.testing.SystemNanoTimeSleeper.sleepMillis;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasDisplayItem;
-import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includes;
+import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includesDisplayDataFrom;
import static org.hamcrest.Matchers.both;
import static org.hamcrest.Matchers.containsString;
@@ -236,7 +236,7 @@ public class IntraBundleParallelizationTest {
.of(fn);
DisplayData displayData = DisplayData.from(transform);
- assertThat(displayData, includes(fn));
+ assertThat(displayData, includesDisplayDataFrom(fn));
assertThat(displayData, hasDisplayItem("fn", fn.getClass()));
assertThat(displayData, hasDisplayItem("maxParallelism", 1234));
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/582befdc/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java
index 44154e6..fdf3ddf 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java
@@ -20,7 +20,7 @@ package org.apache.beam.sdk.transforms;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasDisplayItem;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasKey;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasType;
-import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includes;
+import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includesDisplayDataFrom;
import static org.apache.beam.sdk.util.SerializableUtils.serializeToByteArray;
import static org.apache.beam.sdk.util.StringUtils.byteArrayToJsonString;
import static org.apache.beam.sdk.util.StringUtils.jsonStringToByteArray;
@@ -1549,7 +1549,7 @@ public class ParDoTest implements Serializable {
hasType(DisplayData.Type.JAVA_CLASS),
DisplayDataMatchers.hasValue(fn.getClass().getName()))));
- assertThat(displayData, includes(fn));
+ assertThat(displayData, includesDisplayDataFrom(fn));
}
@Test
@@ -1567,7 +1567,7 @@ public class ParDoTest implements Serializable {
Bound<String, String> parDo = ParDo.of(fn);
DisplayData displayData = DisplayData.from(parDo);
- assertThat(displayData, includes(fn));
+ assertThat(displayData, includesDisplayDataFrom(fn));
assertThat(displayData, hasDisplayItem("fn", fn.getClass()));
}
@@ -1588,7 +1588,7 @@ public class ParDoTest implements Serializable {
.of(fn);
DisplayData displayData = DisplayData.from(parDo);
- assertThat(displayData, includes(fn));
+ assertThat(displayData, includesDisplayDataFrom(fn));
assertThat(displayData, hasDisplayItem("fn", fn.getClass()));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/582befdc/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataMatchers.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataMatchers.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataMatchers.java
index abdc350..90e4441 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataMatchers.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataMatchers.java
@@ -149,22 +149,22 @@ public class DisplayDataMatchers {
}
}
- /** @see #includes(HasDisplayData, String) */
- public static Matcher<DisplayData> includes(HasDisplayData subComponent) {
- return includes(subComponent, subComponent.getClass());
+ /** @see #includesDisplayDataFrom(HasDisplayData, String) */
+ public static Matcher<DisplayData> includesDisplayDataFrom(HasDisplayData subComponent) {
+ return includesDisplayDataFrom(subComponent, subComponent.getClass());
}
- /** @see #includes(HasDisplayData, String) */
- public static Matcher<DisplayData> includes(
+ /** @see #includesDisplayDataFrom(HasDisplayData, String) */
+ public static Matcher<DisplayData> includesDisplayDataFrom(
HasDisplayData subComponent, Class<? extends HasDisplayData> namespace) {
- return includes(subComponent, namespace.getName());
+ return includesDisplayDataFrom(subComponent, namespace.getName());
}
/**
* Create a matcher that matches if the examined {@link DisplayData} contains all display data
* registered from the specified subcomponent and namespace.
*/
- public static Matcher<DisplayData> includes(
+ public static Matcher<DisplayData> includesDisplayDataFrom(
final HasDisplayData subComponent, final String namespace) {
return new CustomTypeSafeMatcher<DisplayData>("includes subcomponent") {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/582befdc/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataMatchersTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataMatchersTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataMatchersTest.java
index 5165e1a..8bb65cc 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataMatchersTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataMatchersTest.java
@@ -22,7 +22,7 @@ import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasKey;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasNamespace;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasType;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasValue;
-import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includes;
+import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includesDisplayDataFrom;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.core.StringStartsWith.startsWith;
@@ -129,7 +129,7 @@ public class DisplayDataMatchersTest {
builder.add("foo", "bar");
}
};
- Matcher<DisplayData> matcher = includes(subComponent);
+ Matcher<DisplayData> matcher = includesDisplayDataFrom(subComponent);
assertFalse(matcher.matches(DisplayData.from(sameKeyDifferentNamespace)));
assertThat(DisplayData.from(hasSubcomponent), matcher);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/582befdc/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataTest.java
index 05d0f6f..98604c7 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/display/DisplayDataTest.java
@@ -22,7 +22,7 @@ import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasKey;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasNamespace;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasType;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasValue;
-import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includes;
+import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includesDisplayDataFrom;
import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.empty;
@@ -304,7 +304,7 @@ public class DisplayDataTest {
}
});
- assertThat(data, includes(subComponent));
+ assertThat(data, includesDisplayDataFrom(subComponent));
}
@Test
@@ -329,7 +329,7 @@ public class DisplayDataTest {
}
});
- assertThat(data, includes(subComponent, namespaceOverride.getClass()));
+ assertThat(data, includesDisplayDataFrom(subComponent, namespaceOverride.getClass()));
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/582befdc/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/WindowTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/WindowTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/WindowTest.java
index 6be6df8..91bd846 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/WindowTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/WindowTest.java
@@ -19,7 +19,7 @@ package org.apache.beam.sdk.transforms.windowing;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasDisplayItem;
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasKey;
-import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includes;
+import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.includesDisplayDataFrom;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.isOneOf;
@@ -250,7 +250,7 @@ public class WindowTest implements Serializable {
DisplayData displayData = DisplayData.from(window);
assertThat(displayData, hasDisplayItem("windowFn", windowFn.getClass()));
- assertThat(displayData, includes(windowFn));
+ assertThat(displayData, includesDisplayDataFrom(windowFn));
assertThat(displayData, hasDisplayItem("trigger", triggerBuilder.toString()));
assertThat(displayData,
[4/4] incubator-beam git commit: This closes #241
Posted by bc...@apache.org.
This closes #241
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/7dc1a404
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/7dc1a404
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/7dc1a404
Branch: refs/heads/master
Commit: 7dc1a4047c8a145377c26ed73163a28f7b8835dd
Parents: d299e2c c6690c1
Author: bchambers <bc...@google.com>
Authored: Tue Apr 26 09:39:06 2016 -0700
Committer: bchambers <bc...@google.com>
Committed: Tue Apr 26 09:39:06 2016 -0700
----------------------------------------------------------------------
.../org/apache/beam/sdk/io/DatastoreIO.java | 1 +
.../main/java/org/apache/beam/sdk/io/Read.java | 2 +
.../main/java/org/apache/beam/sdk/io/Sink.java | 2 +-
.../java/org/apache/beam/sdk/io/Source.java | 2 +-
.../main/java/org/apache/beam/sdk/io/Write.java | 1 +
.../sdk/transforms/ApproximateQuantiles.java | 1 +
.../beam/sdk/transforms/ApproximateUnique.java | 2 +
.../org/apache/beam/sdk/transforms/Combine.java | 11 ++++
.../beam/sdk/transforms/CombineFnBase.java | 4 +-
.../apache/beam/sdk/transforms/CombineFns.java | 4 ++
.../beam/sdk/transforms/CombineWithContext.java | 1 +
.../org/apache/beam/sdk/transforms/DoFn.java | 2 +-
.../beam/sdk/transforms/DoFnWithContext.java | 2 +-
.../org/apache/beam/sdk/transforms/Filter.java | 4 ++
.../apache/beam/sdk/transforms/GroupByKey.java | 1 +
.../transforms/IntraBundleParallelization.java | 1 +
.../org/apache/beam/sdk/transforms/Max.java | 1 +
.../org/apache/beam/sdk/transforms/Min.java | 1 +
.../apache/beam/sdk/transforms/PTransform.java | 2 +-
.../org/apache/beam/sdk/transforms/ParDo.java | 4 +-
.../apache/beam/sdk/transforms/Partition.java | 2 +
.../org/apache/beam/sdk/transforms/Sample.java | 2 +
.../org/apache/beam/sdk/transforms/Top.java | 1 +
.../sdk/transforms/display/ClassForDisplay.java | 4 +-
.../sdk/transforms/display/DisplayData.java | 58 ++++++++++----------
.../sdk/transforms/display/HasDisplayData.java | 8 +--
.../transforms/windowing/CalendarWindows.java | 6 ++
.../sdk/transforms/windowing/FixedWindows.java | 1 +
.../beam/sdk/transforms/windowing/Sessions.java | 1 +
.../transforms/windowing/SlidingWindows.java | 1 +
.../beam/sdk/transforms/windowing/Window.java | 1 +
.../beam/sdk/transforms/windowing/WindowFn.java | 2 +-
.../org/apache/beam/sdk/util/CombineFnUtil.java | 1 +
.../io/BoundedReadFromUnboundedSourceTest.java | 5 +-
.../beam/sdk/io/CompressedSourceTest.java | 5 +-
.../java/org/apache/beam/sdk/io/ReadTest.java | 6 +-
.../java/org/apache/beam/sdk/io/WriteTest.java | 5 +-
.../beam/sdk/transforms/CombineFnsTest.java | 6 +-
.../apache/beam/sdk/transforms/CombineTest.java | 4 +-
.../IntraBundleParallelizationTest.java | 4 +-
.../apache/beam/sdk/transforms/ParDoTest.java | 8 +--
.../transforms/display/DisplayDataMatchers.java | 14 ++---
.../display/DisplayDataMatchersTest.java | 4 +-
.../sdk/transforms/display/DisplayDataTest.java | 6 +-
.../sdk/transforms/windowing/WindowTest.java | 4 +-
45 files changed, 130 insertions(+), 78 deletions(-)
----------------------------------------------------------------------