Skip to content

Commit a9fc8ca

Browse files
author
misi
committed
[improve] modify deprecated method
1 parent b99661f commit a9fc8ca

File tree

4 files changed

+17
-46
lines changed

4 files changed

+17
-46
lines changed

seatunnel-connectors-v2/connector-file/connector-file-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/sink/BaseFileSink.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,6 @@ public void setJobContext(JobContext jobContext) {
7575
preCheckConfig();
7676
}
7777

78-
@Override
79-
public void setTypeInfo(SeaTunnelRowType seaTunnelRowType) {
80-
this.seaTunnelRowType = seaTunnelRowType;
81-
this.fileSinkConfig = new FileSinkConfig(pluginConfig, seaTunnelRowType);
82-
}
83-
8478
@Override
8579
public SinkWriter<SeaTunnelRow, FileCommitInfo, FileSinkState> restoreWriter(
8680
SinkWriter.Context context, List<FileSinkState> states) {

seatunnel-connectors-v2/connector-file/connector-file-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/source/BaseFileSource.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.apache.seatunnel.api.source.SourceSplitEnumerator;
2424
import org.apache.seatunnel.api.source.SupportColumnProjection;
2525
import org.apache.seatunnel.api.source.SupportParallelism;
26-
import org.apache.seatunnel.api.table.type.SeaTunnelDataType;
26+
import org.apache.seatunnel.api.table.catalog.CatalogTable;
2727
import org.apache.seatunnel.api.table.type.SeaTunnelRow;
2828
import org.apache.seatunnel.api.table.type.SeaTunnelRowType;
2929
import org.apache.seatunnel.connectors.seatunnel.file.config.HadoopConf;
@@ -48,11 +48,6 @@ public Boundedness getBoundedness() {
4848
return Boundedness.BOUNDED;
4949
}
5050

51-
@Override
52-
public SeaTunnelDataType<SeaTunnelRow> getProducedType() {
53-
return rowType;
54-
}
55-
5651
@Override
5752
public SourceReader<SeaTunnelRow, FileSourceSplit> createReader(
5853
SourceReader.Context readerContext) {
@@ -72,4 +67,9 @@ public SourceSplitEnumerator<FileSourceSplit, FileSourceState> restoreEnumerator
7267
throws Exception {
7368
return new FileSourceSplitEnumerator(enumeratorContext, filePaths, checkpointState);
7469
}
70+
71+
@Override
72+
public List<CatalogTable> getProducedCatalogTables() {
73+
return SeaTunnelSource.super.getProducedCatalogTables();
74+
}
7575
}

seatunnel-connectors-v2/connector-file/connector-file-cos/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/cos/source/CosFileSource.java

Lines changed: 8 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,15 @@
1919

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

22-
import org.apache.seatunnel.api.common.PrepareFailException;
23-
import org.apache.seatunnel.api.common.SeaTunnelAPIErrorCode;
22+
import org.apache.seatunnel.api.configuration.ReadonlyConfig;
2423
import org.apache.seatunnel.api.options.ConnectorCommonOptions;
2524
import org.apache.seatunnel.api.table.catalog.CatalogTable;
2625
import org.apache.seatunnel.api.table.catalog.CatalogTableUtil;
27-
import org.apache.seatunnel.common.config.CheckConfigUtil;
28-
import org.apache.seatunnel.common.config.CheckResult;
29-
import org.apache.seatunnel.common.constants.PluginType;
3026
import org.apache.seatunnel.common.exception.CommonErrorCodeDeprecated;
31-
import org.apache.seatunnel.connectors.seatunnel.file.config.FileBaseOptions;
3227
import org.apache.seatunnel.connectors.seatunnel.file.config.FileFormat;
3328
import org.apache.seatunnel.connectors.seatunnel.file.config.FileSystemType;
3429
import org.apache.seatunnel.connectors.seatunnel.file.cos.config.CosConf;
3530
import org.apache.seatunnel.connectors.seatunnel.file.cos.config.CosFileBaseOptions;
36-
import org.apache.seatunnel.connectors.seatunnel.file.cos.config.CosFileSourceOptions;
3731
import org.apache.seatunnel.connectors.seatunnel.file.exception.FileConnectorErrorCode;
3832
import org.apache.seatunnel.connectors.seatunnel.file.exception.FileConnectorException;
3933
import org.apache.seatunnel.connectors.seatunnel.file.source.BaseFileSource;
@@ -47,33 +41,9 @@ public class CosFileSource extends BaseFileSource {
4741

4842
private final CatalogTable catalogTable;
4943

50-
public CosFileSource(CatalogTable catalogTable) {
44+
public CosFileSource(ReadonlyConfig readonlyConfig, CatalogTable catalogTable) {
5145
this.catalogTable = catalogTable;
52-
}
53-
54-
@Override
55-
public String getPluginName() {
56-
return FileSystemType.COS.getFileSystemPluginName();
57-
}
58-
59-
@Override
60-
public void prepare(Config pluginConfig) throws PrepareFailException {
61-
CheckResult result =
62-
CheckConfigUtil.checkAllExists(
63-
pluginConfig,
64-
FileBaseOptions.FILE_PATH.key(),
65-
CosFileSourceOptions.FILE_FORMAT_TYPE.key(),
66-
CosFileSourceOptions.SECRET_ID.key(),
67-
CosFileSourceOptions.SECRET_KEY.key(),
68-
CosFileSourceOptions.REGION.key(),
69-
CosFileSourceOptions.BUCKET.key());
70-
if (!result.isSuccess()) {
71-
throw new FileConnectorException(
72-
SeaTunnelAPIErrorCode.CONFIG_VALIDATION_FAILED,
73-
String.format(
74-
"PluginName: %s, PluginType: %s, Message: %s",
75-
getPluginName(), PluginType.SOURCE, result.getMsg()));
76-
}
46+
Config pluginConfig = readonlyConfig.toConfig();
7747
String path = pluginConfig.getString(CosFileBaseOptions.FILE_PATH.key());
7848
hadoopConf = CosConf.buildWithConfig(pluginConfig);
7949
readStrategy =
@@ -136,6 +106,11 @@ public void prepare(Config pluginConfig) throws PrepareFailException {
136106
}
137107
}
138108

109+
@Override
110+
public String getPluginName() {
111+
return FileSystemType.COS.getFileSystemPluginName();
112+
}
113+
139114
@Override
140115
public List<CatalogTable> getProducedCatalogTables() {
141116
return Collections.singletonList(catalogTable);

seatunnel-connectors-v2/connector-file/connector-file-cos/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/cos/source/CosFileSourceFactory.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ public Class<? extends SeaTunnelSource> getSourceClass() {
108108
TableSource<T, SplitT, StateT> createSource(TableSourceFactoryContext context) {
109109
return () ->
110110
(SeaTunnelSource<T, SplitT, StateT>)
111-
new CosFileSource(CatalogTableUtil.buildWithConfig(context.getOptions()));
111+
new CosFileSource(
112+
context.getOptions(),
113+
CatalogTableUtil.buildWithConfig(context.getOptions()));
112114
}
113115
}

0 commit comments

Comments
 (0)