From e9f60c44518d12a198107c577fbc638f856614cc Mon Sep 17 00:00:00 2001 From: Thomas Groh Date: Tue, 26 Sep 2017 09:34:09 -0700 Subject: [PATCH] Move Runners Core Fn Api classes into a package --- .../core/{ => fn}/FnApiControlClient.java | 2 +- .../FnApiControlClientPoolService.java | 2 +- .../runners/core/{ => fn}/FnDataReceiver.java | 2 +- .../runners/core/{ => fn}/FnDataService.java | 2 +- .../core/{ => fn}/SdkHarnessClient.java | 2 +- .../core/{ => fn}/SdkHarnessDoFnRunner.java | 3 ++- .../beam/runners/core/fn/package-info.java | 22 +++++++++++++++++++ .../FnApiControlClientPoolServiceTest.java | 2 +- .../core/{ => fn}/FnApiControlClientTest.java | 2 +- .../core/{ => fn}/SdkHarnessClientTest.java | 2 +- .../{ => fn}/SdkHarnessDoFnRunnerTest.java | 2 +- 11 files changed, 33 insertions(+), 10 deletions(-) rename runners/core-java/src/main/java/org/apache/beam/runners/core/{ => fn}/FnApiControlClient.java (99%) rename runners/core-java/src/main/java/org/apache/beam/runners/core/{ => fn}/FnApiControlClientPoolService.java (98%) rename runners/core-java/src/main/java/org/apache/beam/runners/core/{ => fn}/FnDataReceiver.java (96%) rename runners/core-java/src/main/java/org/apache/beam/runners/core/{ => fn}/FnDataService.java (98%) rename runners/core-java/src/main/java/org/apache/beam/runners/core/{ => fn}/SdkHarnessClient.java (99%) rename runners/core-java/src/main/java/org/apache/beam/runners/core/{ => fn}/SdkHarnessDoFnRunner.java (97%) create mode 100644 runners/core-java/src/main/java/org/apache/beam/runners/core/fn/package-info.java rename runners/core-java/src/test/java/org/apache/beam/runners/core/{ => fn}/FnApiControlClientPoolServiceTest.java (98%) rename runners/core-java/src/test/java/org/apache/beam/runners/core/{ => fn}/FnApiControlClientTest.java (99%) rename runners/core-java/src/test/java/org/apache/beam/runners/core/{ => fn}/SdkHarnessClientTest.java (98%) rename runners/core-java/src/test/java/org/apache/beam/runners/core/{ => fn}/SdkHarnessDoFnRunnerTest.java (98%) diff --git a/runners/core-java/src/main/java/org/apache/beam/runners/core/FnApiControlClient.java b/runners/core-java/src/main/java/org/apache/beam/runners/core/fn/FnApiControlClient.java similarity index 99% rename from runners/core-java/src/main/java/org/apache/beam/runners/core/FnApiControlClient.java rename to runners/core-java/src/main/java/org/apache/beam/runners/core/fn/FnApiControlClient.java index 4b72bfc90318..0e9674550242 100644 --- a/runners/core-java/src/main/java/org/apache/beam/runners/core/FnApiControlClient.java +++ b/runners/core-java/src/main/java/org/apache/beam/runners/core/fn/FnApiControlClient.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.runners.core; +package org.apache.beam.runners.core.fn; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; diff --git a/runners/core-java/src/main/java/org/apache/beam/runners/core/FnApiControlClientPoolService.java b/runners/core-java/src/main/java/org/apache/beam/runners/core/fn/FnApiControlClientPoolService.java similarity index 98% rename from runners/core-java/src/main/java/org/apache/beam/runners/core/FnApiControlClientPoolService.java rename to runners/core-java/src/main/java/org/apache/beam/runners/core/fn/FnApiControlClientPoolService.java index e05a03d4b156..c8b9bdab4d82 100644 --- a/runners/core-java/src/main/java/org/apache/beam/runners/core/FnApiControlClientPoolService.java +++ b/runners/core-java/src/main/java/org/apache/beam/runners/core/fn/FnApiControlClientPoolService.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.runners.core; +package org.apache.beam.runners.core.fn; import io.grpc.stub.StreamObserver; import java.util.concurrent.BlockingQueue; diff --git a/runners/core-java/src/main/java/org/apache/beam/runners/core/FnDataReceiver.java b/runners/core-java/src/main/java/org/apache/beam/runners/core/fn/FnDataReceiver.java similarity index 96% rename from runners/core-java/src/main/java/org/apache/beam/runners/core/FnDataReceiver.java rename to runners/core-java/src/main/java/org/apache/beam/runners/core/fn/FnDataReceiver.java index 98c5e7f3a038..e9928a7051a5 100644 --- a/runners/core-java/src/main/java/org/apache/beam/runners/core/FnDataReceiver.java +++ b/runners/core-java/src/main/java/org/apache/beam/runners/core/fn/FnDataReceiver.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.runners.core; +package org.apache.beam.runners.core.fn; import java.io.Closeable; diff --git a/runners/core-java/src/main/java/org/apache/beam/runners/core/FnDataService.java b/runners/core-java/src/main/java/org/apache/beam/runners/core/fn/FnDataService.java similarity index 98% rename from runners/core-java/src/main/java/org/apache/beam/runners/core/FnDataService.java rename to runners/core-java/src/main/java/org/apache/beam/runners/core/fn/FnDataService.java index 0b23ded513d3..c8b87cc99fe9 100644 --- a/runners/core-java/src/main/java/org/apache/beam/runners/core/FnDataService.java +++ b/runners/core-java/src/main/java/org/apache/beam/runners/core/fn/FnDataService.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.runners.core; +package org.apache.beam.runners.core.fn; import com.google.auto.value.AutoValue; import com.google.common.util.concurrent.ListenableFuture; diff --git a/runners/core-java/src/main/java/org/apache/beam/runners/core/SdkHarnessClient.java b/runners/core-java/src/main/java/org/apache/beam/runners/core/fn/SdkHarnessClient.java similarity index 99% rename from runners/core-java/src/main/java/org/apache/beam/runners/core/SdkHarnessClient.java rename to runners/core-java/src/main/java/org/apache/beam/runners/core/fn/SdkHarnessClient.java index 655ce0affa85..38ebaedef432 100644 --- a/runners/core-java/src/main/java/org/apache/beam/runners/core/SdkHarnessClient.java +++ b/runners/core-java/src/main/java/org/apache/beam/runners/core/fn/SdkHarnessClient.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.runners.core; +package org.apache.beam.runners.core.fn; import com.google.auto.value.AutoValue; import com.google.common.base.Function; diff --git a/runners/core-java/src/main/java/org/apache/beam/runners/core/SdkHarnessDoFnRunner.java b/runners/core-java/src/main/java/org/apache/beam/runners/core/fn/SdkHarnessDoFnRunner.java similarity index 97% rename from runners/core-java/src/main/java/org/apache/beam/runners/core/SdkHarnessDoFnRunner.java rename to runners/core-java/src/main/java/org/apache/beam/runners/core/fn/SdkHarnessDoFnRunner.java index 27e784e077aa..82afa6f64ebd 100644 --- a/runners/core-java/src/main/java/org/apache/beam/runners/core/SdkHarnessDoFnRunner.java +++ b/runners/core-java/src/main/java/org/apache/beam/runners/core/fn/SdkHarnessDoFnRunner.java @@ -15,12 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.runners.core; +package org.apache.beam.runners.core.fn; import static com.google.common.base.Preconditions.checkState; import java.util.concurrent.ExecutionException; import javax.annotation.Nullable; +import org.apache.beam.runners.core.DoFnRunner; import org.apache.beam.sdk.state.TimeDomain; import org.apache.beam.sdk.transforms.windowing.BoundedWindow; import org.apache.beam.sdk.util.UserCodeException; diff --git a/runners/core-java/src/main/java/org/apache/beam/runners/core/fn/package-info.java b/runners/core-java/src/main/java/org/apache/beam/runners/core/fn/package-info.java new file mode 100644 index 000000000000..d24a59735d09 --- /dev/null +++ b/runners/core-java/src/main/java/org/apache/beam/runners/core/fn/package-info.java @@ -0,0 +1,22 @@ +/* + * 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. + */ + +/** + * Provides utilities for a Beam runner to interact with a client using the Fn API. + */ +package org.apache.beam.runners.core.fn; diff --git a/runners/core-java/src/test/java/org/apache/beam/runners/core/FnApiControlClientPoolServiceTest.java b/runners/core-java/src/test/java/org/apache/beam/runners/core/fn/FnApiControlClientPoolServiceTest.java similarity index 98% rename from runners/core-java/src/test/java/org/apache/beam/runners/core/FnApiControlClientPoolServiceTest.java rename to runners/core-java/src/test/java/org/apache/beam/runners/core/fn/FnApiControlClientPoolServiceTest.java index fe63c9d459d1..bc9a137077b1 100644 --- a/runners/core-java/src/test/java/org/apache/beam/runners/core/FnApiControlClientPoolServiceTest.java +++ b/runners/core-java/src/test/java/org/apache/beam/runners/core/fn/FnApiControlClientPoolServiceTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.runners.core; +package org.apache.beam.runners.core.fn; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; diff --git a/runners/core-java/src/test/java/org/apache/beam/runners/core/FnApiControlClientTest.java b/runners/core-java/src/test/java/org/apache/beam/runners/core/fn/FnApiControlClientTest.java similarity index 99% rename from runners/core-java/src/test/java/org/apache/beam/runners/core/FnApiControlClientTest.java rename to runners/core-java/src/test/java/org/apache/beam/runners/core/fn/FnApiControlClientTest.java index 07b478440ebd..55afb4b65ca4 100644 --- a/runners/core-java/src/test/java/org/apache/beam/runners/core/FnApiControlClientTest.java +++ b/runners/core-java/src/test/java/org/apache/beam/runners/core/fn/FnApiControlClientTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.runners.core; +package org.apache.beam.runners.core.fn; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; diff --git a/runners/core-java/src/test/java/org/apache/beam/runners/core/SdkHarnessClientTest.java b/runners/core-java/src/test/java/org/apache/beam/runners/core/fn/SdkHarnessClientTest.java similarity index 98% rename from runners/core-java/src/test/java/org/apache/beam/runners/core/SdkHarnessClientTest.java rename to runners/core-java/src/test/java/org/apache/beam/runners/core/fn/SdkHarnessClientTest.java index 1bf8bbcc6342..cbd24a6cc022 100644 --- a/runners/core-java/src/test/java/org/apache/beam/runners/core/SdkHarnessClientTest.java +++ b/runners/core-java/src/test/java/org/apache/beam/runners/core/fn/SdkHarnessClientTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.runners.core; +package org.apache.beam.runners.core.fn; import static org.mockito.Matchers.any; import static org.mockito.Mockito.when; diff --git a/runners/core-java/src/test/java/org/apache/beam/runners/core/SdkHarnessDoFnRunnerTest.java b/runners/core-java/src/test/java/org/apache/beam/runners/core/fn/SdkHarnessDoFnRunnerTest.java similarity index 98% rename from runners/core-java/src/test/java/org/apache/beam/runners/core/SdkHarnessDoFnRunnerTest.java rename to runners/core-java/src/test/java/org/apache/beam/runners/core/fn/SdkHarnessDoFnRunnerTest.java index 68634f8be70f..98f38e1ca17f 100644 --- a/runners/core-java/src/test/java/org/apache/beam/runners/core/SdkHarnessDoFnRunnerTest.java +++ b/runners/core-java/src/test/java/org/apache/beam/runners/core/fn/SdkHarnessDoFnRunnerTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.runners.core; +package org.apache.beam.runners.core.fn; import static org.junit.Assert.fail; import static org.mockito.Matchers.anyString;