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/seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new f831f7a5ec [Improve] [Connector-V2] Optimize milvus-connector config
code (#7658)
f831f7a5ec is described below
commit f831f7a5ecf90c7c3948fd32798919009f9ece0c
Author: corgy-w <[email protected]>
AuthorDate: Fri Sep 13 20:03:48 2024 +0800
[Improve] [Connector-V2] Optimize milvus-connector config code (#7658)
---
.../{MilvusSourceConfig.java => MilvusCommonConfig.java} | 16 +++-------------
.../seatunnel/milvus/config/MilvusSinkConfig.java | 16 +---------------
.../seatunnel/milvus/config/MilvusSourceConfig.java | 14 +-------------
.../connectors/seatunnel/milvus/source/MilvusSource.java | 3 ++-
4 files changed, 7 insertions(+), 42 deletions(-)
diff --git
a/seatunnel-connectors-v2/connector-milvus/src/main/java/org/apache/seatunnel/connectors/seatunnel/milvus/config/MilvusSourceConfig.java
b/seatunnel-connectors-v2/connector-milvus/src/main/java/org/apache/seatunnel/connectors/seatunnel/milvus/config/MilvusCommonConfig.java
similarity index 74%
copy from
seatunnel-connectors-v2/connector-milvus/src/main/java/org/apache/seatunnel/connectors/seatunnel/milvus/config/MilvusSourceConfig.java
copy to
seatunnel-connectors-v2/connector-milvus/src/main/java/org/apache/seatunnel/connectors/seatunnel/milvus/config/MilvusCommonConfig.java
index aa92286ac0..fe2e5cfc69 100644
---
a/seatunnel-connectors-v2/connector-milvus/src/main/java/org/apache/seatunnel/connectors/seatunnel/milvus/config/MilvusSourceConfig.java
+++
b/seatunnel-connectors-v2/connector-milvus/src/main/java/org/apache/seatunnel/connectors/seatunnel/milvus/config/MilvusCommonConfig.java
@@ -20,7 +20,9 @@ package
org.apache.seatunnel.connectors.seatunnel.milvus.config;
import org.apache.seatunnel.api.configuration.Option;
import org.apache.seatunnel.api.configuration.Options;
-public class MilvusSourceConfig {
+public abstract class MilvusCommonConfig {
+
+ public static final String CONNECTOR_IDENTITY = "Milvus";
public static final Option<String> URL =
Options.key("url")
@@ -33,16 +35,4 @@ public class MilvusSourceConfig {
.stringType()
.noDefaultValue()
.withDescription("Milvus token for authentication");
-
- public static final Option<String> DATABASE =
- Options.key("database")
- .stringType()
- .defaultValue("default")
- .withDescription("database");
-
- public static final Option<String> COLLECTION =
- Options.key("collection")
- .stringType()
- .noDefaultValue()
- .withDescription("Milvus collection to read");
}
diff --git
a/seatunnel-connectors-v2/connector-milvus/src/main/java/org/apache/seatunnel/connectors/seatunnel/milvus/config/MilvusSinkConfig.java
b/seatunnel-connectors-v2/connector-milvus/src/main/java/org/apache/seatunnel/connectors/seatunnel/milvus/config/MilvusSinkConfig.java
index d2357e559c..cd286c987d 100644
---
a/seatunnel-connectors-v2/connector-milvus/src/main/java/org/apache/seatunnel/connectors/seatunnel/milvus/config/MilvusSinkConfig.java
+++
b/seatunnel-connectors-v2/connector-milvus/src/main/java/org/apache/seatunnel/connectors/seatunnel/milvus/config/MilvusSinkConfig.java
@@ -28,21 +28,7 @@ import static
org.apache.seatunnel.api.sink.DataSaveMode.APPEND_DATA;
import static org.apache.seatunnel.api.sink.DataSaveMode.DROP_DATA;
import static
org.apache.seatunnel.api.sink.DataSaveMode.ERROR_WHEN_DATA_EXISTS;
-public class MilvusSinkConfig {
-
- public static final String CONNECTOR_IDENTITY = "Milvus";
-
- public static final Option<String> URL =
- Options.key("url")
- .stringType()
- .noDefaultValue()
- .withDescription("Milvus public endpoint");
-
- public static final Option<String> TOKEN =
- Options.key("token")
- .stringType()
- .noDefaultValue()
- .withDescription("Milvus token for authentication");
+public class MilvusSinkConfig extends MilvusCommonConfig {
public static final Option<String> DATABASE =
Options.key("database").stringType().noDefaultValue().withDescription("database");
diff --git
a/seatunnel-connectors-v2/connector-milvus/src/main/java/org/apache/seatunnel/connectors/seatunnel/milvus/config/MilvusSourceConfig.java
b/seatunnel-connectors-v2/connector-milvus/src/main/java/org/apache/seatunnel/connectors/seatunnel/milvus/config/MilvusSourceConfig.java
index aa92286ac0..b3efba279d 100644
---
a/seatunnel-connectors-v2/connector-milvus/src/main/java/org/apache/seatunnel/connectors/seatunnel/milvus/config/MilvusSourceConfig.java
+++
b/seatunnel-connectors-v2/connector-milvus/src/main/java/org/apache/seatunnel/connectors/seatunnel/milvus/config/MilvusSourceConfig.java
@@ -20,19 +20,7 @@ package
org.apache.seatunnel.connectors.seatunnel.milvus.config;
import org.apache.seatunnel.api.configuration.Option;
import org.apache.seatunnel.api.configuration.Options;
-public class MilvusSourceConfig {
-
- public static final Option<String> URL =
- Options.key("url")
- .stringType()
- .noDefaultValue()
- .withDescription("Milvus public endpoint");
-
- public static final Option<String> TOKEN =
- Options.key("token")
- .stringType()
- .noDefaultValue()
- .withDescription("Milvus token for authentication");
+public class MilvusSourceConfig extends MilvusCommonConfig {
public static final Option<String> DATABASE =
Options.key("database")
diff --git
a/seatunnel-connectors-v2/connector-milvus/src/main/java/org/apache/seatunnel/connectors/seatunnel/milvus/source/MilvusSource.java
b/seatunnel-connectors-v2/connector-milvus/src/main/java/org/apache/seatunnel/connectors/seatunnel/milvus/source/MilvusSource.java
index 05e9aed769..76ccfb743e 100644
---
a/seatunnel-connectors-v2/connector-milvus/src/main/java/org/apache/seatunnel/connectors/seatunnel/milvus/source/MilvusSource.java
+++
b/seatunnel-connectors-v2/connector-milvus/src/main/java/org/apache/seatunnel/connectors/seatunnel/milvus/source/MilvusSource.java
@@ -27,6 +27,7 @@ import org.apache.seatunnel.api.source.SupportParallelism;
import org.apache.seatunnel.api.table.catalog.CatalogTable;
import org.apache.seatunnel.api.table.catalog.TablePath;
import org.apache.seatunnel.api.table.type.SeaTunnelRow;
+import
org.apache.seatunnel.connectors.seatunnel.milvus.config.MilvusSourceConfig;
import
org.apache.seatunnel.connectors.seatunnel.milvus.convert.MilvusConvertUtils;
import java.util.ArrayList;
@@ -77,6 +78,6 @@ public class MilvusSource
@Override
public String getPluginName() {
- return "Milvus";
+ return MilvusSourceConfig.CONNECTOR_IDENTITY;
}
}
