http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/3841f411/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineRunnerHooks.java ---------------------------------------------------------------------- diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineRunnerHooks.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineRunnerHooks.java deleted file mode 100644 index 4d37966..0000000 --- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineRunnerHooks.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.beam.runners.dataflow; - -import org.apache.beam.sdk.annotations.Experimental; - -import com.google.api.services.dataflow.model.Environment; - -/** - * An instance of this class can be passed to the - * {@link DataflowPipelineRunner} to add user defined hooks to be - * invoked at various times during pipeline execution. - */ -@Experimental -public class DataflowPipelineRunnerHooks { - /** - * Allows the user to modify the environment of their job before their job is submitted - * to the service for execution. - * - * @param environment The environment of the job. Users can make change to this instance in order - * to change the environment with which their job executes on the service. - */ - public void modifyEnvironmentBeforeSubmission(Environment environment) {} -}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/3841f411/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslator.java ---------------------------------------------------------------------- diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslator.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslator.java index f5fefc0..e15b9d2 100644 --- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslator.java +++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslator.java @@ -30,7 +30,7 @@ import static org.apache.beam.sdk.util.Structs.getString; import static com.google.common.base.Preconditions.checkArgument; -import org.apache.beam.runners.dataflow.DataflowPipelineRunner.GroupByKeyAndSortValuesOnly; +import org.apache.beam.runners.dataflow.DataflowRunner.GroupByKeyAndSortValuesOnly; import org.apache.beam.runners.dataflow.internal.ReadTranslator; import org.apache.beam.runners.dataflow.options.DataflowPipelineOptions; import org.apache.beam.runners.dataflow.util.DoFnInfo; @@ -139,7 +139,7 @@ public class DataflowPipelineTranslator { */ public JobSpecification translate( Pipeline pipeline, - DataflowPipelineRunner runner, + DataflowRunner runner, List<DataflowPackage> packages) { Translator translator = new Translator(pipeline, runner); @@ -224,7 +224,7 @@ public class DataflowPipelineTranslator { /** * The interface provided to registered callbacks for interacting - * with the {@link DataflowPipelineRunner}, including reading and writing the + * with the {@link DataflowRunner}, including reading and writing the * values of {@link PCollection}s and side inputs ({@link PCollectionView}s). */ public interface TranslationContext { @@ -350,7 +350,7 @@ public class DataflowPipelineTranslator { private final Pipeline pipeline; /** The runner which will execute the pipeline. */ - private final DataflowPipelineRunner runner; + private final DataflowRunner runner; /** The Cloud Dataflow Job representation. */ private final Job job = new Job(); @@ -385,7 +385,7 @@ public class DataflowPipelineTranslator { * Constructs a Translator that will translate the specified * Pipeline into Dataflow objects. */ - public Translator(Pipeline pipeline, DataflowPipelineRunner runner) { + public Translator(Pipeline pipeline, DataflowRunner runner) { this.pipeline = pipeline; this.runner = runner; }