apache · swegner · Apr 25, 2016 · Apr 25, 2016 · Apr 25, 2016
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
@@ -604,6 +604,7 @@ public DatastoreWriteOperation createWriteOperation(PipelineOptions options) {
 
     @Override
     public void populateDisplayData(DisplayData.Builder builder) {
+      super.populateDisplayData(builder);
       builder
           .addIfNotDefault("host", host, DEFAULT_HOST)
           .addIfNotNull("dataset", datasetId);

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
@@ -147,6 +147,7 @@ public String getKindString() {
 
     @Override
     public void populateDisplayData(DisplayData.Builder builder) {
+      super.populateDisplayData(builder);
       builder
           .add("source", source.getClass())
           .include(source);
@@ -261,6 +262,7 @@ public String getKindString() {
 
     @Override
     public void populateDisplayData(DisplayData.Builder builder) {
+      super.populateDisplayData(builder);
       builder
           .add("source", source.getClass())
           .include(source);

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
@@ -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) {}

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
@@ -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) {}

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
@@ -79,6 +79,7 @@ public PDone apply(PCollection<T> input) {
 
     @Override
     public void populateDisplayData(DisplayData.Builder builder) {
+      super.populateDisplayData(builder);
       builder
           .add("sink", sink.getClass())
           .include(sink);

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
@@ -363,6 +363,7 @@ public Coder<QuantileState<T, ComparatorT>> getAccumulatorCoder(
 
     @Override
     public void populateDisplayData(DisplayData.Builder builder) {
+      super.populateDisplayData(builder);
       builder
           .add("numQuantiles", numQuantiles)
           .add("comparer", compareFn.getClass());

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
@@ -216,6 +216,7 @@ public PCollection<Long> apply(PCollection<T> input) {
 
     @Override
     public void populateDisplayData(DisplayData.Builder builder) {
+      super.populateDisplayData(builder);
       ApproximateUnique.populateDisplayData(builder, sampleSize, maximumEstimationError);
     }
   }
@@ -289,6 +290,7 @@ public PCollection<KV<K, Long>> apply(PCollection<KV<K, V>> input) {
 
     @Override
     public void populateDisplayData(DisplayData.Builder builder) {
+      super.populateDisplayData(builder);
       ApproximateUnique.populateDisplayData(builder, sampleSize, maximumEstimationError);
     }
   }

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
@@ -515,6 +515,7 @@ public CombineFn<InputT, AccumT, OutputT> forKey(K key, Coder<K> keyCoder) {
 
         @Override
         public void populateDisplayData(DisplayData.Builder builder) {
+          super.populateDisplayData(builder);
           CombineFn.this.populateDisplayData(builder);
         }
       };
@@ -1193,6 +1194,7 @@ public Coder<OutputT> getDefaultOutputCoder(
 
         @Override
         public void populateDisplayData(DisplayData.Builder builder) {
+          super.populateDisplayData(builder);
           KeyedCombineFn.this.populateDisplayData(builder);
         }
       };
@@ -1378,6 +1380,8 @@ public PCollection<OutputT> apply(PCollection<InputT> input) {
 
     @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 boolean getInsertDefault() {
 
     @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 List<V> compact(List<V> accumulator) {
 
     @Override
     public void populateDisplayData(DisplayData.Builder builder) {
+      super.populateDisplayData(builder);
       builder.add("combineFn", combiner.getClass());
     }
 
@@ -1772,6 +1779,7 @@ public PCollection<KV<K, OutputT>> apply(PCollection<KV<K, InputT>> input) {
 
     @Override
     public void populateDisplayData(DisplayData.Builder builder) {
+      super.populateDisplayData(builder);
       Combine.populateDisplayData(builder, fn, fnClass);
     }
   }
@@ -2077,6 +2085,8 @@ public void processElement(ProcessContext c) {
 
     @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 Coder<KV<K, OutputT>> getDefaultOutputCoder(
 
     @Override
     public void populateDisplayData(DisplayData.Builder builder) {
+      super.populateDisplayData(builder);
       Combine.populateDisplayData(builder, fn, fnClass);
     }
   }

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
@@ -225,7 +225,7 @@ public TypeVariable<?> getOutputTVariable() {
      * {@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 TypeVariable<?> getOutputTVariable() {
      * {@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) {

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
@@ -464,6 +464,7 @@ public Coder<Object[]> getAccumulatorCoder(CoderRegistry registry, Coder<DataT>
 
     @Override
     public void populateDisplayData(DisplayData.Builder builder) {
+      super.populateDisplayData(builder);
       CombineFns.populateDisplayData(builder, combineFns);
     }
   }
@@ -602,6 +603,7 @@ public Coder<Object[]> getAccumulatorCoder(CoderRegistry registry, Coder<DataT>
 
     @Override
     public void populateDisplayData(DisplayData.Builder builder) {
+      super.populateDisplayData(builder);
       CombineFns.populateDisplayData(builder, combineFnWithContexts);
     }
   }
@@ -788,6 +790,7 @@ public Coder<Object[]> getAccumulatorCoder(
 
     @Override
     public void populateDisplayData(DisplayData.Builder builder) {
+      super.populateDisplayData(builder);
       CombineFns.populateDisplayData(builder, keyedCombineFns);
     }
   }
@@ -939,6 +942,7 @@ public Coder<Object[]> getAccumulatorCoder(
 
     @Override
     public void populateDisplayData(DisplayData.Builder builder) {
+      super.populateDisplayData(builder);
       CombineFns.populateDisplayData(builder, keyedCombineFns);
     }
   }

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
@@ -171,6 +171,7 @@ public CombineFnWithContext<InputT, AccumT, OutputT> forKey(K key, Coder<K> keyC
 
         @Override
         public void populateDisplayData(DisplayData.Builder builder) {
+          super.populateDisplayData(builder);
           CombineFnWithContext.this.populateDisplayData(builder);
         }
       };

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
@@ -374,7 +374,7 @@ public void finishBundle(Context c) throws Exception {
    * {@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) {

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
@@ -421,7 +421,7 @@ void prepareForProcessing() {
    * {@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) {

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
@@ -103,6 +103,7 @@ public void processElement(ProcessContext c) {
 
       @Override
       public void populateDisplayData(DisplayData.Builder builder) {
+        super.populateDisplayData(builder);
         Filter.populateDisplayData(builder, String.format("x < %s", value));
       }
     });
@@ -141,6 +142,7 @@ public void processElement(ProcessContext c) {
 
       @Override
       public void populateDisplayData(DisplayData.Builder builder) {
+        super.populateDisplayData(builder);
         Filter.populateDisplayData(builder, String.format("x > %s", value));
       }
     });
@@ -178,6 +180,7 @@ public void processElement(ProcessContext c) {
 
       @Override
       public void populateDisplayData(DisplayData.Builder builder) {
+        super.populateDisplayData(builder);
         Filter.populateDisplayData(builder, String.format("x ≤ %s", value));
       }
     });
@@ -215,6 +218,7 @@ public void processElement(ProcessContext c) {
 
       @Override
       public void populateDisplayData(DisplayData.Builder builder) {
+        super.populateDisplayData(builder);
         Filter.populateDisplayData(builder, String.format("x ≥ %s", value));
       }
     });

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
@@ -277,6 +277,7 @@ public static <K, V> KvCoder<K, Iterable<V>> getOutputKvCoder(Coder<KV<K, V>> in
 
   @Override
   public void populateDisplayData(DisplayData.Builder builder) {
+    super.populateDisplayData(builder);
     if (fewKeys) {
       builder.add("fewKeys", true);
     }

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
@@ -176,6 +176,7 @@ public PCollection<OutputT> apply(PCollection<? extends InputT> input) {
 
     @Override
     public void populateDisplayData(DisplayData.Builder builder) {
+      super.populateDisplayData(builder);
       builder
           .add("maxParallelism", maxParallelism)
           .add("fn", doFn.getClass())

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
@@ -208,6 +208,7 @@ public T apply(T left, T right) {
 
     @Override
     public void populateDisplayData(DisplayData.Builder builder) {
+      super.populateDisplayData(builder);
       builder.add("comparer", comparator.getClass());
     }
   }

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
@@ -208,6 +208,7 @@ public T apply(T left, T right) {
 
     @Override
     public void populateDisplayData(DisplayData.Builder builder) {
+      super.populateDisplayData(builder);
       builder.add("comparer", comparator.getClass());
     }
   }

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
@@ -317,7 +317,7 @@ public <T> Coder<T> getDefaultOutputCoder(
    * {@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) {

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
@@ -808,12 +808,13 @@ protected String getKindString() {
     /**
      * {@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}.
      */
     @Override
     public void populateDisplayData(Builder builder) {
+      super.populateDisplayData(builder);
       ParDo.populateDisplayData(builder, fn, fnClass);
     }
 
@@ -1051,6 +1052,7 @@ protected String getKindString() {
 
     @Override
     public void populateDisplayData(Builder builder) {
+      super.populateDisplayData(builder);
       ParDo.populateDisplayData(builder, fn, fnClass);
     }
 

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
@@ -124,6 +124,7 @@ public PCollectionList<T> apply(PCollection<T> in) {
 
   @Override
   public void populateDisplayData(DisplayData.Builder builder) {
+    super.populateDisplayData(builder);
     builder.include(partitionDoFn);
   }
 
@@ -179,6 +180,7 @@ public void processElement(ProcessContext c) {
 
     @Override
     public void populateDisplayData(DisplayData.Builder builder) {
+      super.populateDisplayData(builder);
       builder
           .add("numPartitions", numPartitions)
           .add("partitionFn", partitionFn.getClass());

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
@@ -157,6 +157,7 @@ public PCollection<T> apply(PCollection<T> in) {
 
     @Override
     public void populateDisplayData(DisplayData.Builder builder) {
+      super.populateDisplayData(builder);
       builder.add("sampleSize", limit);
     }
   }
@@ -256,6 +257,7 @@ public Coder<Iterable<T>> getDefaultOutputCoder(
 
     @Override
     public void populateDisplayData(DisplayData.Builder builder) {
+      super.populateDisplayData(builder);
       builder.add("sampleSize", sampleSize);
     }
   }

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
@@ -395,6 +395,7 @@ public Coder<BoundedHeap<T, ComparatorT>> getAccumulatorCoder(
 
     @Override
     public void populateDisplayData(DisplayData.Builder builder) {
+      super.populateDisplayData(builder);
       builder
           .add("count", count)
           .add("comparer", compareFn.getClass());

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
@@ -23,9 +23,9 @@
 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.
  */