Skip to content

Commit 5f3c9c3

Browse files
authored
[Fix][Connector-V2] Fix connector support SPI but without no args constructor (#6551)
1 parent b1dcd4a commit 5f3c9c3

File tree

21 files changed

+51
-62
lines changed

21 files changed

+51
-62
lines changed

Diff for: seatunnel-connectors-v2/connector-cdc/connector-cdc-mongodb/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/mongodb/MongodbIncrementalSource.java

-6
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import org.apache.seatunnel.api.configuration.Option;
2121
import org.apache.seatunnel.api.configuration.ReadonlyConfig;
22-
import org.apache.seatunnel.api.source.SeaTunnelSource;
2322
import org.apache.seatunnel.api.source.SupportParallelism;
2423
import org.apache.seatunnel.api.table.catalog.CatalogTable;
2524
import org.apache.seatunnel.api.table.type.SeaTunnelDataType;
@@ -41,16 +40,11 @@
4140
import org.apache.seatunnel.connectors.seatunnel.cdc.mongodb.source.dialect.MongodbDialect;
4241
import org.apache.seatunnel.connectors.seatunnel.cdc.mongodb.source.offset.ChangeStreamOffsetFactory;
4342

44-
import com.google.auto.service.AutoService;
45-
import lombok.NoArgsConstructor;
46-
4743
import javax.annotation.Nonnull;
4844

4945
import java.util.List;
5046
import java.util.Optional;
5147

52-
@NoArgsConstructor
53-
@AutoService(SeaTunnelSource.class)
5448
public class MongodbIncrementalSource<T> extends IncrementalSource<T, MongodbSourceConfig>
5549
implements SupportParallelism {
5650

Diff for: seatunnel-connectors-v2/connector-cdc/connector-cdc-mysql/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/mysql/source/MySqlIncrementalSource.java

-6
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import org.apache.seatunnel.api.configuration.Option;
2121
import org.apache.seatunnel.api.configuration.ReadonlyConfig;
22-
import org.apache.seatunnel.api.source.SeaTunnelSource;
2322
import org.apache.seatunnel.api.source.SupportParallelism;
2423
import org.apache.seatunnel.api.table.catalog.CatalogTable;
2524
import org.apache.seatunnel.api.table.type.SeaTunnelDataType;
@@ -42,14 +41,9 @@
4241
import org.apache.seatunnel.connectors.seatunnel.cdc.mysql.source.offset.BinlogOffsetFactory;
4342
import org.apache.seatunnel.connectors.seatunnel.jdbc.catalog.JdbcCatalogOptions;
4443

45-
import com.google.auto.service.AutoService;
46-
import lombok.NoArgsConstructor;
47-
4844
import java.time.ZoneId;
4945
import java.util.List;
5046

51-
@NoArgsConstructor
52-
@AutoService(SeaTunnelSource.class)
5347
public class MySqlIncrementalSource<T> extends IncrementalSource<T, JdbcSourceConfig>
5448
implements SupportParallelism {
5549
static final String IDENTIFIER = "MySQL-CDC";

Diff for: seatunnel-connectors-v2/connector-cdc/connector-cdc-postgres/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/postgres/source/PostgresIncrementalSource.java

-5
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import org.apache.seatunnel.api.configuration.Option;
2121
import org.apache.seatunnel.api.configuration.ReadonlyConfig;
22-
import org.apache.seatunnel.api.source.SeaTunnelSource;
2322
import org.apache.seatunnel.api.source.SupportParallelism;
2423
import org.apache.seatunnel.api.table.catalog.CatalogTable;
2524
import org.apache.seatunnel.api.table.type.SeaTunnelDataType;
@@ -42,21 +41,17 @@
4241

4342
import org.apache.kafka.connect.data.Struct;
4443

45-
import com.google.auto.service.AutoService;
4644
import io.debezium.jdbc.JdbcConnection;
4745
import io.debezium.relational.TableId;
4846
import io.debezium.relational.history.ConnectTableChangeSerializer;
4947
import io.debezium.relational.history.TableChanges;
50-
import lombok.NoArgsConstructor;
5148

5249
import java.time.ZoneId;
5350
import java.util.List;
5451
import java.util.Map;
5552
import java.util.function.Function;
5653
import java.util.stream.Collectors;
5754

58-
@NoArgsConstructor
59-
@AutoService(SeaTunnelSource.class)
6055
public class PostgresIncrementalSource<T> extends IncrementalSource<T, JdbcSourceConfig>
6156
implements SupportParallelism {
6257

Diff for: seatunnel-connectors-v2/connector-cdc/connector-cdc-sqlserver/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/sqlserver/source/source/SqlServerIncrementalSource.java

-6
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import org.apache.seatunnel.api.configuration.Option;
2121
import org.apache.seatunnel.api.configuration.ReadonlyConfig;
22-
import org.apache.seatunnel.api.source.SeaTunnelSource;
2322
import org.apache.seatunnel.api.source.SupportParallelism;
2423
import org.apache.seatunnel.api.table.catalog.CatalogTable;
2524
import org.apache.seatunnel.api.table.type.SeaTunnelDataType;
@@ -42,14 +41,9 @@
4241
import org.apache.seatunnel.connectors.seatunnel.jdbc.catalog.JdbcCatalogOptions;
4342
import org.apache.seatunnel.connectors.seatunnel.jdbc.catalog.sqlserver.SqlServerURLParser;
4443

45-
import com.google.auto.service.AutoService;
46-
import lombok.NoArgsConstructor;
47-
4844
import java.time.ZoneId;
4945
import java.util.List;
5046

51-
@NoArgsConstructor
52-
@AutoService(SeaTunnelSource.class)
5347
public class SqlServerIncrementalSource<T> extends IncrementalSource<T, JdbcSourceConfig>
5448
implements SupportParallelism {
5549

Diff for: seatunnel-connectors-v2/connector-doris/src/main/java/org/apache/seatunnel/connectors/doris/source/DorisSource.java

-2
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,12 @@
2929
import org.apache.seatunnel.connectors.doris.source.split.DorisSourceSplit;
3030
import org.apache.seatunnel.connectors.doris.source.split.DorisSourceSplitEnumerator;
3131

32-
import com.google.auto.service.AutoService;
3332
import lombok.extern.slf4j.Slf4j;
3433

3534
import java.util.Collections;
3635
import java.util.List;
3736

3837
@Slf4j
39-
@AutoService(SeaTunnelSource.class)
4038
public class DorisSource
4139
implements SeaTunnelSource<SeaTunnelRow, DorisSourceSplit, DorisSourceState> {
4240

Diff for: seatunnel-connectors-v2/connector-elasticsearch/src/main/java/org/apache/seatunnel/connectors/seatunnel/elasticsearch/sink/ElasticsearchSink.java

-3
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,12 @@
3535
import org.apache.seatunnel.connectors.seatunnel.elasticsearch.state.ElasticsearchCommitInfo;
3636
import org.apache.seatunnel.connectors.seatunnel.elasticsearch.state.ElasticsearchSinkState;
3737

38-
import com.google.auto.service.AutoService;
39-
4038
import java.util.Optional;
4139

4240
import static org.apache.seatunnel.api.table.factory.FactoryUtil.discoverFactory;
4341
import static org.apache.seatunnel.connectors.seatunnel.elasticsearch.config.SinkConfig.MAX_BATCH_SIZE;
4442
import static org.apache.seatunnel.connectors.seatunnel.elasticsearch.config.SinkConfig.MAX_RETRY_COUNT;
4543

46-
@AutoService(SeaTunnelSink.class)
4744
public class ElasticsearchSink
4845
implements SeaTunnelSink<
4946
SeaTunnelRow,
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.seatunnel.connectors.seatunnel.file.oss.config;
18+
package org.apache.seatunnel.connectors.seatunnel.file.oss.jindo.config;
1919

2020
import org.apache.seatunnel.shade.com.typesafe.config.Config;
2121

Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.seatunnel.connectors.seatunnel.file.oss.config;
18+
package org.apache.seatunnel.connectors.seatunnel.file.oss.jindo.config;
1919

2020
import org.apache.seatunnel.api.configuration.Option;
2121
import org.apache.seatunnel.api.configuration.Options;
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.seatunnel.connectors.seatunnel.file.oss.exception;
18+
package org.apache.seatunnel.connectors.seatunnel.file.oss.jindo.exception;
1919

2020
import org.apache.seatunnel.common.exception.SeaTunnelErrorCode;
2121
import org.apache.seatunnel.common.exception.SeaTunnelRuntimeException;
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.seatunnel.connectors.seatunnel.file.oss.sink;
18+
package org.apache.seatunnel.connectors.seatunnel.file.oss.jindo.sink;
1919

2020
import org.apache.seatunnel.shade.com.typesafe.config.Config;
2121

@@ -26,9 +26,9 @@
2626
import org.apache.seatunnel.common.config.CheckResult;
2727
import org.apache.seatunnel.common.constants.PluginType;
2828
import org.apache.seatunnel.connectors.seatunnel.file.config.FileSystemType;
29-
import org.apache.seatunnel.connectors.seatunnel.file.oss.config.OssConf;
30-
import org.apache.seatunnel.connectors.seatunnel.file.oss.config.OssConfigOptions;
31-
import org.apache.seatunnel.connectors.seatunnel.file.oss.exception.OssJindoConnectorException;
29+
import org.apache.seatunnel.connectors.seatunnel.file.oss.jindo.config.OssConf;
30+
import org.apache.seatunnel.connectors.seatunnel.file.oss.jindo.config.OssConfigOptions;
31+
import org.apache.seatunnel.connectors.seatunnel.file.oss.jindo.exception.OssJindoConnectorException;
3232
import org.apache.seatunnel.connectors.seatunnel.file.sink.BaseFileSink;
3333

3434
import com.google.auto.service.AutoService;
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.seatunnel.connectors.seatunnel.file.oss.sink;
18+
package org.apache.seatunnel.connectors.seatunnel.file.oss.jindo.sink;
1919

2020
import org.apache.seatunnel.api.configuration.util.OptionRule;
2121
import org.apache.seatunnel.api.table.factory.Factory;
2222
import org.apache.seatunnel.api.table.factory.TableSinkFactory;
2323
import org.apache.seatunnel.connectors.seatunnel.file.config.BaseSinkConfig;
2424
import org.apache.seatunnel.connectors.seatunnel.file.config.FileFormat;
2525
import org.apache.seatunnel.connectors.seatunnel.file.config.FileSystemType;
26-
import org.apache.seatunnel.connectors.seatunnel.file.oss.config.OssConfigOptions;
26+
import org.apache.seatunnel.connectors.seatunnel.file.oss.jindo.config.OssConfigOptions;
2727

2828
import com.google.auto.service.AutoService;
2929

Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.seatunnel.connectors.seatunnel.file.oss.source;
18+
package org.apache.seatunnel.connectors.seatunnel.file.oss.jindo.source;
1919

2020
import org.apache.seatunnel.shade.com.typesafe.config.Config;
2121

@@ -33,9 +33,9 @@
3333
import org.apache.seatunnel.connectors.seatunnel.file.config.FileSystemType;
3434
import org.apache.seatunnel.connectors.seatunnel.file.exception.FileConnectorErrorCode;
3535
import org.apache.seatunnel.connectors.seatunnel.file.exception.FileConnectorException;
36-
import org.apache.seatunnel.connectors.seatunnel.file.oss.config.OssConf;
37-
import org.apache.seatunnel.connectors.seatunnel.file.oss.config.OssConfigOptions;
38-
import org.apache.seatunnel.connectors.seatunnel.file.oss.exception.OssJindoConnectorException;
36+
import org.apache.seatunnel.connectors.seatunnel.file.oss.jindo.config.OssConf;
37+
import org.apache.seatunnel.connectors.seatunnel.file.oss.jindo.config.OssConfigOptions;
38+
import org.apache.seatunnel.connectors.seatunnel.file.oss.jindo.exception.OssJindoConnectorException;
3939
import org.apache.seatunnel.connectors.seatunnel.file.source.BaseFileSource;
4040
import org.apache.seatunnel.connectors.seatunnel.file.source.reader.ReadStrategyFactory;
4141

Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.seatunnel.connectors.seatunnel.file.oss.source;
18+
package org.apache.seatunnel.connectors.seatunnel.file.oss.jindo.source;
1919

2020
import org.apache.seatunnel.api.configuration.util.OptionRule;
2121
import org.apache.seatunnel.api.source.SeaTunnelSource;
@@ -25,7 +25,7 @@
2525
import org.apache.seatunnel.connectors.seatunnel.file.config.BaseSourceConfigOptions;
2626
import org.apache.seatunnel.connectors.seatunnel.file.config.FileFormat;
2727
import org.apache.seatunnel.connectors.seatunnel.file.config.FileSystemType;
28-
import org.apache.seatunnel.connectors.seatunnel.file.oss.config.OssConfigOptions;
28+
import org.apache.seatunnel.connectors.seatunnel.file.oss.jindo.config.OssConfigOptions;
2929

3030
import com.google.auto.service.AutoService;
3131

Diff for: seatunnel-connectors-v2/connector-file/connector-file-jindo-oss/src/test/java/org/apache/seatunnel/connectors/test/OssJindoFactoryTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
package org.apache.seatunnel.connectors.test;
1919

20-
import org.apache.seatunnel.connectors.seatunnel.file.oss.sink.OssFileSinkFactory;
21-
import org.apache.seatunnel.connectors.seatunnel.file.oss.source.OssFileSourceFactory;
20+
import org.apache.seatunnel.connectors.seatunnel.file.oss.jindo.sink.OssFileSinkFactory;
21+
import org.apache.seatunnel.connectors.seatunnel.file.oss.jindo.source.OssFileSourceFactory;
2222

2323
import org.junit.jupiter.api.Assertions;
2424
import org.junit.jupiter.api.Test;

Diff for: seatunnel-connectors-v2/connector-file/connector-file-oss/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/oss/sink/OssFileSink.java

-4
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,11 @@
1818
package org.apache.seatunnel.connectors.seatunnel.file.oss.sink;
1919

2020
import org.apache.seatunnel.api.configuration.ReadonlyConfig;
21-
import org.apache.seatunnel.api.sink.SeaTunnelSink;
2221
import org.apache.seatunnel.api.table.catalog.CatalogTable;
2322
import org.apache.seatunnel.connectors.seatunnel.file.config.FileSystemType;
2423
import org.apache.seatunnel.connectors.seatunnel.file.oss.config.OssHadoopConf;
2524
import org.apache.seatunnel.connectors.seatunnel.file.sink.BaseMultipleTableFileSink;
2625

27-
import com.google.auto.service.AutoService;
28-
29-
@AutoService(SeaTunnelSink.class)
3026
public class OssFileSink extends BaseMultipleTableFileSink {
3127
public OssFileSink(ReadonlyConfig readonlyConfig, CatalogTable catalogTable) {
3228
super(OssHadoopConf.buildWithConfig(readonlyConfig), readonlyConfig, catalogTable);

Diff for: seatunnel-connectors-v2/connector-file/connector-file-s3/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/s3/sink/S3FileSink.java

-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.apache.seatunnel.api.sink.DefaultSaveModeHandler;
2626
import org.apache.seatunnel.api.sink.SaveModeHandler;
2727
import org.apache.seatunnel.api.sink.SchemaSaveMode;
28-
import org.apache.seatunnel.api.sink.SeaTunnelSink;
2928
import org.apache.seatunnel.api.sink.SupportSaveMode;
3029
import org.apache.seatunnel.api.table.catalog.Catalog;
3130
import org.apache.seatunnel.api.table.catalog.CatalogTable;
@@ -39,13 +38,10 @@
3938
import org.apache.seatunnel.connectors.seatunnel.file.s3.config.S3ConfigOptions;
4039
import org.apache.seatunnel.connectors.seatunnel.file.sink.BaseMultipleTableFileSink;
4140

42-
import com.google.auto.service.AutoService;
43-
4441
import java.util.Optional;
4542

4643
import static org.apache.seatunnel.api.table.factory.FactoryUtil.discoverFactory;
4744

48-
@AutoService(SeaTunnelSink.class)
4945
public class S3FileSink extends BaseMultipleTableFileSink implements SupportSaveMode {
5046

5147
private CatalogTable catalogTable;

Diff for: seatunnel-connectors-v2/connector-hudi/src/main/java/org/apache/seatunnel/connectors/seatunnel/hudi/source/HudiSourceFactory.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@
1919

2020
import org.apache.seatunnel.api.configuration.util.OptionRule;
2121
import org.apache.seatunnel.api.source.SeaTunnelSource;
22+
import org.apache.seatunnel.api.table.factory.Factory;
2223
import org.apache.seatunnel.api.table.factory.TableSourceFactory;
2324
import org.apache.seatunnel.connectors.seatunnel.hudi.config.HudiSourceConfig;
2425

2526
import com.google.auto.service.AutoService;
2627

27-
@AutoService(SeaTunnelSource.class)
28+
@AutoService(Factory.class)
2829
public class HudiSourceFactory implements TableSourceFactory {
2930

3031
@Override

Diff for: seatunnel-connectors-v2/connector-iceberg/src/main/java/org/apache/seatunnel/connectors/seatunnel/iceberg/sink/IcebergSink.java

-3
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@
4444
import org.apache.seatunnel.connectors.seatunnel.iceberg.sink.commit.IcebergCommitInfo;
4545
import org.apache.seatunnel.connectors.seatunnel.iceberg.sink.state.IcebergSinkState;
4646

47-
import com.google.auto.service.AutoService;
48-
4947
import java.io.IOException;
5048
import java.util.List;
5149
import java.util.Objects;
@@ -54,7 +52,6 @@
5452

5553
import static org.apache.seatunnel.api.table.factory.FactoryUtil.discoverFactory;
5654

57-
@AutoService(SeaTunnelSink.class)
5855
public class IcebergSink
5956
implements SeaTunnelSink<
6057
SeaTunnelRow,

Diff for: seatunnel-connectors-v2/connector-iceberg/src/main/java/org/apache/seatunnel/connectors/seatunnel/iceberg/source/IcebergSource.java

-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
import org.apache.iceberg.Schema;
5050
import org.apache.iceberg.types.Types;
5151

52-
import com.google.auto.service.AutoService;
5352
import lombok.SneakyThrows;
5453

5554
import java.util.ArrayList;
@@ -58,7 +57,6 @@
5857

5958
import static org.apache.seatunnel.shade.com.google.common.base.Preconditions.checkArgument;
6059

61-
@AutoService(SeaTunnelSource.class)
6260
public class IcebergSource
6361
implements SeaTunnelSource<
6462
SeaTunnelRow, IcebergFileScanTaskSplit, IcebergSplitEnumeratorState>,

Diff for: seatunnel-connectors-v2/connector-starrocks/src/main/java/org/apache/seatunnel/connectors/seatunnel/starrocks/source/StarRocksSource.java

-3
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,9 @@
2626
import org.apache.seatunnel.connectors.seatunnel.starrocks.config.CommonConfig;
2727
import org.apache.seatunnel.connectors.seatunnel.starrocks.config.SourceConfig;
2828

29-
import com.google.auto.service.AutoService;
30-
3129
import java.util.Collections;
3230
import java.util.List;
3331

34-
@AutoService(SeaTunnelSource.class)
3532
public class StarRocksSource
3633
implements SeaTunnelSource<SeaTunnelRow, StarRocksSourceSplit, StarRocksSourceState> {
3734

0 commit comments

Comments
 (0)