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 f371ad582 [Improve][Connector-V2][Fake] Unified exception for fake
source connector (#3520)
f371ad582 is described below
commit f371ad5825aa9b0919e7ad31c4d23bcd2c3ab0dd
Author: Tyrantlucifer <[email protected]>
AuthorDate: Thu Nov 24 10:57:50 2022 +0800
[Improve][Connector-V2][Fake] Unified exception for fake source connector
(#3520)
---
.../seatunnel/fake/config/FakeConfig.java | 14 ++++-----
.../fake/config/{Config.java => FakeOption.java} | 2 +-
.../fake/exception/FakeConnectorException.java | 35 ++++++++++++++++++++++
.../seatunnel/fake/source/FakeDataGenerator.java | 5 +++-
.../seatunnel/fake/source/FakeSource.java | 14 +++++++--
.../seatunnel/fake/source/FakeSourceFactory.java | 14 ++++-----
6 files changed, 66 insertions(+), 18 deletions(-)
diff --git
a/seatunnel-connectors-v2/connector-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/config/FakeConfig.java
b/seatunnel-connectors-v2/connector-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/config/FakeConfig.java
index 8c84c773b..c6555f7ab 100644
---
a/seatunnel-connectors-v2/connector-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/config/FakeConfig.java
+++
b/seatunnel-connectors-v2/connector-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/config/FakeConfig.java
@@ -17,13 +17,13 @@
package org.apache.seatunnel.connectors.seatunnel.fake.config;
-import static
org.apache.seatunnel.connectors.seatunnel.fake.config.Config.ARRAY_SIZE;
-import static
org.apache.seatunnel.connectors.seatunnel.fake.config.Config.BYTES_LENGTH;
-import static
org.apache.seatunnel.connectors.seatunnel.fake.config.Config.MAP_SIZE;
-import static
org.apache.seatunnel.connectors.seatunnel.fake.config.Config.ROW_NUM;
-import static
org.apache.seatunnel.connectors.seatunnel.fake.config.Config.SPLIT_NUM;
-import static
org.apache.seatunnel.connectors.seatunnel.fake.config.Config.SPLIT_READ_INTERVAL;
-import static
org.apache.seatunnel.connectors.seatunnel.fake.config.Config.STRING_LENGTH;
+import static
org.apache.seatunnel.connectors.seatunnel.fake.config.FakeOption.ARRAY_SIZE;
+import static
org.apache.seatunnel.connectors.seatunnel.fake.config.FakeOption.BYTES_LENGTH;
+import static
org.apache.seatunnel.connectors.seatunnel.fake.config.FakeOption.MAP_SIZE;
+import static
org.apache.seatunnel.connectors.seatunnel.fake.config.FakeOption.ROW_NUM;
+import static
org.apache.seatunnel.connectors.seatunnel.fake.config.FakeOption.SPLIT_NUM;
+import static
org.apache.seatunnel.connectors.seatunnel.fake.config.FakeOption.SPLIT_READ_INTERVAL;
+import static
org.apache.seatunnel.connectors.seatunnel.fake.config.FakeOption.STRING_LENGTH;
import org.apache.seatunnel.shade.com.typesafe.config.Config;
diff --git
a/seatunnel-connectors-v2/connector-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/config/Config.java
b/seatunnel-connectors-v2/connector-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/config/FakeOption.java
similarity index 98%
rename from
seatunnel-connectors-v2/connector-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/config/Config.java
rename to
seatunnel-connectors-v2/connector-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/config/FakeOption.java
index 2f8ade970..02cb5fe8b 100644
---
a/seatunnel-connectors-v2/connector-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/config/Config.java
+++
b/seatunnel-connectors-v2/connector-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/config/FakeOption.java
@@ -21,7 +21,7 @@ import org.apache.seatunnel.api.configuration.Option;
import org.apache.seatunnel.api.configuration.Options;
@SuppressWarnings("checkstyle:MagicNumber")
-public class Config {
+public class FakeOption {
public static final Option<Integer> ROW_NUM =
Options.key("row.num").intType().defaultValue(5)
.withDescription("The total number of data generated per degree of
parallelism");
diff --git
a/seatunnel-connectors-v2/connector-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/exception/FakeConnectorException.java
b/seatunnel-connectors-v2/connector-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/exception/FakeConnectorException.java
new file mode 100644
index 000000000..be5b7d142
--- /dev/null
+++
b/seatunnel-connectors-v2/connector-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/exception/FakeConnectorException.java
@@ -0,0 +1,35 @@
+/*
+ * 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.seatunnel.connectors.seatunnel.fake.exception;
+
+import org.apache.seatunnel.common.exception.SeaTunnelErrorCode;
+import org.apache.seatunnel.common.exception.SeaTunnelRuntimeException;
+
+public class FakeConnectorException extends SeaTunnelRuntimeException {
+ public FakeConnectorException(SeaTunnelErrorCode seaTunnelErrorCode,
String errorMessage) {
+ super(seaTunnelErrorCode, errorMessage);
+ }
+
+ public FakeConnectorException(SeaTunnelErrorCode seaTunnelErrorCode,
String errorMessage, Throwable cause) {
+ super(seaTunnelErrorCode, errorMessage, cause);
+ }
+
+ public FakeConnectorException(SeaTunnelErrorCode seaTunnelErrorCode,
Throwable cause) {
+ super(seaTunnelErrorCode, cause);
+ }
+}
diff --git
a/seatunnel-connectors-v2/connector-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/source/FakeDataGenerator.java
b/seatunnel-connectors-v2/connector-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/source/FakeDataGenerator.java
index 085bd158a..df158d0b8 100644
---
a/seatunnel-connectors-v2/connector-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/source/FakeDataGenerator.java
+++
b/seatunnel-connectors-v2/connector-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/source/FakeDataGenerator.java
@@ -24,8 +24,10 @@ import org.apache.seatunnel.api.table.type.MapType;
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.common.exception.CommonErrorCode;
import org.apache.seatunnel.connectors.seatunnel.common.schema.SeaTunnelSchema;
import org.apache.seatunnel.connectors.seatunnel.fake.config.FakeConfig;
+import
org.apache.seatunnel.connectors.seatunnel.fake.exception.FakeConnectorException;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.RandomUtils;
@@ -131,7 +133,8 @@ public class FakeDataGenerator {
return new SeaTunnelRow(objects);
default:
// never got in there
- throw new UnsupportedOperationException("SeaTunnel Fake source
connector not support this data type");
+ throw new
FakeConnectorException(CommonErrorCode.UNSUPPORTED_DATA_TYPE,
+ "SeaTunnel Fake source connector not support this data
type");
}
}
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 16275840e..9e5b06d01 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
@@ -18,15 +18,20 @@
package org.apache.seatunnel.connectors.seatunnel.fake.source;
import org.apache.seatunnel.api.common.JobContext;
+import org.apache.seatunnel.api.common.SeaTunnelAPIErrorCode;
import org.apache.seatunnel.api.source.Boundedness;
import org.apache.seatunnel.api.source.SeaTunnelSource;
import org.apache.seatunnel.api.source.SourceReader;
import org.apache.seatunnel.api.source.SourceSplitEnumerator;
import org.apache.seatunnel.api.table.type.SeaTunnelRow;
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.JobMode;
+import org.apache.seatunnel.common.constants.PluginType;
import org.apache.seatunnel.connectors.seatunnel.common.schema.SeaTunnelSchema;
import org.apache.seatunnel.connectors.seatunnel.fake.config.FakeConfig;
+import
org.apache.seatunnel.connectors.seatunnel.fake.exception.FakeConnectorException;
import org.apache.seatunnel.connectors.seatunnel.fake.state.FakeSourceState;
import org.apache.seatunnel.shade.com.typesafe.config.Config;
@@ -74,8 +79,13 @@ public class FakeSource implements
SeaTunnelSource<SeaTunnelRow, FakeSourceSplit
@Override
public void prepare(Config pluginConfig) {
- assert pluginConfig.hasPath(FakeDataGenerator.SCHEMA);
- this.schema =
SeaTunnelSchema.buildWithConfig(pluginConfig.getConfig(FakeDataGenerator.SCHEMA));
+ CheckResult result = CheckConfigUtil.checkAllExists(pluginConfig,
SeaTunnelSchema.SCHEMA.key());
+ if (!result.isSuccess()) {
+ throw new
FakeConnectorException(SeaTunnelAPIErrorCode.CONFIG_VALIDATION_FAILED,
+ String.format("PluginName: %s, PluginType: %s, Message:
%s",
+ getPluginName(), PluginType.SOURCE,
result.getMsg()));
+ }
+ this.schema =
SeaTunnelSchema.buildWithConfig(pluginConfig.getConfig(SeaTunnelSchema.SCHEMA.key()));
this.fakeConfig = FakeConfig.buildWithConfig(pluginConfig);
}
diff --git
a/seatunnel-connectors-v2/connector-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/source/FakeSourceFactory.java
b/seatunnel-connectors-v2/connector-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/source/FakeSourceFactory.java
index b39fd7d5f..5df986949 100644
---
a/seatunnel-connectors-v2/connector-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/source/FakeSourceFactory.java
+++
b/seatunnel-connectors-v2/connector-fake/src/main/java/org/apache/seatunnel/connectors/seatunnel/fake/source/FakeSourceFactory.java
@@ -17,13 +17,13 @@
package org.apache.seatunnel.connectors.seatunnel.fake.source;
-import static
org.apache.seatunnel.connectors.seatunnel.fake.config.Config.ARRAY_SIZE;
-import static
org.apache.seatunnel.connectors.seatunnel.fake.config.Config.BYTES_LENGTH;
-import static
org.apache.seatunnel.connectors.seatunnel.fake.config.Config.MAP_SIZE;
-import static
org.apache.seatunnel.connectors.seatunnel.fake.config.Config.ROW_NUM;
-import static
org.apache.seatunnel.connectors.seatunnel.fake.config.Config.SPLIT_NUM;
-import static
org.apache.seatunnel.connectors.seatunnel.fake.config.Config.SPLIT_READ_INTERVAL;
-import static
org.apache.seatunnel.connectors.seatunnel.fake.config.Config.STRING_LENGTH;
+import static
org.apache.seatunnel.connectors.seatunnel.fake.config.FakeOption.ARRAY_SIZE;
+import static
org.apache.seatunnel.connectors.seatunnel.fake.config.FakeOption.BYTES_LENGTH;
+import static
org.apache.seatunnel.connectors.seatunnel.fake.config.FakeOption.MAP_SIZE;
+import static
org.apache.seatunnel.connectors.seatunnel.fake.config.FakeOption.ROW_NUM;
+import static
org.apache.seatunnel.connectors.seatunnel.fake.config.FakeOption.SPLIT_NUM;
+import static
org.apache.seatunnel.connectors.seatunnel.fake.config.FakeOption.SPLIT_READ_INTERVAL;
+import static
org.apache.seatunnel.connectors.seatunnel.fake.config.FakeOption.STRING_LENGTH;
import org.apache.seatunnel.api.configuration.util.OptionRule;
import org.apache.seatunnel.api.table.factory.Factory;
