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 395635fa1 [Improve][Connector-V2][DataHub] Unified exception for
DataHub sink connector & change package name of DataHub (#3446)
395635fa1 is described below
commit 395635fa185d358d3cae44064d08815aea3a1adb
Author: Tyrantlucifer <[email protected]>
AuthorDate: Wed Nov 16 21:25:20 2022 +0800
[Improve][Connector-V2][DataHub] Unified exception for DataHub sink
connector & change package name of DataHub (#3446)
---
.../{ => datahub}/config/DataHubConfig.java | 2 +-
.../exception/DataHubConnectorException.java | 35 ++++++++++++++++++++++
.../seatunnel/{ => datahub}/sink/DataHubSink.java | 22 ++++++++------
.../{ => datahub}/sink/DataHubSinkFactory.java | 16 +++++-----
.../{ => datahub}/sink/DataHubWriter.java | 2 +-
5 files changed, 58 insertions(+), 19 deletions(-)
diff --git
a/seatunnel-connectors-v2/connector-datahub/src/main/java/org/apache/seatunnel/connectors/seatunnel/config/DataHubConfig.java
b/seatunnel-connectors-v2/connector-datahub/src/main/java/org/apache/seatunnel/connectors/seatunnel/datahub/config/DataHubConfig.java
similarity index 97%
rename from
seatunnel-connectors-v2/connector-datahub/src/main/java/org/apache/seatunnel/connectors/seatunnel/config/DataHubConfig.java
rename to
seatunnel-connectors-v2/connector-datahub/src/main/java/org/apache/seatunnel/connectors/seatunnel/datahub/config/DataHubConfig.java
index b409b0cff..81db5550f 100644
---
a/seatunnel-connectors-v2/connector-datahub/src/main/java/org/apache/seatunnel/connectors/seatunnel/config/DataHubConfig.java
+++
b/seatunnel-connectors-v2/connector-datahub/src/main/java/org/apache/seatunnel/connectors/seatunnel/datahub/config/DataHubConfig.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.seatunnel.connectors.seatunnel.config;
+package org.apache.seatunnel.connectors.seatunnel.datahub.config;
import org.apache.seatunnel.api.configuration.Option;
import org.apache.seatunnel.api.configuration.Options;
diff --git
a/seatunnel-connectors-v2/connector-datahub/src/main/java/org/apache/seatunnel/connectors/seatunnel/datahub/exception/DataHubConnectorException.java
b/seatunnel-connectors-v2/connector-datahub/src/main/java/org/apache/seatunnel/connectors/seatunnel/datahub/exception/DataHubConnectorException.java
new file mode 100644
index 000000000..4223b158d
--- /dev/null
+++
b/seatunnel-connectors-v2/connector-datahub/src/main/java/org/apache/seatunnel/connectors/seatunnel/datahub/exception/DataHubConnectorException.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.datahub.exception;
+
+import org.apache.seatunnel.common.exception.SeaTunnelErrorCode;
+import org.apache.seatunnel.common.exception.SeaTunnelRuntimeException;
+
+public class DataHubConnectorException extends SeaTunnelRuntimeException {
+ public DataHubConnectorException(SeaTunnelErrorCode seaTunnelErrorCode,
String errorMessage) {
+ super(seaTunnelErrorCode, errorMessage);
+ }
+
+ public DataHubConnectorException(SeaTunnelErrorCode seaTunnelErrorCode,
String errorMessage, Throwable cause) {
+ super(seaTunnelErrorCode, errorMessage, cause);
+ }
+
+ public DataHubConnectorException(SeaTunnelErrorCode seaTunnelErrorCode,
Throwable cause) {
+ super(seaTunnelErrorCode, cause);
+ }
+}
diff --git
a/seatunnel-connectors-v2/connector-datahub/src/main/java/org/apache/seatunnel/connectors/seatunnel/sink/DataHubSink.java
b/seatunnel-connectors-v2/connector-datahub/src/main/java/org/apache/seatunnel/connectors/seatunnel/datahub/sink/DataHubSink.java
similarity index 72%
rename from
seatunnel-connectors-v2/connector-datahub/src/main/java/org/apache/seatunnel/connectors/seatunnel/sink/DataHubSink.java
rename to
seatunnel-connectors-v2/connector-datahub/src/main/java/org/apache/seatunnel/connectors/seatunnel/datahub/sink/DataHubSink.java
index b3ef1e1b0..e0be61e96 100644
---
a/seatunnel-connectors-v2/connector-datahub/src/main/java/org/apache/seatunnel/connectors/seatunnel/sink/DataHubSink.java
+++
b/seatunnel-connectors-v2/connector-datahub/src/main/java/org/apache/seatunnel/connectors/seatunnel/datahub/sink/DataHubSink.java
@@ -15,17 +15,18 @@
* limitations under the License.
*/
-package org.apache.seatunnel.connectors.seatunnel.sink;
+package org.apache.seatunnel.connectors.seatunnel.datahub.sink;
-import static
org.apache.seatunnel.connectors.seatunnel.config.DataHubConfig.ACCESS_ID;
-import static
org.apache.seatunnel.connectors.seatunnel.config.DataHubConfig.ACCESS_KEY;
-import static
org.apache.seatunnel.connectors.seatunnel.config.DataHubConfig.ENDPOINT;
-import static
org.apache.seatunnel.connectors.seatunnel.config.DataHubConfig.PROJECT;
-import static
org.apache.seatunnel.connectors.seatunnel.config.DataHubConfig.RETRY_TIMES;
-import static
org.apache.seatunnel.connectors.seatunnel.config.DataHubConfig.TIMEOUT;
-import static
org.apache.seatunnel.connectors.seatunnel.config.DataHubConfig.TOPIC;
+import static
org.apache.seatunnel.connectors.seatunnel.datahub.config.DataHubConfig.ACCESS_ID;
+import static
org.apache.seatunnel.connectors.seatunnel.datahub.config.DataHubConfig.ACCESS_KEY;
+import static
org.apache.seatunnel.connectors.seatunnel.datahub.config.DataHubConfig.ENDPOINT;
+import static
org.apache.seatunnel.connectors.seatunnel.datahub.config.DataHubConfig.PROJECT;
+import static
org.apache.seatunnel.connectors.seatunnel.datahub.config.DataHubConfig.RETRY_TIMES;
+import static
org.apache.seatunnel.connectors.seatunnel.datahub.config.DataHubConfig.TIMEOUT;
+import static
org.apache.seatunnel.connectors.seatunnel.datahub.config.DataHubConfig.TOPIC;
import org.apache.seatunnel.api.common.PrepareFailException;
+import org.apache.seatunnel.api.common.SeaTunnelAPIErrorCode;
import org.apache.seatunnel.api.sink.SeaTunnelSink;
import org.apache.seatunnel.api.sink.SinkWriter.Context;
import org.apache.seatunnel.api.table.type.SeaTunnelDataType;
@@ -36,6 +37,7 @@ import org.apache.seatunnel.common.config.CheckResult;
import org.apache.seatunnel.common.constants.PluginType;
import
org.apache.seatunnel.connectors.seatunnel.common.sink.AbstractSimpleSink;
import
org.apache.seatunnel.connectors.seatunnel.common.sink.AbstractSinkWriter;
+import
org.apache.seatunnel.connectors.seatunnel.datahub.exception.DataHubConnectorException;
import org.apache.seatunnel.shade.com.typesafe.config.Config;
@@ -63,7 +65,9 @@ public class DataHubSink extends
AbstractSimpleSink<SeaTunnelRow, Void> {
CheckResult result = CheckConfigUtil.checkAllExists(pluginConfig,
ENDPOINT.key(), ACCESS_ID.key(), ACCESS_KEY.key(), PROJECT.key(),
TOPIC.key());
if (!result.isSuccess()) {
- throw new PrepareFailException(getPluginName(), PluginType.SINK,
result.getMsg());
+ throw new
DataHubConnectorException(SeaTunnelAPIErrorCode.CONFIG_VALIDATION_FAILED,
+ String.format("PluginName: %s, PluginType: %s, Message:
%s",
+ getPluginName(), PluginType.SINK,
result.getMsg()));
}
this.pluginConfig = pluginConfig;
}
diff --git
a/seatunnel-connectors-v2/connector-datahub/src/main/java/org/apache/seatunnel/connectors/seatunnel/sink/DataHubSinkFactory.java
b/seatunnel-connectors-v2/connector-datahub/src/main/java/org/apache/seatunnel/connectors/seatunnel/datahub/sink/DataHubSinkFactory.java
similarity index 65%
rename from
seatunnel-connectors-v2/connector-datahub/src/main/java/org/apache/seatunnel/connectors/seatunnel/sink/DataHubSinkFactory.java
rename to
seatunnel-connectors-v2/connector-datahub/src/main/java/org/apache/seatunnel/connectors/seatunnel/datahub/sink/DataHubSinkFactory.java
index 41277620c..a7161df9d 100644
---
a/seatunnel-connectors-v2/connector-datahub/src/main/java/org/apache/seatunnel/connectors/seatunnel/sink/DataHubSinkFactory.java
+++
b/seatunnel-connectors-v2/connector-datahub/src/main/java/org/apache/seatunnel/connectors/seatunnel/datahub/sink/DataHubSinkFactory.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.seatunnel.connectors.seatunnel.sink;
+package org.apache.seatunnel.connectors.seatunnel.datahub.sink;
-import static
org.apache.seatunnel.connectors.seatunnel.config.DataHubConfig.ACCESS_ID;
-import static
org.apache.seatunnel.connectors.seatunnel.config.DataHubConfig.ACCESS_KEY;
-import static
org.apache.seatunnel.connectors.seatunnel.config.DataHubConfig.ENDPOINT;
-import static
org.apache.seatunnel.connectors.seatunnel.config.DataHubConfig.PROJECT;
-import static
org.apache.seatunnel.connectors.seatunnel.config.DataHubConfig.RETRY_TIMES;
-import static
org.apache.seatunnel.connectors.seatunnel.config.DataHubConfig.TIMEOUT;
-import static
org.apache.seatunnel.connectors.seatunnel.config.DataHubConfig.TOPIC;
+import static
org.apache.seatunnel.connectors.seatunnel.datahub.config.DataHubConfig.ACCESS_ID;
+import static
org.apache.seatunnel.connectors.seatunnel.datahub.config.DataHubConfig.ACCESS_KEY;
+import static
org.apache.seatunnel.connectors.seatunnel.datahub.config.DataHubConfig.ENDPOINT;
+import static
org.apache.seatunnel.connectors.seatunnel.datahub.config.DataHubConfig.PROJECT;
+import static
org.apache.seatunnel.connectors.seatunnel.datahub.config.DataHubConfig.RETRY_TIMES;
+import static
org.apache.seatunnel.connectors.seatunnel.datahub.config.DataHubConfig.TIMEOUT;
+import static
org.apache.seatunnel.connectors.seatunnel.datahub.config.DataHubConfig.TOPIC;
import org.apache.seatunnel.api.configuration.util.OptionRule;
import org.apache.seatunnel.api.table.factory.Factory;
diff --git
a/seatunnel-connectors-v2/connector-datahub/src/main/java/org/apache/seatunnel/connectors/seatunnel/sink/DataHubWriter.java
b/seatunnel-connectors-v2/connector-datahub/src/main/java/org/apache/seatunnel/connectors/seatunnel/datahub/sink/DataHubWriter.java
similarity index 98%
rename from
seatunnel-connectors-v2/connector-datahub/src/main/java/org/apache/seatunnel/connectors/seatunnel/sink/DataHubWriter.java
rename to
seatunnel-connectors-v2/connector-datahub/src/main/java/org/apache/seatunnel/connectors/seatunnel/datahub/sink/DataHubWriter.java
index 65df1e7df..18632641c 100644
---
a/seatunnel-connectors-v2/connector-datahub/src/main/java/org/apache/seatunnel/connectors/seatunnel/sink/DataHubWriter.java
+++
b/seatunnel-connectors-v2/connector-datahub/src/main/java/org/apache/seatunnel/connectors/seatunnel/datahub/sink/DataHubWriter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.seatunnel.connectors.seatunnel.sink;
+package org.apache.seatunnel.connectors.seatunnel.datahub.sink;
import org.apache.seatunnel.api.table.type.SeaTunnelRow;
import org.apache.seatunnel.api.table.type.SeaTunnelRowType;
