This is an automated email from the ASF dual-hosted git repository.
bhulette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new f53bfee Move payload providers out into their own module. (#13963)
f53bfee is described below
commit f53bfeeae6c3baae27025b96bcdb440436e9a1fc
Author: dpcollins-google <[email protected]>
AuthorDate: Tue Feb 16 11:32:29 2021 -0500
Move payload providers out into their own module. (#13963)
* Move payload providers out into their own module.
This prevents all dependents on sdks:java:extensions:sql from needing to
add a thrift and protobuf dependency.
* fix package
* restructure to put thrift and protobuf suppliers with their relevant
packages
* fix moved messages
* fix moved messages
* fix moved messages
* Fix generated regex
* Add thrift suppresssion
---
.../src/main/resources/beam/suppressions.xml | 2 +-
sdks/java/extensions/protobuf/build.gradle | 1 +
.../protobuf}/ProtoPayloadSerializerProvider.java | 3 +-
.../ProtoPayloadSerializerProviderTest.java | 15 ++--
.../src/test/proto/payload_messages.proto} | 2 +-
sdks/java/extensions/sql/build.gradle | 7 +-
.../sql/meta/provider/payloads/package-info.java | 24 ------
.../provider/kafka/BeamKafkaTableProtoTest.java | 7 +-
.../provider/kafka/BeamKafkaTableThriftTest.java | 2 +-
.../meta/provider/kafka/KafkaTableProviderIT.java | 7 +-
.../provider/kafka/KafkaTableProviderTest.java | 5 +-
sdks/java/io/thrift/build.gradle | 1 +
.../thrift}/ThriftPayloadSerializerProvider.java | 5 +-
.../ThriftPayloadSerializerProviderTest.java | 4 +-
.../sdk/io/thrift/payloads}/ItThriftMessage.java | 56 +++++++-------
.../io/thrift/payloads}/SimpleThriftMessage.java | 51 ++++++------
.../sdk/io/thrift/payloads}/TestThriftMessage.java | 90 +++++++++++-----------
.../sdk/io/thrift/payloads}/thrift_test.thrift | 0
.../thrift/src/test/thrift/payload.thrift} | 6 +-
settings.gradle.kts | 1 +
20 files changed, 129 insertions(+), 160 deletions(-)
diff --git a/sdks/java/build-tools/src/main/resources/beam/suppressions.xml
b/sdks/java/build-tools/src/main/resources/beam/suppressions.xml
index 89b7744..a7116b7 100644
--- a/sdks/java/build-tools/src/main/resources/beam/suppressions.xml
+++ b/sdks/java/build-tools/src/main/resources/beam/suppressions.xml
@@ -122,6 +122,6 @@
<suppress files="org.apache.beam.sdk.io.thrift.TestThriftStruct.java"
checks="[a-zA-Z0-9]*"/>
<suppress files="org.apache.beam.sdk.io.thrift.TestThriftInnerStruct.java"
checks="[a-zA-Z0-9]*"/>
<suppress files="org.apache.beam.sdk.io.thrift.TestThriftUnion.java"
checks="[a-zA-Z0-9]*"/>
- <suppress
files="org.apache.beam.sdk.extensions.sql.meta.provider.kafka.thrift.*"
checks="[a-zA-Z0-9]*"/>
+ <suppress files="org.apache.beam.sdk.io.thrift.payloads.*"
checks="[a-zA-Z0-9]*"/>
</suppressions>
diff --git a/sdks/java/extensions/protobuf/build.gradle
b/sdks/java/extensions/protobuf/build.gradle
index 74882d3..1ed48f3 100644
--- a/sdks/java/extensions/protobuf/build.gradle
+++ b/sdks/java/extensions/protobuf/build.gradle
@@ -19,6 +19,7 @@
plugins { id 'org.apache.beam.module' }
applyJavaNature(
generatedClassPatterns: [
+ /^org\.apache\.beam\.sdk\.extensions\.protobuf\.PayloadMessages/,
/^org\.apache\.beam\.sdk\.extensions\.protobuf\.Proto2CoderTestMessages/,
/^org\.apache\.beam\.sdk\.extensions\.protobuf\.Proto2SchemaMessages/,
/^org\.apache\.beam\.sdk\.extensions\.protobuf\.Proto3SchemaMessages/,
diff --git
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/payloads/ProtoPayloadSerializerProvider.java
b/sdks/java/extensions/protobuf/src/main/java/org/apache/beam/sdk/extensions/protobuf/ProtoPayloadSerializerProvider.java
similarity index 96%
rename from
sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/payloads/ProtoPayloadSerializerProvider.java
rename to
sdks/java/extensions/protobuf/src/main/java/org/apache/beam/sdk/extensions/protobuf/ProtoPayloadSerializerProvider.java
index 1b571f8..0b18c6e 100644
---
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/payloads/ProtoPayloadSerializerProvider.java
+++
b/sdks/java/extensions/protobuf/src/main/java/org/apache/beam/sdk/extensions/protobuf/ProtoPayloadSerializerProvider.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.beam.sdk.extensions.sql.meta.provider.payloads;
+package org.apache.beam.sdk.extensions.protobuf;
import static org.apache.beam.sdk.schemas.transforms.Cast.castRow;
import static org.apache.beam.sdk.util.Preconditions.checkArgumentNotNull;
@@ -27,7 +27,6 @@ import javax.annotation.Nonnull;
import org.apache.beam.sdk.annotations.Experimental;
import org.apache.beam.sdk.annotations.Experimental.Kind;
import org.apache.beam.sdk.annotations.Internal;
-import org.apache.beam.sdk.extensions.protobuf.ProtoMessageSchema;
import org.apache.beam.sdk.schemas.Schema;
import org.apache.beam.sdk.schemas.io.payloads.PayloadSerializer;
import org.apache.beam.sdk.schemas.io.payloads.PayloadSerializerProvider;
diff --git
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/payloads/ProtoPayloadSerializerProviderTest.java
b/sdks/java/extensions/protobuf/src/test/java/org/apache/beam/sdk/extensions/protobuf/ProtoPayloadSerializerProviderTest.java
similarity index 85%
rename from
sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/payloads/ProtoPayloadSerializerProviderTest.java
rename to
sdks/java/extensions/protobuf/src/test/java/org/apache/beam/sdk/extensions/protobuf/ProtoPayloadSerializerProviderTest.java
index f41ea47..69a31f3 100644
---
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/payloads/ProtoPayloadSerializerProviderTest.java
+++
b/sdks/java/extensions/protobuf/src/test/java/org/apache/beam/sdk/extensions/protobuf/ProtoPayloadSerializerProviderTest.java
@@ -15,12 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.beam.sdk.extensions.sql.meta.provider.payloads;
+package org.apache.beam.sdk.extensions.protobuf;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThrows;
-import org.apache.beam.sdk.extensions.sql.meta.provider.kafka.KafkaMessages;
import org.apache.beam.sdk.schemas.Schema;
import org.apache.beam.sdk.schemas.Schema.FieldType;
import org.apache.beam.sdk.values.Row;
@@ -48,8 +47,8 @@ public class ProtoPayloadSerializerProviderTest {
.withFieldValue("f_double", 9.0)
.withFieldValue("f_long", 456L)
.build();
- private static final KafkaMessages.TestMessage MESSAGE =
- KafkaMessages.TestMessage.newBuilder()
+ private static final PayloadMessages.TestMessage MESSAGE =
+ PayloadMessages.TestMessage.newBuilder()
.setFLong(456)
.setFInt(123)
.setFDouble(9.0)
@@ -83,7 +82,7 @@ public class ProtoPayloadSerializerProviderTest {
.addDoubleField("f_double")
.addInt64Field("f_long")
.build(),
- ImmutableMap.of("protoClass",
KafkaMessages.TestMessage.class.getName())));
+ ImmutableMap.of("protoClass",
PayloadMessages.TestMessage.class.getName())));
}
@Test
@@ -92,9 +91,9 @@ public class ProtoPayloadSerializerProviderTest {
provider
.getSerializer(
SHUFFLED_SCHEMA,
- ImmutableMap.of("protoClass",
KafkaMessages.TestMessage.class.getName()))
+ ImmutableMap.of("protoClass",
PayloadMessages.TestMessage.class.getName()))
.serialize(ROW);
- KafkaMessages.TestMessage result =
KafkaMessages.TestMessage.parseFrom(bytes);
+ PayloadMessages.TestMessage result =
PayloadMessages.TestMessage.parseFrom(bytes);
assertEquals(MESSAGE, result);
}
@@ -104,7 +103,7 @@ public class ProtoPayloadSerializerProviderTest {
provider
.getSerializer(
SHUFFLED_SCHEMA,
- ImmutableMap.of("protoClass",
KafkaMessages.TestMessage.class.getName()))
+ ImmutableMap.of("protoClass",
PayloadMessages.TestMessage.class.getName()))
.deserialize(MESSAGE.toByteArray());
assertEquals(ROW, row);
}
diff --git a/sdks/java/extensions/sql/src/test/proto/kafka/kafka_messages.proto
b/sdks/java/extensions/protobuf/src/test/proto/payload_messages.proto
similarity index 93%
rename from sdks/java/extensions/sql/src/test/proto/kafka/kafka_messages.proto
rename to sdks/java/extensions/protobuf/src/test/proto/payload_messages.proto
index 3cafec1..1486ee8 100644
--- a/sdks/java/extensions/sql/src/test/proto/kafka/kafka_messages.proto
+++ b/sdks/java/extensions/protobuf/src/test/proto/payload_messages.proto
@@ -22,7 +22,7 @@
syntax = "proto3";
-option java_package = "org.apache.beam.sdk.extensions.sql.meta.provider.kafka";
+option java_package = "org.apache.beam.sdk.extensions.protobuf";
message TestMessage {
int64 f_long = 1;
diff --git a/sdks/java/extensions/sql/build.gradle
b/sdks/java/extensions/sql/build.gradle
index 9347385..8ed858e 100644
--- a/sdks/java/extensions/sql/build.gradle
+++ b/sdks/java/extensions/sql/build.gradle
@@ -26,16 +26,12 @@ plugins {
applyJavaNature(
generatedClassPatterns: [
/^org\.apache\.beam\.sdk\.extensions\.sql\.impl\.parser\.impl.*/,
-
/^org\.apache\.beam\.sdk\.extensions\.sql\.meta\.provider\.kafka\.KafkaMessages/,
-
/^org\.apache\.beam\.sdk\.extensions\.sql\.meta\.provider\.kafka\.thrift.*/,
],
automaticModuleName: 'org.apache.beam.sdk.extensions.sql',
// javacc generated code produces lint warnings
disableLintWarnings: ['dep-ann', 'rawtypes'],
)
-applyGrpcNature()
-
description = "Apache Beam :: SDKs :: Java :: Extensions :: SQL"
ext.summary = "Beam SQL provides a new interface to generate a Beam pipeline
from SQL statement"
@@ -78,7 +74,6 @@ dependencies {
provided project(":sdks:java:io:google-cloud-platform")
compile project(":sdks:java:io:mongodb")
provided project(":sdks:java:io:parquet")
- provided project(":sdks:java:io:thrift")
provided library.java.jackson_dataformat_xml
provided library.java.hadoop_client
provided library.java.kafka_clients
@@ -92,6 +87,8 @@ dependencies {
testCompile library.java.testcontainers_kafka
testCompile library.java.google_cloud_bigtable_emulator
testCompile project(path: ":sdks:java:io:mongodb", configuration:
"testRuntime")
+ testCompile project(path: ":sdks:java:io:thrift", configuration:
"testRuntime")
+ testCompile project(path: ":sdks:java:extensions:protobuf", configuration:
"testRuntime")
testCompileOnly project(":sdks:java:extensions:sql:udf-test-provider")
testRuntimeClasspath library.java.slf4j_jdk14
hadoopVersions.each {kv ->
diff --git
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/payloads/package-info.java
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/payloads/package-info.java
deleted file mode 100644
index 663e2e6..0000000
---
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/payloads/package-info.java
+++ /dev/null
@@ -1,24 +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.
- */
-
-/** Provides abstractions for schema-aware IOs. */
-@DefaultAnnotation(NonNull.class)
-package org.apache.beam.sdk.extensions.sql.meta.provider.payloads;
-
-import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
-import org.checkerframework.checker.nullness.qual.NonNull;
diff --git
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/BeamKafkaTableProtoTest.java
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/BeamKafkaTableProtoTest.java
index 6e685b8..ac1ba7b 100644
---
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/BeamKafkaTableProtoTest.java
+++
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/BeamKafkaTableProtoTest.java
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertThrows;
import com.alibaba.fastjson.JSON;
import java.util.List;
+import org.apache.beam.sdk.extensions.protobuf.PayloadMessages;
import org.apache.beam.sdk.extensions.sql.meta.Table;
import org.apache.beam.sdk.schemas.Schema;
import org.apache.beam.sdk.testing.PAssert;
@@ -90,7 +91,7 @@ public class BeamKafkaTableProtoTest extends
BeamKafkaTableTest {
.properties(
JSON.parseObject(
"{ \"topics\": [], \"format\": \"proto\",
\"protoClass\": \""
- + KafkaMessages.TestMessage.class.getName()
+ + PayloadMessages.TestMessage.class.getName()
+ "\" }"))
.build()));
}
@@ -109,8 +110,8 @@ public class BeamKafkaTableProtoTest extends
BeamKafkaTableTest {
@Override
protected byte[] generateEncodedPayload(int i) {
- KafkaMessages.TestMessage message =
- KafkaMessages.TestMessage.newBuilder()
+ PayloadMessages.TestMessage message =
+ PayloadMessages.TestMessage.newBuilder()
.setFLong(i)
.setFInt(i)
.setFDouble(i)
diff --git
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/BeamKafkaTableThriftTest.java
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/BeamKafkaTableThriftTest.java
index 3045d45..543ac66 100644
---
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/BeamKafkaTableThriftTest.java
+++
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/BeamKafkaTableThriftTest.java
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertThrows;
import com.alibaba.fastjson.JSON;
import java.util.List;
import org.apache.beam.sdk.extensions.sql.meta.Table;
-import
org.apache.beam.sdk.extensions.sql.meta.provider.kafka.thrift.TestThriftMessage;
+import org.apache.beam.sdk.io.thrift.payloads.TestThriftMessage;
import org.apache.beam.sdk.schemas.Schema;
import org.apache.beam.sdk.testing.PAssert;
import org.apache.beam.sdk.transforms.Create;
diff --git
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/KafkaTableProviderIT.java
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/KafkaTableProviderIT.java
index 9439dad..9f5e38b 100644
---
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/KafkaTableProviderIT.java
+++
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/KafkaTableProviderIT.java
@@ -36,14 +36,15 @@ import org.apache.beam.runners.direct.DirectOptions;
import org.apache.beam.sdk.coders.KvCoder;
import org.apache.beam.sdk.coders.RowCoder;
import org.apache.beam.sdk.coders.StringUtf8Coder;
+import org.apache.beam.sdk.extensions.protobuf.PayloadMessages;
import org.apache.beam.sdk.extensions.protobuf.ProtoMessageSchema;
import org.apache.beam.sdk.extensions.sql.impl.BeamSqlEnv;
import org.apache.beam.sdk.extensions.sql.impl.rel.BeamSqlRelUtils;
import org.apache.beam.sdk.extensions.sql.meta.Table;
import org.apache.beam.sdk.extensions.sql.meta.provider.TableProvider;
-import
org.apache.beam.sdk.extensions.sql.meta.provider.kafka.thrift.ItThriftMessage;
import org.apache.beam.sdk.io.thrift.ThriftCoder;
import org.apache.beam.sdk.io.thrift.ThriftSchema;
+import org.apache.beam.sdk.io.thrift.payloads.ItThriftMessage;
import org.apache.beam.sdk.options.Default;
import org.apache.beam.sdk.options.Description;
import org.apache.beam.sdk.options.PipelineOptions;
@@ -343,7 +344,7 @@ public class KafkaTableProviderIT {
private static class KafkaProtoObjectProvider extends KafkaObjectProvider {
private final SimpleFunction<Row, byte[]> toBytesFn =
- ProtoMessageSchema.getRowToProtoBytesFn(KafkaMessages.ItMessage.class);
+
ProtoMessageSchema.getRowToProtoBytesFn(PayloadMessages.ItMessage.class);
@Override
protected ProducerRecord<String, byte[]> generateProducerRecord(int i) {
@@ -366,7 +367,7 @@ public class KafkaTableProviderIT {
+ kafkaOptions.getKafkaTopic()
+ "\"],"
+ "\"protoClass\": \""
- + KafkaMessages.ItMessage.class.getName()
+ + PayloadMessages.ItMessage.class.getName()
+ "\"}";
}
}
diff --git
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/KafkaTableProviderTest.java
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/KafkaTableProviderTest.java
index 6366186..2a9b31d 100644
---
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/KafkaTableProviderTest.java
+++
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/KafkaTableProviderTest.java
@@ -25,9 +25,10 @@ import static org.junit.Assert.assertTrue;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import java.util.stream.Stream;
+import org.apache.beam.sdk.extensions.protobuf.PayloadMessages;
import org.apache.beam.sdk.extensions.sql.meta.BeamSqlTable;
import org.apache.beam.sdk.extensions.sql.meta.Table;
-import
org.apache.beam.sdk.extensions.sql.meta.provider.kafka.thrift.SimpleThriftMessage;
+import org.apache.beam.sdk.io.thrift.payloads.SimpleThriftMessage;
import org.apache.beam.sdk.schemas.Schema;
import
org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList;
import org.apache.thrift.TBase;
@@ -68,7 +69,7 @@ public class KafkaTableProviderTest {
@Test
public void testBuildBeamSqlProtoTable() {
- Table table = mockProtoTable("hello", KafkaMessages.SimpleMessage.class);
+ Table table = mockProtoTable("hello", PayloadMessages.SimpleMessage.class);
BeamSqlTable sqlTable = provider.buildBeamSqlTable(table);
assertNotNull(sqlTable);
diff --git a/sdks/java/io/thrift/build.gradle b/sdks/java/io/thrift/build.gradle
index d22b934..46535e0 100644
--- a/sdks/java/io/thrift/build.gradle
+++ b/sdks/java/io/thrift/build.gradle
@@ -23,6 +23,7 @@ plugins {
applyJavaNature(
automaticModuleName: 'org.apache.beam.sdk.io.thrift',
generatedClassPatterns: [
+ /^org\.apache\.beam\.sdk\.io\.thrift\.payloads.*/,
/^org\.apache\.beam\.sdk\.io\.thrift\.TestThriftStruct/,
/^org\.apache\.beam\.sdk\.io\.thrift\.TestThriftInnerStruct/,
/^org\.apache\.beam\.sdk\.io\.thrift\.TestThriftEnum/,
diff --git
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/payloads/ThriftPayloadSerializerProvider.java
b/sdks/java/io/thrift/src/main/java/org/apache/beam/sdk/io/thrift/ThriftPayloadSerializerProvider.java
similarity index 96%
rename from
sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/payloads/ThriftPayloadSerializerProvider.java
rename to
sdks/java/io/thrift/src/main/java/org/apache/beam/sdk/io/thrift/ThriftPayloadSerializerProvider.java
index af50011..96b6171 100644
---
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/payloads/ThriftPayloadSerializerProvider.java
+++
b/sdks/java/io/thrift/src/main/java/org/apache/beam/sdk/io/thrift/ThriftPayloadSerializerProvider.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.beam.sdk.extensions.sql.meta.provider.payloads;
+package org.apache.beam.sdk.io.thrift;
import static org.apache.beam.sdk.schemas.transforms.Cast.castRow;
import static org.apache.beam.sdk.util.Preconditions.checkArgumentNotNull;
@@ -26,8 +26,6 @@ import org.apache.beam.sdk.annotations.Experimental;
import org.apache.beam.sdk.annotations.Experimental.Kind;
import org.apache.beam.sdk.annotations.Internal;
import org.apache.beam.sdk.coders.Coder;
-import org.apache.beam.sdk.io.thrift.ThriftCoder;
-import org.apache.beam.sdk.io.thrift.ThriftSchema;
import org.apache.beam.sdk.schemas.RowMessages;
import org.apache.beam.sdk.schemas.Schema;
import org.apache.beam.sdk.schemas.io.payloads.PayloadSerializer;
@@ -40,6 +38,7 @@ import org.apache.thrift.protocol.TProtocolFactory;
@Internal
@Experimental(Kind.SCHEMAS)
+@SuppressWarnings("rawtypes")
@AutoService(PayloadSerializerProvider.class)
public class ThriftPayloadSerializerProvider implements
PayloadSerializerProvider {
@Override
diff --git
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/payloads/ThriftPayloadSerializerProviderTest.java
b/sdks/java/io/thrift/src/test/java/org/apache/beam/sdk/io/thrift/ThriftPayloadSerializerProviderTest.java
similarity index 97%
rename from
sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/payloads/ThriftPayloadSerializerProviderTest.java
rename to
sdks/java/io/thrift/src/test/java/org/apache/beam/sdk/io/thrift/ThriftPayloadSerializerProviderTest.java
index dd79289..c19f15c 100644
---
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/payloads/ThriftPayloadSerializerProviderTest.java
+++
b/sdks/java/io/thrift/src/test/java/org/apache/beam/sdk/io/thrift/ThriftPayloadSerializerProviderTest.java
@@ -15,12 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.beam.sdk.extensions.sql.meta.provider.payloads;
+package org.apache.beam.sdk.io.thrift;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThrows;
-import
org.apache.beam.sdk.extensions.sql.meta.provider.kafka.thrift.TestThriftMessage;
+import org.apache.beam.sdk.io.thrift.payloads.TestThriftMessage;
import org.apache.beam.sdk.schemas.Schema;
import org.apache.beam.sdk.schemas.io.payloads.PayloadSerializerProvider;
import org.apache.beam.sdk.values.Row;
diff --git
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/thrift/ItThriftMessage.java
b/sdks/java/io/thrift/src/test/java/org/apache/beam/sdk/io/thrift/payloads/ItThriftMessage.java
similarity index 90%
rename from
sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/thrift/ItThriftMessage.java
rename to
sdks/java/io/thrift/src/test/java/org/apache/beam/sdk/io/thrift/payloads/ItThriftMessage.java
index 750da06..c977be3 100644
---
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/thrift/ItThriftMessage.java
+++
b/sdks/java/io/thrift/src/test/java/org/apache/beam/sdk/io/thrift/payloads/ItThriftMessage.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.beam.sdk.extensions.sql.meta.provider.kafka.thrift;
+package org.apache.beam.sdk.io.thrift.payloads;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
@javax.annotation.Generated(
@@ -46,7 +46,7 @@ public class ItThriftMessage
private long f_long; // required
private int f_int; // required
- private @org.apache.thrift.annotation.Nullable java.lang.String f_string; //
required
+ private @org.apache.thrift.annotation.Nullable String f_string; // required
/**
* The set of fields this struct contains, along with convenience methods
for finding and
@@ -57,8 +57,8 @@ public class ItThriftMessage
F_INT((short) 2, "f_int"),
F_STRING((short) 3, "f_string");
- private static final java.util.Map<java.lang.String, _Fields> byName =
- new java.util.HashMap<java.lang.String, _Fields>();
+ private static final java.util.Map<String, _Fields> byName =
+ new java.util.HashMap<String, _Fields>();
static {
for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
@@ -85,20 +85,20 @@ public class ItThriftMessage
public static _Fields findByThriftIdOrThrow(int fieldId) {
_Fields fields = findByThriftId(fieldId);
if (fields == null)
- throw new java.lang.IllegalArgumentException("Field " + fieldId + "
doesn't exist!");
+ throw new IllegalArgumentException("Field " + fieldId + " doesn't
exist!");
return fields;
}
/** Find the _Fields constant that matches name, or null if its not found.
*/
@org.apache.thrift.annotation.Nullable
- public static _Fields findByName(java.lang.String name) {
+ public static _Fields findByName(String name) {
return byName.get(name);
}
private final short _thriftId;
- private final java.lang.String _fieldName;
+ private final String _fieldName;
- _Fields(short thriftId, java.lang.String fieldName) {
+ _Fields(short thriftId, String fieldName) {
_thriftId = thriftId;
_fieldName = fieldName;
}
@@ -107,7 +107,7 @@ public class ItThriftMessage
return _thriftId;
}
- public java.lang.String getFieldName() {
+ public String getFieldName() {
return _fieldName;
}
}
@@ -149,7 +149,7 @@ public class ItThriftMessage
public ItThriftMessage() {}
- public ItThriftMessage(long f_long, int f_int, java.lang.String f_string) {
+ public ItThriftMessage(long f_long, int f_int, String f_string) {
this();
this.f_long = f_long;
setFLongIsSet(true);
@@ -231,12 +231,11 @@ public class ItThriftMessage
}
@org.apache.thrift.annotation.Nullable
- public java.lang.String getFString() {
+ public String getFString() {
return this.f_string;
}
- public ItThriftMessage setFString(
- @org.apache.thrift.annotation.Nullable java.lang.String f_string) {
+ public ItThriftMessage setFString(@org.apache.thrift.annotation.Nullable
String f_string) {
this.f_string = f_string;
return this;
}
@@ -256,14 +255,13 @@ public class ItThriftMessage
}
}
- public void setFieldValue(
- _Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object
value) {
+ public void setFieldValue(_Fields field,
@org.apache.thrift.annotation.Nullable Object value) {
switch (field) {
case F_LONG:
if (value == null) {
unsetFLong();
} else {
- setFLong((java.lang.Long) value);
+ setFLong((Long) value);
}
break;
@@ -271,7 +269,7 @@ public class ItThriftMessage
if (value == null) {
unsetFInt();
} else {
- setFInt((java.lang.Integer) value);
+ setFInt((Integer) value);
}
break;
@@ -279,14 +277,14 @@ public class ItThriftMessage
if (value == null) {
unsetFString();
} else {
- setFString((java.lang.String) value);
+ setFString((String) value);
}
break;
}
}
@org.apache.thrift.annotation.Nullable
- public java.lang.Object getFieldValue(_Fields field) {
+ public Object getFieldValue(_Fields field) {
switch (field) {
case F_LONG:
return getFLong();
@@ -297,7 +295,7 @@ public class ItThriftMessage
case F_STRING:
return getFString();
}
- throw new java.lang.IllegalStateException();
+ throw new IllegalStateException();
}
/**
@@ -306,7 +304,7 @@ public class ItThriftMessage
*/
public boolean isSet(_Fields field) {
if (field == null) {
- throw new java.lang.IllegalArgumentException();
+ throw new IllegalArgumentException();
}
switch (field) {
@@ -317,11 +315,11 @@ public class ItThriftMessage
case F_STRING:
return isSetFString();
}
- throw new java.lang.IllegalStateException();
+ throw new IllegalStateException();
}
@Override
- public boolean equals(java.lang.Object that) {
+ public boolean equals(Object that) {
if (that == null) return false;
if (that instanceof ItThriftMessage) return this.equals((ItThriftMessage)
that);
return false;
@@ -377,7 +375,7 @@ public class ItThriftMessage
int lastComparison = 0;
- lastComparison =
java.lang.Boolean.valueOf(isSetFLong()).compareTo(other.isSetFLong());
+ lastComparison =
Boolean.valueOf(isSetFLong()).compareTo(other.isSetFLong());
if (lastComparison != 0) {
return lastComparison;
}
@@ -387,7 +385,7 @@ public class ItThriftMessage
return lastComparison;
}
}
- lastComparison =
java.lang.Boolean.valueOf(isSetFInt()).compareTo(other.isSetFInt());
+ lastComparison = Boolean.valueOf(isSetFInt()).compareTo(other.isSetFInt());
if (lastComparison != 0) {
return lastComparison;
}
@@ -397,7 +395,7 @@ public class ItThriftMessage
return lastComparison;
}
}
- lastComparison =
java.lang.Boolean.valueOf(isSetFString()).compareTo(other.isSetFString());
+ lastComparison =
Boolean.valueOf(isSetFString()).compareTo(other.isSetFString());
if (lastComparison != 0) {
return lastComparison;
}
@@ -425,8 +423,8 @@ public class ItThriftMessage
}
@Override
- public java.lang.String toString() {
- java.lang.StringBuilder sb = new
java.lang.StringBuilder("ItThriftMessage(");
+ public String toString() {
+ StringBuilder sb = new StringBuilder("ItThriftMessage(");
boolean first = true;
sb.append("f_long:");
@@ -471,7 +469,7 @@ public class ItThriftMessage
}
private void readObject(java.io.ObjectInputStream in)
- throws java.io.IOException, java.lang.ClassNotFoundException {
+ throws java.io.IOException, ClassNotFoundException {
try {
// it doesn't seem like you should have to do this, but java
serialization is wacky, and
// doesn't call the default constructor.
diff --git
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/thrift/SimpleThriftMessage.java
b/sdks/java/io/thrift/src/test/java/org/apache/beam/sdk/io/thrift/payloads/SimpleThriftMessage.java
similarity index 90%
rename from
sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/thrift/SimpleThriftMessage.java
rename to
sdks/java/io/thrift/src/test/java/org/apache/beam/sdk/io/thrift/payloads/SimpleThriftMessage.java
index 8b5e321..48cf665 100644
---
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/thrift/SimpleThriftMessage.java
+++
b/sdks/java/io/thrift/src/test/java/org/apache/beam/sdk/io/thrift/payloads/SimpleThriftMessage.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.beam.sdk.extensions.sql.meta.provider.kafka.thrift;
+package org.apache.beam.sdk.io.thrift.payloads;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
@javax.annotation.Generated(
@@ -41,7 +41,7 @@ public class SimpleThriftMessage
new SimpleThriftMessageTupleSchemeFactory();
private int id; // required
- private @org.apache.thrift.annotation.Nullable java.lang.String name; //
required
+ private @org.apache.thrift.annotation.Nullable String name; // required
/**
* The set of fields this struct contains, along with convenience methods
for finding and
@@ -51,8 +51,8 @@ public class SimpleThriftMessage
ID((short) 1, "id"),
NAME((short) 2, "name");
- private static final java.util.Map<java.lang.String, _Fields> byName =
- new java.util.HashMap<java.lang.String, _Fields>();
+ private static final java.util.Map<String, _Fields> byName =
+ new java.util.HashMap<String, _Fields>();
static {
for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
@@ -77,20 +77,20 @@ public class SimpleThriftMessage
public static _Fields findByThriftIdOrThrow(int fieldId) {
_Fields fields = findByThriftId(fieldId);
if (fields == null)
- throw new java.lang.IllegalArgumentException("Field " + fieldId + "
doesn't exist!");
+ throw new IllegalArgumentException("Field " + fieldId + " doesn't
exist!");
return fields;
}
/** Find the _Fields constant that matches name, or null if its not found.
*/
@org.apache.thrift.annotation.Nullable
- public static _Fields findByName(java.lang.String name) {
+ public static _Fields findByName(String name) {
return byName.get(name);
}
private final short _thriftId;
- private final java.lang.String _fieldName;
+ private final String _fieldName;
- _Fields(short thriftId, java.lang.String fieldName) {
+ _Fields(short thriftId, String fieldName) {
_thriftId = thriftId;
_fieldName = fieldName;
}
@@ -99,7 +99,7 @@ public class SimpleThriftMessage
return _thriftId;
}
- public java.lang.String getFieldName() {
+ public String getFieldName() {
return _fieldName;
}
}
@@ -133,7 +133,7 @@ public class SimpleThriftMessage
public SimpleThriftMessage() {}
- public SimpleThriftMessage(int id, java.lang.String name) {
+ public SimpleThriftMessage(int id, String name) {
this();
this.id = id;
setIdIsSet(true);
@@ -185,11 +185,11 @@ public class SimpleThriftMessage
}
@org.apache.thrift.annotation.Nullable
- public java.lang.String getName() {
+ public String getName() {
return this.name;
}
- public SimpleThriftMessage setName(@org.apache.thrift.annotation.Nullable
java.lang.String name) {
+ public SimpleThriftMessage setName(@org.apache.thrift.annotation.Nullable
String name) {
this.name = name;
return this;
}
@@ -209,14 +209,13 @@ public class SimpleThriftMessage
}
}
- public void setFieldValue(
- _Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object
value) {
+ public void setFieldValue(_Fields field,
@org.apache.thrift.annotation.Nullable Object value) {
switch (field) {
case ID:
if (value == null) {
unsetId();
} else {
- setId((java.lang.Integer) value);
+ setId((Integer) value);
}
break;
@@ -224,14 +223,14 @@ public class SimpleThriftMessage
if (value == null) {
unsetName();
} else {
- setName((java.lang.String) value);
+ setName((String) value);
}
break;
}
}
@org.apache.thrift.annotation.Nullable
- public java.lang.Object getFieldValue(_Fields field) {
+ public Object getFieldValue(_Fields field) {
switch (field) {
case ID:
return getId();
@@ -239,7 +238,7 @@ public class SimpleThriftMessage
case NAME:
return getName();
}
- throw new java.lang.IllegalStateException();
+ throw new IllegalStateException();
}
/**
@@ -248,7 +247,7 @@ public class SimpleThriftMessage
*/
public boolean isSet(_Fields field) {
if (field == null) {
- throw new java.lang.IllegalArgumentException();
+ throw new IllegalArgumentException();
}
switch (field) {
@@ -257,11 +256,11 @@ public class SimpleThriftMessage
case NAME:
return isSetName();
}
- throw new java.lang.IllegalStateException();
+ throw new IllegalStateException();
}
@Override
- public boolean equals(java.lang.Object that) {
+ public boolean equals(Object that) {
if (that == null) return false;
if (that instanceof SimpleThriftMessage) return
this.equals((SimpleThriftMessage) that);
return false;
@@ -308,7 +307,7 @@ public class SimpleThriftMessage
int lastComparison = 0;
- lastComparison =
java.lang.Boolean.valueOf(isSetId()).compareTo(other.isSetId());
+ lastComparison = Boolean.valueOf(isSetId()).compareTo(other.isSetId());
if (lastComparison != 0) {
return lastComparison;
}
@@ -318,7 +317,7 @@ public class SimpleThriftMessage
return lastComparison;
}
}
- lastComparison =
java.lang.Boolean.valueOf(isSetName()).compareTo(other.isSetName());
+ lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName());
if (lastComparison != 0) {
return lastComparison;
}
@@ -346,8 +345,8 @@ public class SimpleThriftMessage
}
@Override
- public java.lang.String toString() {
- java.lang.StringBuilder sb = new
java.lang.StringBuilder("SimpleThriftMessage(");
+ public String toString() {
+ StringBuilder sb = new StringBuilder("SimpleThriftMessage(");
boolean first = true;
sb.append("id:");
@@ -386,7 +385,7 @@ public class SimpleThriftMessage
}
private void readObject(java.io.ObjectInputStream in)
- throws java.io.IOException, java.lang.ClassNotFoundException {
+ throws java.io.IOException, ClassNotFoundException {
try {
// it doesn't seem like you should have to do this, but java
serialization is wacky, and
// doesn't call the default constructor.
diff --git
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/thrift/TestThriftMessage.java
b/sdks/java/io/thrift/src/test/java/org/apache/beam/sdk/io/thrift/payloads/TestThriftMessage.java
similarity index 90%
rename from
sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/thrift/TestThriftMessage.java
rename to
sdks/java/io/thrift/src/test/java/org/apache/beam/sdk/io/thrift/payloads/TestThriftMessage.java
index 1f99d9a..c68d254 100644
---
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/thrift/TestThriftMessage.java
+++
b/sdks/java/io/thrift/src/test/java/org/apache/beam/sdk/io/thrift/payloads/TestThriftMessage.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.beam.sdk.extensions.sql.meta.provider.kafka.thrift;
+package org.apache.beam.sdk.io.thrift.payloads;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
@javax.annotation.Generated(
@@ -53,9 +53,8 @@ public class TestThriftMessage
private long f_long; // required
private int f_int; // required
private double f_double; // required
- private @org.apache.thrift.annotation.Nullable java.lang.String f_string; //
required
- private @org.apache.thrift.annotation.Nullable
java.util.List<java.lang.Double>
- f_double_array; // required
+ private @org.apache.thrift.annotation.Nullable String f_string; // required
+ private @org.apache.thrift.annotation.Nullable java.util.List<Double>
f_double_array; // required
/**
* The set of fields this struct contains, along with convenience methods
for finding and
@@ -68,8 +67,8 @@ public class TestThriftMessage
F_STRING((short) 4, "f_string"),
F_DOUBLE_ARRAY((short) 5, "f_double_array");
- private static final java.util.Map<java.lang.String, _Fields> byName =
- new java.util.HashMap<java.lang.String, _Fields>();
+ private static final java.util.Map<String, _Fields> byName =
+ new java.util.HashMap<String, _Fields>();
static {
for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
@@ -100,20 +99,20 @@ public class TestThriftMessage
public static _Fields findByThriftIdOrThrow(int fieldId) {
_Fields fields = findByThriftId(fieldId);
if (fields == null)
- throw new java.lang.IllegalArgumentException("Field " + fieldId + "
doesn't exist!");
+ throw new IllegalArgumentException("Field " + fieldId + " doesn't
exist!");
return fields;
}
/** Find the _Fields constant that matches name, or null if its not found.
*/
@org.apache.thrift.annotation.Nullable
- public static _Fields findByName(java.lang.String name) {
+ public static _Fields findByName(String name) {
return byName.get(name);
}
private final short _thriftId;
- private final java.lang.String _fieldName;
+ private final String _fieldName;
- _Fields(short thriftId, java.lang.String fieldName) {
+ _Fields(short thriftId, String fieldName) {
_thriftId = thriftId;
_fieldName = fieldName;
}
@@ -122,7 +121,7 @@ public class TestThriftMessage
return _thriftId;
}
- public java.lang.String getFieldName() {
+ public String getFieldName() {
return _fieldName;
}
}
@@ -180,15 +179,15 @@ public class TestThriftMessage
}
public TestThriftMessage() {
- this.f_double_array = new java.util.ArrayList<java.lang.Double>();
+ this.f_double_array = new java.util.ArrayList<Double>();
}
public TestThriftMessage(
long f_long,
int f_int,
double f_double,
- java.lang.String f_string,
- java.util.List<java.lang.Double> f_double_array) {
+ String f_string,
+ java.util.List<Double> f_double_array) {
this();
this.f_long = f_long;
setFLongIsSet(true);
@@ -210,8 +209,8 @@ public class TestThriftMessage
this.f_string = other.f_string;
}
if (other.isSetFDoubleArray()) {
- java.util.List<java.lang.Double> __this__f_double_array =
- new java.util.ArrayList<java.lang.Double>(other.f_double_array);
+ java.util.List<Double> __this__f_double_array =
+ new java.util.ArrayList<Double>(other.f_double_array);
this.f_double_array = __this__f_double_array;
}
}
@@ -229,7 +228,7 @@ public class TestThriftMessage
setFDoubleIsSet(false);
this.f_double = 0.0;
this.f_string = null;
- this.f_double_array = new java.util.ArrayList<java.lang.Double>();
+ this.f_double_array = new java.util.ArrayList<Double>();
}
public long getFLong() {
@@ -307,12 +306,11 @@ public class TestThriftMessage
}
@org.apache.thrift.annotation.Nullable
- public java.lang.String getFString() {
+ public String getFString() {
return this.f_string;
}
- public TestThriftMessage setFString(
- @org.apache.thrift.annotation.Nullable java.lang.String f_string) {
+ public TestThriftMessage setFString(@org.apache.thrift.annotation.Nullable
String f_string) {
this.f_string = f_string;
return this;
}
@@ -337,24 +335,24 @@ public class TestThriftMessage
}
@org.apache.thrift.annotation.Nullable
- public java.util.Iterator<java.lang.Double> getFDoubleArrayIterator() {
+ public java.util.Iterator<Double> getFDoubleArrayIterator() {
return (this.f_double_array == null) ? null :
this.f_double_array.iterator();
}
public void addToFDoubleArray(double elem) {
if (this.f_double_array == null) {
- this.f_double_array = new java.util.ArrayList<java.lang.Double>();
+ this.f_double_array = new java.util.ArrayList<Double>();
}
this.f_double_array.add(elem);
}
@org.apache.thrift.annotation.Nullable
- public java.util.List<java.lang.Double> getFDoubleArray() {
+ public java.util.List<Double> getFDoubleArray() {
return this.f_double_array;
}
public TestThriftMessage setFDoubleArray(
- @org.apache.thrift.annotation.Nullable java.util.List<java.lang.Double>
f_double_array) {
+ @org.apache.thrift.annotation.Nullable java.util.List<Double>
f_double_array) {
this.f_double_array = f_double_array;
return this;
}
@@ -374,14 +372,13 @@ public class TestThriftMessage
}
}
- public void setFieldValue(
- _Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object
value) {
+ public void setFieldValue(_Fields field,
@org.apache.thrift.annotation.Nullable Object value) {
switch (field) {
case F_LONG:
if (value == null) {
unsetFLong();
} else {
- setFLong((java.lang.Long) value);
+ setFLong((Long) value);
}
break;
@@ -389,7 +386,7 @@ public class TestThriftMessage
if (value == null) {
unsetFInt();
} else {
- setFInt((java.lang.Integer) value);
+ setFInt((Integer) value);
}
break;
@@ -397,7 +394,7 @@ public class TestThriftMessage
if (value == null) {
unsetFDouble();
} else {
- setFDouble((java.lang.Double) value);
+ setFDouble((Double) value);
}
break;
@@ -405,7 +402,7 @@ public class TestThriftMessage
if (value == null) {
unsetFString();
} else {
- setFString((java.lang.String) value);
+ setFString((String) value);
}
break;
@@ -413,14 +410,14 @@ public class TestThriftMessage
if (value == null) {
unsetFDoubleArray();
} else {
- setFDoubleArray((java.util.List<java.lang.Double>) value);
+ setFDoubleArray((java.util.List<Double>) value);
}
break;
}
}
@org.apache.thrift.annotation.Nullable
- public java.lang.Object getFieldValue(_Fields field) {
+ public Object getFieldValue(_Fields field) {
switch (field) {
case F_LONG:
return getFLong();
@@ -437,7 +434,7 @@ public class TestThriftMessage
case F_DOUBLE_ARRAY:
return getFDoubleArray();
}
- throw new java.lang.IllegalStateException();
+ throw new IllegalStateException();
}
/**
@@ -446,7 +443,7 @@ public class TestThriftMessage
*/
public boolean isSet(_Fields field) {
if (field == null) {
- throw new java.lang.IllegalArgumentException();
+ throw new IllegalArgumentException();
}
switch (field) {
@@ -461,11 +458,11 @@ public class TestThriftMessage
case F_DOUBLE_ARRAY:
return isSetFDoubleArray();
}
- throw new java.lang.IllegalStateException();
+ throw new IllegalStateException();
}
@Override
- public boolean equals(java.lang.Object that) {
+ public boolean equals(Object that) {
if (that == null) return false;
if (that instanceof TestThriftMessage) return
this.equals((TestThriftMessage) that);
return false;
@@ -540,7 +537,7 @@ public class TestThriftMessage
int lastComparison = 0;
- lastComparison =
java.lang.Boolean.valueOf(isSetFLong()).compareTo(other.isSetFLong());
+ lastComparison =
Boolean.valueOf(isSetFLong()).compareTo(other.isSetFLong());
if (lastComparison != 0) {
return lastComparison;
}
@@ -550,7 +547,7 @@ public class TestThriftMessage
return lastComparison;
}
}
- lastComparison =
java.lang.Boolean.valueOf(isSetFInt()).compareTo(other.isSetFInt());
+ lastComparison = Boolean.valueOf(isSetFInt()).compareTo(other.isSetFInt());
if (lastComparison != 0) {
return lastComparison;
}
@@ -560,7 +557,7 @@ public class TestThriftMessage
return lastComparison;
}
}
- lastComparison =
java.lang.Boolean.valueOf(isSetFDouble()).compareTo(other.isSetFDouble());
+ lastComparison =
Boolean.valueOf(isSetFDouble()).compareTo(other.isSetFDouble());
if (lastComparison != 0) {
return lastComparison;
}
@@ -570,7 +567,7 @@ public class TestThriftMessage
return lastComparison;
}
}
- lastComparison =
java.lang.Boolean.valueOf(isSetFString()).compareTo(other.isSetFString());
+ lastComparison =
Boolean.valueOf(isSetFString()).compareTo(other.isSetFString());
if (lastComparison != 0) {
return lastComparison;
}
@@ -580,8 +577,7 @@ public class TestThriftMessage
return lastComparison;
}
}
- lastComparison =
-
java.lang.Boolean.valueOf(isSetFDoubleArray()).compareTo(other.isSetFDoubleArray());
+ lastComparison =
Boolean.valueOf(isSetFDoubleArray()).compareTo(other.isSetFDoubleArray());
if (lastComparison != 0) {
return lastComparison;
}
@@ -610,8 +606,8 @@ public class TestThriftMessage
}
@Override
- public java.lang.String toString() {
- java.lang.StringBuilder sb = new
java.lang.StringBuilder("TestThriftMessage(");
+ public String toString() {
+ StringBuilder sb = new StringBuilder("TestThriftMessage(");
boolean first = true;
sb.append("f_long:");
@@ -674,7 +670,7 @@ public class TestThriftMessage
}
private void readObject(java.io.ObjectInputStream in)
- throws java.io.IOException, java.lang.ClassNotFoundException {
+ throws java.io.IOException, ClassNotFoundException {
try {
// it doesn't seem like you should have to do this, but java
serialization is wacky, and
// doesn't call the default constructor.
@@ -743,7 +739,7 @@ public class TestThriftMessage
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list0 =
iprot.readListBegin();
- struct.f_double_array = new
java.util.ArrayList<java.lang.Double>(_list0.size);
+ struct.f_double_array = new
java.util.ArrayList<Double>(_list0.size);
double _elem1;
for (int _i2 = 0; _i2 < _list0.size; ++_i2) {
_elem1 = iprot.readDouble();
@@ -860,7 +856,7 @@ public class TestThriftMessage
org.apache.thrift.protocol.TList _list5 =
new org.apache.thrift.protocol.TList(
org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32());
- struct.f_double_array = new
java.util.ArrayList<java.lang.Double>(_list5.size);
+ struct.f_double_array = new java.util.ArrayList<Double>(_list5.size);
double _elem6;
for (int _i7 = 0; _i7 < _list5.size; ++_i7) {
_elem6 = iprot.readDouble();
diff --git a/sdks/java/io/thrift/src/test/resources/thrift/thrift_test.thrift
b/sdks/java/io/thrift/src/test/resources/org/apache/beam/sdk/io/thrift/payloads/thrift_test.thrift
similarity index 100%
rename from sdks/java/io/thrift/src/test/resources/thrift/thrift_test.thrift
rename to
sdks/java/io/thrift/src/test/resources/org/apache/beam/sdk/io/thrift/payloads/thrift_test.thrift
diff --git a/sdks/java/extensions/sql/src/test/thrift/kafka/messages.thrift
b/sdks/java/io/thrift/src/test/thrift/payload.thrift
similarity index 86%
rename from sdks/java/extensions/sql/src/test/thrift/kafka/messages.thrift
rename to sdks/java/io/thrift/src/test/thrift/payload.thrift
index 5f95b9f..7544d10 100644
--- a/sdks/java/extensions/sql/src/test/thrift/kafka/messages.thrift
+++ b/sdks/java/io/thrift/src/test/thrift/payload.thrift
@@ -18,13 +18,13 @@
/*
thrift --gen java:private-members,fullcamel \
- -out sdks/java/extensions/sql/src/test/java/ \
- sdks/java/extensions/sql/src/test/thrift/kafka/message.thrift
+ -out sdks/java/io/thrift/src/test/java/ \
+ sdks/java/io/thrift/src/test/thrift/payload.thrift
./gradlew :sdks:java:extensions:sql:spotlessApply
*/
-namespace java org.apache.beam.sdk.extensions.sql.meta.provider.kafka.thrift
+namespace java org.apache.beam.sdk.io.thrift.payloads
struct TestThriftMessage {
1: required i64 f_long
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e9b4ae9..e6f037e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -119,6 +119,7 @@ include(":sdks:java:extensions:schemaio-expansion-service")
include(":sdks:java:extensions:sketching")
include(":sdks:java:extensions:sorter")
include(":sdks:java:extensions:sql")
+include(":sdks:java:extensions:sql:payloads")
include(":sdks:java:extensions:sql:perf-tests")
include(":sdks:java:extensions:sql:jdbc")
include(":sdks:java:extensions:sql:shell")
