From 4332572610824e4fe305e07aeca80d9b2a3ea4e6 Mon Sep 17 00:00:00 2001 From: Dan Halperin Date: Fri, 15 Apr 2016 17:06:53 -0700 Subject: [PATCH] Remove deprecated sdk.transforms.Write, switch users to sdk.io.Write Post-rename cleanup. --- .../FlinkBatchTransformTranslators.java | 2 +- .../wrappers/SinkOutputFormat.java | 2 +- .../beam/runners/flink/WriteSinkITCase.java | 2 +- .../org/apache/beam/sdk/transforms/Write.java | 29 ------------------- 4 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Write.java diff --git a/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/FlinkBatchTransformTranslators.java b/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/FlinkBatchTransformTranslators.java index a7544da474c6..a03352efae15 100644 --- a/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/FlinkBatchTransformTranslators.java +++ b/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/FlinkBatchTransformTranslators.java @@ -38,6 +38,7 @@ import org.apache.beam.sdk.io.BoundedSource; import org.apache.beam.sdk.io.Read; import org.apache.beam.sdk.io.TextIO; +import org.apache.beam.sdk.io.Write; import org.apache.beam.sdk.transforms.Combine; import org.apache.beam.sdk.transforms.Create; import org.apache.beam.sdk.transforms.DoFn; @@ -46,7 +47,6 @@ import org.apache.beam.sdk.transforms.PTransform; import org.apache.beam.sdk.transforms.ParDo; import org.apache.beam.sdk.transforms.View; -import org.apache.beam.sdk.transforms.Write; import org.apache.beam.sdk.transforms.join.CoGbkResult; import org.apache.beam.sdk.transforms.join.CoGbkResultSchema; import org.apache.beam.sdk.transforms.join.CoGroupByKey; diff --git a/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/wrappers/SinkOutputFormat.java b/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/wrappers/SinkOutputFormat.java index 45267b8e990b..c6a4160af426 100644 --- a/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/wrappers/SinkOutputFormat.java +++ b/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/wrappers/SinkOutputFormat.java @@ -19,8 +19,8 @@ package org.apache.beam.runners.flink.translation.wrappers; import org.apache.beam.sdk.io.Sink; +import org.apache.beam.sdk.io.Write; import org.apache.beam.sdk.options.PipelineOptions; -import org.apache.beam.sdk.transforms.Write; import com.google.common.base.Preconditions; diff --git a/runners/flink/runner/src/test/java/org/apache/beam/runners/flink/WriteSinkITCase.java b/runners/flink/runner/src/test/java/org/apache/beam/runners/flink/WriteSinkITCase.java index 71514d3997c7..36d3aef1424d 100644 --- a/runners/flink/runner/src/test/java/org/apache/beam/runners/flink/WriteSinkITCase.java +++ b/runners/flink/runner/src/test/java/org/apache/beam/runners/flink/WriteSinkITCase.java @@ -24,9 +24,9 @@ import org.apache.beam.sdk.coders.Coder; import org.apache.beam.sdk.coders.StringUtf8Coder; import org.apache.beam.sdk.io.Sink; +import org.apache.beam.sdk.io.Write; import org.apache.beam.sdk.options.PipelineOptions; import org.apache.beam.sdk.transforms.Create; -import org.apache.beam.sdk.transforms.Write; import com.google.common.base.Joiner; 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 deleted file mode 100644 index 417da4443217..000000000000 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Write.java +++ /dev/null @@ -1,29 +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.sdk.transforms; - -/** - * A backwards-compatible {@code Write} class that simply inherits from the - * {@link org.apache.beam.sdk.io.Write} class that should be used 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 org.apache.beam.sdk.io.Write { -}