This is an automated email from the ASF dual-hosted git repository.
fanjia pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new 7dc2a2738 [chore][connector-common] Rename SeatunnelSchema to
SeaTunnelSchema (#2538)
7dc2a2738 is described below
commit 7dc2a2738842301b704d30beeb361a1cf2263f55
Author: TyrantLucifer <[email protected]>
AuthorDate: Fri Aug 26 18:26:34 2022 +0800
[chore][connector-common] Rename SeatunnelSchema to SeaTunnelSchema (#2538)
---
.../common/schema/{SeatunnelSchema.java => SeaTunnelSchema.java} | 8 ++++----
.../apache/seatunnel/connector/common/schema/SchemaParseTest.java | 6 +++---
.../connectors/seatunnel/fake/source/FakeRandomData.java | 6 +++---
.../seatunnel/connectors/seatunnel/fake/source/FakeSource.java | 6 +++---
.../FakeRandomDataTest.java | 4 ++--
.../connectors/seatunnel/file/hdfs/source/HdfsFileSource.java | 4 ++--
.../connectors/seatunnel/file/local/source/LocalFileSource.java | 8 ++++----
.../connectors/seatunnel/file/oss/source/OssFileSource.java | 4 ++--
.../seatunnel/connectors/seatunnel/http/source/HttpSource.java | 6 +++---
.../seatunnel/connectors/seatunnel/iotdb/source/IoTDBSource.java | 4 ++--
10 files changed, 28 insertions(+), 28 deletions(-)
diff --git
a/seatunnel-connectors-v2/connector-common/src/main/java/org/apache/seatunnel/connectors/seatunnel/common/schema/SeatunnelSchema.java
b/seatunnel-connectors-v2/connector-common/src/main/java/org/apache/seatunnel/connectors/seatunnel/common/schema/SeaTunnelSchema.java
similarity index 97%
rename from
seatunnel-connectors-v2/connector-common/src/main/java/org/apache/seatunnel/connectors/seatunnel/common/schema/SeatunnelSchema.java
rename to
seatunnel-connectors-v2/connector-common/src/main/java/org/apache/seatunnel/connectors/seatunnel/common/schema/SeaTunnelSchema.java
index fbf481375..76d3d76ec 100644
---
a/seatunnel-connectors-v2/connector-common/src/main/java/org/apache/seatunnel/connectors/seatunnel/common/schema/SeatunnelSchema.java
+++
b/seatunnel-connectors-v2/connector-common/src/main/java/org/apache/seatunnel/connectors/seatunnel/common/schema/SeaTunnelSchema.java
@@ -36,13 +36,13 @@ import
org.apache.seatunnel.shade.com.typesafe.config.ConfigRenderOptions;
import java.io.Serializable;
import java.util.Map;
-public class SeatunnelSchema implements Serializable {
+public class SeaTunnelSchema implements Serializable {
public static final String SCHEMA = "schema";
private static final String FIELD_KEY = "fields";
private static final String SIMPLE_SCHEMA_FILED = "content";
private final SeaTunnelRowType seaTunnelRowType;
- private SeatunnelSchema(SeaTunnelRowType seaTunnelRowType) {
+ private SeaTunnelSchema(SeaTunnelRowType seaTunnelRowType) {
this.seaTunnelRowType = seaTunnelRowType;
}
@@ -192,7 +192,7 @@ public class SeatunnelSchema implements Serializable {
return JsonUtils.toMap(schema);
}
- public static SeatunnelSchema buildWithConfig(Config schemaConfig) {
+ public static SeaTunnelSchema buildWithConfig(Config schemaConfig) {
CheckResult checkResult = CheckConfigUtil.checkAllExists(schemaConfig,
FIELD_KEY);
if (!checkResult.isSuccess()) {
String errorMsg = String.format("Schema config need option [%s],
please correct your config first", FIELD_KEY);
@@ -213,7 +213,7 @@ public class SeatunnelSchema implements Serializable {
i++;
}
SeaTunnelRowType seaTunnelRowType = new SeaTunnelRowType(fieldsName,
seaTunnelDataTypes);
- return new SeatunnelSchema(seaTunnelRowType);
+ return new SeaTunnelSchema(seaTunnelRowType);
}
public static SeaTunnelRowType buildSimpleTextSchema() {
diff --git
a/seatunnel-connectors-v2/connector-common/src/test/java/org/apache/seatunnel/connector/common/schema/SchemaParseTest.java
b/seatunnel-connectors-v2/connector-common/src/test/java/org/apache/seatunnel/connector/common/schema/SchemaParseTest.java
index cbd398547..1baad8f05 100644
---
a/seatunnel-connectors-v2/connector-common/src/test/java/org/apache/seatunnel/connector/common/schema/SchemaParseTest.java
+++
b/seatunnel-connectors-v2/connector-common/src/test/java/org/apache/seatunnel/connector/common/schema/SchemaParseTest.java
@@ -23,7 +23,7 @@ import org.apache.seatunnel.api.table.type.DecimalType;
import org.apache.seatunnel.api.table.type.MapType;
import org.apache.seatunnel.api.table.type.PrimitiveByteArrayType;
import org.apache.seatunnel.api.table.type.SeaTunnelRowType;
-import org.apache.seatunnel.connectors.seatunnel.common.schema.SeatunnelSchema;
+import org.apache.seatunnel.connectors.seatunnel.common.schema.SeaTunnelSchema;
import org.apache.seatunnel.shade.com.typesafe.config.Config;
import org.apache.seatunnel.shade.com.typesafe.config.ConfigFactory;
@@ -48,7 +48,7 @@ public class SchemaParseTest {
.resolve(ConfigResolveOptions.defaults().setAllowUnresolved(true))
.resolveWith(ConfigFactory.systemProperties(),
ConfigResolveOptions.defaults().setAllowUnresolved(true));
config = config.getConfig("schema");
- SeatunnelSchema seatunnelSchema =
SeatunnelSchema.buildWithConfig(config);
+ SeaTunnelSchema seatunnelSchema =
SeaTunnelSchema.buildWithConfig(config);
SeaTunnelRowType seaTunnelRowType =
seatunnelSchema.getSeaTunnelRowType();
Assertions.assertNotNull(seatunnelSchema);
Assertions.assertEquals(seaTunnelRowType.getFieldType(1),
ArrayType.BYTE_ARRAY_TYPE);
@@ -66,7 +66,7 @@ public class SchemaParseTest {
.resolve(ConfigResolveOptions.defaults().setAllowUnresolved(true))
.resolveWith(ConfigFactory.systemProperties(),
ConfigResolveOptions.defaults().setAllowUnresolved(true));
config = config.getConfig("schema");
- SeatunnelSchema seatunnelSchema =
SeatunnelSchema.buildWithConfig(config);
+ SeaTunnelSchema seatunnelSchema =
SeaTunnelSchema.buildWithConfig(config);
SeaTunnelRowType seaTunnelRowType =
seatunnelSchema.getSeaTunnelRowType();
Assertions.assertNotNull(seatunnelSchema);
Assertions.assertEquals(seaTunnelRowType.getFieldType(0),
diff --git
a/seatunnel-connectors-v2/connector-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/source/FakeRandomData.java
b/seatunnel-connectors-v2/connector-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/source/FakeRandomData.java
index efafde5ca..a44c05e88 100644
---
a/seatunnel-connectors-v2/connector-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/source/FakeRandomData.java
+++
b/seatunnel-connectors-v2/connector-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/source/FakeRandomData.java
@@ -36,7 +36,7 @@ import
org.apache.seatunnel.api.table.type.PrimitiveByteArrayType;
import org.apache.seatunnel.api.table.type.SeaTunnelDataType;
import org.apache.seatunnel.api.table.type.SeaTunnelRow;
import org.apache.seatunnel.api.table.type.SeaTunnelRowType;
-import org.apache.seatunnel.connectors.seatunnel.common.schema.SeatunnelSchema;
+import org.apache.seatunnel.connectors.seatunnel.common.schema.SeaTunnelSchema;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.RandomUtils;
@@ -50,9 +50,9 @@ import java.util.List;
public class FakeRandomData {
public static final String SCHEMA = "schema";
- private final SeatunnelSchema schema;
+ private final SeaTunnelSchema schema;
- public FakeRandomData(SeatunnelSchema schema) {
+ public FakeRandomData(SeaTunnelSchema schema) {
this.schema = schema;
}
diff --git
a/seatunnel-connectors-v2/connector-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/source/FakeSource.java
b/seatunnel-connectors-v2/connector-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/source/FakeSource.java
index 4e7b1317e..0200362d0 100644
---
a/seatunnel-connectors-v2/connector-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/source/FakeSource.java
+++
b/seatunnel-connectors-v2/connector-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/source/FakeSource.java
@@ -23,7 +23,7 @@ import org.apache.seatunnel.api.source.SeaTunnelSource;
import org.apache.seatunnel.api.table.type.SeaTunnelRow;
import org.apache.seatunnel.api.table.type.SeaTunnelRowType;
import org.apache.seatunnel.common.constants.JobMode;
-import org.apache.seatunnel.connectors.seatunnel.common.schema.SeatunnelSchema;
+import org.apache.seatunnel.connectors.seatunnel.common.schema.SeaTunnelSchema;
import
org.apache.seatunnel.connectors.seatunnel.common.source.AbstractSingleSplitReader;
import
org.apache.seatunnel.connectors.seatunnel.common.source.AbstractSingleSplitSource;
import
org.apache.seatunnel.connectors.seatunnel.common.source.SingleSplitReaderContext;
@@ -37,7 +37,7 @@ public class FakeSource extends
AbstractSingleSplitSource<SeaTunnelRow> {
private Config pluginConfig;
private SeaTunnelContext seaTunnelContext;
- private SeatunnelSchema schema;
+ private SeaTunnelSchema schema;
@Override
public Boundedness getBoundedness() {
@@ -63,7 +63,7 @@ public class FakeSource extends
AbstractSingleSplitSource<SeaTunnelRow> {
public void prepare(Config pluginConfig) {
this.pluginConfig = pluginConfig;
assert pluginConfig.hasPath(FakeRandomData.SCHEMA);
- this.schema =
SeatunnelSchema.buildWithConfig(pluginConfig.getConfig(FakeRandomData.SCHEMA));
+ this.schema =
SeaTunnelSchema.buildWithConfig(pluginConfig.getConfig(FakeRandomData.SCHEMA));
}
@Override
diff --git
a/seatunnel-connectors-v2/connector-fake/src/test/java/org.apache.seatunnel.connectors.seatunnel.fake.source/FakeRandomDataTest.java
b/seatunnel-connectors-v2/connector-fake/src/test/java/org.apache.seatunnel.connectors.seatunnel.fake.source/FakeRandomDataTest.java
index 67906a161..e97533c88 100644
---
a/seatunnel-connectors-v2/connector-fake/src/test/java/org.apache.seatunnel.connectors.seatunnel.fake.source/FakeRandomDataTest.java
+++
b/seatunnel-connectors-v2/connector-fake/src/test/java/org.apache.seatunnel.connectors.seatunnel.fake.source/FakeRandomDataTest.java
@@ -21,7 +21,7 @@ import org.apache.seatunnel.api.table.type.SeaTunnelDataType;
import org.apache.seatunnel.api.table.type.SeaTunnelRow;
import org.apache.seatunnel.api.table.type.SeaTunnelRowType;
import org.apache.seatunnel.api.table.type.SqlType;
-import org.apache.seatunnel.connectors.seatunnel.common.schema.SeatunnelSchema;
+import org.apache.seatunnel.connectors.seatunnel.common.schema.SeaTunnelSchema;
import org.apache.seatunnel.shade.com.typesafe.config.Config;
import org.apache.seatunnel.shade.com.typesafe.config.ConfigFactory;
@@ -44,7 +44,7 @@ public class FakeRandomDataTest {
@ValueSource(strings = {"complex.schema.conf", "simple.schema.conf"})
public void testComplexSchemaParse(String conf) throws
FileNotFoundException, URISyntaxException {
Config testConfigFile = getTestConfigFile(conf);
- SeatunnelSchema seatunnelSchema =
SeatunnelSchema.buildWithConfig(testConfigFile);
+ SeaTunnelSchema seatunnelSchema =
SeaTunnelSchema.buildWithConfig(testConfigFile);
FakeRandomData fakeRandomData = new FakeRandomData(seatunnelSchema);
SeaTunnelRow seaTunnelRow = fakeRandomData.randomRow();
Assertions.assertNotNull(seaTunnelRow);
diff --git
a/seatunnel-connectors-v2/connector-file/connector-file-hadoop/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/hdfs/source/HdfsFileSource.java
b/seatunnel-connectors-v2/connector-file/connector-file-hadoop/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/hdfs/source/HdfsFileSource.java
index f0474a2c1..45298c8b0 100644
---
a/seatunnel-connectors-v2/connector-file/connector-file-hadoop/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/hdfs/source/HdfsFileSource.java
+++
b/seatunnel-connectors-v2/connector-file/connector-file-hadoop/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/hdfs/source/HdfsFileSource.java
@@ -22,7 +22,7 @@ import org.apache.seatunnel.api.source.SeaTunnelSource;
import org.apache.seatunnel.common.config.CheckConfigUtil;
import org.apache.seatunnel.common.config.CheckResult;
import org.apache.seatunnel.common.constants.PluginType;
-import org.apache.seatunnel.connectors.seatunnel.common.schema.SeatunnelSchema;
+import org.apache.seatunnel.connectors.seatunnel.common.schema.SeaTunnelSchema;
import org.apache.seatunnel.connectors.seatunnel.file.config.FileSystemType;
import org.apache.seatunnel.connectors.seatunnel.file.config.HadoopConf;
import
org.apache.seatunnel.connectors.seatunnel.file.exception.FilePluginException;
@@ -61,7 +61,7 @@ public class HdfsFileSource extends BaseFileSource {
// support user-defined schema
if (pluginConfig.hasPath(HdfsSourceConfig.SCHEMA)) {
Config schemaConfig =
pluginConfig.getConfig(HdfsSourceConfig.SCHEMA);
- rowType = SeatunnelSchema
+ rowType = SeaTunnelSchema
.buildWithConfig(schemaConfig)
.getSeaTunnelRowType();
readStrategy.setSeaTunnelRowTypeInfo(rowType);
diff --git
a/seatunnel-connectors-v2/connector-file/connector-file-local/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/local/source/LocalFileSource.java
b/seatunnel-connectors-v2/connector-file/connector-file-local/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/local/source/LocalFileSource.java
index 35953113a..36a9a6b27 100644
---
a/seatunnel-connectors-v2/connector-file/connector-file-local/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/local/source/LocalFileSource.java
+++
b/seatunnel-connectors-v2/connector-file/connector-file-local/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/local/source/LocalFileSource.java
@@ -22,7 +22,7 @@ import org.apache.seatunnel.api.source.SeaTunnelSource;
import org.apache.seatunnel.common.config.CheckConfigUtil;
import org.apache.seatunnel.common.config.CheckResult;
import org.apache.seatunnel.common.constants.PluginType;
-import org.apache.seatunnel.connectors.seatunnel.common.schema.SeatunnelSchema;
+import org.apache.seatunnel.connectors.seatunnel.common.schema.SeaTunnelSchema;
import org.apache.seatunnel.connectors.seatunnel.file.config.FileFormat;
import org.apache.seatunnel.connectors.seatunnel.file.config.FileSystemType;
import
org.apache.seatunnel.connectors.seatunnel.file.exception.FilePluginException;
@@ -61,9 +61,9 @@ public class LocalFileSource extends BaseFileSource {
// support user-defined schema
FileFormat fileFormat =
FileFormat.valueOf(pluginConfig.getString(LocalSourceConfig.FILE_PATH).toUpperCase());
// only json type support user-defined schema now
- if (pluginConfig.hasPath(SeatunnelSchema.SCHEMA) &&
fileFormat.equals(FileFormat.JSON)) {
- Config schemaConfig =
pluginConfig.getConfig(SeatunnelSchema.SCHEMA);
- rowType = SeatunnelSchema
+ if (pluginConfig.hasPath(SeaTunnelSchema.SCHEMA) &&
fileFormat.equals(FileFormat.JSON)) {
+ Config schemaConfig =
pluginConfig.getConfig(SeaTunnelSchema.SCHEMA);
+ rowType = SeaTunnelSchema
.buildWithConfig(schemaConfig)
.getSeaTunnelRowType();
readStrategy.setSeaTunnelRowTypeInfo(rowType);
diff --git
a/seatunnel-connectors-v2/connector-file/connector-file-oss/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/oss/source/OssFileSource.java
b/seatunnel-connectors-v2/connector-file/connector-file-oss/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/oss/source/OssFileSource.java
index b12efa07d..1eb588c8e 100644
---
a/seatunnel-connectors-v2/connector-file/connector-file-oss/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/oss/source/OssFileSource.java
+++
b/seatunnel-connectors-v2/connector-file/connector-file-oss/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/oss/source/OssFileSource.java
@@ -22,7 +22,7 @@ import org.apache.seatunnel.api.source.SeaTunnelSource;
import org.apache.seatunnel.common.config.CheckConfigUtil;
import org.apache.seatunnel.common.config.CheckResult;
import org.apache.seatunnel.common.constants.PluginType;
-import org.apache.seatunnel.connectors.seatunnel.common.schema.SeatunnelSchema;
+import org.apache.seatunnel.connectors.seatunnel.common.schema.SeaTunnelSchema;
import org.apache.seatunnel.connectors.seatunnel.file.config.FileSystemType;
import
org.apache.seatunnel.connectors.seatunnel.file.exception.FilePluginException;
import
org.apache.seatunnel.connectors.seatunnel.file.oss.source.config.OssConf;
@@ -70,7 +70,7 @@ public class OssFileSource extends BaseFileSource {
// support user-defined schema
if (pluginConfig.hasPath(OssSourceConfig.SCHEMA)) {
Config schemaConfig =
pluginConfig.getConfig(OssSourceConfig.SCHEMA);
- rowType = SeatunnelSchema
+ rowType = SeaTunnelSchema
.buildWithConfig(schemaConfig)
.getSeaTunnelRowType();
readStrategy.setSeaTunnelRowTypeInfo(rowType);
diff --git
a/seatunnel-connectors-v2/connector-http/connector-http-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/http/source/HttpSource.java
b/seatunnel-connectors-v2/connector-http/connector-http-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/http/source/HttpSource.java
index d65e59e75..cd52b19a6 100644
---
a/seatunnel-connectors-v2/connector-http/connector-http-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/http/source/HttpSource.java
+++
b/seatunnel-connectors-v2/connector-http/connector-http-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/http/source/HttpSource.java
@@ -29,7 +29,7 @@ import org.apache.seatunnel.common.config.CheckConfigUtil;
import org.apache.seatunnel.common.config.CheckResult;
import org.apache.seatunnel.common.constants.JobMode;
import org.apache.seatunnel.common.constants.PluginType;
-import org.apache.seatunnel.connectors.seatunnel.common.schema.SeatunnelSchema;
+import org.apache.seatunnel.connectors.seatunnel.common.schema.SeaTunnelSchema;
import
org.apache.seatunnel.connectors.seatunnel.common.source.AbstractSingleSplitReader;
import
org.apache.seatunnel.connectors.seatunnel.common.source.AbstractSingleSplitSource;
import
org.apache.seatunnel.connectors.seatunnel.common.source.SingleSplitReaderContext;
@@ -67,9 +67,9 @@ public class HttpSource extends
AbstractSingleSplitSource<SeaTunnelRow> {
this.httpParameter.buildWithConfig(pluginConfig);
if (pluginConfig.hasPath(HttpConfig.SCHEMA)) {
Config schema = pluginConfig.getConfig(HttpConfig.SCHEMA);
- this.rowType =
SeatunnelSchema.buildWithConfig(schema).getSeaTunnelRowType();
+ this.rowType =
SeaTunnelSchema.buildWithConfig(schema).getSeaTunnelRowType();
} else {
- this.rowType = SeatunnelSchema.buildSimpleTextSchema();
+ this.rowType = SeaTunnelSchema.buildSimpleTextSchema();
}
// TODO: use format SPI
// default use json format
diff --git
a/seatunnel-connectors-v2/connector-iotdb/src/main/java/org/apache/seatunnel/connectors/seatunnel/iotdb/source/IoTDBSource.java
b/seatunnel-connectors-v2/connector-iotdb/src/main/java/org/apache/seatunnel/connectors/seatunnel/iotdb/source/IoTDBSource.java
index 987c43c84..a7c052592 100644
---
a/seatunnel-connectors-v2/connector-iotdb/src/main/java/org/apache/seatunnel/connectors/seatunnel/iotdb/source/IoTDBSource.java
+++
b/seatunnel-connectors-v2/connector-iotdb/src/main/java/org/apache/seatunnel/connectors/seatunnel/iotdb/source/IoTDBSource.java
@@ -33,7 +33,7 @@ import org.apache.seatunnel.api.table.type.SeaTunnelRowType;
import org.apache.seatunnel.common.config.CheckConfigUtil;
import org.apache.seatunnel.common.config.CheckResult;
import org.apache.seatunnel.common.constants.PluginType;
-import org.apache.seatunnel.connectors.seatunnel.common.schema.SeatunnelSchema;
+import org.apache.seatunnel.connectors.seatunnel.common.schema.SeaTunnelSchema;
import org.apache.seatunnel.connectors.seatunnel.iotdb.state.IoTDBSourceState;
import org.apache.seatunnel.shade.com.typesafe.config.Config;
@@ -67,7 +67,7 @@ public class IoTDBSource implements
SeaTunnelSource<SeaTunnelRow, IoTDBSourceSpl
throw new PrepareFailException(getPluginName(),
PluginType.SOURCE, "host and port and node urls are both empty");
}
}
- SeatunnelSchema seatunnelSchema =
SeatunnelSchema.buildWithConfig(pluginConfig);
+ SeaTunnelSchema seatunnelSchema =
SeaTunnelSchema.buildWithConfig(pluginConfig);
this.typeInfo = seatunnelSchema.getSeaTunnelRowType();
pluginConfig.entrySet().forEach(entry ->
configParams.put(entry.getKey(), entry.getValue().unwrapped()));
}
