http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/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 f19af3b..132d7f2 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 @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms; +package org.apache.beam.sdk.transforms; -import com.google.cloud.dataflow.sdk.transforms.Combine.BinaryCombineFn; -import com.google.cloud.dataflow.sdk.util.common.Counter; -import com.google.cloud.dataflow.sdk.util.common.Counter.AggregationKind; -import com.google.cloud.dataflow.sdk.util.common.CounterProvider; +import org.apache.beam.sdk.transforms.Combine.BinaryCombineFn; +import org.apache.beam.sdk.util.common.Counter; +import org.apache.beam.sdk.util.common.Counter.AggregationKind; +import org.apache.beam.sdk.util.common.CounterProvider; import java.io.Serializable; import java.util.Comparator;
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Mean.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Mean.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Mean.java index 74b4a8c..5005f6b 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Mean.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Mean.java @@ -15,15 +15,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms; - -import com.google.cloud.dataflow.sdk.coders.AtomicCoder; -import com.google.cloud.dataflow.sdk.coders.BigEndianLongCoder; -import com.google.cloud.dataflow.sdk.coders.Coder; -import com.google.cloud.dataflow.sdk.coders.CoderException; -import com.google.cloud.dataflow.sdk.coders.CoderRegistry; -import com.google.cloud.dataflow.sdk.coders.DoubleCoder; -import com.google.cloud.dataflow.sdk.transforms.Combine.AccumulatingCombineFn.Accumulator; +package org.apache.beam.sdk.transforms; + +import org.apache.beam.sdk.coders.AtomicCoder; +import org.apache.beam.sdk.coders.BigEndianLongCoder; +import org.apache.beam.sdk.coders.Coder; +import org.apache.beam.sdk.coders.CoderException; +import org.apache.beam.sdk.coders.CoderRegistry; +import org.apache.beam.sdk.coders.DoubleCoder; +import org.apache.beam.sdk.transforms.Combine.AccumulatingCombineFn.Accumulator; + import com.google.common.base.MoreObjects; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/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 26212f6..dcee91f 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 @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms; +package org.apache.beam.sdk.transforms; -import com.google.cloud.dataflow.sdk.transforms.Combine.BinaryCombineFn; -import com.google.cloud.dataflow.sdk.util.common.Counter; -import com.google.cloud.dataflow.sdk.util.common.Counter.AggregationKind; -import com.google.cloud.dataflow.sdk.util.common.CounterProvider; +import org.apache.beam.sdk.transforms.Combine.BinaryCombineFn; +import org.apache.beam.sdk.util.common.Counter; +import org.apache.beam.sdk.util.common.Counter.AggregationKind; +import org.apache.beam.sdk.util.common.CounterProvider; import java.io.Serializable; import java.util.Comparator; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/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 8ef28da..d502b93 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 @@ -15,17 +15,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms; +package org.apache.beam.sdk.transforms; -import com.google.cloud.dataflow.sdk.Pipeline; -import com.google.cloud.dataflow.sdk.coders.CannotProvideCoderException; -import com.google.cloud.dataflow.sdk.coders.Coder; -import com.google.cloud.dataflow.sdk.transforms.display.DisplayData.Builder; -import com.google.cloud.dataflow.sdk.transforms.display.HasDisplayData; -import com.google.cloud.dataflow.sdk.util.StringUtils; -import com.google.cloud.dataflow.sdk.values.PInput; -import com.google.cloud.dataflow.sdk.values.POutput; -import com.google.cloud.dataflow.sdk.values.TypedPValue; +import org.apache.beam.sdk.Pipeline; +import org.apache.beam.sdk.coders.CannotProvideCoderException; +import org.apache.beam.sdk.coders.Coder; +import org.apache.beam.sdk.transforms.display.DisplayData.Builder; +import org.apache.beam.sdk.transforms.display.HasDisplayData; +import org.apache.beam.sdk.util.StringUtils; +import org.apache.beam.sdk.values.PInput; +import org.apache.beam.sdk.values.POutput; +import org.apache.beam.sdk.values.TypedPValue; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; @@ -37,14 +37,14 @@ import java.io.Serializable; * {@code OutputT} (some subtype of {@link POutput}). * * <p>Common PTransforms include root PTransforms like - * {@link com.google.cloud.dataflow.sdk.io.TextIO.Read}, + * {@link org.apache.beam.sdk.io.TextIO.Read}, * {@link Create}, processing and * conversion operations like {@link ParDo}, * {@link GroupByKey}, - * {@link com.google.cloud.dataflow.sdk.transforms.join.CoGroupByKey}, + * {@link org.apache.beam.sdk.transforms.join.CoGroupByKey}, * {@link Combine}, and {@link Count}, and outputting * PTransforms like - * {@link com.google.cloud.dataflow.sdk.io.TextIO.Write}. Users also + * {@link org.apache.beam.sdk.io.TextIO.Write}. Users also * define their own application-specific composite PTransforms. * * <p>Each {@code PTransform<InputT, OutputT>} has a single @@ -52,18 +52,18 @@ import java.io.Serializable; * PTransforms conceptually transform one input value to one output * value, and in this case {@code InputT} and {@code Output} are * typically instances of - * {@link com.google.cloud.dataflow.sdk.values.PCollection}. + * {@link org.apache.beam.sdk.values.PCollection}. * A root * PTransform conceptually has no input; in this case, conventionally - * a {@link com.google.cloud.dataflow.sdk.values.PBegin} object + * a {@link org.apache.beam.sdk.values.PBegin} object * produced by calling {@link Pipeline#begin} is used as the input. * An outputting PTransform conceptually has no output; in this case, - * conventionally {@link com.google.cloud.dataflow.sdk.values.PDone} + * conventionally {@link org.apache.beam.sdk.values.PDone} * is used as its output type. Some PTransforms conceptually have * multiple inputs and/or outputs; in these cases special "bundling" * classes like - * {@link com.google.cloud.dataflow.sdk.values.PCollectionList}, - * {@link com.google.cloud.dataflow.sdk.values.PCollectionTuple} + * {@link org.apache.beam.sdk.values.PCollectionList}, + * {@link org.apache.beam.sdk.values.PCollectionTuple} * are used * to combine multiple values into a single bundle for passing into or * returning from the PTransform. @@ -100,7 +100,7 @@ import java.io.Serializable; * its own name derived from the name of its producing PTransform. * * <p>Each PCollection output produced by a PTransform - * also records a {@link com.google.cloud.dataflow.sdk.coders.Coder} + * also records a {@link org.apache.beam.sdk.coders.Coder} * that specifies how the elements of that PCollection * are to be encoded as a byte string, if necessary. The * PTransform may provide a default Coder for any of its outputs, for @@ -109,17 +109,17 @@ import java.io.Serializable; * the system will attempt to infer a Coder for it, based on * what's known at run-time about the Java type of the output's * elements. The enclosing {@link Pipeline}'s - * {@link com.google.cloud.dataflow.sdk.coders.CoderRegistry} + * {@link org.apache.beam.sdk.coders.CoderRegistry} * (accessible via {@link Pipeline#getCoderRegistry}) defines the * mapping from Java types to the default Coder to use, for a standard * set of Java types; users can extend this mapping for additional * types, via - * {@link com.google.cloud.dataflow.sdk.coders.CoderRegistry#registerCoder}. + * {@link org.apache.beam.sdk.coders.CoderRegistry#registerCoder}. * If this inference process fails, either because the Java type was * not known at run-time (e.g., due to Java's "erasure" of generic * types) or there was no default Coder registered, then the Coder * should be specified manually by calling - * {@link com.google.cloud.dataflow.sdk.values.TypedPValue#setCoder} + * {@link org.apache.beam.sdk.values.TypedPValue#setCoder} * on the output PCollection. The Coder of every output * PCollection must be determined one way or another * before that output is used as an input to another PTransform, or @@ -185,7 +185,7 @@ public abstract class PTransform<InputT extends PInput, OutputT extends POutput> * <p>The default implementation throws an exception. A derived class must * either implement apply, or else each runner must supply a custom * implementation via - * {@link com.google.cloud.dataflow.sdk.runners.PipelineRunner#apply}. + * {@link org.apache.beam.sdk.runners.PipelineRunner#apply}. */ public OutputT apply(InputT input) { throw new IllegalArgumentException( http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/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 8f5d26c..b448c26 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 @@ -15,38 +15,38 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms; +package org.apache.beam.sdk.transforms; +import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.annotations.Experimental; +import org.apache.beam.sdk.coders.CannotProvideCoderException; +import org.apache.beam.sdk.coders.Coder; +import org.apache.beam.sdk.coders.CoderException; +import org.apache.beam.sdk.runners.DirectPipelineRunner; +import org.apache.beam.sdk.transforms.display.DisplayData.Builder; +import org.apache.beam.sdk.transforms.windowing.WindowFn; +import org.apache.beam.sdk.util.DirectModeExecutionContext; +import org.apache.beam.sdk.util.DirectSideInputReader; +import org.apache.beam.sdk.util.DoFnRunner; +import org.apache.beam.sdk.util.DoFnRunnerBase; +import org.apache.beam.sdk.util.DoFnRunners; +import org.apache.beam.sdk.util.IllegalMutationException; +import org.apache.beam.sdk.util.MutationDetector; +import org.apache.beam.sdk.util.MutationDetectors; +import org.apache.beam.sdk.util.PTuple; +import org.apache.beam.sdk.util.SerializableUtils; +import org.apache.beam.sdk.util.SideInputReader; +import org.apache.beam.sdk.util.StringUtils; +import org.apache.beam.sdk.util.UserCodeException; +import org.apache.beam.sdk.util.WindowedValue; +import org.apache.beam.sdk.values.KV; +import org.apache.beam.sdk.values.PCollection; +import org.apache.beam.sdk.values.PCollectionTuple; +import org.apache.beam.sdk.values.PCollectionView; +import org.apache.beam.sdk.values.TupleTag; +import org.apache.beam.sdk.values.TupleTagList; +import org.apache.beam.sdk.values.TypedPValue; -import com.google.cloud.dataflow.sdk.Pipeline; -import com.google.cloud.dataflow.sdk.coders.CannotProvideCoderException; -import com.google.cloud.dataflow.sdk.coders.Coder; -import com.google.cloud.dataflow.sdk.coders.CoderException; -import com.google.cloud.dataflow.sdk.runners.DirectPipelineRunner; -import com.google.cloud.dataflow.sdk.transforms.display.DisplayData.Builder; -import com.google.cloud.dataflow.sdk.transforms.windowing.WindowFn; -import com.google.cloud.dataflow.sdk.util.DirectModeExecutionContext; -import com.google.cloud.dataflow.sdk.util.DirectSideInputReader; -import com.google.cloud.dataflow.sdk.util.DoFnRunner; -import com.google.cloud.dataflow.sdk.util.DoFnRunnerBase; -import com.google.cloud.dataflow.sdk.util.DoFnRunners; -import com.google.cloud.dataflow.sdk.util.IllegalMutationException; -import com.google.cloud.dataflow.sdk.util.MutationDetector; -import com.google.cloud.dataflow.sdk.util.MutationDetectors; -import com.google.cloud.dataflow.sdk.util.PTuple; -import com.google.cloud.dataflow.sdk.util.SerializableUtils; -import com.google.cloud.dataflow.sdk.util.SideInputReader; -import com.google.cloud.dataflow.sdk.util.StringUtils; -import com.google.cloud.dataflow.sdk.util.UserCodeException; -import com.google.cloud.dataflow.sdk.util.WindowedValue; -import com.google.cloud.dataflow.sdk.values.KV; -import com.google.cloud.dataflow.sdk.values.PCollection; -import com.google.cloud.dataflow.sdk.values.PCollectionTuple; -import com.google.cloud.dataflow.sdk.values.PCollectionView; -import com.google.cloud.dataflow.sdk.values.TupleTag; -import com.google.cloud.dataflow.sdk.values.TupleTagList; -import com.google.cloud.dataflow.sdk.values.TypedPValue; import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/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 60e1d49..47d49f7 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 @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms; +package org.apache.beam.sdk.transforms; -import com.google.cloud.dataflow.sdk.coders.Coder; -import com.google.cloud.dataflow.sdk.values.PCollection; -import com.google.cloud.dataflow.sdk.values.PCollectionList; -import com.google.cloud.dataflow.sdk.values.PCollectionTuple; -import com.google.cloud.dataflow.sdk.values.TupleTag; -import com.google.cloud.dataflow.sdk.values.TupleTagList; +import org.apache.beam.sdk.coders.Coder; +import org.apache.beam.sdk.values.PCollection; +import org.apache.beam.sdk.values.PCollectionList; +import org.apache.beam.sdk.values.PCollectionTuple; +import org.apache.beam.sdk.values.TupleTag; +import org.apache.beam.sdk.values.TupleTagList; import java.io.Serializable; @@ -56,7 +56,7 @@ import java.io.Serializable; * <p>Each output element has the same timestamp and is in the same windows * as its corresponding input element, and each output {@code PCollection} * has the same - * {@link com.google.cloud.dataflow.sdk.transforms.windowing.WindowFn} + * {@link org.apache.beam.sdk.transforms.windowing.WindowFn} * associated with it as the input. * * @param <T> the type of the elements of the input and output http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/RemoveDuplicates.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/RemoveDuplicates.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/RemoveDuplicates.java index c9738a3..84b1f80 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/RemoveDuplicates.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/RemoveDuplicates.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms; +package org.apache.beam.sdk.transforms; -import com.google.cloud.dataflow.sdk.values.KV; -import com.google.cloud.dataflow.sdk.values.PCollection; -import com.google.cloud.dataflow.sdk.values.TypeDescriptor; +import org.apache.beam.sdk.values.KV; +import org.apache.beam.sdk.values.PCollection; +import org.apache.beam.sdk.values.TypeDescriptor; /** * {@code RemoveDuplicates<T>} takes a {@code PCollection<T>} and @@ -43,7 +43,7 @@ import com.google.cloud.dataflow.sdk.values.TypeDescriptor; * <p>Each output element is in the same window as its corresponding input * element, and has the timestamp of the end of that window. The output * {@code PCollection} has the same - * {@link com.google.cloud.dataflow.sdk.transforms.windowing.WindowFn} + * {@link org.apache.beam.sdk.transforms.windowing.WindowFn} * as the input. * * <p>Does not preserve any order the input PCollection might have had. http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/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 83c7f2e..1e621d4 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 @@ -15,18 +15,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms; - -import com.google.cloud.dataflow.sdk.coders.BigEndianIntegerCoder; -import com.google.cloud.dataflow.sdk.coders.Coder; -import com.google.cloud.dataflow.sdk.coders.CoderRegistry; -import com.google.cloud.dataflow.sdk.coders.IterableCoder; -import com.google.cloud.dataflow.sdk.coders.KvCoder; -import com.google.cloud.dataflow.sdk.coders.VoidCoder; -import com.google.cloud.dataflow.sdk.transforms.Combine.CombineFn; -import com.google.cloud.dataflow.sdk.values.KV; -import com.google.cloud.dataflow.sdk.values.PCollection; -import com.google.cloud.dataflow.sdk.values.PCollectionView; +package org.apache.beam.sdk.transforms; + +import org.apache.beam.sdk.coders.BigEndianIntegerCoder; +import org.apache.beam.sdk.coders.Coder; +import org.apache.beam.sdk.coders.CoderRegistry; +import org.apache.beam.sdk.coders.IterableCoder; +import org.apache.beam.sdk.coders.KvCoder; +import org.apache.beam.sdk.coders.VoidCoder; +import org.apache.beam.sdk.transforms.Combine.CombineFn; +import org.apache.beam.sdk.values.KV; +import org.apache.beam.sdk.values.PCollection; +import org.apache.beam.sdk.values.PCollectionView; + import com.google.common.base.Preconditions; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/SerializableComparator.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/SerializableComparator.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/SerializableComparator.java index 52cdaa0..390b852 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/SerializableComparator.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/SerializableComparator.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms; +package org.apache.beam.sdk.transforms; import java.io.Serializable; import java.util.Comparator; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/SerializableFunction.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/SerializableFunction.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/SerializableFunction.java index d1da82d..eb15630 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/SerializableFunction.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/SerializableFunction.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms; +package org.apache.beam.sdk.transforms; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/SimpleFunction.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/SimpleFunction.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/SimpleFunction.java index bb8ea4c..a879925 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/SimpleFunction.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/SimpleFunction.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms; +package org.apache.beam.sdk.transforms; -import com.google.cloud.dataflow.sdk.values.TypeDescriptor; +import org.apache.beam.sdk.values.TypeDescriptor; /** * A {@link SerializableFunction} which is not a <i>functional interface</i>. http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Sum.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Sum.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Sum.java index 7144aa3..07f78b5 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Sum.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Sum.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms; +package org.apache.beam.sdk.transforms; -import com.google.cloud.dataflow.sdk.util.common.Counter; -import com.google.cloud.dataflow.sdk.util.common.Counter.AggregationKind; -import com.google.cloud.dataflow.sdk.util.common.CounterProvider; +import org.apache.beam.sdk.util.common.Counter; +import org.apache.beam.sdk.util.common.Counter.AggregationKind; +import org.apache.beam.sdk.util.common.CounterProvider; /** * {@code PTransform}s for computing the sum of the elements in a http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/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 b81c152..82747c2 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 @@ -15,21 +15,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms; - -import com.google.cloud.dataflow.sdk.coders.Coder; -import com.google.cloud.dataflow.sdk.coders.CoderException; -import com.google.cloud.dataflow.sdk.coders.CoderRegistry; -import com.google.cloud.dataflow.sdk.coders.CustomCoder; -import com.google.cloud.dataflow.sdk.coders.ListCoder; -import com.google.cloud.dataflow.sdk.transforms.Combine.AccumulatingCombineFn; -import com.google.cloud.dataflow.sdk.transforms.Combine.AccumulatingCombineFn.Accumulator; -import com.google.cloud.dataflow.sdk.transforms.Combine.PerKey; -import com.google.cloud.dataflow.sdk.transforms.windowing.GlobalWindow; -import com.google.cloud.dataflow.sdk.transforms.windowing.GlobalWindows; -import com.google.cloud.dataflow.sdk.util.common.ElementByteSizeObserver; -import com.google.cloud.dataflow.sdk.values.KV; -import com.google.cloud.dataflow.sdk.values.PCollection; +package org.apache.beam.sdk.transforms; + +import org.apache.beam.sdk.coders.Coder; +import org.apache.beam.sdk.coders.CoderException; +import org.apache.beam.sdk.coders.CoderRegistry; +import org.apache.beam.sdk.coders.CustomCoder; +import org.apache.beam.sdk.coders.ListCoder; +import org.apache.beam.sdk.transforms.Combine.AccumulatingCombineFn; +import org.apache.beam.sdk.transforms.Combine.AccumulatingCombineFn.Accumulator; +import org.apache.beam.sdk.transforms.Combine.PerKey; +import org.apache.beam.sdk.transforms.windowing.GlobalWindow; +import org.apache.beam.sdk.transforms.windowing.GlobalWindows; +import org.apache.beam.sdk.util.common.ElementByteSizeObserver; +import org.apache.beam.sdk.values.KV; +import org.apache.beam.sdk.values.PCollection; + import com.google.common.base.Preconditions; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Values.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Values.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Values.java index 3fc69ca..0b533b8 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Values.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Values.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms; +package org.apache.beam.sdk.transforms; -import com.google.cloud.dataflow.sdk.values.KV; -import com.google.cloud.dataflow.sdk.values.PCollection; +import org.apache.beam.sdk.values.KV; +import org.apache.beam.sdk.values.PCollection; /** * {@code Values<V>} takes a {@code PCollection} of {@code KV<K, V>}s and @@ -33,7 +33,7 @@ import com.google.cloud.dataflow.sdk.values.PCollection; * <p>Each output element has the same timestamp and is in the same windows * as its corresponding input element, and the output {@code PCollection} * has the same - * {@link com.google.cloud.dataflow.sdk.transforms.windowing.WindowFn} + * {@link org.apache.beam.sdk.transforms.windowing.WindowFn} * associated with it as the input. * * <p>See also {@link Keys}. http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/View.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/View.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/View.java index 6f40889..3df915b 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/View.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/View.java @@ -15,15 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms; - -import com.google.cloud.dataflow.sdk.runners.DirectPipelineRunner; -import com.google.cloud.dataflow.sdk.runners.PipelineRunner; -import com.google.cloud.dataflow.sdk.util.PCollectionViews; -import com.google.cloud.dataflow.sdk.util.WindowedValue; -import com.google.cloud.dataflow.sdk.values.KV; -import com.google.cloud.dataflow.sdk.values.PCollection; -import com.google.cloud.dataflow.sdk.values.PCollectionView; +package org.apache.beam.sdk.transforms; + +import org.apache.beam.sdk.runners.DirectPipelineRunner; +import org.apache.beam.sdk.runners.PipelineRunner; +import org.apache.beam.sdk.util.PCollectionViews; +import org.apache.beam.sdk.util.WindowedValue; +import org.apache.beam.sdk.values.KV; +import org.apache.beam.sdk.values.PCollection; +import org.apache.beam.sdk.values.PCollectionView; import java.util.List; import java.util.Map; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/WithKeys.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/WithKeys.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/WithKeys.java index 91ef254..198e7cb 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/WithKeys.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/WithKeys.java @@ -15,15 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms; +package org.apache.beam.sdk.transforms; -import com.google.cloud.dataflow.sdk.coders.CannotProvideCoderException; -import com.google.cloud.dataflow.sdk.coders.Coder; -import com.google.cloud.dataflow.sdk.coders.CoderRegistry; -import com.google.cloud.dataflow.sdk.coders.KvCoder; -import com.google.cloud.dataflow.sdk.values.KV; -import com.google.cloud.dataflow.sdk.values.PCollection; -import com.google.cloud.dataflow.sdk.values.TypeDescriptor; +import org.apache.beam.sdk.coders.CannotProvideCoderException; +import org.apache.beam.sdk.coders.Coder; +import org.apache.beam.sdk.coders.CoderRegistry; +import org.apache.beam.sdk.coders.KvCoder; +import org.apache.beam.sdk.values.KV; +import org.apache.beam.sdk.values.PCollection; +import org.apache.beam.sdk.values.TypeDescriptor; /** * {@code WithKeys<K, V>} takes a {@code PCollection<V>}, and either a @@ -43,7 +43,7 @@ import com.google.cloud.dataflow.sdk.values.TypeDescriptor; * <p>Each output element has the same timestamp and is in the same windows * as its corresponding input element, and the output {@code PCollection} * has the same - * {@link com.google.cloud.dataflow.sdk.transforms.windowing.WindowFn} + * {@link org.apache.beam.sdk.transforms.windowing.WindowFn} * associated with it as the input. * * @param <K> the type of the keys in the output {@code PCollection} http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/WithTimestamps.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/WithTimestamps.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/WithTimestamps.java index bc8e047..eae8de5 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/WithTimestamps.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/WithTimestamps.java @@ -15,15 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms; +package org.apache.beam.sdk.transforms; import static com.google.common.base.Preconditions.checkNotNull; -import com.google.cloud.dataflow.sdk.io.Source; -import com.google.cloud.dataflow.sdk.transforms.windowing.BoundedWindow; -import com.google.cloud.dataflow.sdk.transforms.windowing.Window; -import com.google.cloud.dataflow.sdk.transforms.windowing.WindowFn; -import com.google.cloud.dataflow.sdk.values.PCollection; +import org.apache.beam.sdk.io.Source; +import org.apache.beam.sdk.transforms.windowing.BoundedWindow; +import org.apache.beam.sdk.transforms.windowing.Window; +import org.apache.beam.sdk.transforms.windowing.WindowFn; +import org.apache.beam.sdk.values.PCollection; import org.joda.time.Duration; import org.joda.time.Instant; @@ -32,10 +32,10 @@ import org.joda.time.Instant; * A {@link PTransform} for assigning timestamps to all the elements of a {@link PCollection}. * * <p>Timestamps are used to assign {@link BoundedWindow Windows} to elements within the - * {@link Window#into(com.google.cloud.dataflow.sdk.transforms.windowing.WindowFn)} + * {@link Window#into(org.apache.beam.sdk.transforms.windowing.WindowFn)} * {@link PTransform}. Assigning timestamps is useful when the input data set comes from a * {@link Source} without implicit timestamps (such as - * {@link com.google.cloud.dataflow.sdk.io.TextIO.Read TextIO}). + * {@link org.apache.beam.sdk.io.TextIO.Read TextIO}). * */ public class WithTimestamps<T> extends PTransform<PCollection<T>, PCollection<T>> { http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Write.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Write.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Write.java index 7c6f677..417da44 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Write.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Write.java @@ -15,15 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms; +package org.apache.beam.sdk.transforms; /** * A backwards-compatible {@code Write} class that simply inherits from the - * {@link com.google.cloud.dataflow.sdk.io.Write} class that should be used instead. + * {@link org.apache.beam.sdk.io.Write} class that should be used instead. * - * @deprecated: use {@link com.google.cloud.dataflow.sdk.io.Write} from the - * {@code com.google.cloud.dataflow.sdk.io} package instead. + * @deprecated: use {@link org.apache.beam.sdk.io.Write} from the + * {@code org.apache.beam.sdk.io} package instead. */ @Deprecated -public class Write extends com.google.cloud.dataflow.sdk.io.Write { +public class Write extends org.apache.beam.sdk.io.Write { } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/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 d9098ba..3aeed83 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 @@ -15,14 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.display; +package org.apache.beam.sdk.transforms.display; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import com.google.cloud.dataflow.sdk.transforms.DoFn; -import com.google.cloud.dataflow.sdk.transforms.PTransform; -import com.google.cloud.dataflow.sdk.transforms.ParDo; +import org.apache.beam.sdk.transforms.DoFn; +import org.apache.beam.sdk.transforms.PTransform; +import org.apache.beam.sdk.transforms.ParDo; + import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.common.collect.Sets; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/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 36f7a31..b295d97 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 @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.display; +package org.apache.beam.sdk.transforms.display; -import com.google.cloud.dataflow.sdk.transforms.PTransform; +import org.apache.beam.sdk.transforms.PTransform; /** * Marker interface for {@link PTransform PTransforms} and components used within http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/CoGbkResult.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/CoGbkResult.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/CoGbkResult.java index c7aef32..3732bec 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/CoGbkResult.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/CoGbkResult.java @@ -15,19 +15,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.join; - -import static com.google.cloud.dataflow.sdk.util.Structs.addObject; - -import com.google.cloud.dataflow.sdk.coders.Coder; -import com.google.cloud.dataflow.sdk.coders.CoderException; -import com.google.cloud.dataflow.sdk.coders.IterableCoder; -import com.google.cloud.dataflow.sdk.coders.StandardCoder; -import com.google.cloud.dataflow.sdk.util.CloudObject; -import com.google.cloud.dataflow.sdk.util.PropertyNames; -import com.google.cloud.dataflow.sdk.util.common.Reiterator; -import com.google.cloud.dataflow.sdk.values.TupleTag; -import com.google.cloud.dataflow.sdk.values.TupleTagList; +package org.apache.beam.sdk.transforms.join; + +import static org.apache.beam.sdk.util.Structs.addObject; + +import org.apache.beam.sdk.coders.Coder; +import org.apache.beam.sdk.coders.CoderException; +import org.apache.beam.sdk.coders.IterableCoder; +import org.apache.beam.sdk.coders.StandardCoder; +import org.apache.beam.sdk.util.CloudObject; +import org.apache.beam.sdk.util.PropertyNames; +import org.apache.beam.sdk.util.common.Reiterator; +import org.apache.beam.sdk.values.PCollection; +import org.apache.beam.sdk.values.TupleTag; +import org.apache.beam.sdk.values.TupleTagList; + import com.google.common.base.Preconditions; import com.google.common.collect.Iterators; import com.google.common.collect.PeekingIterator; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/CoGbkResultSchema.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/CoGbkResultSchema.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/CoGbkResultSchema.java index bed8a5b..29a0c7d 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/CoGbkResultSchema.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/CoGbkResultSchema.java @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.join; +package org.apache.beam.sdk.transforms.join; -import static com.google.cloud.dataflow.sdk.util.Structs.addList; +import static org.apache.beam.sdk.util.Structs.addList; -import com.google.cloud.dataflow.sdk.util.CloudObject; -import com.google.cloud.dataflow.sdk.util.PropertyNames; -import com.google.cloud.dataflow.sdk.values.TupleTag; -import com.google.cloud.dataflow.sdk.values.TupleTagList; +import org.apache.beam.sdk.util.CloudObject; +import org.apache.beam.sdk.util.PropertyNames; +import org.apache.beam.sdk.values.TupleTag; +import org.apache.beam.sdk.values.TupleTagList; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/CoGroupByKey.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/CoGroupByKey.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/CoGroupByKey.java index 6ac76d6..d7ac5e4 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/CoGroupByKey.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/CoGroupByKey.java @@ -15,20 +15,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.join; - -import com.google.cloud.dataflow.sdk.coders.Coder; -import com.google.cloud.dataflow.sdk.coders.KvCoder; -import com.google.cloud.dataflow.sdk.transforms.DoFn; -import com.google.cloud.dataflow.sdk.transforms.Flatten; -import com.google.cloud.dataflow.sdk.transforms.GroupByKey; -import com.google.cloud.dataflow.sdk.transforms.PTransform; -import com.google.cloud.dataflow.sdk.transforms.ParDo; -import com.google.cloud.dataflow.sdk.transforms.join.CoGbkResult.CoGbkResultCoder; -import com.google.cloud.dataflow.sdk.transforms.join.KeyedPCollectionTuple.TaggedKeyedPCollection; -import com.google.cloud.dataflow.sdk.values.KV; -import com.google.cloud.dataflow.sdk.values.PCollection; -import com.google.cloud.dataflow.sdk.values.PCollectionList; +package org.apache.beam.sdk.transforms.join; + +import org.apache.beam.sdk.coders.Coder; +import org.apache.beam.sdk.coders.KvCoder; +import org.apache.beam.sdk.transforms.DoFn; +import org.apache.beam.sdk.transforms.Flatten; +import org.apache.beam.sdk.transforms.GroupByKey; +import org.apache.beam.sdk.transforms.PTransform; +import org.apache.beam.sdk.transforms.ParDo; +import org.apache.beam.sdk.transforms.join.CoGbkResult.CoGbkResultCoder; +import org.apache.beam.sdk.transforms.join.KeyedPCollectionTuple.TaggedKeyedPCollection; +import org.apache.beam.sdk.values.KV; +import org.apache.beam.sdk.values.PCollection; +import org.apache.beam.sdk.values.PCollectionList; import java.util.ArrayList; import java.util.List; @@ -38,7 +38,7 @@ import java.util.List; * of tables. A {@link CoGroupByKey} groups results from all * tables by like keys into {@link CoGbkResult}s, * from which the results for any specific table can be accessed by the - * {@link com.google.cloud.dataflow.sdk.values.TupleTag} + * {@link org.apache.beam.sdk.values.TupleTag} * supplied with the initial table. * * <p>Example of performing a {@link CoGroupByKey} followed by a http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/KeyedPCollectionTuple.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/KeyedPCollectionTuple.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/KeyedPCollectionTuple.java index 1a5758c..0852c9c 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/KeyedPCollectionTuple.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/KeyedPCollectionTuple.java @@ -15,19 +15,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.join; - -import com.google.cloud.dataflow.sdk.Pipeline; -import com.google.cloud.dataflow.sdk.coders.Coder; -import com.google.cloud.dataflow.sdk.coders.KvCoder; -import com.google.cloud.dataflow.sdk.transforms.PTransform; -import com.google.cloud.dataflow.sdk.values.KV; -import com.google.cloud.dataflow.sdk.values.PCollection; -import com.google.cloud.dataflow.sdk.values.PInput; -import com.google.cloud.dataflow.sdk.values.POutput; -import com.google.cloud.dataflow.sdk.values.PValue; -import com.google.cloud.dataflow.sdk.values.TupleTag; -import com.google.cloud.dataflow.sdk.values.TupleTagList; +package org.apache.beam.sdk.transforms.join; + +import org.apache.beam.sdk.Pipeline; +import org.apache.beam.sdk.coders.Coder; +import org.apache.beam.sdk.coders.KvCoder; +import org.apache.beam.sdk.transforms.PTransform; +import org.apache.beam.sdk.values.KV; +import org.apache.beam.sdk.values.PCollection; +import org.apache.beam.sdk.values.PInput; +import org.apache.beam.sdk.values.POutput; +import org.apache.beam.sdk.values.PValue; +import org.apache.beam.sdk.values.TupleTag; +import org.apache.beam.sdk.values.TupleTagList; import java.util.ArrayList; import java.util.Collection; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/RawUnionValue.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/RawUnionValue.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/RawUnionValue.java index a74ee52..159b100 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/RawUnionValue.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/RawUnionValue.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.join; +package org.apache.beam.sdk.transforms.join; // TODO: Think about making this a complete dynamic union by adding // a schema. Type would then be defined by the corresponding schema entry. http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/UnionCoder.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/UnionCoder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/UnionCoder.java index 8e6206c..43f1adf 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/UnionCoder.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/UnionCoder.java @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.join; - -import com.google.cloud.dataflow.sdk.coders.Coder; -import com.google.cloud.dataflow.sdk.coders.CoderException; -import com.google.cloud.dataflow.sdk.coders.StandardCoder; -import com.google.cloud.dataflow.sdk.util.PropertyNames; -import com.google.cloud.dataflow.sdk.util.VarInt; -import com.google.cloud.dataflow.sdk.util.common.ElementByteSizeObserver; +package org.apache.beam.sdk.transforms.join; + +import org.apache.beam.sdk.coders.Coder; +import org.apache.beam.sdk.coders.CoderException; +import org.apache.beam.sdk.coders.StandardCoder; +import org.apache.beam.sdk.util.PropertyNames; +import org.apache.beam.sdk.util.VarInt; +import org.apache.beam.sdk.util.common.ElementByteSizeObserver; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/package-info.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/package-info.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/package-info.java index 7672a3a..f4b315e 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/package-info.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/package-info.java @@ -16,7 +16,7 @@ * limitations under the License. */ /** - * Defines the {@link com.google.cloud.dataflow.sdk.transforms.join.CoGroupByKey} transform + * Defines the {@link org.apache.beam.sdk.transforms.join.CoGroupByKey} transform * for joining multiple PCollections. */ -package com.google.cloud.dataflow.sdk.transforms.join; +package org.apache.beam.sdk.transforms.join; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/package-info.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/package-info.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/package-info.java index 68d602a..892dee9 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/package-info.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/package-info.java @@ -16,28 +16,28 @@ * limitations under the License. */ /** - * Defines {@link com.google.cloud.dataflow.sdk.transforms.PTransform}s for transforming + * Defines {@link org.apache.beam.sdk.transforms.PTransform}s for transforming * data in a pipeline. * - * <p>A {@link com.google.cloud.dataflow.sdk.transforms.PTransform} is an operation that takes an - * {@code InputT} (some subtype of {@link com.google.cloud.dataflow.sdk.values.PInput}) + * <p>A {@link org.apache.beam.sdk.transforms.PTransform} is an operation that takes an + * {@code InputT} (some subtype of {@link org.apache.beam.sdk.values.PInput}) * and produces an - * {@code OutputT} (some subtype of {@link com.google.cloud.dataflow.sdk.values.POutput}). + * {@code OutputT} (some subtype of {@link org.apache.beam.sdk.values.POutput}). * * <p>Common PTransforms include root PTransforms like - * {@link com.google.cloud.dataflow.sdk.io.TextIO.Read} and - * {@link com.google.cloud.dataflow.sdk.transforms.Create}, processing and - * conversion operations like {@link com.google.cloud.dataflow.sdk.transforms.ParDo}, - * {@link com.google.cloud.dataflow.sdk.transforms.GroupByKey}, - * {@link com.google.cloud.dataflow.sdk.transforms.join.CoGroupByKey}, - * {@link com.google.cloud.dataflow.sdk.transforms.Combine}, and - * {@link com.google.cloud.dataflow.sdk.transforms.Count}, and outputting + * {@link org.apache.beam.sdk.io.TextIO.Read} and + * {@link org.apache.beam.sdk.transforms.Create}, processing and + * conversion operations like {@link org.apache.beam.sdk.transforms.ParDo}, + * {@link org.apache.beam.sdk.transforms.GroupByKey}, + * {@link org.apache.beam.sdk.transforms.join.CoGroupByKey}, + * {@link org.apache.beam.sdk.transforms.Combine}, and + * {@link org.apache.beam.sdk.transforms.Count}, and outputting * PTransforms like - * {@link com.google.cloud.dataflow.sdk.io.TextIO.Write}. + * {@link org.apache.beam.sdk.io.TextIO.Write}. * * <p>New PTransforms can be created by composing existing PTransforms. * Most PTransforms in this package are composites, and users can also create composite PTransforms * for their own application-specific logic. * */ -package com.google.cloud.dataflow.sdk.transforms; +package org.apache.beam.sdk.transforms; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterAll.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterAll.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterAll.java index aa93ec6..ac1fa43 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterAll.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterAll.java @@ -15,11 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.windowing; +package org.apache.beam.sdk.transforms.windowing; import org.apache.beam.sdk.annotations.Experimental; -import com.google.cloud.dataflow.sdk.transforms.windowing.Trigger.OnceTrigger; -import com.google.cloud.dataflow.sdk.util.ExecutableTrigger; +import org.apache.beam.sdk.transforms.windowing.Trigger.OnceTrigger; +import org.apache.beam.sdk.util.ExecutableTrigger; + import com.google.common.base.Preconditions; import org.joda.time.Instant; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterDelayFromFirstElement.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterDelayFromFirstElement.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterDelayFromFirstElement.java index 34f7056..83e0bea 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterDelayFromFirstElement.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterDelayFromFirstElement.java @@ -15,22 +15,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.windowing; +package org.apache.beam.sdk.transforms.windowing; import org.apache.beam.sdk.annotations.Experimental; -import com.google.cloud.dataflow.sdk.coders.InstantCoder; -import com.google.cloud.dataflow.sdk.transforms.Combine; -import com.google.cloud.dataflow.sdk.transforms.Min; -import com.google.cloud.dataflow.sdk.transforms.SerializableFunction; -import com.google.cloud.dataflow.sdk.transforms.windowing.Trigger.OnceTrigger; -import com.google.cloud.dataflow.sdk.util.TimeDomain; -import com.google.cloud.dataflow.sdk.util.state.AccumulatorCombiningState; -import com.google.cloud.dataflow.sdk.util.state.CombiningState; -import com.google.cloud.dataflow.sdk.util.state.MergingStateAccessor; -import com.google.cloud.dataflow.sdk.util.state.StateAccessor; -import com.google.cloud.dataflow.sdk.util.state.StateMerging; -import com.google.cloud.dataflow.sdk.util.state.StateTag; -import com.google.cloud.dataflow.sdk.util.state.StateTags; +import org.apache.beam.sdk.coders.InstantCoder; +import org.apache.beam.sdk.transforms.Combine; +import org.apache.beam.sdk.transforms.Min; +import org.apache.beam.sdk.transforms.SerializableFunction; +import org.apache.beam.sdk.transforms.windowing.Trigger.OnceTrigger; +import org.apache.beam.sdk.util.TimeDomain; +import org.apache.beam.sdk.util.state.AccumulatorCombiningState; +import org.apache.beam.sdk.util.state.CombiningState; +import org.apache.beam.sdk.util.state.MergingStateAccessor; +import org.apache.beam.sdk.util.state.StateAccessor; +import org.apache.beam.sdk.util.state.StateMerging; +import org.apache.beam.sdk.util.state.StateTag; +import org.apache.beam.sdk.util.state.StateTags; + import com.google.common.collect.ImmutableList; import org.joda.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterEach.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterEach.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterEach.java index 46b10da..0c80851 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterEach.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterEach.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.windowing; +package org.apache.beam.sdk.transforms.windowing; import static com.google.common.base.Preconditions.checkArgument; import org.apache.beam.sdk.annotations.Experimental; -import com.google.cloud.dataflow.sdk.util.ExecutableTrigger; +import org.apache.beam.sdk.util.ExecutableTrigger; import org.joda.time.Instant; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterFirst.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterFirst.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterFirst.java index 0a4f885..1462ec4 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterFirst.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterFirst.java @@ -15,11 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.windowing; +package org.apache.beam.sdk.transforms.windowing; import org.apache.beam.sdk.annotations.Experimental; -import com.google.cloud.dataflow.sdk.transforms.windowing.Trigger.OnceTrigger; -import com.google.cloud.dataflow.sdk.util.ExecutableTrigger; +import org.apache.beam.sdk.transforms.windowing.Trigger.OnceTrigger; +import org.apache.beam.sdk.util.ExecutableTrigger; + import com.google.common.base.Preconditions; import org.joda.time.Instant; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterPane.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterPane.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterPane.java index 5a261ee..977259d 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterPane.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterPane.java @@ -15,18 +15,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.windowing; +package org.apache.beam.sdk.transforms.windowing; import org.apache.beam.sdk.annotations.Experimental; -import com.google.cloud.dataflow.sdk.coders.VarLongCoder; -import com.google.cloud.dataflow.sdk.transforms.Sum; -import com.google.cloud.dataflow.sdk.transforms.windowing.Trigger.OnceTrigger; -import com.google.cloud.dataflow.sdk.util.state.AccumulatorCombiningState; -import com.google.cloud.dataflow.sdk.util.state.MergingStateAccessor; -import com.google.cloud.dataflow.sdk.util.state.StateAccessor; -import com.google.cloud.dataflow.sdk.util.state.StateMerging; -import com.google.cloud.dataflow.sdk.util.state.StateTag; -import com.google.cloud.dataflow.sdk.util.state.StateTags; +import org.apache.beam.sdk.coders.VarLongCoder; +import org.apache.beam.sdk.transforms.Sum; +import org.apache.beam.sdk.transforms.windowing.Trigger.OnceTrigger; +import org.apache.beam.sdk.util.state.AccumulatorCombiningState; +import org.apache.beam.sdk.util.state.MergingStateAccessor; +import org.apache.beam.sdk.util.state.StateAccessor; +import org.apache.beam.sdk.util.state.StateMerging; +import org.apache.beam.sdk.util.state.StateTag; +import org.apache.beam.sdk.util.state.StateTags; import org.joda.time.Instant; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterProcessingTime.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterProcessingTime.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterProcessingTime.java index 97cefa3..b2ea1b4 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterProcessingTime.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterProcessingTime.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.windowing; +package org.apache.beam.sdk.transforms.windowing; import org.apache.beam.sdk.annotations.Experimental; -import com.google.cloud.dataflow.sdk.transforms.SerializableFunction; -import com.google.cloud.dataflow.sdk.util.TimeDomain; +import org.apache.beam.sdk.transforms.SerializableFunction; +import org.apache.beam.sdk.util.TimeDomain; import org.joda.time.Instant; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterSynchronizedProcessingTime.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterSynchronizedProcessingTime.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterSynchronizedProcessingTime.java index 4ccba04..e8e0fb6 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterSynchronizedProcessingTime.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterSynchronizedProcessingTime.java @@ -15,10 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.windowing; +package org.apache.beam.sdk.transforms.windowing; + +import org.apache.beam.sdk.transforms.SerializableFunction; +import org.apache.beam.sdk.util.TimeDomain; -import com.google.cloud.dataflow.sdk.transforms.SerializableFunction; -import com.google.cloud.dataflow.sdk.util.TimeDomain; import com.google.common.base.Objects; import org.joda.time.Instant; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterWatermark.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterWatermark.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterWatermark.java index e62bce2..5aca093 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterWatermark.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterWatermark.java @@ -15,14 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.windowing; +package org.apache.beam.sdk.transforms.windowing; import static com.google.common.base.Preconditions.checkNotNull; import org.apache.beam.sdk.annotations.Experimental; -import com.google.cloud.dataflow.sdk.transforms.windowing.Trigger.OnceTrigger; -import com.google.cloud.dataflow.sdk.util.ExecutableTrigger; -import com.google.cloud.dataflow.sdk.util.TimeDomain; +import org.apache.beam.sdk.transforms.windowing.Trigger.OnceTrigger; +import org.apache.beam.sdk.util.ExecutableTrigger; +import org.apache.beam.sdk.util.TimeDomain; + import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; @@ -37,14 +38,14 @@ import java.util.Objects; * by the pipeline. * * <p>For sources that provide non-heuristic watermarks (e.g. - * {@link com.google.cloud.dataflow.sdk.io.PubsubIO} when using arrival times as event times), the + * {@link org.apache.beam.sdk.io.PubsubIO} when using arrival times as event times), the * watermark is a strict guarantee that no data with an event time earlier than * that watermark will ever be observed in the pipeline. In this case, it's safe to assume that any * pane triggered by an {@code AfterWatermark} trigger with a reference point at or beyond the end * of the window will be the last pane ever for that window. * * <p>For sources that provide heuristic watermarks (e.g. - * {@link com.google.cloud.dataflow.sdk.io.PubsubIO} when using user-supplied event times), the + * {@link org.apache.beam.sdk.io.PubsubIO} when using user-supplied event times), the * watermark itself becomes an <i>estimate</i> that no data with an event time earlier than that * watermark (i.e. "late data") will ever be observed in the pipeline. These heuristics can * often be quite accurate, but the chance of seeing late data for any given window is non-zero. http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/BoundedWindow.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/BoundedWindow.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/BoundedWindow.java index 7b66f7e..50ee9b5 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/BoundedWindow.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/BoundedWindow.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.windowing; +package org.apache.beam.sdk.transforms.windowing; import org.joda.time.Instant; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/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 2da0c03..794d5fd 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 @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.windowing; +package org.apache.beam.sdk.transforms.windowing; -import com.google.cloud.dataflow.sdk.coders.Coder; +import org.apache.beam.sdk.coders.Coder; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/DefaultTrigger.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/DefaultTrigger.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/DefaultTrigger.java index 90c7211..3c6dbf3 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/DefaultTrigger.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/DefaultTrigger.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.windowing; +package org.apache.beam.sdk.transforms.windowing; import org.apache.beam.sdk.annotations.Experimental; -import com.google.cloud.dataflow.sdk.util.TimeDomain; +import org.apache.beam.sdk.util.TimeDomain; import org.joda.time.Instant; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/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 5671fd8..cc43887 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 @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.windowing; +package org.apache.beam.sdk.transforms.windowing; -import com.google.cloud.dataflow.sdk.coders.Coder; +import org.apache.beam.sdk.coders.Coder; import org.joda.time.Duration; import org.joda.time.Instant; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/GlobalWindow.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/GlobalWindow.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/GlobalWindow.java index c4c5183..a4712fe 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/GlobalWindow.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/GlobalWindow.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.windowing; +package org.apache.beam.sdk.transforms.windowing; -import com.google.cloud.dataflow.sdk.coders.AtomicCoder; +import org.apache.beam.sdk.coders.AtomicCoder; import org.joda.time.Duration; import org.joda.time.Instant; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/GlobalWindows.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/GlobalWindows.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/GlobalWindows.java index 734c212..499ffeb 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/GlobalWindows.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/GlobalWindows.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.windowing; +package org.apache.beam.sdk.transforms.windowing; -import com.google.cloud.dataflow.sdk.coders.Coder; +import org.apache.beam.sdk.coders.Coder; import org.joda.time.Instant; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/IntervalWindow.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/IntervalWindow.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/IntervalWindow.java index 88d11e0..6f9c717 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/IntervalWindow.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/IntervalWindow.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.windowing; +package org.apache.beam.sdk.transforms.windowing; -import com.google.cloud.dataflow.sdk.coders.AtomicCoder; -import com.google.cloud.dataflow.sdk.coders.Coder; -import com.google.cloud.dataflow.sdk.coders.CoderException; -import com.google.cloud.dataflow.sdk.coders.DurationCoder; -import com.google.cloud.dataflow.sdk.coders.InstantCoder; +import org.apache.beam.sdk.coders.AtomicCoder; +import org.apache.beam.sdk.coders.Coder; +import org.apache.beam.sdk.coders.CoderException; +import org.apache.beam.sdk.coders.DurationCoder; +import org.apache.beam.sdk.coders.InstantCoder; import com.fasterxml.jackson.annotation.JsonCreator; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/InvalidWindows.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/InvalidWindows.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/InvalidWindows.java index 23f4a3f..e0d65e5 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/InvalidWindows.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/InvalidWindows.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.windowing; +package org.apache.beam.sdk.transforms.windowing; -import com.google.cloud.dataflow.sdk.coders.Coder; +import org.apache.beam.sdk.coders.Coder; import org.joda.time.Instant; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/MergeOverlappingIntervalWindows.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/MergeOverlappingIntervalWindows.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/MergeOverlappingIntervalWindows.java index 0d12c75..8314dd7 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/MergeOverlappingIntervalWindows.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/MergeOverlappingIntervalWindows.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.windowing; +package org.apache.beam.sdk.transforms.windowing; import java.util.ArrayList; import java.util.Arrays; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/NonMergingWindowFn.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/NonMergingWindowFn.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/NonMergingWindowFn.java index 03256d0..d304a68 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/NonMergingWindowFn.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/NonMergingWindowFn.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.windowing; +package org.apache.beam.sdk.transforms.windowing; /** * Abstract base class for {@link WindowFn}s that do not merge windows. http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/OrFinallyTrigger.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/OrFinallyTrigger.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/OrFinallyTrigger.java index 68b9083..48e1dc2 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/OrFinallyTrigger.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/OrFinallyTrigger.java @@ -15,9 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.windowing; +package org.apache.beam.sdk.transforms.windowing; + +import org.apache.beam.sdk.util.ExecutableTrigger; -import com.google.cloud.dataflow.sdk.util.ExecutableTrigger; import com.google.common.annotations.VisibleForTesting; import org.joda.time.Instant; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/OutputTimeFn.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/OutputTimeFn.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/OutputTimeFn.java index 76c8a11..3deea56 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/OutputTimeFn.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/OutputTimeFn.java @@ -15,9 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.windowing; +package org.apache.beam.sdk.transforms.windowing; import org.apache.beam.sdk.annotations.Experimental; + import com.google.common.collect.Ordering; import org.joda.time.Instant; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/OutputTimeFns.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/OutputTimeFns.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/OutputTimeFns.java index a080991..363181b 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/OutputTimeFns.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/OutputTimeFns.java @@ -15,11 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.windowing; +package org.apache.beam.sdk.transforms.windowing; import static com.google.common.base.Preconditions.checkArgument; import org.apache.beam.sdk.annotations.Experimental; + import com.google.common.collect.Iterables; import com.google.common.collect.Ordering; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/PaneInfo.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/PaneInfo.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/PaneInfo.java index 656b87f..266c4d3 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/PaneInfo.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/PaneInfo.java @@ -15,14 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.windowing; - -import com.google.cloud.dataflow.sdk.coders.AtomicCoder; -import com.google.cloud.dataflow.sdk.coders.Coder; -import com.google.cloud.dataflow.sdk.coders.CoderException; -import com.google.cloud.dataflow.sdk.transforms.DoFn; -import com.google.cloud.dataflow.sdk.transforms.GroupByKey; -import com.google.cloud.dataflow.sdk.util.VarInt; +package org.apache.beam.sdk.transforms.windowing; + +import org.apache.beam.sdk.coders.AtomicCoder; +import org.apache.beam.sdk.coders.Coder; +import org.apache.beam.sdk.coders.CoderException; +import org.apache.beam.sdk.transforms.DoFn; +import org.apache.beam.sdk.transforms.GroupByKey; +import org.apache.beam.sdk.util.VarInt; + import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; @@ -35,7 +36,7 @@ import java.util.Objects; /** * Provides information about the pane an element belongs to. Every pane is implicitly associated * with a window. Panes are observable only via the - * {@link com.google.cloud.dataflow.sdk.transforms.DoFn.ProcessContext#pane} method of the context + * {@link org.apache.beam.sdk.transforms.DoFn.ProcessContext#pane} method of the context * passed to a {@link DoFn#processElement} overridden method. * * <p>Note: This does not uniquely identify a pane, and should not be used for comparisons. @@ -64,16 +65,16 @@ public final class PaneInfo { * produces a final pane, it will not be merged into any new windows. * * <p>The predictions above are made using the mechanism of watermarks. - * See {@link com.google.cloud.dataflow.sdk.util.TimerInternals} for more information + * See {@link org.apache.beam.sdk.util.TimerInternals} for more information * about watermarks. * * <p>We can state some properties of {@code LATE} and {@code ON_TIME} panes, but first need some * definitions: * <ol> * <li>We'll call a pipeline 'simple' if it does not use - * {@link com.google.cloud.dataflow.sdk.transforms.DoFn.Context#outputWithTimestamp} in + * {@link org.apache.beam.sdk.transforms.DoFn.Context#outputWithTimestamp} in * any {@code DoFn}, and it uses the same - * {@link com.google.cloud.dataflow.sdk.transforms.windowing.Window.Bound#withAllowedLateness} + * {@link org.apache.beam.sdk.transforms.windowing.Window.Bound#withAllowedLateness} * argument value on all windows (or uses the default of {@link org.joda.time.Duration#ZERO}). * <li>We'll call an element 'locally late', from the point of view of a computation on a * worker, if the element's timestamp is before the input watermark for that computation http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/PartitioningWindowFn.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/PartitioningWindowFn.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/PartitioningWindowFn.java index a756ed9..b0dd8b9 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/PartitioningWindowFn.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/PartitioningWindowFn.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.windowing; +package org.apache.beam.sdk.transforms.windowing; import org.joda.time.Instant; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Repeatedly.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Repeatedly.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Repeatedly.java index 988f0a4..414f107 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Repeatedly.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Repeatedly.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.windowing; +package org.apache.beam.sdk.transforms.windowing; -import com.google.cloud.dataflow.sdk.util.ExecutableTrigger; +import org.apache.beam.sdk.util.ExecutableTrigger; import org.joda.time.Instant; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/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 bf2a487..3be6454 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 @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.windowing; +package org.apache.beam.sdk.transforms.windowing; import org.apache.beam.sdk.annotations.Experimental; import org.apache.beam.sdk.annotations.Experimental.Kind; -import com.google.cloud.dataflow.sdk.coders.Coder; +import org.apache.beam.sdk.coders.Coder; import org.joda.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/b9724454/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 7c2a39e..3a7b072 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 @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.dataflow.sdk.transforms.windowing; +package org.apache.beam.sdk.transforms.windowing; import org.apache.beam.sdk.annotations.Experimental; import org.apache.beam.sdk.annotations.Experimental.Kind; -import com.google.cloud.dataflow.sdk.coders.Coder; +import org.apache.beam.sdk.coders.Coder; import org.joda.time.Duration; import org.joda.time.Instant;