Rename 'util' package to 'org.apache.beam.learning.katas.util'

mransley · Jun 15, 2019 · 7e1f1e8 · 7e1f1e8
1 parent 2e9667c
commit 7e1f1e8
Show file tree

Hide file tree

Showing 35 changed files with 112 additions and 111 deletions.
diff --git a/learning/katas/java/.idea/study_project.xml b/learning/katas/java/.idea/study_project.xml
diff --git a/...ion/Count/src/org/apache/beam/learning/katas/commontransforms/aggregation/count/Task.java b/...ion/Count/src/org/apache/beam/learning/katas/commontransforms/aggregation/count/Task.java
@@ -18,13 +18,13 @@
 
 package org.apache.beam.learning.katas.commontransforms.aggregation.count;
 
+import org.apache.beam.learning.katas.util.Log;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.options.PipelineOptions;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
 import org.apache.beam.sdk.transforms.Count;
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.values.PCollection;
-import util.Log;
 
 public class Task {
 

diff --git a/...egation/Max/src/org/apache/beam/learning/katas/commontransforms/aggregation/max/Task.java b/...egation/Max/src/org/apache/beam/learning/katas/commontransforms/aggregation/max/Task.java
@@ -18,13 +18,13 @@
 
 package org.apache.beam.learning.katas.commontransforms.aggregation.max;
 
+import org.apache.beam.learning.katas.util.Log;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.options.PipelineOptions;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.transforms.Max;
 import org.apache.beam.sdk.values.PCollection;
-import util.Log;
 
 public class Task {
 

diff --git a/...ation/Mean/src/org/apache/beam/learning/katas/commontransforms/aggregation/mean/Task.java b/...ation/Mean/src/org/apache/beam/learning/katas/commontransforms/aggregation/mean/Task.java
@@ -18,13 +18,13 @@
 
 package org.apache.beam.learning.katas.commontransforms.aggregation.mean;
 
+import org.apache.beam.learning.katas.util.Log;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.options.PipelineOptions;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.transforms.Mean;
 import org.apache.beam.sdk.values.PCollection;
-import util.Log;
 
 public class Task {
 

diff --git a/...egation/Min/src/org/apache/beam/learning/katas/commontransforms/aggregation/min/Task.java b/...egation/Min/src/org/apache/beam/learning/katas/commontransforms/aggregation/min/Task.java
@@ -18,13 +18,13 @@
 
 package org.apache.beam.learning.katas.commontransforms.aggregation.min;
 
+import org.apache.beam.learning.katas.util.Log;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.options.PipelineOptions;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.transforms.Min;
 import org.apache.beam.sdk.values.PCollection;
-import util.Log;
 
 public class Task {
 

diff --git a/...egation/Sum/src/org/apache/beam/learning/katas/commontransforms/aggregation/sum/Task.java b/...egation/Sum/src/org/apache/beam/learning/katas/commontransforms/aggregation/sum/Task.java
@@ -18,13 +18,13 @@
 
 package org.apache.beam.learning.katas.commontransforms.aggregation.sum;
 
+import org.apache.beam.learning.katas.util.Log;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.options.PipelineOptions;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.transforms.Sum;
 import org.apache.beam.sdk.values.PCollection;
-import util.Log;
 
 public class Task {
 

diff --git a/...Filter/Filter/src/org/apache/beam/learning/katas/commontransforms/filter/filter/Task.java b/...Filter/Filter/src/org/apache/beam/learning/katas/commontransforms/filter/filter/Task.java
@@ -18,13 +18,13 @@
 
 package org.apache.beam.learning.katas.commontransforms.filter.filter;
 
+import org.apache.beam.learning.katas.util.Log;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.options.PipelineOptions;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.transforms.Filter;
 import org.apache.beam.sdk.values.PCollection;
-import util.Log;
 
 public class Task {
 

diff --git a/...s/Filter/ParDo/src/org/apache/beam/learning/katas/commontransforms/filter/pardo/Task.java b/...s/Filter/ParDo/src/org/apache/beam/learning/katas/commontransforms/filter/pardo/Task.java
@@ -18,14 +18,14 @@
 
 package org.apache.beam.learning.katas.commontransforms.filter.pardo;
 
+import org.apache.beam.learning.katas.util.Log;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.options.PipelineOptions;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.transforms.DoFn;
 import org.apache.beam.sdk.transforms.ParDo;
 import org.apache.beam.sdk.values.PCollection;
-import util.Log;
 
 public class Task {
 

diff --git a/...Branching/Branching/src/org/apache/beam/learning/katas/coretransforms/branching/Task.java b/...Branching/Branching/src/org/apache/beam/learning/katas/coretransforms/branching/Task.java
@@ -20,13 +20,13 @@
 
 import static org.apache.beam.sdk.values.TypeDescriptors.integers;
 
+import org.apache.beam.learning.katas.util.Log;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.options.PipelineOptions;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.transforms.MapElements;
 import org.apache.beam.sdk.values.PCollection;
-import util.Log;
 
 public class Task {
 

diff --git a/...Key/CoGroupByKey/src/org/apache/beam/learning/katas/coretransforms/cogroupbykey/Task.java b/...Key/CoGroupByKey/src/org/apache/beam/learning/katas/coretransforms/cogroupbykey/Task.java
@@ -21,6 +21,7 @@
 import static org.apache.beam.sdk.values.TypeDescriptors.kvs;
 import static org.apache.beam.sdk.values.TypeDescriptors.strings;
 
+import org.apache.beam.learning.katas.util.Log;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.options.PipelineOptions;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
@@ -34,7 +35,6 @@
 import org.apache.beam.sdk.values.KV;
 import org.apache.beam.sdk.values.PCollection;
 import org.apache.beam.sdk.values.TupleTag;
-import util.Log;
 
 public class Task {
 

diff --git a/...src/org/apache/beam/learning/katas/coretransforms/combine/binarycombinefnlambda/Task.java b/...src/org/apache/beam/learning/katas/coretransforms/combine/binarycombinefnlambda/Task.java
@@ -19,13 +19,13 @@
 package org.apache.beam.learning.katas.coretransforms.combine.binarycombinefnlambda;
 
 import java.math.BigInteger;
+import org.apache.beam.learning.katas.util.Log;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.options.PipelineOptions;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
 import org.apache.beam.sdk.transforms.Combine;
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.values.PCollection;
-import util.Log;
 
 public class Task {
 

diff --git a/...ineFn/src/org/apache/beam/learning/katas/coretransforms/combine/binarycombinefn/Task.java b/...ineFn/src/org/apache/beam/learning/katas/coretransforms/combine/binarycombinefn/Task.java
@@ -19,14 +19,14 @@
 package org.apache.beam.learning.katas.coretransforms.combine.binarycombinefn;
 
 import java.math.BigInteger;
+import org.apache.beam.learning.katas.util.Log;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.options.PipelineOptions;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
 import org.apache.beam.sdk.transforms.Combine;
 import org.apache.beam.sdk.transforms.Combine.BinaryCombineFn;
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.values.PCollection;
-import util.Log;
 
 public class Task {
 

diff --git a/... PerKey/src/org/apache/beam/learning/katas/coretransforms/combine/combineperkey/Task.java b/... PerKey/src/org/apache/beam/learning/katas/coretransforms/combine/combineperkey/Task.java
@@ -18,6 +18,7 @@
 
 package org.apache.beam.learning.katas.coretransforms.combine.combineperkey;
 
+import org.apache.beam.learning.katas.util.Log;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.options.PipelineOptions;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
@@ -26,7 +27,6 @@
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.values.KV;
 import org.apache.beam.sdk.values.PCollection;
-import util.Log;
 
 public class Task {
 

diff --git a/...e/CombineFn/src/org/apache/beam/learning/katas/coretransforms/combine/combinefn/Task.java b/...e/CombineFn/src/org/apache/beam/learning/katas/coretransforms/combine/combinefn/Task.java
@@ -20,14 +20,14 @@
 
 import java.io.Serializable;
 import java.util.Objects;
+import org.apache.beam.learning.katas.util.Log;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.options.PipelineOptions;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
 import org.apache.beam.sdk.transforms.Combine;
 import org.apache.beam.sdk.transforms.Combine.CombineFn;
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.values.PCollection;
-import util.Log;
 
 public class Task {
 

diff --git a/...imple Function/src/org/apache/beam/learning/katas/coretransforms/combine/simple/Task.java b/...imple Function/src/org/apache/beam/learning/katas/coretransforms/combine/simple/Task.java
@@ -18,14 +18,14 @@
 
 package org.apache.beam.learning.katas.coretransforms.combine.simple;
 
+import org.apache.beam.learning.katas.util.Log;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.options.PipelineOptions;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
 import org.apache.beam.sdk.transforms.Combine;
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.transforms.SerializableFunction;
 import org.apache.beam.sdk.values.PCollection;
-import util.Log;
 
 public class Task {
 

diff --git a/...Composite Transform/src/org/apache/beam/learning/katas/coretransforms/composite/Task.java b/...Composite Transform/src/org/apache/beam/learning/katas/coretransforms/composite/Task.java
@@ -21,6 +21,7 @@
 import static org.apache.beam.sdk.values.TypeDescriptors.integers;
 
 import java.util.Arrays;
+import org.apache.beam.learning.katas.util.Log;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.options.PipelineOptions;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
@@ -30,7 +31,6 @@
 import org.apache.beam.sdk.transforms.PTransform;
 import org.apache.beam.sdk.transforms.ParDo;
 import org.apache.beam.sdk.values.PCollection;
-import util.Log;
 
 public class Task {
 

diff --git a/...forms/Flatten/Flatten/src/org/apache/beam/learning/katas/coretransforms/flatten/Task.java b/...forms/Flatten/Flatten/src/org/apache/beam/learning/katas/coretransforms/flatten/Task.java
@@ -18,14 +18,14 @@
 
 package org.apache.beam.learning.katas.coretransforms.flatten;
 
+import org.apache.beam.learning.katas.util.Log;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.options.PipelineOptions;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.transforms.Flatten;
 import org.apache.beam.sdk.values.PCollection;
 import org.apache.beam.sdk.values.PCollectionList;
-import util.Log;
 
 public class Task {
 

diff --git a/...upByKey/GroupByKey/src/org/apache/beam/learning/katas/coretransforms/groupbykey/Task.java b/...upByKey/GroupByKey/src/org/apache/beam/learning/katas/coretransforms/groupbykey/Task.java
@@ -21,6 +21,7 @@
 import static org.apache.beam.sdk.values.TypeDescriptors.kvs;
 import static org.apache.beam.sdk.values.TypeDescriptors.strings;
 
+import org.apache.beam.learning.katas.util.Log;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.options.PipelineOptions;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
@@ -29,7 +30,6 @@
 import org.apache.beam.sdk.transforms.MapElements;
 import org.apache.beam.sdk.values.KV;
 import org.apache.beam.sdk.values.PCollection;
-import util.Log;
 
 public class Task {
 

diff --git a/...ey/GroupByKey/test/org/apache/beam/learning/katas/coretransforms/groupbykey/TaskTest.java b/...ey/GroupByKey/test/org/apache/beam/learning/katas/coretransforms/groupbykey/TaskTest.java
@@ -18,7 +18,7 @@
 
 package org.apache.beam.learning.katas.coretransforms.groupbykey;
 
-import static test.util.ContainsKvs.containsKvs;
+import static org.apache.beam.learning.katas.util.ContainsKvs.containsKvs;
 
 import com.google.common.collect.ImmutableList;
 import org.apache.beam.sdk.testing.PAssert;

diff --git a/...pElements/src/org/apache/beam/learning/katas/coretransforms/map/flatmapelements/Task.java b/...pElements/src/org/apache/beam/learning/katas/coretransforms/map/flatmapelements/Task.java
@@ -19,14 +19,14 @@
 package org.apache.beam.learning.katas.coretransforms.map.flatmapelements;
 
 import java.util.Arrays;
+import org.apache.beam.learning.katas.util.Log;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.options.PipelineOptions;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.transforms.FlatMapElements;
 import org.apache.beam.sdk.values.PCollection;
 import org.apache.beam.sdk.values.TypeDescriptors;
-import util.Log;
 
 public class Task {
 

diff --git a/...p/MapElements/src/org/apache/beam/learning/katas/coretransforms/map/mapelements/Task.java b/...p/MapElements/src/org/apache/beam/learning/katas/coretransforms/map/mapelements/Task.java
@@ -18,14 +18,14 @@
 
 package org.apache.beam.learning.katas.coretransforms.map.mapelements;
 
+import org.apache.beam.learning.katas.util.Log;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.options.PipelineOptions;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.transforms.MapElements;
 import org.apache.beam.sdk.values.PCollection;
 import org.apache.beam.sdk.values.TypeDescriptors;
-import util.Log;
 
 public class Task {
 

diff --git a/... OneToMany/src/org/apache/beam/learning/katas/coretransforms/map/pardoonetomany/Task.java b/... OneToMany/src/org/apache/beam/learning/katas/coretransforms/map/pardoonetomany/Task.java
@@ -18,14 +18,14 @@
 
 package org.apache.beam.learning.katas.coretransforms.map.pardoonetomany;
 
+import org.apache.beam.learning.katas.util.Log;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.options.PipelineOptions;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.transforms.DoFn;
 import org.apache.beam.sdk.transforms.ParDo;
 import org.apache.beam.sdk.values.PCollection;
-import util.Log;
 
 public class Task {
 

diff --git a/...ransforms/Map/ParDo/src/org/apache/beam/learning/katas/coretransforms/map/pardo/Task.java b/...ransforms/Map/ParDo/src/org/apache/beam/learning/katas/coretransforms/map/pardo/Task.java
@@ -18,14 +18,14 @@
 
 package org.apache.beam.learning.katas.coretransforms.map.pardo;
 
+import org.apache.beam.learning.katas.util.Log;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.options.PipelineOptions;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
 import org.apache.beam.sdk.transforms.Create;
 import org.apache.beam.sdk.transforms.DoFn;
 import org.apache.beam.sdk.transforms.ParDo;
 import org.apache.beam.sdk.values.PCollection;
-import util.Log;
 
 public class Task {
 

diff --git a/...Partition/Partition/src/org/apache/beam/learning/katas/coretransforms/partition/Task.java b/...Partition/Partition/src/org/apache/beam/learning/katas/coretransforms/partition/Task.java
@@ -18,6 +18,7 @@
 
 package org.apache.beam.learning.katas.coretransforms.partition;
 
+import org.apache.beam.learning.katas.util.Log;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.options.PipelineOptions;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
@@ -26,7 +27,6 @@
 import org.apache.beam.sdk.transforms.Partition.PartitionFn;
 import org.apache.beam.sdk.values.PCollection;
 import org.apache.beam.sdk.values.PCollectionList;
-import util.Log;
 
 public class Task {
 

diff --git a/...de Input/Side Input/src/org/apache/beam/learning/katas/coretransforms/sideinput/Task.java b/...de Input/Side Input/src/org/apache/beam/learning/katas/coretransforms/sideinput/Task.java
@@ -19,6 +19,7 @@
 package org.apache.beam.learning.katas.coretransforms.sideinput;
 
 import java.util.Map;
+import org.apache.beam.learning.katas.util.Log;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.options.PipelineOptions;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
@@ -29,7 +30,6 @@
 import org.apache.beam.sdk.values.KV;
 import org.apache.beam.sdk.values.PCollection;
 import org.apache.beam.sdk.values.PCollectionView;
-import util.Log;
 
 public class Task {
 
@@ -69,6 +69,7 @@ public static void main(String[] args) {
 
  static PCollectionView<Map<String, String>> createView(
  PCollection<KV<String, String>> citiesToCountries) {
+
  return citiesToCountries.apply(View.asMap());
  }
 

diff --git a/...Output/Side Output/src/org/apache/beam/learning/katas/coretransforms/sideoutput/Task.java b/...Output/Side Output/src/org/apache/beam/learning/katas/coretransforms/sideoutput/Task.java
@@ -18,6 +18,7 @@
 
 package org.apache.beam.learning.katas.coretransforms.sideoutput;
 
+import org.apache.beam.learning.katas.util.Log;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.options.PipelineOptions;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
@@ -28,7 +29,6 @@
 import org.apache.beam.sdk.values.PCollectionTuple;
 import org.apache.beam.sdk.values.TupleTag;
 import org.apache.beam.sdk.values.TupleTagList;
-import util.Log;
 
 public class Task {