You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@seatunnel.apache.org by GitBox <gi...@apache.org> on 2022/10/15 14:41:52 UTC
[GitHub] [incubator-seatunnel] hailin0 commented on a diff in pull request #3111: [Feature][Connector-V2] Optimize package name
hailin0 commented on code in PR #3111:
URL: https://github.com/apache/incubator-seatunnel/pull/3111#discussion_r996313938
##########
seatunnel-connectors-v2/connector-clickhouse/src/main/java/org/apache/seatunnel/connectors/clickhouse/sink/client/ClickhouseSink.java:
##########
@@ -15,18 +15,7 @@
* limitations under the License.
*/
-package org.apache.seatunnel.connectors.seatunnel.clickhouse.sink.client;
-
-import static org.apache.seatunnel.connectors.seatunnel.clickhouse.config.Config.BULK_SIZE;
-import static org.apache.seatunnel.connectors.seatunnel.clickhouse.config.Config.CLICKHOUSE_PREFIX;
-import static org.apache.seatunnel.connectors.seatunnel.clickhouse.config.Config.DATABASE;
-import static org.apache.seatunnel.connectors.seatunnel.clickhouse.config.Config.FIELDS;
-import static org.apache.seatunnel.connectors.seatunnel.clickhouse.config.Config.HOST;
-import static org.apache.seatunnel.connectors.seatunnel.clickhouse.config.Config.PASSWORD;
-import static org.apache.seatunnel.connectors.seatunnel.clickhouse.config.Config.SHARDING_KEY;
-import static org.apache.seatunnel.connectors.seatunnel.clickhouse.config.Config.SPLIT_MODE;
-import static org.apache.seatunnel.connectors.seatunnel.clickhouse.config.Config.TABLE;
-import static org.apache.seatunnel.connectors.seatunnel.clickhouse.config.Config.USERNAME;
Review Comment:
why remove?
##########
seatunnel-connectors-v2/connector-clickhouse/src/main/java/org/apache/seatunnel/connectors/clickhouse/source/ClickhouseSource.java:
##########
@@ -63,18 +57,18 @@ public String getPluginName() {
@Override
public void prepare(Config config) throws PrepareFailException {
- CheckResult result = CheckConfigUtil.checkAllExists(config, HOST, DATABASE, SQL, USERNAME, PASSWORD);
+ CheckResult result = CheckConfigUtil.checkAllExists(config, org.apache.seatunnel.connectors.clickhouse.config.Config.HOST, org.apache.seatunnel.connectors.clickhouse.config.Config.DATABASE, org.apache.seatunnel.connectors.clickhouse.config.Config.SQL, org.apache.seatunnel.connectors.clickhouse.config.Config.USERNAME, org.apache.seatunnel.connectors.clickhouse.config.Config.PASSWORD);
if (!result.isSuccess()) {
throw new PrepareFailException(getPluginName(), PluginType.SOURCE, result.getMsg());
}
- servers = ClickhouseUtil.createNodes(config.getString(HOST), config.getString(DATABASE),
- config.getString(USERNAME), config.getString(PASSWORD));
+ servers = ClickhouseUtil.createNodes(config.getString(org.apache.seatunnel.connectors.clickhouse.config.Config.HOST), config.getString(org.apache.seatunnel.connectors.clickhouse.config.Config.DATABASE),
+ config.getString(org.apache.seatunnel.connectors.clickhouse.config.Config.USERNAME), config.getString(org.apache.seatunnel.connectors.clickhouse.config.Config.PASSWORD));
- sql = config.getString(SQL);
+ sql = config.getString(org.apache.seatunnel.connectors.clickhouse.config.Config.SQL);
try (ClickHouseClient client = ClickHouseClient.newInstance(servers.get(0).getProtocol());
ClickHouseResponse response =
client.connect(servers.get(0)).format(ClickHouseFormat.RowBinaryWithNamesAndTypes)
- .query(modifySQLToLimit1(config.getString(SQL))).executeAndWait()) {
+ .query(modifySQLToLimit1(config.getString(org.apache.seatunnel.connectors.clickhouse.config.Config.SQL))).executeAndWait()) {
Review Comment:
revert
##########
seatunnel-connectors-v2/connector-mongodb/src/main/java/org/apache/seatunnel/connectors/mongodb/sink/MongodbSink.java:
##########
@@ -15,11 +15,7 @@
* limitations under the License.
*/
-package org.apache.seatunnel.connectors.seatunnel.mongodb.sink;
-
-import static org.apache.seatunnel.connectors.seatunnel.mongodb.config.MongodbConfig.COLLECTION;
-import static org.apache.seatunnel.connectors.seatunnel.mongodb.config.MongodbConfig.DATABASE;
-import static org.apache.seatunnel.connectors.seatunnel.mongodb.config.MongodbConfig.URI;
Review Comment:
why remove
##########
seatunnel-connectors-v2/connector-clickhouse/src/main/java/org/apache/seatunnel/connectors/clickhouse/sink/file/ClickhouseFileSink.java:
##########
@@ -73,55 +61,55 @@ public String getPluginName() {
@Override
public void prepare(Config config) throws PrepareFailException {
- CheckResult checkResult = CheckConfigUtil.checkAllExists(config, HOST, TABLE, DATABASE, USERNAME, PASSWORD, CLICKHOUSE_LOCAL_PATH);
+ CheckResult checkResult = CheckConfigUtil.checkAllExists(config, org.apache.seatunnel.connectors.clickhouse.config.Config.HOST, org.apache.seatunnel.connectors.clickhouse.config.Config.TABLE, org.apache.seatunnel.connectors.clickhouse.config.Config.DATABASE, org.apache.seatunnel.connectors.clickhouse.config.Config.USERNAME, org.apache.seatunnel.connectors.clickhouse.config.Config.PASSWORD, org.apache.seatunnel.connectors.clickhouse.config.Config.CLICKHOUSE_LOCAL_PATH);
Review Comment:
including other places
##########
seatunnel-connectors-v2/connector-iotdb/src/main/java/org/apache/seatunnel/connectors/iotdb/source/IoTDBSourceSplitEnumerator.java:
##########
@@ -15,19 +15,17 @@
* limitations under the License.
*/
-package org.apache.seatunnel.connectors.seatunnel.iotdb.source;
-
-import static org.apache.seatunnel.connectors.seatunnel.iotdb.config.SourceConfig.LOWER_BOUND;
-import static org.apache.seatunnel.connectors.seatunnel.iotdb.config.SourceConfig.NUM_PARTITIONS;
-import static org.apache.seatunnel.connectors.seatunnel.iotdb.config.SourceConfig.SQL;
-import static org.apache.seatunnel.connectors.seatunnel.iotdb.config.SourceConfig.UPPER_BOUND;
-import static org.apache.seatunnel.connectors.seatunnel.iotdb.constant.SourceConstants.DEFAULT_PARTITIONS;
-import static org.apache.seatunnel.connectors.seatunnel.iotdb.constant.SourceConstants.SQL_ALIGN;
-import static org.apache.seatunnel.connectors.seatunnel.iotdb.constant.SourceConstants.SQL_WHERE;
Review Comment:
why remove
##########
seatunnel-connectors-v2/connector-clickhouse/src/main/java/org/apache/seatunnel/connectors/clickhouse/sink/file/ClickhouseFileSink.java:
##########
@@ -15,19 +15,7 @@
* limitations under the License.
*/
-package org.apache.seatunnel.connectors.seatunnel.clickhouse.sink.file;
-
-import static org.apache.seatunnel.connectors.seatunnel.clickhouse.config.Config.CLICKHOUSE_LOCAL_PATH;
-import static org.apache.seatunnel.connectors.seatunnel.clickhouse.config.Config.COPY_METHOD;
-import static org.apache.seatunnel.connectors.seatunnel.clickhouse.config.Config.DATABASE;
-import static org.apache.seatunnel.connectors.seatunnel.clickhouse.config.Config.FIELDS;
-import static org.apache.seatunnel.connectors.seatunnel.clickhouse.config.Config.HOST;
-import static org.apache.seatunnel.connectors.seatunnel.clickhouse.config.Config.NODE_ADDRESS;
-import static org.apache.seatunnel.connectors.seatunnel.clickhouse.config.Config.NODE_PASS;
-import static org.apache.seatunnel.connectors.seatunnel.clickhouse.config.Config.PASSWORD;
-import static org.apache.seatunnel.connectors.seatunnel.clickhouse.config.Config.SHARDING_KEY;
-import static org.apache.seatunnel.connectors.seatunnel.clickhouse.config.Config.TABLE;
-import static org.apache.seatunnel.connectors.seatunnel.clickhouse.config.Config.USERNAME;
Review Comment:
revert
##########
seatunnel-connectors-v2/connector-elasticsearch/src/main/java/org/apache/seatunnel/connectors/elasticsearch/serialize/type/IndexTypeSerializerFactory.java:
##########
@@ -15,15 +15,11 @@
* limitations under the License.
*/
-package org.apache.seatunnel.connectors.seatunnel.elasticsearch.serialize.type;
+package org.apache.seatunnel.connectors.elasticsearch.serialize.type;
-import static org.apache.seatunnel.connectors.seatunnel.elasticsearch.constant.ElasticsearchVersion.ES2;
-import static org.apache.seatunnel.connectors.seatunnel.elasticsearch.constant.ElasticsearchVersion.ES5;
-import static org.apache.seatunnel.connectors.seatunnel.elasticsearch.constant.ElasticsearchVersion.ES6;
-
-import org.apache.seatunnel.connectors.seatunnel.elasticsearch.constant.ElasticsearchVersion;
-import org.apache.seatunnel.connectors.seatunnel.elasticsearch.serialize.type.impl.NotIndexTypeSerializer;
-import org.apache.seatunnel.connectors.seatunnel.elasticsearch.serialize.type.impl.RequiredIndexTypeSerializer;
+import org.apache.seatunnel.connectors.elasticsearch.constant.ElasticsearchVersion;
+import org.apache.seatunnel.connectors.elasticsearch.serialize.type.impl.NotIndexTypeSerializer;
+import org.apache.seatunnel.connectors.elasticsearch.serialize.type.impl.RequiredIndexTypeSerializer;
Review Comment:
revert
##########
seatunnel-connectors-v2/connector-hive/src/main/java/org/apache/seatunnel/connectors/hive/sink/HiveSink.java:
##########
@@ -15,31 +15,28 @@
* limitations under the License.
*/
-package org.apache.seatunnel.connectors.seatunnel.hive.sink;
+package org.apache.seatunnel.connectors.hive.sink;
-import static org.apache.seatunnel.connectors.seatunnel.file.config.Constant.FIELD_DELIMITER;
-import static org.apache.seatunnel.connectors.seatunnel.file.config.Constant.FILE_FORMAT;
-import static org.apache.seatunnel.connectors.seatunnel.file.config.Constant.FILE_NAME_EXPRESSION;
-import static org.apache.seatunnel.connectors.seatunnel.file.config.Constant.IS_PARTITION_FIELD_WRITE_IN_FILE;
-import static org.apache.seatunnel.connectors.seatunnel.file.config.Constant.PATH;
-import static org.apache.seatunnel.connectors.seatunnel.file.config.Constant.ROW_DELIMITER;
-import static org.apache.seatunnel.connectors.seatunnel.file.config.Constant.SAVE_MODE;
-import static org.apache.seatunnel.connectors.seatunnel.hive.config.HiveConfig.ORC_OUTPUT_FORMAT_CLASSNAME;
-import static org.apache.seatunnel.connectors.seatunnel.hive.config.HiveConfig.PARQUET_OUTPUT_FORMAT_CLASSNAME;
-import static org.apache.seatunnel.connectors.seatunnel.hive.config.HiveConfig.TEXT_OUTPUT_FORMAT_CLASSNAME;
+import static org.apache.seatunnel.connectors.file.config.Constant.FIELD_DELIMITER;
+import static org.apache.seatunnel.connectors.file.config.Constant.FILE_FORMAT;
+import static org.apache.seatunnel.connectors.file.config.Constant.FILE_NAME_EXPRESSION;
+import static org.apache.seatunnel.connectors.file.config.Constant.IS_PARTITION_FIELD_WRITE_IN_FILE;
+import static org.apache.seatunnel.connectors.file.config.Constant.PATH;
+import static org.apache.seatunnel.connectors.file.config.Constant.ROW_DELIMITER;
+import static org.apache.seatunnel.connectors.file.config.Constant.SAVE_MODE;
Review Comment:
why remove?
##########
seatunnel-connectors-v2/connector-clickhouse/src/main/java/org/apache/seatunnel/connectors/clickhouse/sink/client/ClickhouseSink.java:
##########
@@ -137,34 +126,34 @@ public void prepare(Config config) throws PrepareFailException {
metadata = new ShardMetadata(
shardKey,
shardKeyType,
- config.getString(DATABASE),
- config.getString(TABLE),
- config.getBoolean(SPLIT_MODE),
- new Shard(1, 1, nodes.get(0)), config.getString(USERNAME), config.getString(PASSWORD));
+ config.getString(org.apache.seatunnel.connectors.clickhouse.config.Config.DATABASE),
+ config.getString(org.apache.seatunnel.connectors.clickhouse.config.Config.TABLE),
+ config.getBoolean(org.apache.seatunnel.connectors.clickhouse.config.Config.SPLIT_MODE),
+ new Shard(1, 1, nodes.get(0)), config.getString(org.apache.seatunnel.connectors.clickhouse.config.Config.USERNAME), config.getString(org.apache.seatunnel.connectors.clickhouse.config.Config.PASSWORD));
} else {
metadata = new ShardMetadata(
shardKey,
shardKeyType,
- config.getString(DATABASE),
- config.getString(TABLE),
- config.getBoolean(SPLIT_MODE),
+ config.getString(org.apache.seatunnel.connectors.clickhouse.config.Config.DATABASE),
+ config.getString(org.apache.seatunnel.connectors.clickhouse.config.Config.TABLE),
+ config.getBoolean(org.apache.seatunnel.connectors.clickhouse.config.Config.SPLIT_MODE),
new Shard(1, 1, nodes.get(0)));
}
List<String> fields = new ArrayList<>();
- if (config.hasPath(FIELDS)) {
- fields.addAll(config.getStringList(FIELDS));
+ if (config.hasPath(org.apache.seatunnel.connectors.clickhouse.config.Config.FIELDS)) {
+ fields.addAll(config.getStringList(org.apache.seatunnel.connectors.clickhouse.config.Config.FIELDS));
// check if the fields exist in schema
for (String field : fields) {
if (!tableSchema.containsKey(field)) {
- throw new RuntimeException("Field " + field + " does not exist in table " + config.getString(TABLE));
+ throw new RuntimeException("Field " + field + " does not exist in table " + config.getString(org.apache.seatunnel.connectors.clickhouse.config.Config.TABLE));
}
}
} else {
fields.addAll(tableSchema.keySet());
}
proxy.close();
- this.option = new ReaderOption(metadata, clickhouseProperties, fields, tableSchema, config.getInt(BULK_SIZE));
+ this.option = new ReaderOption(metadata, clickhouseProperties, fields, tableSchema, config.getInt(org.apache.seatunnel.connectors.clickhouse.config.Config.BULK_SIZE));
Review Comment:
revert？
##########
seatunnel-connectors-v2/connector-clickhouse/src/main/java/org/apache/seatunnel/connectors/clickhouse/sink/file/ClickhouseFileSink.java:
##########
@@ -73,55 +61,55 @@ public String getPluginName() {
@Override
public void prepare(Config config) throws PrepareFailException {
- CheckResult checkResult = CheckConfigUtil.checkAllExists(config, HOST, TABLE, DATABASE, USERNAME, PASSWORD, CLICKHOUSE_LOCAL_PATH);
+ CheckResult checkResult = CheckConfigUtil.checkAllExists(config, org.apache.seatunnel.connectors.clickhouse.config.Config.HOST, org.apache.seatunnel.connectors.clickhouse.config.Config.TABLE, org.apache.seatunnel.connectors.clickhouse.config.Config.DATABASE, org.apache.seatunnel.connectors.clickhouse.config.Config.USERNAME, org.apache.seatunnel.connectors.clickhouse.config.Config.PASSWORD, org.apache.seatunnel.connectors.clickhouse.config.Config.CLICKHOUSE_LOCAL_PATH);
Review Comment:
revert？
##########
seatunnel-connectors-v2/connector-pulsar/src/main/java/org/apache/seatunnel/connectors/pulsar/source/PulsarSource.java:
##########
@@ -15,29 +15,10 @@
* limitations under the License.
*/
-package org.apache.seatunnel.connectors.seatunnel.pulsar.source;
+package org.apache.seatunnel.connectors.pulsar.source;
import static org.apache.seatunnel.common.PropertiesUtil.getEnum;
import static org.apache.seatunnel.common.PropertiesUtil.setOption;
-import static org.apache.seatunnel.connectors.seatunnel.pulsar.config.SourceProperties.ADMIN_SERVICE_URL;
-import static org.apache.seatunnel.connectors.seatunnel.pulsar.config.SourceProperties.AUTH_PARAMS;
-import static org.apache.seatunnel.connectors.seatunnel.pulsar.config.SourceProperties.AUTH_PLUGIN_CLASS;
-import static org.apache.seatunnel.connectors.seatunnel.pulsar.config.SourceProperties.CLIENT_SERVICE_URL;
-import static org.apache.seatunnel.connectors.seatunnel.pulsar.config.SourceProperties.CURSOR_RESET_MODE;
-import static org.apache.seatunnel.connectors.seatunnel.pulsar.config.SourceProperties.CURSOR_STARTUP_MODE;
-import static org.apache.seatunnel.connectors.seatunnel.pulsar.config.SourceProperties.CURSOR_STARTUP_TIMESTAMP;
-import static org.apache.seatunnel.connectors.seatunnel.pulsar.config.SourceProperties.CURSOR_STOP_MODE;
-import static org.apache.seatunnel.connectors.seatunnel.pulsar.config.SourceProperties.CURSOR_STOP_TIMESTAMP;
-import static org.apache.seatunnel.connectors.seatunnel.pulsar.config.SourceProperties.POLL_BATCH_SIZE;
-import static org.apache.seatunnel.connectors.seatunnel.pulsar.config.SourceProperties.POLL_INTERVAL;
-import static org.apache.seatunnel.connectors.seatunnel.pulsar.config.SourceProperties.POLL_TIMEOUT;
-import static org.apache.seatunnel.connectors.seatunnel.pulsar.config.SourceProperties.SUBSCRIPTION_NAME;
-import static org.apache.seatunnel.connectors.seatunnel.pulsar.config.SourceProperties.StartMode;
-import static org.apache.seatunnel.connectors.seatunnel.pulsar.config.SourceProperties.StartMode.LATEST;
-import static org.apache.seatunnel.connectors.seatunnel.pulsar.config.SourceProperties.StopMode.NEVER;
-import static org.apache.seatunnel.connectors.seatunnel.pulsar.config.SourceProperties.TOPIC;
-import static org.apache.seatunnel.connectors.seatunnel.pulsar.config.SourceProperties.TOPIC_DISCOVERY_INTERVAL;
-import static org.apache.seatunnel.connectors.seatunnel.pulsar.config.SourceProperties.TOPIC_PATTERN;
Review Comment:
why remove
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@seatunnel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org