From 6ba1f26e9b9059f4079f60403841c5bfc20da4ac Mon Sep 17 00:00:00 2001 From: vernedeng Date: Fri, 19 Apr 2024 13:42:56 +0800 Subject: [PATCH] fix --- .../inlong/agent/pojo/TaskProfileDto.java | 6 +- .../sinks/filecollect/SenderManager.java | 4 +- .../apache/inlong/audit/sink/KafkaSink.java | 4 +- .../apache/inlong/audit/sink/TubeSink.java | 4 +- .../sink/pulsar/PulsarClientService.java | 4 +- .../audit/service/AuditMsgConsumerServer.java | 8 +- .../common/constant/CompressionType.java | 26 ------ .../inlong/common/constant/Constants.java | 61 ++++++++++++++ .../inlong/common/constant/DataNodeType.java | 26 ------ .../common/constant/DeserializationType.java | 26 ------ .../apache/inlong/common/constant/MQType.java | 35 -------- .../inlong/common/constant/SinkType.java | 26 ------ .../common/pojo/sort/SortTaskConfig.java | 2 +- .../pojo/sort/dataflow/SourceConfig.java | 4 + .../DeserializationConfig.java | 10 +-- .../KvDeserializationConfig.java | 1 - .../sort/dataflow/field/FieldConfig.java} | 18 ++-- .../field/format}/ArrayFormatInfo.java | 6 +- .../dataflow/field/format}/ArrayTypeInfo.java | 6 +- .../field/format}/BasicFormatInfo.java | 2 +- .../field/format}/BinaryFormatInfo.java | 6 +- .../field/format}/BinaryTypeInfo.java | 2 +- .../field/format}/BooleanFormatInfo.java | 2 +- .../field/format}/BooleanTypeInfo.java | 2 +- .../field/format}/ByteFormatInfo.java | 2 +- .../dataflow/field/format}/ByteTypeInfo.java | 2 +- .../dataflow/field/format}/Constants.java | 2 +- .../field/format}/DateFormatInfo.java | 12 +-- .../dataflow/field/format}/DateTypeInfo.java | 2 +- .../field/format}/DecimalFormatInfo.java | 6 +- .../field/format}/DecimalTypeInfo.java | 2 +- .../field/format}/DoubleFormatInfo.java | 2 +- .../field/format}/DoubleTypeInfo.java | 2 +- .../field/format}/FloatFormatInfo.java | 2 +- .../dataflow/field/format}/FloatTypeInfo.java | 2 +- .../dataflow/field/format}/FormatInfo.java | 8 +- .../dataflow/field/format}/IntFormatInfo.java | 2 +- .../dataflow/field/format}/IntTypeInfo.java | 2 +- .../LocalZonedTimestampFormatInfo.java | 2 +- .../format}/LocalZonedTimestampTypeInfo.java | 2 +- .../field/format}/LongFormatInfo.java | 2 +- .../dataflow/field/format}/LongTypeInfo.java | 2 +- .../dataflow/field/format}/MapFormatInfo.java | 6 +- .../dataflow/field/format}/MapTypeInfo.java | 6 +- .../field/format}/NullFormatInfo.java | 2 +- .../dataflow/field/format}/NullTypeInfo.java | 2 +- .../dataflow/field/format}/RowFormatInfo.java | 6 +- .../dataflow/field/format}/RowTypeInfo.java | 6 +- .../field/format}/ShortFormatInfo.java | 2 +- .../dataflow/field/format}/ShortTypeInfo.java | 2 +- .../field/format}/StringFormatInfo.java | 2 +- .../field/format}/StringTypeInfo.java | 2 +- .../field/format}/TimeFormatInfo.java | 12 +-- .../dataflow/field/format}/TimeTypeInfo.java | 2 +- .../field/format}/TimestampFormatInfo.java | 12 +-- .../field/format}/TimestampTypeInfo.java | 2 +- .../sort/dataflow/field/format}/TypeInfo.java | 6 +- .../field/format}/VarBinaryFormatInfo.java | 6 +- .../field/format}/VarBinaryTypeInfo.java | 2 +- .../field/format}/VarCharFormatInfo.java | 6 +- .../pojo/sort/dataflow/sink/SinkConfig.java | 13 ++- .../common/pojo/sort/mq/MqClusterConfig.java | 6 +- .../{dataflow => }/node/ClsNodeConfig.java | 2 +- .../{dataflow => }/node/EsNodeConfig.java | 2 +- .../sort/{dataflow => }/node/NodeConfig.java | 10 +-- .../{dataflow => }/node/PulsarNodeConfig.java | 2 +- .../dataproxy/config/pojo/CacheType.java | 12 +-- .../client/api/inner/ClientFactoryTest.java | 6 +- .../api/inner/InlongConsumeClientTest.java | 12 +-- .../manager/dao/RestTemplateConfig.java | 6 +- .../pojo/consume/kafka/ConsumeKafkaInfo.java | 4 +- .../consume/kafka/ConsumeKafkaRequest.java | 4 +- .../consume/pulsar/ConsumePulsarInfo.java | 4 +- .../consume/pulsar/ConsumePulsarRequest.java | 4 +- .../consume/tubemq/ConsumeTubeMQInfo.java | 4 +- .../consume/tubemq/ConsumeTubeMQRequest.java | 4 +- .../pojo/group/kafka/InlongKafkaInfo.java | 6 +- .../pojo/group/kafka/InlongKafkaRequest.java | 6 +- .../group/kafka/InlongKafkaTopicInfo.java | 6 +- .../pojo/group/none/InlongNoneMqInfo.java | 6 +- .../pojo/group/none/InlongNoneMqRequest.java | 6 +- .../group/none/InlongNoneMqTopicInfo.java | 6 +- .../pojo/group/pulsar/InlongPulsarInfo.java | 6 +- .../group/pulsar/InlongPulsarRequest.java | 6 +- .../group/pulsar/InlongPulsarTopicInfo.java | 6 +- .../group/pulsar/InlongTdmqPulsarInfo.java | 6 +- .../group/pulsar/InlongTdmqPulsarRequest.java | 6 +- .../pojo/group/tubemq/InlongTubeMQInfo.java | 6 +- .../group/tubemq/InlongTubeMQRequest.java | 6 +- .../group/tubemq/InlongTubeMQTopicInfo.java | 6 +- .../pojo/sort/node/base/LoadNodeProvider.java | 2 +- .../sort/node/provider/PulsarProvider.java | 2 +- .../sort/node/provider/StarRocksProvider.java | 2 +- .../sort/node/provider/TubeMqProvider.java | 2 +- .../pojo/sort/util/FieldInfoUtils.java | 38 ++++----- .../pojo/sort/util/FieldRelationUtils.java | 4 +- .../pojo/sort/util/FieldInfoUtilsTest.java | 12 +-- .../cluster/InlongClusterServiceImpl.java | 7 +- .../service/consume/ConsumeKafkaOperator.java | 4 +- .../consume/ConsumePulsarOperator.java | 6 +- .../consume/ConsumeTubeMQOperator.java | 4 +- .../service/core/impl/AgentServiceImpl.java | 7 +- .../core/impl/SortSourceServiceImpl.java | 8 +- .../group/InlongGroupOperator4Kafka.java | 4 +- .../group/InlongGroupOperator4NoneMQ.java | 4 +- .../group/InlongGroupOperator4Pulsar.java | 6 +- .../group/InlongGroupOperator4TubeMQ.java | 4 +- .../apply/ApproveConsumeProcessListener.java | 8 +- .../kafka/KafkaQueueResourceOperator.java | 3 +- .../pulsar/PulsarQueueResourceOperator.java | 4 +- .../tubemq/TubeMQQueueResourceOperator.java | 4 +- .../manager/service/RestTemplateConfig.java | 6 +- .../manager/service/ServiceBaseTest.java | 6 +- .../cluster/InlongClusterServiceTest.java | 28 ++++--- .../consume/InlongConsumeServiceTest.java | 6 +- .../core/heartbeat/HeartbeatManagerTest.java | 6 +- .../core/impl/HeartbeatServiceTest.java | 4 +- .../group/InlongGroupProcessServiceTest.java | 4 +- .../service/group/InlongGroupServiceTest.java | 4 +- .../sink/StandaloneAutoAssignTest.java | 4 +- .../service/sort/DisableZkForSortTest.java | 4 +- .../listener/StreamSourceListenerTest.java | 4 +- .../workflow/WorkflowServiceImplTest.java | 4 +- .../web/config/RestTemplateConfig.java | 6 +- .../sdk/dataproxy/DefaultMessageSender.java | 6 +- .../dataproxy/example/HttpClientExample.java | 4 +- .../dataproxy/example/TcpClientExample.java | 4 +- .../dataproxy/network/HttpProxySender.java | 6 +- .../inlong/sort/protocol/FieldInfo.java | 2 +- .../node/extract/MongoExtractNode.java | 2 +- .../sort/protocol/node/load/HiveLoadNode.java | 4 +- .../inlong/sort/protocol/FieldInfoTest.java | 2 +- .../inlong/sort/protocol/GroupInfoTest.java | 10 +-- .../inlong/sort/protocol/StreamInfoTest.java | 10 +-- .../node/extract/DorisExtractNodeTest.java | 8 +- .../node/extract/HudiExtractNodeTest.java | 8 +- .../node/extract/KafkaExtractNodeTest.java | 4 +- .../node/extract/MongoExtractNodeTest.java | 4 +- .../node/extract/MySqlExtractNodeTest.java | 2 +- .../node/extract/OracleExtractNodeTest.java | 4 +- .../node/extract/PostgresExtractNodeTest.java | 4 +- .../node/extract/PulsarExtractNodeTest.java | 4 +- .../node/extract/RedisExtractNodeTest.java | 4 +- .../extract/SqlServerExtractNodeTest.java | 4 +- .../node/extract/TubeMQExtractNodeTest.java | 8 +- .../node/load/ClickHouseLoadNodeTest.java | 2 +- .../protocol/node/load/DorisLoadNodeTest.java | 8 +- .../node/load/ElasticSearchNodeTest.java | 2 +- .../node/load/GreenplumLoadNodeTest.java | 2 +- .../protocol/node/load/HbaseLoadNodeTest.java | 2 +- .../protocol/node/load/HiveLoadNodeTest.java | 4 +- .../protocol/node/load/HudiLoadNodeTest.java | 2 +- .../node/load/IcebergLoadNodeTest.java | 2 +- .../protocol/node/load/KafkaLoadNodeTest.java | 2 +- .../protocol/node/load/MySqlLoadNodeTest.java | 2 +- .../node/load/OracleLoadNodeTest.java | 2 +- .../node/load/PostgresLoadNodeTest.java | 2 +- .../node/load/SqlServerLoadNodeTest.java | 4 +- .../node/load/TDSQLPostgresLoadNodeTest.java | 2 +- .../node/transform/DistinctNodeTest.java | 4 +- .../transformation/FieldRelationTest.java | 2 +- .../transformation/WatermarkFieldTest.java | 2 +- .../function/AddFunctionTest.java | 2 +- .../function/BetweenFunctionTest.java | 2 +- .../function/CascadeFunctionWrapperTest.java | 2 +- .../function/HopEndFunctionTest.java | 2 +- .../function/HopFunctionTest.java | 2 +- .../function/HopStartFunctionTest.java | 2 +- .../MultiValueFilterFunctionTest.java | 2 +- .../RegexpReplaceFirstFunctionTest.java | 2 +- .../function/RegexpReplaceFunctionTest.java | 2 +- .../function/SessionEndFunctionTest.java | 2 +- .../function/SessionFunctionTest.java | 2 +- .../function/SessionStartFunctionTest.java | 2 +- .../SingleValueFilterFunctionTest.java | 2 +- .../function/SplitIndexFunctionTest.java | 2 +- .../function/SubtractFunctionTest.java | 2 +- .../function/TumbleEndFunctionTest.java | 2 +- .../function/TumbleFunctionTest.java | 2 +- .../function/TumbleStartFunctionTest.java | 2 +- .../FullOuterJoinNodeRelationTest.java | 2 +- .../relation/InnerJoinNodeRelationTest.java | 2 +- .../InnerTemporalJoinRelationTest.java | 4 +- .../relation/IntervalJoinRelationTest.java | 2 +- .../LeftOuterJoinNodeRelationTest.java | 2 +- .../LeftTemporalJoinRelationTest.java | 4 +- .../RightOuterJoinNodeRelationTest.java | 2 +- .../sort/parser/impl/FlinkSqlParser.java | 8 +- .../function/CascadeFunctionWrapperTest.java | 2 +- .../sort/function/EncryptFunctionTest.java | 2 +- .../sort/function/JsonGetterFunctionTest.java | 2 +- .../RegexpReplaceFirstFunctionTest.java | 2 +- .../function/RegexpReplaceFunctionTest.java | 2 +- .../sort/function/SplitIndexFunctionTest.java | 2 +- .../sort/parser/AllMigrateMongoDBTest.java | 2 +- .../sort/parser/AllMigrateOracleTest.java | 4 +- .../sort/parser/AllMigratePostgreSQLTest.java | 2 +- .../inlong/sort/parser/AllMigrateTest.java | 4 +- .../AllMigrateWithSpecifyingFieldTest.java | 2 +- .../sort/parser/ClickHouseSqlParserTest.java | 4 +- .../parser/CustomFunctionSqlParseTest.java | 6 +- .../parser/DataTypeConvertSqlParseTest.java | 6 +- .../parser/DecimalFormatSqlParseTest.java | 4 +- .../sort/parser/DistinctNodeSqlParseTest.java | 10 +-- .../DorisExtractNodeToDorisLoadNodeTest.java | 8 +- .../DorisExtractNodeToMySqlLoadNodeTest.java | 8 +- .../sort/parser/DorisMultipleSinkTest.java | 2 +- .../sort/parser/ESMultipleSinkTest.java | 2 +- .../parser/ElasticsearchSqlParseTest.java | 2 +- .../sort/parser/FilesystemSqlParserTest.java | 6 +- .../inlong/sort/parser/FilterParseTest.java | 10 +-- .../sort/parser/FlinkSqlParserTest.java | 10 +-- .../parser/FullOuterJoinSqlParseTest.java | 10 +-- .../parser/GreenplumLoadSqlParseTest.java | 6 +- .../parser/HbaseLoadFlinkSqlParseTest.java | 4 +- .../sort/parser/HudiNodeSqlParserTest.java | 10 +-- .../Iceberg2StarRocksSqlParserTest.java | 4 +- .../sort/parser/IcebergNodeSqlParserTest.java | 10 +-- .../parser/InnerJoinRelationSqlParseTest.java | 10 +-- .../IntervalJoinRelationSqlParseTest.java | 8 +- .../sort/parser/KafkaLoadSqlParseTest.java | 8 +- .../inlong/sort/parser/KafkaSqlParseTest.java | 6 +- .../parser/LeftOuterJoinSqlParseTest.java | 10 +-- .../inlong/sort/parser/MetaFieldSyncTest.java | 10 +-- .../parser/MongoExtractFlinkSqlParseTest.java | 8 +- .../MySqlExtractNodeToDorisLoadNodeTest.java | 4 +- .../sort/parser/MySqlLoadSqlParseTest.java | 6 +- ...MySqlTemporalJoinRelationSqlParseTest.java | 8 +- .../parser/OracleExtractSqlParseTest.java | 8 +- .../sort/parser/OracleLoadSqlParseTest.java | 6 +- .../PostgresExtractFlinkSqlParseTest.java | 8 +- .../PostgresLoadNodeFlinkSqlParseTest.java | 4 +- .../sort/parser/PulsarSqlParserTest.java | 4 +- .../sort/parser/RedisNodeSqlParserTest.java | 10 +-- ...RedisTemporalJoinRelationSqlParseTest.java | 8 +- .../parser/RightOuterJoinSqlParseTest.java | 10 +-- .../parser/SqlServerNodeSqlParseTest.java | 6 +- ...DSQLPostgresLoadNodeFlinkSqlParseTest.java | 4 +- .../sort/parser/TubeMQNodeSqlParseTest.java | 8 +- .../inlong/sort/parser/UnionSqlParseTest.java | 10 +-- .../inlong/sort/kudu/common/KuduUtils.java | 24 +++--- .../sort/connector/kudu/KuduTestBase.java | 10 +-- .../sort/formats/base/TableFormatUtils.java | 82 +++++++++---------- .../sort/formats/base/TextFormatBuilder.java | 2 +- .../formats/base/TextFormatDescriptor.java | 6 +- .../formats/{common => util}/FormatUtils.java | 4 +- .../formats/common/ArrayFormatInfoTest.java | 7 ++ .../formats/common/BinaryFormatInfoTest.java | 3 + .../formats/common/BooleanFormatInfoTest.java | 3 + .../formats/common/ByteFormatInfoTest.java | 3 + .../formats/common/DateFormatInfoTest.java | 3 + .../formats/common/DecimalFormatInfoTest.java | 3 + .../formats/common/DoubleFormatInfoTest.java | 3 + .../formats/common/FloatFormatInfoTest.java | 3 + .../formats/common/FormatInfoTestBase.java | 3 + .../formats/common/IntFormatInfoTest.java | 3 + .../LocalZonedTimestampFormatInfoTest.java | 3 + .../formats/common/LongFormatInfoTest.java | 3 + .../formats/common/MapFormatInfoTest.java | 9 ++ .../formats/common/RowFormatInfoTest.java | 7 ++ .../formats/common/ShortFormatInfoTest.java | 3 + .../formats/common/StringFormatInfoTest.java | 3 + .../formats/common/TimeFormatInfoTest.java | 3 + .../common/TimestampFormatInfoTest.java | 3 + .../common/VarBinaryFormatInfoTest.java | 3 + .../formats/common/VarCharFormatInfoTest.java | 3 + .../formats/base/TableFormatUtilsTest.java | 4 +- .../formats/csv/CsvDeserializationSchema.java | 4 +- .../sort/formats/csv/CsvFormatBuilder.java | 2 +- .../sort/formats/csv/CsvFormatFactory.java | 6 +- .../formats/csv/CsvSerializationSchema.java | 4 +- .../csv/CsvDeserializationSchemaTest.java | 30 +++---- .../formats/csv/CsvFormatFactoryTest.java | 12 +-- .../csv/CsvSerializationSchemaTest.java | 30 +++---- .../InLongMsgMixedFormatConverterBuilder.java | 2 +- .../formats/inlongmsg/InLongMsgUtils.java | 4 +- .../inlongmsgbinlog/InLongMsgBinlog.java | 6 +- .../InLongMsgBinlogFormatBuilder.java | 2 +- .../InLongMsgBinlogFormatDeserializer.java | 2 +- .../InLongMsgBinlogFormatFactory.java | 2 +- .../InLongMsgBinlogMixedFormatConverter.java | 2 +- .../inlongmsgbinlog/InLongMsgBinlogUtils.java | 4 +- ...InLongMsgBinlogFormatDeserializerTest.java | 8 +- .../InLongMsgBinlogFormatFactoryTest.java | 10 +-- .../inlongmsgbinlog/InLongMsgBinlogTest.java | 12 +-- .../InLongMsgCsvFormatDeserializer.java | 2 +- .../InLongMsgCsvFormatFactory.java | 2 +- .../InLongMsgCsvMixedFormatConverter.java | 2 +- .../inlongmsgcsv/InLongMsgCsvUtils.java | 4 +- .../InLongMsgCsvFormatDeserializerTest.java | 8 +- .../InLongMsgCsvFormatFactoryTest.java | 12 +-- .../InLongMsgKvFormatDeserializer.java | 2 +- .../inlongmsgkv/InLongMsgKvFormatFactory.java | 2 +- .../InLongMsgKvMixedFormatConverter.java | 2 +- .../formats/inlongmsgkv/InLongMsgKvUtils.java | 4 +- .../InLongMsgKvFormatDeserializerTest.java | 8 +- .../InLongMsgKvFormatFactoryTest.java | 10 +-- .../InLongMsgTlogCsvFormatDeserializer.java | 2 +- .../InLongMsgTlogCsvFormatFactory.java | 2 +- .../InLongMsgTlogCsvMixedFormatConverter.java | 2 +- .../InLongMsgTlogCsvUtils.java | 4 +- ...nLongMsgTlogCsvFormatDeserializerTest.java | 8 +- .../InLongMsgTlogCsvFormatFactoryTest.java | 12 +-- .../InLongMsgTlogKvFormatDeserializer.java | 2 +- .../InLongMsgTlogKvFormatFactory.java | 2 +- .../InLongMsgTlogKvMixedFormatConverter.java | 2 +- .../inlongmsgtlogkv/InLongMsgTlogKvUtils.java | 4 +- ...InLongMsgTlogKvFormatDeserializerTest.java | 8 +- .../InLongMsgTlogKvFormatFactoryTest.java | 12 +-- .../formats/kv/KvDeserializationSchema.java | 4 +- .../sort/formats/kv/KvFormatBuilder.java | 2 +- .../sort/formats/kv/KvFormatFactory.java | 6 +- .../formats/kv/KvSerializationSchema.java | 4 +- .../kv/KvDeserializationSchemaTest.java | 30 +++---- .../sort/formats/kv/KvFormatFactoryTest.java | 14 ++-- .../formats/kv/KvSerializationSchemaTest.java | 30 +++---- .../InLongMsgMixedFormatConverterBuilder.java | 2 +- .../formats/inlongmsg/InLongMsgUtils.java | 2 +- .../InLongMsgBinlogFormatDeserializer.java | 2 +- ...MsgBinlogRowDataDeserializationSchema.java | 2 +- .../inlongmsgbinlog/InLongMsgBinlogUtils.java | 4 +- .../InLongMsgBinlogFormatFactoryTest.java | 12 +-- .../InLongMsgCsvFormatDeserializer.java | 2 +- ...ongMsgCsvRowDataDeserializationSchema.java | 2 +- .../inlongmsgcsv/InLongMsgCsvUtils.java | 4 +- .../InLongMsgCsvFormatDeserializerTest.java | 12 +-- .../InLongMsgCsvFormatFactoryTest.java | 16 ++-- .../InLongMsgKvFormatDeserializer.java | 2 +- ...LongMsgKvRowDataDeserializationSchema.java | 2 +- .../formats/inlongmsgkv/InLongMsgKvUtils.java | 4 +- .../InLongMsgKvFormatDeserializerTest.java | 8 +- .../InLongMsgKvFormatFactoryTest.java | 16 ++-- ...InLongMsgTlogCsvDeserializationSchema.java | 2 +- .../InLongMsgTlogCsvFormatDeserializer.java | 2 +- .../InLongMsgTlogCsvUtils.java | 4 +- ...nLongMsgTlogCsvFormatDeserializerTest.java | 8 +- .../InLongMsgTlogCsvFormatFactoryTest.java | 16 ++-- .../InLongMsgTlogKvFormatDeserializer.java | 2 +- .../inlongmsgtlogkv/InLongMsgTlogKvUtils.java | 4 +- ...InLongMsgTlogKvFormatDeserializerTest.java | 8 +- .../base/TableFormatForRowDataUtils.java | 4 +- .../formats/base/TableFormatUtilsTest.java | 20 ++--- .../sort/formats/csv/CsvFormatFactory.java | 2 +- .../csv/CsvRowDataDeserializationSchema.java | 4 +- .../csv/CsvRowDataSerializationSchema.java | 4 +- .../formats/csv/CsvFormatFactoryTest.java | 12 +-- .../CsvRowDataDeserializationSchemaTest.java | 30 +++---- .../CsvRowDataSerializationSchemaTest.java | 30 +++---- .../json/JsonRowDeserializationSchema.java | 12 +-- .../json/JsonRowSerializationSchema.java | 26 +++--- .../JsonRowDeserializationSchemaTest.java | 32 ++++---- .../json/JsonRowSerializationSchemaTest.java | 32 ++++---- .../sort/formats/kv/KvFormatBuilder.java | 2 +- .../sort/formats/kv/KvFormatFactory.java | 2 +- .../kv/KvRowDataDeserializationSchema.java | 4 +- .../kv/KvRowDataSerializationSchema.java | 4 +- .../sort/formats/kv/KvFormatFactoryTest.java | 12 +-- .../KvRowDataDeserializationSchemaTest.java | 30 +++---- .../kv/KvRowDataSerializationSchemaTest.java | 30 +++---- 359 files changed, 1173 insertions(+), 1168 deletions(-) delete mode 100644 inlong-common/src/main/java/org/apache/inlong/common/constant/CompressionType.java delete mode 100644 inlong-common/src/main/java/org/apache/inlong/common/constant/DataNodeType.java delete mode 100644 inlong-common/src/main/java/org/apache/inlong/common/constant/DeserializationType.java delete mode 100644 inlong-common/src/main/java/org/apache/inlong/common/constant/MQType.java delete mode 100644 inlong-common/src/main/java/org/apache/inlong/common/constant/SinkType.java rename inlong-common/src/main/java/org/apache/inlong/common/{constant/ProtocolType.java => pojo/sort/dataflow/field/FieldConfig.java} (72%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/ArrayFormatInfo.java (91%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/ArrayTypeInfo.java (90%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/BasicFormatInfo.java (95%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/BinaryFormatInfo.java (92%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/BinaryTypeInfo.java (95%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/BooleanFormatInfo.java (96%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/BooleanTypeInfo.java (95%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/ByteFormatInfo.java (96%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/ByteTypeInfo.java (95%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/Constants.java (93%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/DateFormatInfo.java (90%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/DateTypeInfo.java (95%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/DecimalFormatInfo.java (92%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/DecimalTypeInfo.java (95%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/DoubleFormatInfo.java (96%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/DoubleTypeInfo.java (95%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/FloatFormatInfo.java (96%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/FloatTypeInfo.java (95%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/FormatInfo.java (89%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/IntFormatInfo.java (96%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/IntTypeInfo.java (95%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/LocalZonedTimestampFormatInfo.java (97%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/LocalZonedTimestampTypeInfo.java (95%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/LongFormatInfo.java (96%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/LongTypeInfo.java (95%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/MapFormatInfo.java (92%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/MapTypeInfo.java (92%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/NullFormatInfo.java (95%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/NullTypeInfo.java (95%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/RowFormatInfo.java (94%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/RowTypeInfo.java (95%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/ShortFormatInfo.java (96%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/ShortTypeInfo.java (95%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/StringFormatInfo.java (96%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/StringTypeInfo.java (95%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/TimeFormatInfo.java (91%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/TimeTypeInfo.java (95%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/TimestampFormatInfo.java (91%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/TimestampTypeInfo.java (95%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/TypeInfo.java (91%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/VarBinaryFormatInfo.java (93%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/VarBinaryTypeInfo.java (95%) rename {inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common => inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format}/VarCharFormatInfo.java (90%) rename inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/{dataflow => }/node/ClsNodeConfig.java (95%) rename inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/{dataflow => }/node/EsNodeConfig.java (95%) rename inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/{dataflow => }/node/NodeConfig.java (78%) rename inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/{dataflow => }/node/PulsarNodeConfig.java (94%) rename inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/{common => util}/FormatUtils.java (95%) diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/TaskProfileDto.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/TaskProfileDto.java index baf9e0c64b0..ae8997d47e2 100644 --- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/TaskProfileDto.java +++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/TaskProfileDto.java @@ -31,7 +31,7 @@ import org.apache.inlong.agent.pojo.PulsarTask.PulsarTaskConfig; import org.apache.inlong.agent.pojo.RedisTask.RedisTaskConfig; import org.apache.inlong.agent.pojo.SqlServerTask.SqlserverTaskConfig; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.common.enums.TaskTypeEnum; import org.apache.inlong.common.pojo.agent.DataConfig; @@ -453,9 +453,9 @@ public static TaskProfile convertToTaskProfile(DataConfig dataConfig) { String mqType = dataConfig.getMqClusters().get(0).getMqType(); task.setMqClusters(GSON.toJson(dataConfig.getMqClusters())); task.setTopicInfo(GSON.toJson(dataConfig.getTopicInfo())); - if (mqType.equals(MQType.PULSAR)) { + if (mqType.equals(Constants.MQType.PULSAR)) { task.setSink(PULSAR_SINK); - } else if (mqType.equals(MQType.KAFKA)) { + } else if (mqType.equals(Constants.MQType.KAFKA)) { task.setSink(KAFKA_SINK); } else { throw new IllegalArgumentException("input dataConfig" + dataConfig + "is invalid please check"); diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/filecollect/SenderManager.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/filecollect/SenderManager.java index 4e5c07ca26a..a0dc66524e6 100755 --- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/filecollect/SenderManager.java +++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/filecollect/SenderManager.java @@ -28,7 +28,7 @@ import org.apache.inlong.agent.plugin.message.SequentialID; import org.apache.inlong.agent.utils.AgentUtils; import org.apache.inlong.agent.utils.ThreadUtils; -import org.apache.inlong.common.constant.ProtocolType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.common.metric.MetricRegister; import org.apache.inlong.sdk.dataproxy.DefaultMessageSender; import org.apache.inlong.sdk.dataproxy.ProxyClientConfig; @@ -203,7 +203,7 @@ private void createMessageSender(String tagName) throws Exception { proxyClientConfig.setIoThreadNum(ioThreadNum); proxyClientConfig.setEnableBusyWait(enableBusyWait); - proxyClientConfig.setProtocolType(ProtocolType.TCP); + proxyClientConfig.setProtocolType(Constants.ProtocolType.TCP); SHARED_FACTORY = new DefaultThreadFactory("agent-sender-manager-" + sourcePath, Thread.currentThread().isDaemon()); diff --git a/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/sink/KafkaSink.java b/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/sink/KafkaSink.java index dc2c7c154d7..a5a1d984f74 100644 --- a/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/sink/KafkaSink.java +++ b/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/sink/KafkaSink.java @@ -20,7 +20,7 @@ import org.apache.inlong.audit.base.HighPriorityThreadFactory; import org.apache.inlong.audit.file.ConfigManager; import org.apache.inlong.audit.utils.FailoverChannelProcessorHolder; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.common.pojo.audit.MQInfo; import org.apache.inlong.common.util.NetworkUtils; @@ -289,7 +289,7 @@ private void initTopicProducer(String topic) { ConfigManager configManager = ConfigManager.getInstance(); List mqInfoList = configManager.getMqInfoList(); mqInfoList.forEach(mqClusterInfo -> { - if (MQType.KAFKA.equals(mqClusterInfo.getMqType())) { + if (Constants.MQType.KAFKA.equals(mqClusterInfo.getMqType())) { kafkaServerUrl = mqClusterInfo.getUrl(); } }); diff --git a/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/sink/TubeSink.java b/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/sink/TubeSink.java index c6cefcb0887..14c2d121ea0 100644 --- a/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/sink/TubeSink.java +++ b/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/sink/TubeSink.java @@ -21,7 +21,7 @@ import org.apache.inlong.audit.consts.ConfigConstants; import org.apache.inlong.audit.file.ConfigManager; import org.apache.inlong.audit.utils.FailoverChannelProcessorHolder; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.common.pojo.audit.MQInfo; import org.apache.inlong.common.util.NetworkUtils; import org.apache.inlong.tubemq.client.config.TubeClientConfig; @@ -391,7 +391,7 @@ private TubeClientConfig initTubeConfig() throws Exception { ConfigManager configManager = ConfigManager.getInstance(); List mqInfoList = configManager.getMqInfoList(); mqInfoList.forEach(mqClusterInfo -> { - if (MQType.TUBEMQ.equals(mqClusterInfo.getMqType())) { + if (Constants.MQType.TUBEMQ.equals(mqClusterInfo.getMqType())) { masterHostAndPortList = mqClusterInfo.getUrl(); } }); diff --git a/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/sink/pulsar/PulsarClientService.java b/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/sink/pulsar/PulsarClientService.java index c35617a27bf..a5964be0c5f 100644 --- a/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/sink/pulsar/PulsarClientService.java +++ b/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/sink/pulsar/PulsarClientService.java @@ -21,7 +21,7 @@ import org.apache.inlong.audit.file.ConfigManager; import org.apache.inlong.audit.sink.EventStat; import org.apache.inlong.audit.utils.LogCounter; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.common.pojo.audit.MQInfo; import org.apache.inlong.common.util.NetworkUtils; @@ -102,7 +102,7 @@ public PulsarClientService(Context context) { ConfigManager configManager = ConfigManager.getInstance(); List mqInfoList = configManager.getMqInfoList(); mqInfoList.forEach(mqClusterInfo -> { - if (MQType.PULSAR.equals(mqClusterInfo.getMqType())) { + if (Constants.MQType.PULSAR.equals(mqClusterInfo.getMqType())) { pulsarServerUrl = mqClusterInfo.getUrl(); } }); diff --git a/inlong-audit/audit-store/src/main/java/org/apache/inlong/audit/service/AuditMsgConsumerServer.java b/inlong-audit/audit-store/src/main/java/org/apache/inlong/audit/service/AuditMsgConsumerServer.java index 04796a3b4b3..0b381af2d35 100644 --- a/inlong-audit/audit-store/src/main/java/org/apache/inlong/audit/service/AuditMsgConsumerServer.java +++ b/inlong-audit/audit-store/src/main/java/org/apache/inlong/audit/service/AuditMsgConsumerServer.java @@ -27,7 +27,7 @@ import org.apache.inlong.audit.service.consume.KafkaConsume; import org.apache.inlong.audit.service.consume.PulsarConsume; import org.apache.inlong.audit.service.consume.TubeConsume; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.common.pojo.audit.AuditConfigRequest; import org.apache.inlong.common.pojo.audit.MQInfo; @@ -87,15 +87,15 @@ public void afterPropertiesSet() { List insertServiceList = this.getInsertServiceList(); for (MQInfo mqInfo : mqInfoList) { - if (mqConfig.isPulsar() && MQType.PULSAR.equals(mqInfo.getMqType())) { + if (mqConfig.isPulsar() && Constants.MQType.PULSAR.equals(mqInfo.getMqType())) { mqConfig.setPulsarServerUrl(mqInfo.getUrl()); mqConsume = new PulsarConsume(insertServiceList, storeConfig, mqConfig); break; - } else if (mqConfig.isTube() && MQType.TUBEMQ.equals(mqInfo.getMqType())) { + } else if (mqConfig.isTube() && Constants.MQType.TUBEMQ.equals(mqInfo.getMqType())) { mqConfig.setTubeMasterList(mqInfo.getUrl()); mqConsume = new TubeConsume(insertServiceList, storeConfig, mqConfig); break; - } else if (mqConfig.isKafka() && MQType.KAFKA.equals(mqInfo.getMqType())) { + } else if (mqConfig.isKafka() && Constants.MQType.KAFKA.equals(mqInfo.getMqType())) { mqConfig.setKafkaServerUrl(mqInfo.getUrl()); mqConsume = new KafkaConsume(insertServiceList, storeConfig, mqConfig); break; diff --git a/inlong-common/src/main/java/org/apache/inlong/common/constant/CompressionType.java b/inlong-common/src/main/java/org/apache/inlong/common/constant/CompressionType.java deleted file mode 100644 index 7b9caafe5e1..00000000000 --- a/inlong-common/src/main/java/org/apache/inlong/common/constant/CompressionType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * 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.inlong.common.constant; - -public class CompressionType { - - public static final String GZIP = "GZIP"; - public static final String SNAPPY = "SNAPPY"; - public static final String LZO = "LZO"; - public static final String NONE = "NONE"; -} diff --git a/inlong-common/src/main/java/org/apache/inlong/common/constant/Constants.java b/inlong-common/src/main/java/org/apache/inlong/common/constant/Constants.java index 766e3c4a447..46bb6e44f7c 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/constant/Constants.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/constant/Constants.java @@ -33,4 +33,65 @@ public class Constants { // Default audit version is -1 public static final long DEFAULT_AUDIT_VERSION = -1; + public static class DataNodeType { + + public static final String KAFKA = "KAFKA"; + public static final String PULSAR = "PULSAR"; + public static final String CLS = "CLS"; + public static final String ELASTICSEARCH = "ELASTICSEARCH"; + } + + public static class DeserializationType { + + public static final String INLONG_MSG = "INLONG_MSG"; + public static final String INLONG_MSG_PB = "INLONG_MSG_PB"; + public static final String CSV = "CSV"; + public static final String KV = "KV"; + } + + public static class CompressionType { + + public static final String GZIP = "GZIP"; + public static final String SNAPPY = "SNAPPY"; + public static final String LZO = "LZO"; + public static final String NONE = "NONE"; + } + + /** + * Constants of MQ type. + */ + public static class MQType { + + public static final String TUBEMQ = "TUBEMQ"; + public static final String PULSAR = "PULSAR"; + public static final String KAFKA = "KAFKA"; + public static final String TDMQ_PULSAR = "TDMQ_PULSAR"; + + /** + * Not use any MQ + */ + public static final String NONE = "NONE"; + + } + + /** + * Constants of protocol type. + */ + public static class ProtocolType { + + public static final String TCP = "TCP"; + public static final String UDP = "UDP"; + + public static final String HTTP = "HTTP"; + public static final String HTTPS = "HTTPS"; + + } + + public static class SinkType { + + public static final String KAFKA = "KAFKA"; + public static final String PULSAR = "PULSAR"; + public static final String CLS = "CLS"; + public static final String ELASTICSEARCH = "ELASTICSEARCH"; + } } diff --git a/inlong-common/src/main/java/org/apache/inlong/common/constant/DataNodeType.java b/inlong-common/src/main/java/org/apache/inlong/common/constant/DataNodeType.java deleted file mode 100644 index 2ccae832fa2..00000000000 --- a/inlong-common/src/main/java/org/apache/inlong/common/constant/DataNodeType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * 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.inlong.common.constant; - -public class DataNodeType { - - public static final String KAFKA = "KAFKA"; - public static final String PULSAR = "PULSAR"; - public static final String CLS = "CLS"; - public static final String ELASTICSEARCH = "ELASTICSEARCH"; -} diff --git a/inlong-common/src/main/java/org/apache/inlong/common/constant/DeserializationType.java b/inlong-common/src/main/java/org/apache/inlong/common/constant/DeserializationType.java deleted file mode 100644 index 66999634fac..00000000000 --- a/inlong-common/src/main/java/org/apache/inlong/common/constant/DeserializationType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * 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.inlong.common.constant; - -public class DeserializationType { - - public static final String INLONG_MSG = "INLONG_MSG"; - public static final String INLONG_MSG_PB = "INLONG_MSG_PB"; - public static final String CSV = "CSV"; - public static final String KV = "KV"; -} diff --git a/inlong-common/src/main/java/org/apache/inlong/common/constant/MQType.java b/inlong-common/src/main/java/org/apache/inlong/common/constant/MQType.java deleted file mode 100644 index d15319b95a6..00000000000 --- a/inlong-common/src/main/java/org/apache/inlong/common/constant/MQType.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * 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.inlong.common.constant; - -/** - * Constants of MQ type. - */ -public class MQType { - - public static final String TUBEMQ = "TUBEMQ"; - public static final String PULSAR = "PULSAR"; - public static final String KAFKA = "KAFKA"; - public static final String TDMQ_PULSAR = "TDMQ_PULSAR"; - - /** - * Not use any MQ - */ - public static final String NONE = "NONE"; - -} diff --git a/inlong-common/src/main/java/org/apache/inlong/common/constant/SinkType.java b/inlong-common/src/main/java/org/apache/inlong/common/constant/SinkType.java deleted file mode 100644 index 0dba17eb60b..00000000000 --- a/inlong-common/src/main/java/org/apache/inlong/common/constant/SinkType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * 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.inlong.common.constant; - -public class SinkType { - - public static final String KAFKA = "KAFKA"; - public static final String PULSAR = "PULSAR"; - public static final String CLS = "CLS"; - public static final String ELASTICSEARCH = "ELASTICSEARCH"; -} diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/SortTaskConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/SortTaskConfig.java index f94590e314e..ac98af5b815 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/SortTaskConfig.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/SortTaskConfig.java @@ -17,7 +17,7 @@ package org.apache.inlong.common.pojo.sort; -import org.apache.inlong.common.pojo.sort.dataflow.node.NodeConfig; +import org.apache.inlong.common.pojo.sort.node.NodeConfig; import lombok.Data; diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/SourceConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/SourceConfig.java index 0adf501b4dd..4eac286b687 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/SourceConfig.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/SourceConfig.java @@ -18,15 +18,19 @@ package org.apache.inlong.common.pojo.sort.dataflow; import org.apache.inlong.common.pojo.sort.dataflow.deserialization.DeserializationConfig; +import org.apache.inlong.common.pojo.sort.dataflow.field.FieldConfig; import lombok.Data; import java.io.Serializable; +import java.util.List; @Data public class SourceConfig implements Serializable { private String topic; private String subscription; + private String encodingType; private DeserializationConfig deserializationConfig; + private List fieldConfigs; } diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/deserialization/DeserializationConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/deserialization/DeserializationConfig.java index 49ae3da39a6..880644cb0cb 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/deserialization/DeserializationConfig.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/deserialization/DeserializationConfig.java @@ -17,7 +17,7 @@ package org.apache.inlong.common.pojo.sort.dataflow.deserialization; -import org.apache.inlong.common.constant.DeserializationType; +import org.apache.inlong.common.constant.Constants; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; @@ -26,10 +26,10 @@ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type") @JsonSubTypes({ - @JsonSubTypes.Type(value = InlongMsgDeserializationConfig.class, name = DeserializationType.INLONG_MSG), - @JsonSubTypes.Type(value = InlongMsgPbDeserialiationConfig.class, name = DeserializationType.INLONG_MSG_PB), - @JsonSubTypes.Type(value = CsvDeserializationConfig.class, name = DeserializationType.CSV), - @JsonSubTypes.Type(value = KvDeserializationConfig.class, name = DeserializationType.KV), + @JsonSubTypes.Type(value = InlongMsgDeserializationConfig.class, name = Constants.DeserializationType.INLONG_MSG), + @JsonSubTypes.Type(value = InlongMsgPbDeserialiationConfig.class, name = Constants.DeserializationType.INLONG_MSG_PB), + @JsonSubTypes.Type(value = CsvDeserializationConfig.class, name = Constants.DeserializationType.CSV), + @JsonSubTypes.Type(value = KvDeserializationConfig.class, name = Constants.DeserializationType.KV), }) public interface DeserializationConfig extends Serializable { diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/deserialization/KvDeserializationConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/deserialization/KvDeserializationConfig.java index 649e677af6c..e43896166ce 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/deserialization/KvDeserializationConfig.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/deserialization/KvDeserializationConfig.java @@ -24,6 +24,5 @@ public class KvDeserializationConfig implements DeserializationConfig { private char entrySplitter; private char kvSplitter; - private String streamId; private Character escapeChar; } diff --git a/inlong-common/src/main/java/org/apache/inlong/common/constant/ProtocolType.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/FieldConfig.java similarity index 72% rename from inlong-common/src/main/java/org/apache/inlong/common/constant/ProtocolType.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/FieldConfig.java index edcf10dbb1f..eead2416546 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/constant/ProtocolType.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/FieldConfig.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.inlong.common.constant; +package org.apache.inlong.common.pojo.sort.dataflow.field; -/** - * Constants of protocol type. - */ -public class ProtocolType { +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; + +import lombok.Data; - public static final String TCP = "TCP"; - public static final String UDP = "UDP"; +import java.io.Serializable; - public static final String HTTP = "HTTP"; - public static final String HTTPS = "HTTPS"; +@Data +public class FieldConfig implements Serializable { + private String name; + private FormatInfo formatInfo; } diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ArrayFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ArrayFormatInfo.java similarity index 91% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ArrayFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ArrayFormatInfo.java index c296e0da9c1..e9456ba9e2a 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ArrayFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ArrayFormatInfo.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import javax.annotation.Nonnull; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ArrayTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ArrayTypeInfo.java similarity index 90% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ArrayTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ArrayTypeInfo.java index c67a9350fd8..000399c379e 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ArrayTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ArrayTypeInfo.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import javax.annotation.Nonnull; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/BasicFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BasicFormatInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/BasicFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BasicFormatInfo.java index 2ed0a65552d..02ea656c5ac 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/BasicFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BasicFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The format information for basic types. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/BinaryFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BinaryFormatInfo.java similarity index 92% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/BinaryFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BinaryFormatInfo.java index a2f73d6bd25..b1ad81413bb 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/BinaryFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BinaryFormatInfo.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import java.nio.charset.StandardCharsets; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/BinaryTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BinaryTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/BinaryTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BinaryTypeInfo.java index 36918c25ff8..b0f733901c9 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/BinaryTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BinaryTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; public class BinaryTypeInfo implements TypeInfo { diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/BooleanFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BooleanFormatInfo.java similarity index 96% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/BooleanFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BooleanFormatInfo.java index 2bae898a04f..63935c6f968 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/BooleanFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BooleanFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The format information for booleans. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/BooleanTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BooleanTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/BooleanTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BooleanTypeInfo.java index b63b4c3f58d..5e3cf61a401 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/BooleanTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BooleanTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The type information for booleans. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ByteFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ByteFormatInfo.java similarity index 96% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ByteFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ByteFormatInfo.java index 1fbafb263b9..257d8ef747c 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ByteFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ByteFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The format information for strings. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ByteTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ByteTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ByteTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ByteTypeInfo.java index dddca846c7b..42b55497ef7 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ByteTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ByteTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The type information for strings. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/Constants.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/Constants.java similarity index 93% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/Constants.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/Constants.java index d196ba6f4f9..f3056180edf 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/Constants.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/Constants.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; public class Constants { diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DateFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DateFormatInfo.java similarity index 90% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DateFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DateFormatInfo.java index d323ec398f1..462a440cd07 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DateFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DateFormatInfo.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnore; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -30,8 +30,8 @@ import java.util.Objects; import java.util.concurrent.TimeUnit; -import static org.apache.inlong.sort.formats.common.Constants.DATE_AND_TIME_STANDARD_ISO_8601; -import static org.apache.inlong.sort.formats.common.Constants.DATE_AND_TIME_STANDARD_SQL; +import static org.apache.inlong.common.pojo.sort.dataflow.field.format.Constants.DATE_AND_TIME_STANDARD_ISO_8601; +import static org.apache.inlong.common.pojo.sort.dataflow.field.format.Constants.DATE_AND_TIME_STANDARD_SQL; /** * The format information for {@link Date}s. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DateTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DateTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DateTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DateTypeInfo.java index 1d84dd74b3d..bdfd7c45db3 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DateTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DateTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The type information for dates. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DecimalFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DecimalFormatInfo.java similarity index 92% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DecimalFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DecimalFormatInfo.java index 0bb740a42a0..4c33678a0ad 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DecimalFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DecimalFormatInfo.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import java.math.BigDecimal; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DecimalTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DecimalTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DecimalTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DecimalTypeInfo.java index 06c27101570..65bbfc04127 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DecimalTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DecimalTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The type information for decimals. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DoubleFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DoubleFormatInfo.java similarity index 96% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DoubleFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DoubleFormatInfo.java index 4277a7d01e3..259d13a3933 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DoubleFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DoubleFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The format information for doubles. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DoubleTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DoubleTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DoubleTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DoubleTypeInfo.java index 3bccdfdeea9..537ca0b0e99 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DoubleTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DoubleTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The type information for doubles. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/FloatFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FloatFormatInfo.java similarity index 96% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/FloatFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FloatFormatInfo.java index 2557e2baf13..aede019ef0a 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/FloatFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FloatFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The format information for floats. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/FloatTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FloatTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/FloatTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FloatTypeInfo.java index cf261d1d29f..c44d1a512af 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/FloatTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FloatTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The type information for floats. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/FormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FormatInfo.java similarity index 89% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/FormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FormatInfo.java index 4d8cc7fe5d9..b83da028183 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/FormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FormatInfo.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnore; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonSubTypes; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import java.io.Serializable; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/IntFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/IntFormatInfo.java similarity index 96% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/IntFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/IntFormatInfo.java index 2a0ba47c7fa..e80f1fed3d9 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/IntFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/IntFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The format information for integers. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/IntTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/IntTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/IntTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/IntTypeInfo.java index 16a537d4cca..442fe66f384 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/IntTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/IntTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The type information for integers. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/LocalZonedTimestampFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/LocalZonedTimestampFormatInfo.java similarity index 97% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/LocalZonedTimestampFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/LocalZonedTimestampFormatInfo.java index 952ddf94f54..56d8611e2d0 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/LocalZonedTimestampFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/LocalZonedTimestampFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; import java.util.Objects; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/LocalZonedTimestampTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/LocalZonedTimestampTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/LocalZonedTimestampTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/LocalZonedTimestampTypeInfo.java index cdc66f8e307..1a82b2c529c 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/LocalZonedTimestampTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/LocalZonedTimestampTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; public class LocalZonedTimestampTypeInfo implements TypeInfo { diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/LongFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/LongFormatInfo.java similarity index 96% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/LongFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/LongFormatInfo.java index 6dd88828097..b019df4d4c3 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/LongFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/LongFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The format information for longs. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/LongTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/LongTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/LongTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/LongTypeInfo.java index aa0f66dc589..e55e79844aa 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/LongTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/LongTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The type information for longs. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/MapFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/MapFormatInfo.java similarity index 92% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/MapFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/MapFormatInfo.java index 6ccbedd092b..62c178d0e6a 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/MapFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/MapFormatInfo.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import javax.annotation.Nonnull; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/MapTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/MapTypeInfo.java similarity index 92% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/MapTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/MapTypeInfo.java index 0da0d7c2afe..a479c4f3e24 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/MapTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/MapTypeInfo.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import javax.annotation.Nonnull; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/NullFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/NullFormatInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/NullFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/NullFormatInfo.java index 24273c84e20..b7264cc3efd 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/NullFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/NullFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; public class NullFormatInfo implements FormatInfo { diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/NullTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/NullTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/NullTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/NullTypeInfo.java index e31d398f852..b8fe669af01 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/NullTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/NullTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; public class NullTypeInfo implements TypeInfo { diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/RowFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/RowFormatInfo.java similarity index 94% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/RowFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/RowFormatInfo.java index 27b38459dfc..6fe85a52130 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/RowFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/RowFormatInfo.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import javax.annotation.Nonnull; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/RowTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/RowTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/RowTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/RowTypeInfo.java index 1e0dd72b914..fe07906ceab 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/RowTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/RowTypeInfo.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import javax.annotation.Nonnull; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ShortFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ShortFormatInfo.java similarity index 96% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ShortFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ShortFormatInfo.java index fb47c64520d..6dc6baf1aa4 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ShortFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ShortFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The format information for strings. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ShortTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ShortTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ShortTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ShortTypeInfo.java index d588b6154f0..796c8d847df 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/ShortTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ShortTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The type information for strings. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/StringFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/StringFormatInfo.java similarity index 96% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/StringFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/StringFormatInfo.java index f59e50e3f8f..c249b334860 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/StringFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/StringFormatInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The format information for strings. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/StringTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/StringTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/StringTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/StringTypeInfo.java index 2022c0d04e4..0a535435697 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/StringTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/StringTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The type information for strings. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TimeFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimeFormatInfo.java similarity index 91% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TimeFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimeFormatInfo.java index 45bfa9f948b..439a2811cb2 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TimeFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimeFormatInfo.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnore; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -31,8 +31,8 @@ import java.util.Objects; import java.util.concurrent.TimeUnit; -import static org.apache.inlong.sort.formats.common.Constants.DATE_AND_TIME_STANDARD_ISO_8601; -import static org.apache.inlong.sort.formats.common.Constants.DATE_AND_TIME_STANDARD_SQL; +import static org.apache.inlong.common.pojo.sort.dataflow.field.format.Constants.DATE_AND_TIME_STANDARD_ISO_8601; +import static org.apache.inlong.common.pojo.sort.dataflow.field.format.Constants.DATE_AND_TIME_STANDARD_SQL; /** * The format information for {@link Time}s. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TimeTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimeTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TimeTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimeTypeInfo.java index 99ed9cd53e7..e5935f1aab2 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TimeTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimeTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The type information for times. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TimestampFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimestampFormatInfo.java similarity index 91% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TimestampFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimestampFormatInfo.java index ec3de92036f..4519e38c833 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TimestampFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimestampFormatInfo.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnore; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -31,8 +31,8 @@ import java.util.Objects; import java.util.concurrent.TimeUnit; -import static org.apache.inlong.sort.formats.common.Constants.DATE_AND_TIME_STANDARD_ISO_8601; -import static org.apache.inlong.sort.formats.common.Constants.DATE_AND_TIME_STANDARD_SQL; +import static org.apache.inlong.common.pojo.sort.dataflow.field.format.Constants.DATE_AND_TIME_STANDARD_ISO_8601; +import static org.apache.inlong.common.pojo.sort.dataflow.field.format.Constants.DATE_AND_TIME_STANDARD_SQL; /** * The format information for {@link Timestamp}s. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TimestampTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimestampTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TimestampTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimestampTypeInfo.java index b8cbebe01da..aa999dfad1c 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TimestampTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimestampTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The type information for timestamps. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TypeInfo.java similarity index 91% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TypeInfo.java index fc2d2625081..53b16143a73 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TypeInfo.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonSubTypes; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import java.io.Serializable; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/VarBinaryFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/VarBinaryFormatInfo.java similarity index 93% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/VarBinaryFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/VarBinaryFormatInfo.java index 28732a24472..f14f025853f 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/VarBinaryFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/VarBinaryFormatInfo.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import java.nio.charset.StandardCharsets; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/VarBinaryTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/VarBinaryTypeInfo.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/VarBinaryTypeInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/VarBinaryTypeInfo.java index 97ff95350fc..de7a4159831 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/VarBinaryTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/VarBinaryTypeInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; /** * The type information for VarBinary. diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/VarCharFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/VarCharFormatInfo.java similarity index 90% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/VarCharFormatInfo.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/VarCharFormatInfo.java index dd1ef59787e..2fae720e4e4 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/VarCharFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/VarCharFormatInfo.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; /** * The format information for varchar. diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/sink/SinkConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/sink/SinkConfig.java index e79ceb993d1..590d987c93b 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/sink/SinkConfig.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/sink/SinkConfig.java @@ -17,20 +17,25 @@ package org.apache.inlong.common.pojo.sort.dataflow.sink; -import org.apache.inlong.common.constant.SinkType; +import org.apache.inlong.common.constant.Constants; +import org.apache.inlong.common.pojo.sort.dataflow.field.FieldConfig; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import lombok.Data; import java.io.Serializable; +import java.util.List; @Data @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type") @JsonSubTypes({ - @JsonSubTypes.Type(value = ClsSinkConfig.class, name = SinkType.CLS), - @JsonSubTypes.Type(value = EsSinkConfig.class, name = SinkType.ELASTICSEARCH), - @JsonSubTypes.Type(value = PulsarSinkConfig.class, name = SinkType.PULSAR), + @JsonSubTypes.Type(value = ClsSinkConfig.class, name = Constants.SinkType.CLS), + @JsonSubTypes.Type(value = EsSinkConfig.class, name = Constants.SinkType.ELASTICSEARCH), + @JsonSubTypes.Type(value = PulsarSinkConfig.class, name = Constants.SinkType.PULSAR), }) public abstract class SinkConfig implements Serializable { + + private String encodingType; + private List fieldConfigs; } diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/mq/MqClusterConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/mq/MqClusterConfig.java index 45eaa6762ee..bb297168b24 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/mq/MqClusterConfig.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/mq/MqClusterConfig.java @@ -17,7 +17,7 @@ package org.apache.inlong.common.pojo.sort.mq; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; @@ -28,8 +28,8 @@ @Data @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type") @JsonSubTypes({ - @JsonSubTypes.Type(value = PulsarClusterConfig.class, name = MQType.PULSAR), - @JsonSubTypes.Type(value = TubeClusterConfig.class, name = MQType.TUBEMQ) + @JsonSubTypes.Type(value = PulsarClusterConfig.class, name = Constants.MQType.PULSAR), + @JsonSubTypes.Type(value = TubeClusterConfig.class, name = Constants.MQType.TUBEMQ) }) public abstract class MqClusterConfig implements Serializable { diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/node/ClsNodeConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/node/ClsNodeConfig.java similarity index 95% rename from inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/node/ClsNodeConfig.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/node/ClsNodeConfig.java index f1c671561ac..b2f23382bd0 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/node/ClsNodeConfig.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/node/ClsNodeConfig.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.common.pojo.sort.dataflow.node; +package org.apache.inlong.common.pojo.sort.node; import lombok.Data; diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/node/EsNodeConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/node/EsNodeConfig.java similarity index 95% rename from inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/node/EsNodeConfig.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/node/EsNodeConfig.java index 789b4cbd6bb..5a6a3ae8947 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/node/EsNodeConfig.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/node/EsNodeConfig.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.common.pojo.sort.dataflow.node; +package org.apache.inlong.common.pojo.sort.node; import lombok.Data; diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/node/NodeConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/node/NodeConfig.java similarity index 78% rename from inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/node/NodeConfig.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/node/NodeConfig.java index 5ba37674b48..9d6daf455ce 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/node/NodeConfig.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/node/NodeConfig.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.inlong.common.pojo.sort.dataflow.node; +package org.apache.inlong.common.pojo.sort.node; -import org.apache.inlong.common.constant.DataNodeType; +import org.apache.inlong.common.constant.Constants; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; @@ -28,9 +28,9 @@ @Data @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type") @JsonSubTypes({ - @JsonSubTypes.Type(value = ClsNodeConfig.class, name = DataNodeType.CLS), - @JsonSubTypes.Type(value = EsNodeConfig.class, name = DataNodeType.ELASTICSEARCH), - @JsonSubTypes.Type(value = PulsarNodeConfig.class, name = DataNodeType.PULSAR), + @JsonSubTypes.Type(value = ClsNodeConfig.class, name = Constants.DataNodeType.CLS), + @JsonSubTypes.Type(value = EsNodeConfig.class, name = Constants.DataNodeType.ELASTICSEARCH), + @JsonSubTypes.Type(value = PulsarNodeConfig.class, name = Constants.DataNodeType.PULSAR), }) public abstract class NodeConfig implements Serializable { diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/node/PulsarNodeConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/node/PulsarNodeConfig.java similarity index 94% rename from inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/node/PulsarNodeConfig.java rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/node/PulsarNodeConfig.java index f596f600222..b207e1de277 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/node/PulsarNodeConfig.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/node/PulsarNodeConfig.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.common.pojo.sort.dataflow.node; +package org.apache.inlong.common.pojo.sort.node; import lombok.Data; diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/pojo/CacheType.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/pojo/CacheType.java index 0d8a5430d4c..1d6112dc2cd 100644 --- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/pojo/CacheType.java +++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/pojo/CacheType.java @@ -17,18 +17,18 @@ package org.apache.inlong.dataproxy.config.pojo; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; /** * cache cluster type */ public enum CacheType { - TUBE(0, MQType.TUBEMQ), - KAFKA(1, MQType.KAFKA), - PULSAR(2, MQType.PULSAR), - TDMQPULSAR(3, MQType.TDMQ_PULSAR), - N(99, MQType.NONE); + TUBE(0, Constants.MQType.TUBEMQ), + KAFKA(1, Constants.MQType.KAFKA), + PULSAR(2, Constants.MQType.PULSAR), + TDMQPULSAR(3, Constants.MQType.TDMQ_PULSAR), + N(99, Constants.MQType.NONE); private final int id; private final String value; diff --git a/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/ClientFactoryTest.java b/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/ClientFactoryTest.java index be4aa144133..f54b50a0dc4 100644 --- a/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/ClientFactoryTest.java +++ b/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/ClientFactoryTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.client.api.inner; -import org.apache.inlong.common.constant.ProtocolType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.client.api.ClientConfiguration; import org.apache.inlong.manager.client.api.impl.InlongClientImpl; import org.apache.inlong.manager.client.api.inner.client.ClientFactory; @@ -846,7 +846,7 @@ void testListClusterNode() { .parentId(1) .ip("127.0.0.1") .port(46801) - .protocolType(ProtocolType.HTTP) + .protocolType(Constants.ProtocolType.HTTP) .build(); List responses = new ArrayList<>(); responses.add(response); @@ -856,7 +856,7 @@ void testListClusterNode() { okJson(JsonUtils.toJsonString( Response.success(responses))))); List clusterNode = clusterClient.listNode( - "1", ClusterType.DATAPROXY, ProtocolType.HTTP); + "1", ClusterType.DATAPROXY, Constants.ProtocolType.HTTP); Assertions.assertEquals(1, clusterNode.size()); } diff --git a/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/InlongConsumeClientTest.java b/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/InlongConsumeClientTest.java index 16158945441..38630eb3bbe 100644 --- a/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/InlongConsumeClientTest.java +++ b/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/InlongConsumeClientTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.client.api.inner; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.client.api.inner.client.InlongConsumeClient; import org.apache.inlong.manager.common.util.JsonUtils; import org.apache.inlong.manager.pojo.common.PageResult; @@ -59,7 +59,7 @@ void testConsumeSave() { InlongConsumeRequest request = new ConsumePulsarRequest(); request.setTopic("test_topic"); - request.setMqType(MQType.PULSAR); + request.setMqType(Constants.MQType.PULSAR); request.setConsumerGroup("test_consume_group"); Integer consumeId = consumeClient.save(request); Assertions.assertEquals(1, consumeId); @@ -68,7 +68,7 @@ void testConsumeSave() { @Test void testConsumeGet() { InlongConsumeInfo response = new ConsumePulsarInfo(); - response.setMqType(MQType.PULSAR); + response.setMqType(Constants.MQType.PULSAR); response.setId(1); stubFor( @@ -103,7 +103,7 @@ void testConsumeList() { List responses = Lists.newArrayList( InlongConsumeBriefInfo.builder() .id(1) - .mqType(MQType.PULSAR) + .mqType(Constants.MQType.PULSAR) .inlongGroupId("test_group_id") .consumerGroup("test_consume_group") .build()); @@ -127,7 +127,7 @@ void testConsumeUpdate() { InlongConsumeRequest request = new ConsumePulsarRequest(); request.setId(1); - request.setMqType(MQType.PULSAR); + request.setMqType(Constants.MQType.PULSAR); Integer consumeId = consumeClient.update(request); Assertions.assertEquals(1, consumeId); } @@ -141,7 +141,7 @@ void testConsumeDelete() { InlongConsumeRequest request = new ConsumePulsarRequest(); request.setId(1); - request.setMqType(MQType.PULSAR); + request.setMqType(Constants.MQType.PULSAR); Boolean delete = consumeClient.delete(1); Assertions.assertTrue(delete); } diff --git a/inlong-manager/manager-dao/src/test/java/org/apache/inlong/manager/dao/RestTemplateConfig.java b/inlong-manager/manager-dao/src/test/java/org/apache/inlong/manager/dao/RestTemplateConfig.java index 52b5ea2ba31..822e89fecb4 100644 --- a/inlong-manager/manager-dao/src/test/java/org/apache/inlong/manager/dao/RestTemplateConfig.java +++ b/inlong-manager/manager-dao/src/test/java/org/apache/inlong/manager/dao/RestTemplateConfig.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.dao; -import org.apache.inlong.common.constant.ProtocolType; +import org.apache.inlong.common.constant.Constants; import lombok.Data; import org.apache.http.HttpResponse; @@ -81,8 +81,8 @@ public class RestTemplateConfig { public PoolingHttpClientConnectionManager httpClientConnectionManager() { // Support HTTP, HTTPS Registry registry = RegistryBuilder.create() - .register(ProtocolType.HTTP, PlainConnectionSocketFactory.getSocketFactory()) - .register(ProtocolType.HTTPS, SSLConnectionSocketFactory.getSocketFactory()) + .register(Constants.ProtocolType.HTTP, PlainConnectionSocketFactory.getSocketFactory()) + .register(Constants.ProtocolType.HTTPS, SSLConnectionSocketFactory.getSocketFactory()) .build(); PoolingHttpClientConnectionManager httpClientConnectionManager = new PoolingHttpClientConnectionManager( registry); diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/kafka/ConsumeKafkaInfo.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/kafka/ConsumeKafkaInfo.java index aafcc44e9a1..bfdee84574d 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/kafka/ConsumeKafkaInfo.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/kafka/ConsumeKafkaInfo.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.pojo.consume.kafka; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.util.CommonBeanUtils; import org.apache.inlong.manager.common.util.JsonTypeDefine; import org.apache.inlong.manager.pojo.consume.InlongConsumeInfo; @@ -33,7 +33,7 @@ @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -@JsonTypeDefine(value = MQType.KAFKA) +@JsonTypeDefine(value = Constants.MQType.KAFKA) @ApiModel("Inlong consume info of Kafka") public class ConsumeKafkaInfo extends InlongConsumeInfo { diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/kafka/ConsumeKafkaRequest.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/kafka/ConsumeKafkaRequest.java index bf8f3c409b3..c7f7a8f1ed6 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/kafka/ConsumeKafkaRequest.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/kafka/ConsumeKafkaRequest.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.pojo.consume.kafka; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.util.JsonTypeDefine; import org.apache.inlong.manager.pojo.consume.InlongConsumeRequest; @@ -33,7 +33,7 @@ @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) @ApiModel("Inlong consume request of Kafka") -@JsonTypeDefine(value = MQType.KAFKA) +@JsonTypeDefine(value = Constants.MQType.KAFKA) public class ConsumeKafkaRequest extends InlongConsumeRequest { } diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/pulsar/ConsumePulsarInfo.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/pulsar/ConsumePulsarInfo.java index 7788481dbbb..9c7a14ab719 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/pulsar/ConsumePulsarInfo.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/pulsar/ConsumePulsarInfo.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.pojo.consume.pulsar; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.util.CommonBeanUtils; import org.apache.inlong.manager.common.util.JsonTypeDefine; import org.apache.inlong.manager.pojo.consume.InlongConsumeInfo; @@ -34,7 +34,7 @@ @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -@JsonTypeDefine(value = MQType.PULSAR) +@JsonTypeDefine(value = Constants.MQType.PULSAR) @ApiModel("Inlong consume info of Pulsar") public class ConsumePulsarInfo extends InlongConsumeInfo { diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/pulsar/ConsumePulsarRequest.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/pulsar/ConsumePulsarRequest.java index 1a1d7056629..d4bc8894ea8 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/pulsar/ConsumePulsarRequest.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/pulsar/ConsumePulsarRequest.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.pojo.consume.pulsar; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.util.JsonTypeDefine; import org.apache.inlong.manager.pojo.consume.InlongConsumeRequest; @@ -34,7 +34,7 @@ @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) @ApiModel("Inlong consume request of Pulsar") -@JsonTypeDefine(value = MQType.PULSAR) +@JsonTypeDefine(value = Constants.MQType.PULSAR) public class ConsumePulsarRequest extends InlongConsumeRequest { @ApiModelProperty("Whether to configure the dead letter queue, 0: not configure, 1: configure") diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/tubemq/ConsumeTubeMQInfo.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/tubemq/ConsumeTubeMQInfo.java index 21deb120989..36d837a85ff 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/tubemq/ConsumeTubeMQInfo.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/tubemq/ConsumeTubeMQInfo.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.pojo.consume.tubemq; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.util.CommonBeanUtils; import org.apache.inlong.manager.common.util.JsonTypeDefine; import org.apache.inlong.manager.pojo.consume.InlongConsumeInfo; @@ -33,7 +33,7 @@ @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -@JsonTypeDefine(value = MQType.TUBEMQ) +@JsonTypeDefine(value = Constants.MQType.TUBEMQ) @ApiModel("Inlong consume info of TubeMQ") public class ConsumeTubeMQInfo extends InlongConsumeInfo { diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/tubemq/ConsumeTubeMQRequest.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/tubemq/ConsumeTubeMQRequest.java index 15aa466358f..70d80d67d12 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/tubemq/ConsumeTubeMQRequest.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/tubemq/ConsumeTubeMQRequest.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.pojo.consume.tubemq; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.util.JsonTypeDefine; import org.apache.inlong.manager.pojo.consume.InlongConsumeRequest; @@ -32,7 +32,7 @@ @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -@JsonTypeDefine(value = MQType.TUBEMQ) +@JsonTypeDefine(value = Constants.MQType.TUBEMQ) @ApiModel("Inlong consume request of TubeMQ") public class ConsumeTubeMQRequest extends InlongConsumeRequest { diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/kafka/InlongKafkaInfo.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/kafka/InlongKafkaInfo.java index 0b2c9756517..39db07c658e 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/kafka/InlongKafkaInfo.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/kafka/InlongKafkaInfo.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.pojo.group.kafka; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.util.CommonBeanUtils; import org.apache.inlong.manager.common.util.JsonTypeDefine; import org.apache.inlong.manager.pojo.group.InlongGroupInfo; @@ -33,7 +33,7 @@ @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -@JsonTypeDefine(value = MQType.KAFKA) +@JsonTypeDefine(value = Constants.MQType.KAFKA) @ApiModel("Inlong group info for Kafka") public class InlongKafkaInfo extends InlongGroupInfo { @@ -43,7 +43,7 @@ public class InlongKafkaInfo extends InlongGroupInfo { private Short replicationFactor = 1; public InlongKafkaInfo() { - this.setMqType(MQType.KAFKA); + this.setMqType(Constants.MQType.KAFKA); } @Override diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/kafka/InlongKafkaRequest.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/kafka/InlongKafkaRequest.java index 85d3fadbca2..a5b891c81af 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/kafka/InlongKafkaRequest.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/kafka/InlongKafkaRequest.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.pojo.group.kafka; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.util.JsonTypeDefine; import org.apache.inlong.manager.pojo.group.InlongGroupRequest; @@ -33,7 +33,7 @@ @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) @ApiModel("Inlong group request for Kafka") -@JsonTypeDefine(value = MQType.KAFKA) +@JsonTypeDefine(value = Constants.MQType.KAFKA) public class InlongKafkaRequest extends InlongGroupRequest { // partition number @@ -42,7 +42,7 @@ public class InlongKafkaRequest extends InlongGroupRequest { private Short replicationFactor = 1; public InlongKafkaRequest() { - this.setMqType(MQType.KAFKA); + this.setMqType(Constants.MQType.KAFKA); } } diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/kafka/InlongKafkaTopicInfo.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/kafka/InlongKafkaTopicInfo.java index 7a83a452094..f1c6fc008ca 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/kafka/InlongKafkaTopicInfo.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/kafka/InlongKafkaTopicInfo.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.pojo.group.kafka; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.util.JsonTypeDefine; import org.apache.inlong.manager.pojo.group.InlongGroupTopicInfo; @@ -34,7 +34,7 @@ @Builder @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@JsonTypeDefine(value = MQType.KAFKA) +@JsonTypeDefine(value = Constants.MQType.KAFKA) @ApiModel("Inlong kafka group topic info") public class InlongKafkaTopicInfo extends InlongGroupTopicInfo { @@ -42,7 +42,7 @@ public class InlongKafkaTopicInfo extends InlongGroupTopicInfo { private List topics; public InlongKafkaTopicInfo() { - this.setMqType(MQType.KAFKA); + this.setMqType(Constants.MQType.KAFKA); } } diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/none/InlongNoneMqInfo.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/none/InlongNoneMqInfo.java index 2898fbceb77..588c7e087da 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/none/InlongNoneMqInfo.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/none/InlongNoneMqInfo.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.pojo.group.none; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.util.CommonBeanUtils; import org.apache.inlong.manager.common.util.JsonTypeDefine; import org.apache.inlong.manager.pojo.group.InlongGroupInfo; @@ -34,13 +34,13 @@ @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) @ApiModel("Inlong group info without MQ") -@JsonTypeDefine(value = MQType.NONE) +@JsonTypeDefine(value = Constants.MQType.NONE) public class InlongNoneMqInfo extends InlongGroupInfo { // no fields public InlongNoneMqInfo() { - this.setMqType(MQType.NONE); + this.setMqType(Constants.MQType.NONE); } @Override diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/none/InlongNoneMqRequest.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/none/InlongNoneMqRequest.java index 96104ea9d3e..546432b1762 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/none/InlongNoneMqRequest.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/none/InlongNoneMqRequest.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.pojo.group.none; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.util.JsonTypeDefine; import org.apache.inlong.manager.pojo.group.InlongGroupRequest; @@ -33,13 +33,13 @@ @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) @ApiModel("Inlong group request without MQ") -@JsonTypeDefine(value = MQType.NONE) +@JsonTypeDefine(value = Constants.MQType.NONE) public class InlongNoneMqRequest extends InlongGroupRequest { // no field public InlongNoneMqRequest() { - this.setMqType(MQType.NONE); + this.setMqType(Constants.MQType.NONE); } } diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/none/InlongNoneMqTopicInfo.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/none/InlongNoneMqTopicInfo.java index 623f2647d59..66a62669c96 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/none/InlongNoneMqTopicInfo.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/none/InlongNoneMqTopicInfo.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.pojo.group.none; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.util.JsonTypeDefine; import org.apache.inlong.manager.pojo.group.InlongGroupTopicInfo; @@ -33,13 +33,13 @@ @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) @ApiModel("Inlong group request without MQ") -@JsonTypeDefine(value = MQType.NONE) +@JsonTypeDefine(value = Constants.MQType.NONE) public class InlongNoneMqTopicInfo extends InlongGroupTopicInfo { // no field public InlongNoneMqTopicInfo() { - this.setMqType(MQType.NONE); + this.setMqType(Constants.MQType.NONE); } } diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/pulsar/InlongPulsarInfo.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/pulsar/InlongPulsarInfo.java index 1bd7780b6e1..23393a8181e 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/pulsar/InlongPulsarInfo.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/pulsar/InlongPulsarInfo.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.pojo.group.pulsar; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.util.CommonBeanUtils; import org.apache.inlong.manager.common.util.JsonTypeDefine; import org.apache.inlong.manager.pojo.group.InlongGroupInfo; @@ -36,7 +36,7 @@ @AllArgsConstructor @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -@JsonTypeDefine(value = MQType.PULSAR) +@JsonTypeDefine(value = Constants.MQType.PULSAR) @ApiModel("Inlong group info for Pulsar") public class InlongPulsarInfo extends InlongGroupInfo { @@ -81,7 +81,7 @@ public class InlongPulsarInfo extends InlongGroupInfo { private Double maxMarkDeleteRate = 0.0; public InlongPulsarInfo() { - this.setMqType(MQType.PULSAR); + this.setMqType(Constants.MQType.PULSAR); } @Override diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/pulsar/InlongPulsarRequest.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/pulsar/InlongPulsarRequest.java index 9d93e39ee50..1cf530406ab 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/pulsar/InlongPulsarRequest.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/pulsar/InlongPulsarRequest.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.pojo.group.pulsar; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.util.JsonTypeDefine; import org.apache.inlong.manager.pojo.group.InlongGroupRequest; @@ -34,7 +34,7 @@ @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) @ApiModel("Inlong group request for Pulsar") -@JsonTypeDefine(value = MQType.PULSAR) +@JsonTypeDefine(value = Constants.MQType.PULSAR) public class InlongPulsarRequest extends InlongGroupRequest { /** @@ -82,7 +82,7 @@ public class InlongPulsarRequest extends InlongGroupRequest { private Double maxMarkDeleteRate = 0.0; public InlongPulsarRequest() { - this.setMqType(MQType.PULSAR); + this.setMqType(Constants.MQType.PULSAR); } } diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/pulsar/InlongPulsarTopicInfo.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/pulsar/InlongPulsarTopicInfo.java index 835557fcce6..f2d689a992b 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/pulsar/InlongPulsarTopicInfo.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/pulsar/InlongPulsarTopicInfo.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.pojo.group.pulsar; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.util.JsonTypeDefine; import org.apache.inlong.manager.pojo.group.InlongGroupTopicInfo; @@ -34,7 +34,7 @@ @Builder @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@JsonTypeDefine(value = MQType.PULSAR) +@JsonTypeDefine(value = Constants.MQType.PULSAR) @ApiModel("Inlong pulsar group topic info") public class InlongPulsarTopicInfo extends InlongGroupTopicInfo { @@ -48,7 +48,7 @@ public class InlongPulsarTopicInfo extends InlongGroupTopicInfo { private List topics; public InlongPulsarTopicInfo() { - this.setMqType(MQType.PULSAR); + this.setMqType(Constants.MQType.PULSAR); } } diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/pulsar/InlongTdmqPulsarInfo.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/pulsar/InlongTdmqPulsarInfo.java index aed16338134..803f2471d58 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/pulsar/InlongTdmqPulsarInfo.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/pulsar/InlongTdmqPulsarInfo.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.pojo.group.pulsar; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.util.CommonBeanUtils; import org.apache.inlong.manager.common.util.JsonTypeDefine; @@ -33,11 +33,11 @@ @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) @ApiModel("Inlong group info for Tdmq Pulsar") -@JsonTypeDefine(value = MQType.TDMQ_PULSAR) +@JsonTypeDefine(value = Constants.MQType.TDMQ_PULSAR) public class InlongTdmqPulsarInfo extends InlongPulsarInfo { public InlongTdmqPulsarInfo() { - this.setMqType(MQType.TDMQ_PULSAR); + this.setMqType(Constants.MQType.TDMQ_PULSAR); } @Override diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/pulsar/InlongTdmqPulsarRequest.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/pulsar/InlongTdmqPulsarRequest.java index e546d2a4553..506291834ae 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/pulsar/InlongTdmqPulsarRequest.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/pulsar/InlongTdmqPulsarRequest.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.pojo.group.pulsar; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.util.JsonTypeDefine; import io.swagger.annotations.ApiModel; @@ -32,11 +32,11 @@ @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) @ApiModel("Inlong group request for Tdmq Pulsar") -@JsonTypeDefine(value = MQType.TDMQ_PULSAR) +@JsonTypeDefine(value = Constants.MQType.TDMQ_PULSAR) public class InlongTdmqPulsarRequest extends InlongPulsarRequest { public InlongTdmqPulsarRequest() { - this.setMqType(MQType.TDMQ_PULSAR); + this.setMqType(Constants.MQType.TDMQ_PULSAR); } } diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/tubemq/InlongTubeMQInfo.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/tubemq/InlongTubeMQInfo.java index 4fa42812497..adc3cfd6965 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/tubemq/InlongTubeMQInfo.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/tubemq/InlongTubeMQInfo.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.pojo.group.tubemq; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.util.CommonBeanUtils; import org.apache.inlong.manager.common.util.JsonTypeDefine; import org.apache.inlong.manager.pojo.group.InlongGroupInfo; @@ -35,7 +35,7 @@ @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) @ApiModel("Inlong group info for TubeMQ") -@JsonTypeDefine(value = MQType.TUBEMQ) +@JsonTypeDefine(value = Constants.MQType.TUBEMQ) public class InlongTubeMQInfo extends InlongGroupInfo { @ApiModelProperty("TubeMQ manager URL") @@ -48,7 +48,7 @@ public class InlongTubeMQInfo extends InlongGroupInfo { private int clusterId = 1; public InlongTubeMQInfo() { - this.setMqType(MQType.TUBEMQ); + this.setMqType(Constants.MQType.TUBEMQ); } @Override diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/tubemq/InlongTubeMQRequest.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/tubemq/InlongTubeMQRequest.java index 3e50197af32..3caaf906042 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/tubemq/InlongTubeMQRequest.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/tubemq/InlongTubeMQRequest.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.pojo.group.tubemq; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.util.JsonTypeDefine; import org.apache.inlong.manager.pojo.group.InlongGroupRequest; @@ -33,13 +33,13 @@ @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) @ApiModel("Inlong group request for TubeMQ") -@JsonTypeDefine(value = MQType.TUBEMQ) +@JsonTypeDefine(value = Constants.MQType.TUBEMQ) public class InlongTubeMQRequest extends InlongGroupRequest { // no field public InlongTubeMQRequest() { - this.setMqType(MQType.TUBEMQ); + this.setMqType(Constants.MQType.TUBEMQ); } } diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/tubemq/InlongTubeMQTopicInfo.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/tubemq/InlongTubeMQTopicInfo.java index 8c7205ed6cb..e923e4eaebb 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/tubemq/InlongTubeMQTopicInfo.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/tubemq/InlongTubeMQTopicInfo.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.pojo.group.tubemq; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.util.JsonTypeDefine; import org.apache.inlong.manager.pojo.group.InlongGroupTopicInfo; @@ -32,7 +32,7 @@ @Builder @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@JsonTypeDefine(value = MQType.TUBEMQ) +@JsonTypeDefine(value = Constants.MQType.TUBEMQ) @ApiModel("Inlong tube group topic info") public class InlongTubeMQTopicInfo extends InlongGroupTopicInfo { @@ -40,7 +40,7 @@ public class InlongTubeMQTopicInfo extends InlongGroupTopicInfo { private String topic; public InlongTubeMQTopicInfo() { - this.setMqType(MQType.TUBEMQ); + this.setMqType(Constants.MQType.TUBEMQ); } } diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/base/LoadNodeProvider.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/base/LoadNodeProvider.java index 87f82e71854..e243226b7ca 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/base/LoadNodeProvider.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/base/LoadNodeProvider.java @@ -18,13 +18,13 @@ package org.apache.inlong.manager.pojo.sort.node.base; import org.apache.inlong.common.enums.DataTypeEnum; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringTypeInfo; import org.apache.inlong.manager.common.enums.FieldType; import org.apache.inlong.manager.common.fieldtype.strategy.FieldTypeMappingStrategy; import org.apache.inlong.manager.pojo.sink.SinkField; import org.apache.inlong.manager.pojo.sort.util.FieldInfoUtils; import org.apache.inlong.manager.pojo.stream.StreamField; import org.apache.inlong.manager.pojo.stream.StreamNode; -import org.apache.inlong.sort.formats.common.StringTypeInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.node.LoadNode; import org.apache.inlong.sort.protocol.node.format.CanalJsonFormat; diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/provider/PulsarProvider.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/provider/PulsarProvider.java index a0fada67c15..815a2c945d9 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/provider/PulsarProvider.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/provider/PulsarProvider.java @@ -18,12 +18,12 @@ package org.apache.inlong.manager.pojo.sort.node.provider; import org.apache.inlong.common.enums.MetaField; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; import org.apache.inlong.manager.common.consts.SourceType; import org.apache.inlong.manager.pojo.sort.node.base.ExtractNodeProvider; import org.apache.inlong.manager.pojo.source.pulsar.PulsarSource; import org.apache.inlong.manager.pojo.stream.StreamField; import org.apache.inlong.manager.pojo.stream.StreamNode; -import org.apache.inlong.sort.formats.common.LongFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.enums.PulsarScanStartupMode; import org.apache.inlong.sort.protocol.node.ExtractNode; diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/provider/StarRocksProvider.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/provider/StarRocksProvider.java index 5a86455a0f3..3f0c7e21656 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/provider/StarRocksProvider.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/provider/StarRocksProvider.java @@ -18,13 +18,13 @@ package org.apache.inlong.manager.pojo.sort.node.provider; import org.apache.inlong.common.enums.MetaField; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; import org.apache.inlong.manager.common.consts.SinkType; import org.apache.inlong.manager.pojo.sink.SinkField; import org.apache.inlong.manager.pojo.sink.starrocks.StarRocksSink; import org.apache.inlong.manager.pojo.sort.node.base.LoadNodeProvider; import org.apache.inlong.manager.pojo.stream.StreamField; import org.apache.inlong.manager.pojo.stream.StreamNode; -import org.apache.inlong.sort.formats.common.LongFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.node.LoadNode; import org.apache.inlong.sort.protocol.node.format.Format; diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/provider/TubeMqProvider.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/provider/TubeMqProvider.java index 34723608a5b..546363fe7e9 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/provider/TubeMqProvider.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/provider/TubeMqProvider.java @@ -18,12 +18,12 @@ package org.apache.inlong.manager.pojo.sort.node.provider; import org.apache.inlong.common.enums.MetaField; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; import org.apache.inlong.manager.common.consts.SourceType; import org.apache.inlong.manager.pojo.sort.node.base.ExtractNodeProvider; import org.apache.inlong.manager.pojo.source.tubemq.TubeMQSource; import org.apache.inlong.manager.pojo.stream.StreamField; import org.apache.inlong.manager.pojo.stream.StreamNode; -import org.apache.inlong.sort.formats.common.LongFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.node.ExtractNode; import org.apache.inlong.sort.protocol.node.extract.TubeMQExtractNode; diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/FieldInfoUtils.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/FieldInfoUtils.java index 6e6a0483d26..96781cc7d38 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/FieldInfoUtils.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/FieldInfoUtils.java @@ -18,6 +18,25 @@ package org.apache.inlong.manager.pojo.sort.util; import org.apache.inlong.common.enums.MetaField; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ArrayFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BinaryFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LocalZonedTimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.MapFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.VarBinaryFormatInfo; import org.apache.inlong.manager.common.enums.FieldType; import org.apache.inlong.manager.common.fieldtype.strategy.FieldTypeMappingStrategy; import org.apache.inlong.manager.pojo.fieldformat.ArrayFormat; @@ -29,25 +48,6 @@ import org.apache.inlong.manager.pojo.fieldformat.VarBinaryFormat; import org.apache.inlong.manager.pojo.sink.SinkField; import org.apache.inlong.manager.pojo.stream.StreamField; -import org.apache.inlong.sort.formats.common.ArrayFormatInfo; -import org.apache.inlong.sort.formats.common.BinaryFormatInfo; -import org.apache.inlong.sort.formats.common.BooleanFormatInfo; -import org.apache.inlong.sort.formats.common.ByteFormatInfo; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LocalZonedTimestampFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.MapFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.ShortFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimeFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; -import org.apache.inlong.sort.formats.common.VarBinaryFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.MetaFieldInfo; diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/FieldRelationUtils.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/FieldRelationUtils.java index bd0120d8afe..675accc9a40 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/FieldRelationUtils.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/FieldRelationUtils.java @@ -17,6 +17,8 @@ package org.apache.inlong.manager.pojo.sort.util; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringTypeInfo; import org.apache.inlong.manager.common.enums.ErrorCodeEnum; import org.apache.inlong.manager.common.enums.FieldType; import org.apache.inlong.manager.common.enums.TransformType; @@ -31,8 +33,6 @@ import org.apache.inlong.manager.pojo.transform.replacer.StringReplacerDefinition.ReplaceRule; import org.apache.inlong.manager.pojo.transform.splitter.SplitterDefinition; import org.apache.inlong.manager.pojo.transform.splitter.SplitterDefinition.SplitRule; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.StringTypeInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.CascadeFunction; import org.apache.inlong.sort.protocol.transformation.ConstantParam; diff --git a/inlong-manager/manager-pojo/src/test/java/org/apache/inlong/manager/pojo/sort/util/FieldInfoUtilsTest.java b/inlong-manager/manager-pojo/src/test/java/org/apache/inlong/manager/pojo/sort/util/FieldInfoUtilsTest.java index 92fd73ace26..6aade6c54f2 100644 --- a/inlong-manager/manager-pojo/src/test/java/org/apache/inlong/manager/pojo/sort/util/FieldInfoUtilsTest.java +++ b/inlong-manager/manager-pojo/src/test/java/org/apache/inlong/manager/pojo/sort/util/FieldInfoUtilsTest.java @@ -17,6 +17,12 @@ package org.apache.inlong.manager.pojo.sort.util; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LocalZonedTimestampTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TypeInfo; import org.apache.inlong.manager.common.enums.FieldType; import org.apache.inlong.manager.common.fieldtype.strategy.ClickHouseFieldTypeStrategy; import org.apache.inlong.manager.common.fieldtype.strategy.IcebergFieldTypeStrategy; @@ -26,12 +32,6 @@ import org.apache.inlong.manager.common.fieldtype.strategy.PostgreSQLFieldTypeStrategy; import org.apache.inlong.manager.common.fieldtype.strategy.SQLServerFieldTypeStrategy; import org.apache.inlong.manager.pojo.stream.StreamField; -import org.apache.inlong.sort.formats.common.ByteTypeInfo; -import org.apache.inlong.sort.formats.common.IntTypeInfo; -import org.apache.inlong.sort.formats.common.LocalZonedTimestampTypeInfo; -import org.apache.inlong.sort.formats.common.ShortTypeInfo; -import org.apache.inlong.sort.formats.common.StringTypeInfo; -import org.apache.inlong.sort.formats.common.TypeInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.junit.jupiter.api.Assertions; diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceImpl.java index 3733318817b..9d64a7a83e5 100644 --- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceImpl.java +++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceImpl.java @@ -18,7 +18,6 @@ package org.apache.inlong.manager.service.cluster; import org.apache.inlong.common.constant.Constants; -import org.apache.inlong.common.constant.MQType; import org.apache.inlong.common.heartbeat.ReportResourceType; import org.apache.inlong.common.pojo.audit.AuditConfig; import org.apache.inlong.common.pojo.audit.MQInfo; @@ -1351,7 +1350,7 @@ public DataProxyConfig getDataProxyConfig(String clusterTag, String clusterName) String realClusterTag = groupInfo.getInlongClusterTag(); String mqType = groupInfo.getMqType(); - if (MQType.PULSAR.equals(mqType) || MQType.TDMQ_PULSAR.equals(mqType)) { + if (Constants.MQType.PULSAR.equals(mqType) || Constants.MQType.TDMQ_PULSAR.equals(mqType)) { InlongPulsarDTO pulsarDTO = InlongPulsarDTO.getFromJson(groupInfo.getExtParams()); // First get the tenant from the InlongGroup, and then get it from the PulsarCluster. String tenant = pulsarDTO.getPulsarTenant(); @@ -1379,12 +1378,12 @@ public DataProxyConfig getDataProxyConfig(String clusterTag, String clusterName) topicConfig.setTopic(topic); topicList.add(topicConfig); } - } else if (MQType.TUBEMQ.equals(mqType)) { + } else if (Constants.MQType.TUBEMQ.equals(mqType)) { DataProxyTopicInfo topicConfig = new DataProxyTopicInfo(); topicConfig.setInlongGroupId(groupId); topicConfig.setTopic(mqResource); topicList.add(topicConfig); - } else if (MQType.KAFKA.equals(mqType)) { + } else if (Constants.MQType.KAFKA.equals(mqType)) { List streamList = streamMapper.selectBriefList(groupId); for (InlongStreamBriefInfo streamInfo : streamList) { String streamId = streamInfo.getInlongStreamId(); diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/consume/ConsumeKafkaOperator.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/consume/ConsumeKafkaOperator.java index f0c754179c0..14d24d7e65c 100644 --- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/consume/ConsumeKafkaOperator.java +++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/consume/ConsumeKafkaOperator.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.service.consume; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.enums.ErrorCodeEnum; import org.apache.inlong.manager.common.util.CommonBeanUtils; import org.apache.inlong.manager.common.util.Preconditions; @@ -54,7 +54,7 @@ public Boolean accept(String mqType) { @Override public String getMQType() { - return MQType.KAFKA; + return Constants.MQType.KAFKA; } @Override diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/consume/ConsumePulsarOperator.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/consume/ConsumePulsarOperator.java index 699a53986bf..6f30823c601 100644 --- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/consume/ConsumePulsarOperator.java +++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/consume/ConsumePulsarOperator.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.service.consume; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.consts.InlongConstants; import org.apache.inlong.manager.common.enums.ClusterType; import org.apache.inlong.manager.common.enums.ErrorCodeEnum; @@ -74,12 +74,12 @@ public class ConsumePulsarOperator extends AbstractConsumeOperator { @Override public Boolean accept(String mqType) { - return getMQType().equals(mqType) || MQType.TDMQ_PULSAR.equals(mqType); + return getMQType().equals(mqType) || Constants.MQType.TDMQ_PULSAR.equals(mqType); } @Override public String getMQType() { - return MQType.PULSAR; + return Constants.MQType.PULSAR; } @Override diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/consume/ConsumeTubeMQOperator.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/consume/ConsumeTubeMQOperator.java index 17ab8663619..c862ecdc430 100644 --- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/consume/ConsumeTubeMQOperator.java +++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/consume/ConsumeTubeMQOperator.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.service.consume; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.enums.ErrorCodeEnum; import org.apache.inlong.manager.common.util.CommonBeanUtils; import org.apache.inlong.manager.common.util.Preconditions; @@ -56,7 +56,7 @@ public Boolean accept(String mqType) { @Override public String getMQType() { - return MQType.TUBEMQ; + return Constants.MQType.TUBEMQ; } @Override diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentServiceImpl.java index 9eba178179d..daa3f551a63 100644 --- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentServiceImpl.java +++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentServiceImpl.java @@ -18,7 +18,6 @@ package org.apache.inlong.manager.service.core.impl; import org.apache.inlong.common.constant.Constants; -import org.apache.inlong.common.constant.MQType; import org.apache.inlong.common.db.CommandEntity; import org.apache.inlong.common.enums.PullJobTypeEnum; import org.apache.inlong.common.enums.TaskStateEnum; @@ -711,7 +710,7 @@ private DataConfig getDataConfig(StreamSourceEntity entity, int op) { // add topic setting String mqResource = groupEntity.getMqResource(); String mqType = groupEntity.getMqType(); - if (MQType.PULSAR.equals(mqType) || MQType.TDMQ_PULSAR.equals(mqType)) { + if (Constants.MQType.PULSAR.equals(mqType) || Constants.MQType.TDMQ_PULSAR.equals(mqType)) { // first get the tenant from the InlongGroup, and then get it from the PulsarCluster. InlongPulsarDTO pulsarDTO = InlongPulsarDTO.getFromJson(groupEntity.getExtParams()); String tenant = pulsarDTO.getPulsarTenant(); @@ -729,12 +728,12 @@ private DataConfig getDataConfig(StreamSourceEntity entity, int op) { topicConfig.setInlongGroupId(groupId + "/" + streamId); topicConfig.setTopic(topic); dataConfig.setTopicInfo(topicConfig); - } else if (MQType.TUBEMQ.equals(mqType)) { + } else if (Constants.MQType.TUBEMQ.equals(mqType)) { DataProxyTopicInfo topicConfig = new DataProxyTopicInfo(); topicConfig.setInlongGroupId(groupId); topicConfig.setTopic(mqResource); dataConfig.setTopicInfo(topicConfig); - } else if (MQType.KAFKA.equals(mqType)) { + } else if (Constants.MQType.KAFKA.equals(mqType)) { DataProxyTopicInfo topicConfig = new DataProxyTopicInfo(); topicConfig.setInlongGroupId(groupId); topicConfig.setTopic(groupEntity.getMqResource() + DOT + streamEntity.getMqResource()); diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/SortSourceServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/SortSourceServiceImpl.java index 247f2706857..a4f747c807b 100644 --- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/SortSourceServiceImpl.java +++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/SortSourceServiceImpl.java @@ -18,7 +18,7 @@ package org.apache.inlong.manager.service.core.impl; import org.apache.inlong.common.constant.ClusterSwitch; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.common.pojo.sdk.CacheZone; import org.apache.inlong.common.pojo.sdk.CacheZoneConfig; import org.apache.inlong.common.pojo.sdk.SortSourceConfigResponse; @@ -78,9 +78,9 @@ public class SortSourceServiceImpl implements SortSourceService { private static final Set SUPPORTED_MQ_TYPE = new HashSet() { { - add(MQType.KAFKA); - add(MQType.TUBEMQ); - add(MQType.PULSAR); + add(Constants.MQType.KAFKA); + add(Constants.MQType.TUBEMQ); + add(Constants.MQType.PULSAR); } }; private static final String KEY_AUTH = "authentication"; diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupOperator4Kafka.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupOperator4Kafka.java index c58b3f1cc1e..ba6a8dd25c2 100644 --- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupOperator4Kafka.java +++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupOperator4Kafka.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.service.group; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.enums.ErrorCodeEnum; import org.apache.inlong.manager.common.exceptions.BusinessException; import org.apache.inlong.manager.common.util.CommonBeanUtils; @@ -57,7 +57,7 @@ public Boolean accept(String mqType) { @Override public String getMQType() { - return MQType.KAFKA; + return Constants.MQType.KAFKA; } @Override diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupOperator4NoneMQ.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupOperator4NoneMQ.java index ff89b2cf505..3e884243ae3 100644 --- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupOperator4NoneMQ.java +++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupOperator4NoneMQ.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.service.group; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.enums.ErrorCodeEnum; import org.apache.inlong.manager.common.exceptions.BusinessException; import org.apache.inlong.manager.common.util.CommonBeanUtils; @@ -48,7 +48,7 @@ public Boolean accept(String mqType) { @Override public String getMQType() { - return MQType.NONE; + return Constants.MQType.NONE; } @Override diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupOperator4Pulsar.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupOperator4Pulsar.java index 29eb364e9f5..c4985e3d3f7 100644 --- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupOperator4Pulsar.java +++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupOperator4Pulsar.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.service.group; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.enums.ClusterType; import org.apache.inlong.manager.common.enums.ErrorCodeEnum; import org.apache.inlong.manager.common.exceptions.BusinessException; @@ -55,12 +55,12 @@ public class InlongGroupOperator4Pulsar extends AbstractGroupOperator { @Override public Boolean accept(String mqType) { - return getMQType().equals(mqType) || MQType.TDMQ_PULSAR.equals(mqType); + return getMQType().equals(mqType) || Constants.MQType.TDMQ_PULSAR.equals(mqType); } @Override public String getMQType() { - return MQType.PULSAR; + return Constants.MQType.PULSAR; } @Override diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupOperator4TubeMQ.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupOperator4TubeMQ.java index 56f67042748..85c0e3139a0 100644 --- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupOperator4TubeMQ.java +++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupOperator4TubeMQ.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.service.group; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.enums.ErrorCodeEnum; import org.apache.inlong.manager.common.exceptions.BusinessException; import org.apache.inlong.manager.common.util.CommonBeanUtils; @@ -53,7 +53,7 @@ public Boolean accept(String mqType) { @Override public String getMQType() { - return MQType.TUBEMQ; + return Constants.MQType.TUBEMQ; } @Override diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/consume/apply/ApproveConsumeProcessListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/consume/apply/ApproveConsumeProcessListener.java index eb54f4ba230..0bc7e07ff38 100644 --- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/consume/apply/ApproveConsumeProcessListener.java +++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/consume/apply/ApproveConsumeProcessListener.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.service.listener.consume.apply; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.consts.InlongConstants; import org.apache.inlong.manager.common.enums.ClusterType; import org.apache.inlong.manager.common.enums.ConsumeStatus; @@ -85,11 +85,11 @@ public ListenerResult listen(WorkflowContext context) throws WorkflowListenerExc } String mqType = entity.getMqType(); - if (MQType.TUBEMQ.equals(mqType)) { + if (Constants.MQType.TUBEMQ.equals(mqType)) { this.createTubeConsumerGroup(entity, context.getOperator()); - } else if (MQType.PULSAR.equals(mqType) || MQType.TDMQ_PULSAR.equals(mqType)) { + } else if (Constants.MQType.PULSAR.equals(mqType) || Constants.MQType.TDMQ_PULSAR.equals(mqType)) { this.createPulsarSubscription(entity); - } else if (MQType.KAFKA.equals(mqType)) { + } else if (Constants.MQType.KAFKA.equals(mqType)) { // Kafka consumers do not need to register in advance } else { throw new WorkflowListenerException("Unsupported MQ type " + mqType); diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/queue/kafka/KafkaQueueResourceOperator.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/queue/kafka/KafkaQueueResourceOperator.java index cc0fa83dd29..43586308b73 100644 --- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/queue/kafka/KafkaQueueResourceOperator.java +++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/queue/kafka/KafkaQueueResourceOperator.java @@ -18,7 +18,6 @@ package org.apache.inlong.manager.service.resource.queue.kafka; import org.apache.inlong.common.constant.Constants; -import org.apache.inlong.common.constant.MQType; import org.apache.inlong.manager.common.enums.ClusterType; import org.apache.inlong.manager.common.enums.ErrorCodeEnum; import org.apache.inlong.manager.common.exceptions.WorkflowListenerException; @@ -72,7 +71,7 @@ public class KafkaQueueResourceOperator implements QueueResourceOperator { @Override public boolean accept(String mqType) { - return MQType.KAFKA.equals(mqType); + return Constants.MQType.KAFKA.equals(mqType); } @Override diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/queue/pulsar/PulsarQueueResourceOperator.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/queue/pulsar/PulsarQueueResourceOperator.java index b1ab068b12d..8b6286f9089 100644 --- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/queue/pulsar/PulsarQueueResourceOperator.java +++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/queue/pulsar/PulsarQueueResourceOperator.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.service.resource.queue.pulsar; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.consts.InlongConstants; import org.apache.inlong.manager.common.enums.ClusterType; import org.apache.inlong.manager.common.enums.ErrorCodeEnum; @@ -85,7 +85,7 @@ public class PulsarQueueResourceOperator implements QueueResourceOperator { @Override public boolean accept(String mqType) { - return MQType.PULSAR.equals(mqType) || MQType.TDMQ_PULSAR.equals(mqType); + return Constants.MQType.PULSAR.equals(mqType) || Constants.MQType.TDMQ_PULSAR.equals(mqType); } @Override diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/queue/tubemq/TubeMQQueueResourceOperator.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/queue/tubemq/TubeMQQueueResourceOperator.java index f6cf034e679..3bc4a177f88 100644 --- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/queue/tubemq/TubeMQQueueResourceOperator.java +++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/queue/tubemq/TubeMQQueueResourceOperator.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.service.resource.queue.tubemq; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.enums.ClusterType; import org.apache.inlong.manager.common.enums.ErrorCodeEnum; import org.apache.inlong.manager.common.enums.GroupStatus; @@ -66,7 +66,7 @@ public class TubeMQQueueResourceOperator implements QueueResourceOperator { @Override public boolean accept(String mqType) { - return MQType.TUBEMQ.equals(mqType); + return Constants.MQType.TUBEMQ.equals(mqType); } @Override diff --git a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/RestTemplateConfig.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/RestTemplateConfig.java index 5cfbe224e45..7535e62cebe 100644 --- a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/RestTemplateConfig.java +++ b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/RestTemplateConfig.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.service; -import org.apache.inlong.common.constant.ProtocolType; +import org.apache.inlong.common.constant.Constants; import lombok.Data; import org.apache.http.HttpResponse; @@ -81,8 +81,8 @@ public class RestTemplateConfig { public PoolingHttpClientConnectionManager httpClientConnectionManager() { // Support HTTP, HTTPS Registry registry = RegistryBuilder.create() - .register(ProtocolType.HTTP, PlainConnectionSocketFactory.getSocketFactory()) - .register(ProtocolType.HTTPS, SSLConnectionSocketFactory.getSocketFactory()) + .register(Constants.ProtocolType.HTTP, PlainConnectionSocketFactory.getSocketFactory()) + .register(Constants.ProtocolType.HTTPS, SSLConnectionSocketFactory.getSocketFactory()) .build(); PoolingHttpClientConnectionManager httpClientConnectionManager = new PoolingHttpClientConnectionManager( registry); diff --git a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/ServiceBaseTest.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/ServiceBaseTest.java index 27bed28ac8c..d4df73d9f42 100644 --- a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/ServiceBaseTest.java +++ b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/ServiceBaseTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.service; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.enums.FieldType; import org.apache.inlong.manager.common.enums.GroupStatus; import org.apache.inlong.manager.pojo.group.InlongGroupInfo; @@ -95,9 +95,9 @@ public InlongGroupInfo createInlongGroup(String inlongGroupId, String mqType) { } InlongGroupInfo groupInfo; - if (MQType.PULSAR.equals(mqType) || MQType.TDMQ_PULSAR.equals(mqType)) { + if (Constants.MQType.PULSAR.equals(mqType) || Constants.MQType.TDMQ_PULSAR.equals(mqType)) { groupInfo = new InlongPulsarInfo(); - } else if (MQType.TUBEMQ.equals(mqType)) { + } else if (Constants.MQType.TUBEMQ.equals(mqType)) { groupInfo = new InlongPulsarInfo(); } else { groupInfo = new InlongNoneMqInfo(); diff --git a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceTest.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceTest.java index d8c0224f36d..f54e15459bc 100644 --- a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceTest.java +++ b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceTest.java @@ -17,8 +17,7 @@ package org.apache.inlong.manager.service.cluster; -import org.apache.inlong.common.constant.MQType; -import org.apache.inlong.common.constant.ProtocolType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.common.enums.ComponentTypeEnum; import org.apache.inlong.common.heartbeat.HeartbeatMsg; import org.apache.inlong.common.pojo.dataproxy.DataProxyNodeInfo; @@ -250,7 +249,7 @@ public void testPulsarCluster() { Integer parentId = id; String ip = "127.0.0.1"; Integer port = 8080; - Integer nodeId = this.saveClusterNode(parentId, ClusterType.PULSAR, ip, port, ProtocolType.HTTP); + Integer nodeId = this.saveClusterNode(parentId, ClusterType.PULSAR, ip, port, Constants.ProtocolType.HTTP); Assertions.assertNotNull(nodeId); // list cluster node @@ -307,7 +306,7 @@ public void testPulsarClusterByKey() { Integer parentId = id; String ip = "127.0.0.1"; Integer port = 8080; - Integer nodeId = this.saveClusterNode(parentId, ClusterType.PULSAR, ip, port, ProtocolType.HTTP); + Integer nodeId = this.saveClusterNode(parentId, ClusterType.PULSAR, ip, port, Constants.ProtocolType.HTTP); Assertions.assertNotNull(nodeId); // list cluster node @@ -360,29 +359,32 @@ public void testDataProxyCluster() { // save cluster node String ip = "127.0.0.1"; Integer port1 = 46800; - Integer nodeId1 = this.saveDataProxyClusterNode(id, ClusterType.DATAPROXY, ip, port1, ProtocolType.TCP); + Integer nodeId1 = + this.saveDataProxyClusterNode(id, ClusterType.DATAPROXY, ip, port1, Constants.ProtocolType.TCP); Assertions.assertNotNull(nodeId1); Integer port2 = 46801; - Integer nodeId2 = this.saveDataProxyClusterNode(id, ClusterType.DATAPROXY, ip, port2, ProtocolType.TCP); + Integer nodeId2 = + this.saveDataProxyClusterNode(id, ClusterType.DATAPROXY, ip, port2, Constants.ProtocolType.TCP); Assertions.assertNotNull(nodeId2); // create an inlong group which use the clusterTag String inlongGroupId = "test_cluster_tag_group"; - InlongGroupInfo inlongGroup = super.createInlongGroup(inlongGroupId, MQType.PULSAR); + InlongGroupInfo inlongGroup = super.createInlongGroup(inlongGroupId, Constants.MQType.PULSAR); InlongGroupInfo updateGroupInfo = groupService.get(inlongGroupId); updateGroupInfo.setInlongClusterTag(clusterTag); groupService.update(updateGroupInfo.genRequest(), GLOBAL_OPERATOR); // report heartbeat HeartbeatMsg msg1 = createHeartbeatMsg(clusterName, ip, String.valueOf(port1), - ComponentTypeEnum.DataProxy.getType(), ProtocolType.TCP); + ComponentTypeEnum.DataProxy.getType(), Constants.ProtocolType.TCP); heartbeatManager.reportHeartbeat(msg1); HeartbeatMsg msg2 = createHeartbeatMsg(clusterName, ip, String.valueOf(port2), - ComponentTypeEnum.DataProxy.getType(), ProtocolType.TCP); + ComponentTypeEnum.DataProxy.getType(), Constants.ProtocolType.TCP); heartbeatManager.reportHeartbeat(msg2); // get the data proxy nodes, the first port should is p1, second port is p2 - DataProxyNodeResponse nodeResponse = clusterService.getDataProxyNodes(inlongGroupId, ProtocolType.TCP); + DataProxyNodeResponse nodeResponse = + clusterService.getDataProxyNodes(inlongGroupId, Constants.ProtocolType.TCP); List nodeInfoList = nodeResponse.getNodeList(); nodeInfoList.sort(Comparator.comparingInt(DataProxyNodeInfo::getId)); Assertions.assertEquals(nodeInfoList.size(), 2); @@ -391,12 +393,12 @@ public void testDataProxyCluster() { // report heartbeat HeartbeatMsg msg3 = createHeartbeatMsg(clusterName, ip, String.valueOf(port1), - ComponentTypeEnum.DataProxy.getType(), ProtocolType.HTTP); + ComponentTypeEnum.DataProxy.getType(), Constants.ProtocolType.HTTP); heartbeatManager.reportHeartbeat(msg3); HeartbeatMsg msg4 = createHeartbeatMsg(clusterName, ip, String.valueOf(port2), - ComponentTypeEnum.DataProxy.getType(), ProtocolType.HTTP); + ComponentTypeEnum.DataProxy.getType(), Constants.ProtocolType.HTTP); heartbeatManager.reportHeartbeat(msg4); - nodeResponse = clusterService.getDataProxyNodes(inlongGroupId, ProtocolType.HTTP); + nodeResponse = clusterService.getDataProxyNodes(inlongGroupId, Constants.ProtocolType.HTTP); nodeInfoList = nodeResponse.getNodeList(); nodeInfoList.sort(Comparator.comparingInt(DataProxyNodeInfo::getId)); Assertions.assertEquals(nodeInfoList.size(), 2); diff --git a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/consume/InlongConsumeServiceTest.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/consume/InlongConsumeServiceTest.java index 30bca683156..8a9db13a68b 100644 --- a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/consume/InlongConsumeServiceTest.java +++ b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/consume/InlongConsumeServiceTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.service.consume; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.enums.ClusterType; import org.apache.inlong.manager.pojo.cluster.pulsar.PulsarClusterRequest; import org.apache.inlong.manager.pojo.common.OrderFieldEnum; @@ -104,7 +104,7 @@ private Integer testSave() { ConsumePulsarRequest request = new ConsumePulsarRequest(); request.setInlongGroupId(groupId); request.setInlongStreamId(streamId); - request.setMqType(MQType.PULSAR); + request.setMqType(Constants.MQType.PULSAR); request.setTopic(streamId); request.setConsumerGroup(consumerGroup); request.setInCharges(GLOBAL_OPERATOR); @@ -131,7 +131,7 @@ private PageResult testList() { private Integer testUpdate(InlongConsumeInfo consumeInfo) { ConsumePulsarRequest request = new ConsumePulsarRequest(); request.setId(consumeInfo.getId()); - request.setMqType(MQType.PULSAR); + request.setMqType(Constants.MQType.PULSAR); request.setInlongGroupId(groupId); request.setIsDlq(1); request.setDeadLetterTopic(deadLetterTopic); diff --git a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/heartbeat/HeartbeatManagerTest.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/heartbeat/HeartbeatManagerTest.java index b4d0535763b..2cb65487248 100644 --- a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/heartbeat/HeartbeatManagerTest.java +++ b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/heartbeat/HeartbeatManagerTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.service.core.heartbeat; -import org.apache.inlong.common.constant.ProtocolType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.common.enums.ComponentTypeEnum; import org.apache.inlong.common.heartbeat.HeartbeatMsg; import org.apache.inlong.manager.common.enums.NodeStatus; @@ -66,7 +66,7 @@ void testReportHeartbeat() throws InterruptedException { nodeRequest.setType(msg.getComponentType()); nodeRequest.setIp(msg.getIp()); nodeRequest.setPort(Integer.valueOf(msg.getPort())); - nodeRequest.setProtocolType(ProtocolType.HTTP); + nodeRequest.setProtocolType(Constants.ProtocolType.HTTP); nodeRequest.setNodeLoad(0xFFFF); InlongClusterNodeEntity clusterNode = clusterNodeMapper.selectByUniqueKey(nodeRequest); Assertions.assertNotNull(clusterNode); @@ -78,7 +78,7 @@ private HeartbeatMsg createHeartbeatMsg() { heartbeatMsg.setIp("127.0.0.1"); heartbeatMsg.setPort("46802"); heartbeatMsg.setClusterTag("default_cluster"); - heartbeatMsg.setProtocolType(ProtocolType.HTTP); + heartbeatMsg.setProtocolType(Constants.ProtocolType.HTTP); heartbeatMsg.setComponentType(ComponentTypeEnum.DataProxy.getType()); heartbeatMsg.setReportTime(System.currentTimeMillis()); return heartbeatMsg; diff --git a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/impl/HeartbeatServiceTest.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/impl/HeartbeatServiceTest.java index fa80256661e..d046cf85b79 100644 --- a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/impl/HeartbeatServiceTest.java +++ b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/impl/HeartbeatServiceTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.service.core.impl; -import org.apache.inlong.common.constant.ProtocolType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.common.enums.ComponentTypeEnum; import org.apache.inlong.common.heartbeat.GroupHeartbeat; import org.apache.inlong.common.heartbeat.StreamHeartbeat; @@ -57,7 +57,7 @@ public void testReportHeartbeat() { request.setPort("56802"); request.setClusterTag("default_cluster"); request.setReportTime(Instant.now().toEpochMilli()); - request.setProtocolType(ProtocolType.HTTP); + request.setProtocolType(Constants.ProtocolType.HTTP); List groupHeartbeats = new ArrayList<>(); GroupHeartbeat groupHeartbeat = new GroupHeartbeat(); diff --git a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/group/InlongGroupProcessServiceTest.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/group/InlongGroupProcessServiceTest.java index 5087849289b..066a63cbaac 100644 --- a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/group/InlongGroupProcessServiceTest.java +++ b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/group/InlongGroupProcessServiceTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.service.group; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.enums.GroupStatus; import org.apache.inlong.manager.common.enums.ProcessStatus; import org.apache.inlong.manager.pojo.group.InlongGroupInfo; @@ -71,7 +71,7 @@ private void before() { InlongPulsarRequest groupInfo = new InlongPulsarRequest(); groupInfo.setInlongGroupId(GROUP_ID); groupInfo.setInCharges(OPERATOR); - groupInfo.setMqType(MQType.PULSAR); + groupInfo.setMqType(Constants.MQType.PULSAR); groupService.save(groupInfo, OPERATOR); } diff --git a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/group/InlongGroupServiceTest.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/group/InlongGroupServiceTest.java index 4b440d76431..695ea8ab3e2 100644 --- a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/group/InlongGroupServiceTest.java +++ b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/group/InlongGroupServiceTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.service.group; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.enums.GroupStatus; import org.apache.inlong.manager.dao.entity.InlongGroupExtEntity; import org.apache.inlong.manager.dao.mapper.InlongGroupExtEntityMapper; @@ -66,7 +66,7 @@ public String saveGroup(String inlongGroupId, String operator) { InlongPulsarInfo pulsarInfo = new InlongPulsarInfo(); pulsarInfo.setInlongGroupId(inlongGroupId); - pulsarInfo.setMqType(MQType.PULSAR); + pulsarInfo.setMqType(Constants.MQType.PULSAR); pulsarInfo.setCreator(operator); pulsarInfo.setInCharges(operator); pulsarInfo.setStatus(GroupStatus.CONFIG_SUCCESSFUL.getCode()); diff --git a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/resource/sink/StandaloneAutoAssignTest.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/resource/sink/StandaloneAutoAssignTest.java index ea9a0683146..9e289f4c24c 100644 --- a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/resource/sink/StandaloneAutoAssignTest.java +++ b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/resource/sink/StandaloneAutoAssignTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.service.resource.sink; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.consts.SinkType; import org.apache.inlong.manager.dao.entity.StreamSinkEntity; import org.apache.inlong.manager.dao.mapper.StreamSinkEntityMapper; @@ -48,7 +48,7 @@ public void testAutoAssign() { String group = "autoGroup"; String stream = "autoStream"; - InlongGroupInfo groupInfo = this.createInlongGroup(group, MQType.PULSAR); + InlongGroupInfo groupInfo = this.createInlongGroup(group, Constants.MQType.PULSAR); InlongStreamInfo streamInfo = this.createStreamInfo(groupInfo, stream); Integer id = saveClsSink(groupInfo.getInlongGroupId(), streamInfo.getInlongStreamId()); diff --git a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/sort/DisableZkForSortTest.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/sort/DisableZkForSortTest.java index 821c6d49ecf..8cfbfe829ab 100644 --- a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/sort/DisableZkForSortTest.java +++ b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/sort/DisableZkForSortTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.service.sort; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.consts.InlongConstants; import org.apache.inlong.manager.common.enums.GroupOperateType; import org.apache.inlong.manager.common.enums.GroupStatus; @@ -123,7 +123,7 @@ public KafkaSourceRequest createKafkaSource(InlongStreamInfo streamInfo) { // @Test public void testCreateSortConfigInUpdateWorkflow() { - InlongGroupInfo groupInfo = createInlongGroup("test20", MQType.PULSAR); + InlongGroupInfo groupInfo = createInlongGroup("test20", Constants.MQType.PULSAR); groupInfo.setEnableZookeeper(InlongConstants.ENABLE_ZK); groupInfo.setEnableCreateResource(InlongConstants.ENABLE_CREATE_RESOURCE); groupService.updateStatus(GROUP_ID, GroupStatus.CONFIG_SUCCESSFUL.getCode(), OPERATOR); diff --git a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/source/listener/StreamSourceListenerTest.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/source/listener/StreamSourceListenerTest.java index 99e14209151..328aa11a8e9 100644 --- a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/source/listener/StreamSourceListenerTest.java +++ b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/source/listener/StreamSourceListenerTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.service.source.listener; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.enums.GroupOperateType; import org.apache.inlong.manager.common.enums.GroupStatus; import org.apache.inlong.manager.common.enums.ProcessName; @@ -62,7 +62,7 @@ public class StreamSourceListenerTest extends ServiceBaseTest { */ // @Test public void testAllOperate() { - groupInfo = createInlongGroup(GROUP_ID, MQType.PULSAR); + groupInfo = createInlongGroup(GROUP_ID, Constants.MQType.PULSAR); groupService.updateStatus(GROUP_ID, GroupStatus.CONFIG_ING.getCode(), GLOBAL_OPERATOR); groupService.updateStatus(GROUP_ID, GroupStatus.CONFIG_SUCCESSFUL.getCode(), GLOBAL_OPERATOR); groupService.update(groupInfo.genRequest(), GLOBAL_OPERATOR); diff --git a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/workflow/WorkflowServiceImplTest.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/workflow/WorkflowServiceImplTest.java index 1d46283f0a9..e779b9c314f 100644 --- a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/workflow/WorkflowServiceImplTest.java +++ b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/workflow/WorkflowServiceImplTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.service.workflow; -import org.apache.inlong.common.constant.MQType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.manager.common.enums.ProcessName; import org.apache.inlong.manager.common.enums.ProcessStatus; import org.apache.inlong.manager.common.enums.TaskEvent; @@ -133,7 +133,7 @@ public ListenerResult listen(WorkflowContext context) { @Test public void testStartCreatePulsarWorkflow() { - createInlongGroup("test14" + subType, MQType.PULSAR); + createInlongGroup("test14" + subType, Constants.MQType.PULSAR); mockTaskListenerFactory(); WorkflowContext context = processService.start(processName.name(), applicant, form); diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/config/RestTemplateConfig.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/config/RestTemplateConfig.java index ddc20cdfc95..27fd782748e 100644 --- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/config/RestTemplateConfig.java +++ b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/config/RestTemplateConfig.java @@ -17,7 +17,7 @@ package org.apache.inlong.manager.web.config; -import org.apache.inlong.common.constant.ProtocolType; +import org.apache.inlong.common.constant.Constants; import lombok.Data; import org.apache.http.HttpResponse; @@ -87,8 +87,8 @@ public class RestTemplateConfig { public PoolingHttpClientConnectionManager httpClientConnectionManager() { // Support HTTP, HTTPS Registry registry = RegistryBuilder.create() - .register(ProtocolType.HTTP, PlainConnectionSocketFactory.getSocketFactory()) - .register(ProtocolType.HTTPS, SSLConnectionSocketFactory.getSocketFactory()) + .register(Constants.ProtocolType.HTTP, PlainConnectionSocketFactory.getSocketFactory()) + .register(Constants.ProtocolType.HTTPS, SSLConnectionSocketFactory.getSocketFactory()) .build(); PoolingHttpClientConnectionManager httpClientConnectionManager = new PoolingHttpClientConnectionManager( registry); diff --git a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/DefaultMessageSender.java b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/DefaultMessageSender.java index 7b655b29fa6..adb4011350e 100644 --- a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/DefaultMessageSender.java +++ b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/DefaultMessageSender.java @@ -17,7 +17,7 @@ package org.apache.inlong.sdk.dataproxy; -import org.apache.inlong.common.constant.ProtocolType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.common.msg.AttributeConstants; import org.apache.inlong.common.util.MessageUtils; import org.apache.inlong.sdk.dataproxy.codec.EncodeObject; @@ -101,8 +101,8 @@ public static DefaultMessageSender generateSenderByClusterId( public static DefaultMessageSender generateSenderByClusterId(ProxyClientConfig configure, ThreadFactory selfDefineFactory) throws Exception { // correct ProtocolType settings - if (!ProtocolType.TCP.equals(configure.getProtocolType())) { - configure.setProtocolType(ProtocolType.TCP); + if (!Constants.ProtocolType.TCP.equals(configure.getProtocolType())) { + configure.setProtocolType(Constants.ProtocolType.TCP); } LOGGER.info("Initial tcp sender, configure is {}", configure); // initial sender object diff --git a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/example/HttpClientExample.java b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/example/HttpClientExample.java index 22274fcf7c5..fe15df44db6 100644 --- a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/example/HttpClientExample.java +++ b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/example/HttpClientExample.java @@ -17,7 +17,7 @@ package org.apache.inlong.sdk.dataproxy.example; -import org.apache.inlong.common.constant.ProtocolType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.sdk.dataproxy.ProxyClientConfig; import org.apache.inlong.sdk.dataproxy.network.HttpProxySender; import org.apache.inlong.sdk.dataproxy.network.ProxysdkException; @@ -67,7 +67,7 @@ public static HttpProxySender getMessageSender(String localIP, String inLongMana proxyConfig.setConfStoreBasePath(configBasePath); proxyConfig.setReadProxyIPFromLocal(isReadProxyIPFromLocal); proxyConfig.setDiscardOldMessage(true); - proxyConfig.setProtocolType(ProtocolType.HTTP); + proxyConfig.setProtocolType(Constants.ProtocolType.HTTP); sender = new HttpProxySender(proxyConfig); } catch (ProxysdkException e) { e.printStackTrace(); diff --git a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/example/TcpClientExample.java b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/example/TcpClientExample.java index 993b7750f77..0951dc90f17 100644 --- a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/example/TcpClientExample.java +++ b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/example/TcpClientExample.java @@ -17,7 +17,7 @@ package org.apache.inlong.sdk.dataproxy.example; -import org.apache.inlong.common.constant.ProtocolType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.sdk.dataproxy.DefaultMessageSender; import org.apache.inlong.sdk.dataproxy.ProxyClientConfig; import org.apache.inlong.sdk.dataproxy.common.SendResult; @@ -83,7 +83,7 @@ public DefaultMessageSender getMessageSender(String localIP, String inLongManage dataProxyConfig.setConfStoreBasePath(configBasePath); } dataProxyConfig.setReadProxyIPFromLocal(isReadProxyIPFromLocal); - dataProxyConfig.setProtocolType(ProtocolType.TCP); + dataProxyConfig.setProtocolType(Constants.ProtocolType.TCP); messageSender = DefaultMessageSender.generateSenderByClusterId(dataProxyConfig); messageSender.setMsgtype(msgType); } catch (Exception e) { diff --git a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/network/HttpProxySender.java b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/network/HttpProxySender.java index 4ef884ae8fa..007aa667d22 100644 --- a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/network/HttpProxySender.java +++ b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/network/HttpProxySender.java @@ -17,7 +17,7 @@ package org.apache.inlong.sdk.dataproxy.network; -import org.apache.inlong.common.constant.ProtocolType; +import org.apache.inlong.common.constant.Constants; import org.apache.inlong.sdk.dataproxy.ProxyClientConfig; import org.apache.inlong.sdk.dataproxy.common.SendMessageCallback; import org.apache.inlong.sdk.dataproxy.common.SendResult; @@ -56,8 +56,8 @@ public class HttpProxySender extends Thread { public HttpProxySender(ProxyClientConfig configure) throws Exception { // correct ProtocolType settings - if (!ProtocolType.HTTP.equals(configure.getProtocolType())) { - configure.setProtocolType(ProtocolType.HTTP); + if (!Constants.ProtocolType.HTTP.equals(configure.getProtocolType())) { + configure.setProtocolType(Constants.ProtocolType.HTTP); } logger.info("Initial http sender, configure is {}", configure); this.proxyClientConfig = configure; diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/FieldInfo.java b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/FieldInfo.java index 86a48985581..92366a42cf3 100644 --- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/FieldInfo.java +++ b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/FieldInfo.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol; -import org.apache.inlong.sort.formats.common.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; import org.apache.inlong.sort.protocol.transformation.FunctionParam; import com.google.common.base.Preconditions; diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/node/extract/MongoExtractNode.java b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/node/extract/MongoExtractNode.java index ad39b337726..7fb56241658 100644 --- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/node/extract/MongoExtractNode.java +++ b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/node/extract/MongoExtractNode.java @@ -18,7 +18,7 @@ package org.apache.inlong.sort.protocol.node.extract; import org.apache.inlong.common.enums.MetaField; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.InlongMetric; import org.apache.inlong.sort.protocol.Metadata; diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/node/load/HiveLoadNode.java b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/node/load/HiveLoadNode.java index a9d4f081f06..d9020292eab 100644 --- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/node/load/HiveLoadNode.java +++ b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/node/load/HiveLoadNode.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.node.load; -import org.apache.inlong.sort.formats.common.LocalZonedTimestampFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LocalZonedTimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.InlongMetric; import org.apache.inlong.sort.protocol.enums.FilterStrategy; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/FieldInfoTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/FieldInfoTest.java index 8a51a09dcd7..29dafc2d47d 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/FieldInfoTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/FieldInfoTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/GroupInfoTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/GroupInfoTest.java index 1100a71bdf7..b65e4639b0b 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/GroupInfoTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/GroupInfoTest.java @@ -17,12 +17,12 @@ package org.apache.inlong.sort.protocol; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; import org.apache.inlong.sort.protocol.node.Node; import org.apache.inlong.sort.protocol.node.extract.MySqlExtractNode; import org.apache.inlong.sort.protocol.node.format.JsonFormat; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/StreamInfoTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/StreamInfoTest.java index 93fad505763..f1b59918bb7 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/StreamInfoTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/StreamInfoTest.java @@ -17,12 +17,12 @@ package org.apache.inlong.sort.protocol; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; import org.apache.inlong.sort.protocol.node.Node; import org.apache.inlong.sort.protocol.node.extract.MySqlExtractNode; import org.apache.inlong.sort.protocol.node.format.JsonFormat; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/DorisExtractNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/DorisExtractNodeTest.java index e9a465cdf01..9bc2bf9b12c 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/DorisExtractNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/DorisExtractNodeTest.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.protocol.node.extract; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import java.util.Arrays; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/HudiExtractNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/HudiExtractNodeTest.java index 245787e478b..e71f8f701fb 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/HudiExtractNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/HudiExtractNodeTest.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.protocol.node.extract; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.constant.HudiConstant.CatalogType; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/KafkaExtractNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/KafkaExtractNodeTest.java index 9b556285fc9..b7b8e327aa4 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/KafkaExtractNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/KafkaExtractNodeTest.java @@ -18,9 +18,9 @@ package org.apache.inlong.sort.protocol.node.extract; import org.apache.inlong.common.enums.MetaField; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.enums.KafkaScanStartupMode; import org.apache.inlong.sort.protocol.node.format.CsvFormat; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/MongoExtractNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/MongoExtractNodeTest.java index b8d5f603db3..f74098f2bfc 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/MongoExtractNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/MongoExtractNodeTest.java @@ -18,9 +18,9 @@ package org.apache.inlong.sort.protocol.node.extract; import org.apache.inlong.common.enums.MetaField; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.junit.Assert; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/MySqlExtractNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/MySqlExtractNodeTest.java index 1dcd7d2c596..8f70b1223b7 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/MySqlExtractNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/MySqlExtractNodeTest.java @@ -18,8 +18,8 @@ package org.apache.inlong.sort.protocol.node.extract; import org.apache.inlong.common.enums.MetaField; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.junit.Assert; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/OracleExtractNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/OracleExtractNodeTest.java index fe9639b6ead..30470620f87 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/OracleExtractNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/OracleExtractNodeTest.java @@ -18,9 +18,9 @@ package org.apache.inlong.sort.protocol.node.extract; import org.apache.inlong.common.enums.MetaField; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.junit.Assert; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/PostgresExtractNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/PostgresExtractNodeTest.java index d06dbc26b1a..c6083659f55 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/PostgresExtractNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/PostgresExtractNodeTest.java @@ -18,9 +18,9 @@ package org.apache.inlong.sort.protocol.node.extract; import org.apache.inlong.common.enums.MetaField; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.junit.Assert; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/PulsarExtractNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/PulsarExtractNodeTest.java index 5c84a4e0e77..8134146bc63 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/PulsarExtractNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/PulsarExtractNodeTest.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.protocol.node.extract; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.node.Node; import org.apache.inlong.sort.protocol.node.format.CsvFormat; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/RedisExtractNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/RedisExtractNodeTest.java index 01087077bda..20e67f802d4 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/RedisExtractNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/RedisExtractNodeTest.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.protocol.node.extract; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.LookupOptions; import org.apache.inlong.sort.protocol.enums.RedisCommand; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/SqlServerExtractNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/SqlServerExtractNodeTest.java index b618be0c1ba..616c10432b8 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/SqlServerExtractNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/SqlServerExtractNodeTest.java @@ -18,9 +18,9 @@ package org.apache.inlong.sort.protocol.node.extract; import org.apache.inlong.common.enums.MetaField; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.junit.Assert; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/TubeMQExtractNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/TubeMQExtractNodeTest.java index e7849fc24ed..951dcae7ba5 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/TubeMQExtractNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/extract/TubeMQExtractNodeTest.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.protocol.node.extract; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.node.format.CsvFormat; import org.apache.inlong.sort.protocol.node.format.Format; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/ClickHouseLoadNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/ClickHouseLoadNodeTest.java index eeeae2a57f7..d034dfbfec4 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/ClickHouseLoadNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/ClickHouseLoadNodeTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.node.load; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.node.Node; import org.apache.inlong.sort.protocol.transformation.FieldRelation; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/DorisLoadNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/DorisLoadNodeTest.java index 7a24071cfd8..11d72304ca6 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/DorisLoadNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/DorisLoadNodeTest.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.protocol.node.load; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.FieldRelation; import org.apache.inlong.sort.protocol.transformation.FilterFunction; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/ElasticSearchNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/ElasticSearchNodeTest.java index cd52b9e56c1..eb43d16b596 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/ElasticSearchNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/ElasticSearchNodeTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.node.load; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.node.Node; import org.apache.inlong.sort.protocol.transformation.FieldRelation; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/GreenplumLoadNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/GreenplumLoadNodeTest.java index 79a13b775e6..22a6da352ca 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/GreenplumLoadNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/GreenplumLoadNodeTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.node.load; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.FieldRelation; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/HbaseLoadNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/HbaseLoadNodeTest.java index 5b5522e24c6..56d8fd80131 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/HbaseLoadNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/HbaseLoadNodeTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.node.load; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.FieldRelation; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/HiveLoadNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/HiveLoadNodeTest.java index e761351fef1..297bc11df0f 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/HiveLoadNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/HiveLoadNodeTest.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.protocol.node.load; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.FieldRelation; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/HudiLoadNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/HudiLoadNodeTest.java index 8c69e854961..346c72ebb16 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/HudiLoadNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/HudiLoadNodeTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.node.load; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.constant.HudiConstant.CatalogType; import org.apache.inlong.sort.protocol.transformation.FieldRelation; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/IcebergLoadNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/IcebergLoadNodeTest.java index 24d5b39730a..c38f90779d3 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/IcebergLoadNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/IcebergLoadNodeTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.node.load; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.constant.IcebergConstant.CatalogType; import org.apache.inlong.sort.protocol.transformation.FieldRelation; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/KafkaLoadNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/KafkaLoadNodeTest.java index 1c45279a158..90947665b47 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/KafkaLoadNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/KafkaLoadNodeTest.java @@ -18,8 +18,8 @@ package org.apache.inlong.sort.protocol.node.load; import org.apache.inlong.common.enums.MetaField; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.node.format.CanalJsonFormat; import org.apache.inlong.sort.protocol.transformation.FieldRelation; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/MySqlLoadNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/MySqlLoadNodeTest.java index ec79abe8bbf..1c4a5f7041e 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/MySqlLoadNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/MySqlLoadNodeTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.node.load; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.FieldRelation; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/OracleLoadNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/OracleLoadNodeTest.java index 474f666aa99..2af0fd1f989 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/OracleLoadNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/OracleLoadNodeTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.node.load; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.FieldRelation; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/PostgresLoadNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/PostgresLoadNodeTest.java index 4e6b555beab..d38dfe79386 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/PostgresLoadNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/PostgresLoadNodeTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.node.load; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.FieldRelation; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/SqlServerLoadNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/SqlServerLoadNodeTest.java index 40428c22ca8..6f44c1dbb28 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/SqlServerLoadNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/SqlServerLoadNodeTest.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.protocol.node.load; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.FieldRelation; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/TDSQLPostgresLoadNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/TDSQLPostgresLoadNodeTest.java index 2f954ce522f..6cf57bb42fa 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/TDSQLPostgresLoadNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/load/TDSQLPostgresLoadNodeTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.node.load; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.FieldRelation; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/transform/DistinctNodeTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/transform/DistinctNodeTest.java index d7ad63af9ca..c4b79e1d34a 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/transform/DistinctNodeTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/node/transform/DistinctNodeTest.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.protocol.node.transform; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.FieldRelation; import org.apache.inlong.sort.protocol.transformation.OrderDirection; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/FieldRelationTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/FieldRelationTest.java index fb4db7fca58..c4e3751db7e 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/FieldRelationTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/FieldRelationTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.transformation; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; /** diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/WatermarkFieldTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/WatermarkFieldTest.java index 10aeba5271b..1ba9abb7e58 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/WatermarkFieldTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/WatermarkFieldTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.TimeUnitConstantParam.TimeUnit; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/AddFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/AddFunctionTest.java index 344c2e8ac64..58880f39ccc 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/AddFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/AddFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/BetweenFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/BetweenFunctionTest.java index 89518c7e8b9..627c5ca71c5 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/BetweenFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/BetweenFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/CascadeFunctionWrapperTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/CascadeFunctionWrapperTest.java index 438539cce90..a77cd03b00c 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/CascadeFunctionWrapperTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/CascadeFunctionWrapperTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/HopEndFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/HopEndFunctionTest.java index 6eb079d282c..52114cffda6 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/HopEndFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/HopEndFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/HopFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/HopFunctionTest.java index 1a2dc61a61a..482e81ee25e 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/HopFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/HopFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/HopStartFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/HopStartFunctionTest.java index 6b766e5957b..fa2f3de1df4 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/HopStartFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/HopStartFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/MultiValueFilterFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/MultiValueFilterFunctionTest.java index fa7d2d06191..0203c5a02e9 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/MultiValueFilterFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/MultiValueFilterFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/RegexpReplaceFirstFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/RegexpReplaceFirstFunctionTest.java index a32aa0a8ed5..2ba423d68b1 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/RegexpReplaceFirstFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/RegexpReplaceFirstFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/RegexpReplaceFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/RegexpReplaceFunctionTest.java index 5a07dd07c93..af76863a72c 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/RegexpReplaceFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/RegexpReplaceFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SessionEndFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SessionEndFunctionTest.java index 6804674bc78..0135b8b8ac1 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SessionEndFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SessionEndFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SessionFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SessionFunctionTest.java index e60cfd07345..56b70276bda 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SessionFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SessionFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SessionStartFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SessionStartFunctionTest.java index 388863f397c..2d4a0acd517 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SessionStartFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SessionStartFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SingleValueFilterFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SingleValueFilterFunctionTest.java index 1ea74dc36fd..3ce0bad5185 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SingleValueFilterFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SingleValueFilterFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SplitIndexFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SplitIndexFunctionTest.java index 2a66b9859a4..f7c890676c8 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SplitIndexFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SplitIndexFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.ConstantParam; import org.apache.inlong.sort.protocol.transformation.Function; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SubtractFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SubtractFunctionTest.java index 57a3eef164c..0433bbc3247 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SubtractFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/SubtractFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/TumbleEndFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/TumbleEndFunctionTest.java index 966a3fb4673..0215b49136d 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/TumbleEndFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/TumbleEndFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/TumbleFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/TumbleFunctionTest.java index 8d3a313aafa..46c7558febf 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/TumbleFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/TumbleFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/TumbleStartFunctionTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/TumbleStartFunctionTest.java index 758279820ef..e3e1b7062a1 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/TumbleStartFunctionTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/function/TumbleStartFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.protocol.transformation.function; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.Function; import org.apache.inlong.sort.protocol.transformation.FunctionBaseTest; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/FullOuterJoinNodeRelationTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/FullOuterJoinNodeRelationTest.java index 6210c4c10ef..94f7de6808d 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/FullOuterJoinNodeRelationTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/FullOuterJoinNodeRelationTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.transformation.relation; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.ConstantParam; import org.apache.inlong.sort.protocol.transformation.FilterFunction; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/InnerJoinNodeRelationTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/InnerJoinNodeRelationTest.java index 9e62a74fce1..ed9bca210ca 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/InnerJoinNodeRelationTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/InnerJoinNodeRelationTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.transformation.relation; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.ConstantParam; import org.apache.inlong.sort.protocol.transformation.FilterFunction; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/InnerTemporalJoinRelationTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/InnerTemporalJoinRelationTest.java index 17549ba6d82..caa7c9be48c 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/InnerTemporalJoinRelationTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/InnerTemporalJoinRelationTest.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.protocol.transformation.relation; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.ConstantParam; import org.apache.inlong.sort.protocol.transformation.FilterFunction; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/IntervalJoinRelationTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/IntervalJoinRelationTest.java index ca50ac0ded1..71ca6fde44e 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/IntervalJoinRelationTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/IntervalJoinRelationTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.transformation.relation; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.ConstantParam; import org.apache.inlong.sort.protocol.transformation.FilterFunction; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/LeftOuterJoinNodeRelationTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/LeftOuterJoinNodeRelationTest.java index ce36f08b118..25212ee89fe 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/LeftOuterJoinNodeRelationTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/LeftOuterJoinNodeRelationTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.transformation.relation; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.ConstantParam; import org.apache.inlong.sort.protocol.transformation.FilterFunction; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/LeftTemporalJoinRelationTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/LeftTemporalJoinRelationTest.java index 67be5133411..07b55851be1 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/LeftTemporalJoinRelationTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/LeftTemporalJoinRelationTest.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.protocol.transformation.relation; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.ConstantParam; import org.apache.inlong.sort.protocol.transformation.FilterFunction; diff --git a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/RightOuterJoinNodeRelationTest.java b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/RightOuterJoinNodeRelationTest.java index 605481fd700..3b067036e53 100644 --- a/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/RightOuterJoinNodeRelationTest.java +++ b/inlong-sort/sort-common/src/test/java/org/apache/inlong/sort/protocol/transformation/relation/RightOuterJoinNodeRelationTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.protocol.transformation.relation; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.SerializeBaseTest; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.ConstantParam; import org.apache.inlong.sort.protocol.transformation.FilterFunction; diff --git a/inlong-sort/sort-core/src/main/java/org/apache/inlong/sort/parser/impl/FlinkSqlParser.java b/inlong-sort/sort-core/src/main/java/org/apache/inlong/sort/parser/impl/FlinkSqlParser.java index 61f497d6500..933a0af0f27 100644 --- a/inlong-sort/sort-core/src/main/java/org/apache/inlong/sort/parser/impl/FlinkSqlParser.java +++ b/inlong-sort/sort-core/src/main/java/org/apache/inlong/sort/parser/impl/FlinkSqlParser.java @@ -17,12 +17,12 @@ package org.apache.inlong.sort.parser.impl; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ArrayFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.MapFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.configuration.Constants; import org.apache.inlong.sort.formats.base.TableFormatUtils; -import org.apache.inlong.sort.formats.common.ArrayFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.MapFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.function.EmbeddingFunction; import org.apache.inlong.sort.function.EncryptFunction; import org.apache.inlong.sort.function.JsonGetterFunction; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/CascadeFunctionWrapperTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/CascadeFunctionWrapperTest.java index f8eef41c1fe..3afdc696cf4 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/CascadeFunctionWrapperTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/CascadeFunctionWrapperTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.function; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.CascadeFunction; import org.apache.inlong.sort.protocol.transformation.StringConstantParam; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/EncryptFunctionTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/EncryptFunctionTest.java index 98d686b4fba..b3f86e582b7 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/EncryptFunctionTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/EncryptFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.function; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.StringConstantParam; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/JsonGetterFunctionTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/JsonGetterFunctionTest.java index 5c602523d74..6b4771c710f 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/JsonGetterFunctionTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/JsonGetterFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.function; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.StringConstantParam; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/RegexpReplaceFirstFunctionTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/RegexpReplaceFirstFunctionTest.java index 4ebddc464bc..96de0cf0b5b 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/RegexpReplaceFirstFunctionTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/RegexpReplaceFirstFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.function; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.StringConstantParam; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/RegexpReplaceFunctionTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/RegexpReplaceFunctionTest.java index ea25034b53d..2d6d1d522ca 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/RegexpReplaceFunctionTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/RegexpReplaceFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.function; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.StringConstantParam; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/SplitIndexFunctionTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/SplitIndexFunctionTest.java index 13701f707b7..bc4972e78ca 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/SplitIndexFunctionTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/function/SplitIndexFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.function; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.transformation.ConstantParam; import org.apache.inlong.sort.protocol.transformation.StringConstantParam; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateMongoDBTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateMongoDBTest.java index fb3f8fd61f7..f52db7092e6 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateMongoDBTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateMongoDBTest.java @@ -18,7 +18,7 @@ package org.apache.inlong.sort.parser; import org.apache.inlong.common.enums.MetaField; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateOracleTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateOracleTest.java index c44e35f5613..afa358bb14a 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateOracleTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateOracleTest.java @@ -18,8 +18,8 @@ package org.apache.inlong.sort.parser; import org.apache.inlong.common.enums.MetaField; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.VarBinaryFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.VarBinaryFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigratePostgreSQLTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigratePostgreSQLTest.java index 87b507923be..7bbaaa22942 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigratePostgreSQLTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigratePostgreSQLTest.java @@ -18,7 +18,7 @@ package org.apache.inlong.sort.parser; import org.apache.inlong.common.enums.MetaField; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateTest.java index 1f75ca89d4f..7919bfbc72d 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateTest.java @@ -18,8 +18,8 @@ package org.apache.inlong.sort.parser; import org.apache.inlong.common.enums.MetaField; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.VarBinaryFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.VarBinaryFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateWithSpecifyingFieldTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateWithSpecifyingFieldTest.java index 1f5f1007d0e..c314cd5f002 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateWithSpecifyingFieldTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/AllMigrateWithSpecifyingFieldTest.java @@ -18,7 +18,7 @@ package org.apache.inlong.sort.parser; import org.apache.inlong.common.enums.MetaField; -import org.apache.inlong.sort.formats.common.VarBinaryFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.VarBinaryFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/ClickHouseSqlParserTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/ClickHouseSqlParserTest.java index fecd29e106c..a43772071b6 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/ClickHouseSqlParserTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/ClickHouseSqlParserTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/CustomFunctionSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/CustomFunctionSqlParseTest.java index d765117a075..808289e0509 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/CustomFunctionSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/CustomFunctionSqlParseTest.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DataTypeConvertSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DataTypeConvertSqlParseTest.java index e0e7558ee2b..bdf886a4f07 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DataTypeConvertSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DataTypeConvertSqlParseTest.java @@ -18,9 +18,9 @@ package org.apache.inlong.sort.parser; import org.apache.inlong.common.enums.MetaField; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DecimalFormatSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DecimalFormatSqlParseTest.java index 7a19568659c..d03ddba1e84 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DecimalFormatSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DecimalFormatSqlParseTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DistinctNodeSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DistinctNodeSqlParseTest.java index a1e7c65d546..13dfcc7981d 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DistinctNodeSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DistinctNodeSqlParseTest.java @@ -18,11 +18,11 @@ package org.apache.inlong.sort.parser; import org.apache.inlong.common.enums.MetaField; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DorisExtractNodeToDorisLoadNodeTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DorisExtractNodeToDorisLoadNodeTest.java index 2661ae5dbab..916978ae1d9 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DorisExtractNodeToDorisLoadNodeTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DorisExtractNodeToDorisLoadNodeTest.java @@ -17,10 +17,10 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DorisExtractNodeToMySqlLoadNodeTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DorisExtractNodeToMySqlLoadNodeTest.java index e07fd49d9df..c05d2f1b4c5 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DorisExtractNodeToMySqlLoadNodeTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DorisExtractNodeToMySqlLoadNodeTest.java @@ -17,10 +17,10 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DorisMultipleSinkTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DorisMultipleSinkTest.java index 54f20de477f..97fc015fb5d 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DorisMultipleSinkTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DorisMultipleSinkTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.VarBinaryFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.VarBinaryFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/ESMultipleSinkTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/ESMultipleSinkTest.java index 80186cee28e..fb5e0c56b79 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/ESMultipleSinkTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/ESMultipleSinkTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.VarBinaryFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.VarBinaryFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/ElasticsearchSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/ElasticsearchSqlParseTest.java index 29a3d1fd518..44c27b9c626 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/ElasticsearchSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/ElasticsearchSqlParseTest.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FilesystemSqlParserTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FilesystemSqlParserTest.java index 51478cf7043..a8ee9a16a9b 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FilesystemSqlParserTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FilesystemSqlParserTest.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FilterParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FilterParseTest.java index e76a829cb50..1b63e15c349 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FilterParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FilterParseTest.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FlinkSqlParserTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FlinkSqlParserTest.java index 6db698414d6..09bbfc62dbd 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FlinkSqlParserTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FlinkSqlParserTest.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FullOuterJoinSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FullOuterJoinSqlParseTest.java index cad150822b4..dd5e2fb98dd 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FullOuterJoinSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/FullOuterJoinSqlParseTest.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/GreenplumLoadSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/GreenplumLoadSqlParseTest.java index bdf72278af3..161abad8805 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/GreenplumLoadSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/GreenplumLoadSqlParseTest.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/HbaseLoadFlinkSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/HbaseLoadFlinkSqlParseTest.java index 291f89f22ec..74c08231c1d 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/HbaseLoadFlinkSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/HbaseLoadFlinkSqlParseTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/HudiNodeSqlParserTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/HudiNodeSqlParserTest.java index 0b7ff83296d..35a77d55a71 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/HudiNodeSqlParserTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/HudiNodeSqlParserTest.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.FlinkSqlParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/Iceberg2StarRocksSqlParserTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/Iceberg2StarRocksSqlParserTest.java index d9c7c26fc0f..4e9012d3707 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/Iceberg2StarRocksSqlParserTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/Iceberg2StarRocksSqlParserTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.FlinkSqlParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/IcebergNodeSqlParserTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/IcebergNodeSqlParserTest.java index fc0b889db0b..141bb4dba39 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/IcebergNodeSqlParserTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/IcebergNodeSqlParserTest.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.FlinkSqlParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/InnerJoinRelationSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/InnerJoinRelationSqlParseTest.java index bde57ec2cc8..ef284878905 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/InnerJoinRelationSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/InnerJoinRelationSqlParseTest.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/IntervalJoinRelationSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/IntervalJoinRelationSqlParseTest.java index 3e7c51ff533..f97cd4dbe69 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/IntervalJoinRelationSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/IntervalJoinRelationSqlParseTest.java @@ -18,10 +18,10 @@ package org.apache.inlong.sort.parser; import org.apache.inlong.common.enums.MetaField; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/KafkaLoadSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/KafkaLoadSqlParseTest.java index 957e890e68f..b3f055147a9 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/KafkaLoadSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/KafkaLoadSqlParseTest.java @@ -17,10 +17,10 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.VarBinaryFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.VarBinaryFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/KafkaSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/KafkaSqlParseTest.java index 6c91da6bba0..ab03d0aeab0 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/KafkaSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/KafkaSqlParseTest.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/LeftOuterJoinSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/LeftOuterJoinSqlParseTest.java index 547535a1364..d33899d3750 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/LeftOuterJoinSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/LeftOuterJoinSqlParseTest.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MetaFieldSyncTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MetaFieldSyncTest.java index d7e4b751069..3bd02973e76 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MetaFieldSyncTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MetaFieldSyncTest.java @@ -18,11 +18,11 @@ package org.apache.inlong.sort.parser; import org.apache.inlong.common.enums.MetaField; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MongoExtractFlinkSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MongoExtractFlinkSqlParseTest.java index d2bb5645de1..a54d0a6ea21 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MongoExtractFlinkSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MongoExtractFlinkSqlParseTest.java @@ -18,10 +18,10 @@ package org.apache.inlong.sort.parser; import org.apache.inlong.common.enums.MetaField; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MySqlExtractNodeToDorisLoadNodeTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MySqlExtractNodeToDorisLoadNodeTest.java index 422cde37e7b..bc4fd57d269 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MySqlExtractNodeToDorisLoadNodeTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MySqlExtractNodeToDorisLoadNodeTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MySqlLoadSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MySqlLoadSqlParseTest.java index 17ad63b1782..279b834037c 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MySqlLoadSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MySqlLoadSqlParseTest.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MySqlTemporalJoinRelationSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MySqlTemporalJoinRelationSqlParseTest.java index 1aac2d11bd4..987d30be892 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MySqlTemporalJoinRelationSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/MySqlTemporalJoinRelationSqlParseTest.java @@ -18,10 +18,10 @@ package org.apache.inlong.sort.parser; import org.apache.inlong.common.enums.MetaField; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/OracleExtractSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/OracleExtractSqlParseTest.java index 6f61c9eaf78..e16f574fa74 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/OracleExtractSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/OracleExtractSqlParseTest.java @@ -18,10 +18,10 @@ package org.apache.inlong.sort.parser; import org.apache.inlong.common.enums.MetaField; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/OracleLoadSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/OracleLoadSqlParseTest.java index 0b7e7e4fc58..8f17fb9c344 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/OracleLoadSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/OracleLoadSqlParseTest.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/PostgresExtractFlinkSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/PostgresExtractFlinkSqlParseTest.java index 342c7e3e387..12dea3856fc 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/PostgresExtractFlinkSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/PostgresExtractFlinkSqlParseTest.java @@ -18,10 +18,10 @@ package org.apache.inlong.sort.parser; import org.apache.inlong.common.enums.MetaField; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/PostgresLoadNodeFlinkSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/PostgresLoadNodeFlinkSqlParseTest.java index 52e6671bf7d..13ff2195773 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/PostgresLoadNodeFlinkSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/PostgresLoadNodeFlinkSqlParseTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/PulsarSqlParserTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/PulsarSqlParserTest.java index fe3d758fae3..87db594ddee 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/PulsarSqlParserTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/PulsarSqlParserTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/RedisNodeSqlParserTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/RedisNodeSqlParserTest.java index 49651dc68ca..b8ca015d158 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/RedisNodeSqlParserTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/RedisNodeSqlParserTest.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.FlinkSqlParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/RedisTemporalJoinRelationSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/RedisTemporalJoinRelationSqlParseTest.java index 56927ab5e4e..0de56cd5267 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/RedisTemporalJoinRelationSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/RedisTemporalJoinRelationSqlParseTest.java @@ -18,10 +18,10 @@ package org.apache.inlong.sort.parser; import org.apache.inlong.common.enums.MetaField; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/RightOuterJoinSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/RightOuterJoinSqlParseTest.java index f945bcb3ecb..41279e52ed7 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/RightOuterJoinSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/RightOuterJoinSqlParseTest.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/SqlServerNodeSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/SqlServerNodeSqlParseTest.java index 5eff7df857a..ceb01254e84 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/SqlServerNodeSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/SqlServerNodeSqlParseTest.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.GroupInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/TDSQLPostgresLoadNodeFlinkSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/TDSQLPostgresLoadNodeFlinkSqlParseTest.java index 4662eff382f..f956644a1d3 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/TDSQLPostgresLoadNodeFlinkSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/TDSQLPostgresLoadNodeFlinkSqlParseTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/TubeMQNodeSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/TubeMQNodeSqlParseTest.java index 16a66bb0ca9..b6c863ac8c6 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/TubeMQNodeSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/TubeMQNodeSqlParseTest.java @@ -17,10 +17,10 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.protocol.FieldInfo; import org.apache.inlong.sort.protocol.GroupInfo; diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/UnionSqlParseTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/UnionSqlParseTest.java index 4616a13697c..1e04a59e4fe 100644 --- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/UnionSqlParseTest.java +++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/UnionSqlParseTest.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.parser; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.parser.impl.FlinkSqlParser; import org.apache.inlong.sort.parser.result.ParseResult; import org.apache.inlong.sort.protocol.FieldInfo; diff --git a/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kudu/src/main/java/org/apache/inlong/sort/kudu/common/KuduUtils.java b/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kudu/src/main/java/org/apache/inlong/sort/kudu/common/KuduUtils.java index f83829d3683..f471c319fa2 100644 --- a/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kudu/src/main/java/org/apache/inlong/sort/kudu/common/KuduUtils.java +++ b/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kudu/src/main/java/org/apache/inlong/sort/kudu/common/KuduUtils.java @@ -17,18 +17,18 @@ package org.apache.inlong.sort.kudu.common; -import org.apache.inlong.sort.formats.common.BooleanTypeInfo; -import org.apache.inlong.sort.formats.common.ByteTypeInfo; -import org.apache.inlong.sort.formats.common.DateTypeInfo; -import org.apache.inlong.sort.formats.common.DecimalTypeInfo; -import org.apache.inlong.sort.formats.common.DoubleTypeInfo; -import org.apache.inlong.sort.formats.common.FloatTypeInfo; -import org.apache.inlong.sort.formats.common.IntTypeInfo; -import org.apache.inlong.sort.formats.common.LongTypeInfo; -import org.apache.inlong.sort.formats.common.RowTypeInfo; -import org.apache.inlong.sort.formats.common.StringTypeInfo; -import org.apache.inlong.sort.formats.common.TimestampTypeInfo; -import org.apache.inlong.sort.formats.common.TypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TypeInfo; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.table.types.DataType; diff --git a/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kudu/src/test/java/org/apache/inlong/sort/connector/kudu/KuduTestBase.java b/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kudu/src/test/java/org/apache/inlong/sort/connector/kudu/KuduTestBase.java index 32b44342330..58e9076066b 100644 --- a/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kudu/src/test/java/org/apache/inlong/sort/connector/kudu/KuduTestBase.java +++ b/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/kudu/src/test/java/org/apache/inlong/sort/connector/kudu/KuduTestBase.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.connector.kudu; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.flink.configuration.Configuration; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/base/TableFormatUtils.java b/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/base/TableFormatUtils.java index 430b89b32f2..abcc23a2656 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/base/TableFormatUtils.java +++ b/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/base/TableFormatUtils.java @@ -17,47 +17,47 @@ package org.apache.inlong.sort.formats.base; -import org.apache.inlong.sort.formats.common.ArrayFormatInfo; -import org.apache.inlong.sort.formats.common.ArrayTypeInfo; -import org.apache.inlong.sort.formats.common.BasicFormatInfo; -import org.apache.inlong.sort.formats.common.BinaryFormatInfo; -import org.apache.inlong.sort.formats.common.BinaryTypeInfo; -import org.apache.inlong.sort.formats.common.BooleanFormatInfo; -import org.apache.inlong.sort.formats.common.BooleanTypeInfo; -import org.apache.inlong.sort.formats.common.ByteFormatInfo; -import org.apache.inlong.sort.formats.common.ByteTypeInfo; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.DateTypeInfo; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DecimalTypeInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleTypeInfo; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.FloatTypeInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.FormatUtils; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.IntTypeInfo; -import org.apache.inlong.sort.formats.common.LocalZonedTimestampFormatInfo; -import org.apache.inlong.sort.formats.common.LocalZonedTimestampTypeInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.LongTypeInfo; -import org.apache.inlong.sort.formats.common.MapFormatInfo; -import org.apache.inlong.sort.formats.common.MapTypeInfo; -import org.apache.inlong.sort.formats.common.NullFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.RowTypeInfo; -import org.apache.inlong.sort.formats.common.ShortFormatInfo; -import org.apache.inlong.sort.formats.common.ShortTypeInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.StringTypeInfo; -import org.apache.inlong.sort.formats.common.TimeFormatInfo; -import org.apache.inlong.sort.formats.common.TimeTypeInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampTypeInfo; -import org.apache.inlong.sort.formats.common.TypeInfo; -import org.apache.inlong.sort.formats.common.VarBinaryFormatInfo; -import org.apache.inlong.sort.formats.common.VarCharFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ArrayFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ArrayTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BasicFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BinaryFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BinaryTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LocalZonedTimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LocalZonedTimestampTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.MapFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.MapTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.NullFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.VarBinaryFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.VarCharFormatInfo; +import org.apache.inlong.sort.formats.util.FormatUtils; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.serialization.SerializationSchema; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/base/TextFormatBuilder.java b/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/base/TextFormatBuilder.java index 965a77f218e..b329c791492 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/base/TextFormatBuilder.java +++ b/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/base/TextFormatBuilder.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.formats.base; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.flink.table.descriptors.DescriptorProperties; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/base/TextFormatDescriptor.java b/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/base/TextFormatDescriptor.java index 0eada989e6d..067c035427b 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/base/TextFormatDescriptor.java +++ b/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/base/TextFormatDescriptor.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.formats.base; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.FormatUtils; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.sort.formats.util.FormatUtils; import org.apache.flink.table.descriptors.DescriptorProperties; diff --git a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/FormatUtils.java b/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/util/FormatUtils.java similarity index 95% rename from inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/FormatUtils.java rename to inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/util/FormatUtils.java index e7b5de20fae..092269788ea 100644 --- a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/FormatUtils.java +++ b/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/util/FormatUtils.java @@ -15,7 +15,9 @@ * limitations under the License. */ -package org.apache.inlong.sort.formats.common; +package org.apache.inlong.sort.formats.util; + +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.DeserializationFeature; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/ArrayFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/ArrayFormatInfoTest.java index 1df333f4751..0bc09d31154 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/ArrayFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/ArrayFormatInfoTest.java @@ -17,6 +17,13 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ArrayFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.MapFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; + import java.util.Arrays; import java.util.Collection; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/BinaryFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/BinaryFormatInfoTest.java index d8ee05ac640..12db8034b9c 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/BinaryFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/BinaryFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BinaryFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; + import org.junit.Test; import java.nio.charset.StandardCharsets; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/BooleanFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/BooleanFormatInfoTest.java index 24f7b4667f2..0efbb487218 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/BooleanFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/BooleanFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; + import org.junit.Test; import java.util.Collection; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/ByteFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/ByteFormatInfoTest.java index fa5789b160a..09b031b44bf 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/ByteFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/ByteFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; + import org.junit.Test; import java.util.Collection; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/DateFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/DateFormatInfoTest.java index 33ad8dec562..6ee8209ffe7 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/DateFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/DateFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; + import org.junit.Test; import java.sql.Date; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/DecimalFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/DecimalFormatInfoTest.java index 43e5b892762..412b0a5e4ab 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/DecimalFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/DecimalFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; + import org.junit.Test; import java.math.BigDecimal; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/DoubleFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/DoubleFormatInfoTest.java index b91809e5060..d89108671f7 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/DoubleFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/DoubleFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; + import org.junit.Test; import java.util.Collection; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/FloatFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/FloatFormatInfoTest.java index 85003d91695..05a6cdc7caa 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/FloatFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/FloatFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; + import org.junit.Test; import java.util.Collection; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/FormatInfoTestBase.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/FormatInfoTestBase.java index c9a8460e446..e20641c2fd8 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/FormatInfoTestBase.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/FormatInfoTestBase.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.sort.formats.util.FormatUtils; + import org.junit.Test; import java.util.Collection; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/IntFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/IntFormatInfoTest.java index c9cbb7d7045..3241cff9bc1 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/IntFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/IntFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; + import org.junit.Test; import java.util.Collection; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/LocalZonedTimestampFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/LocalZonedTimestampFormatInfoTest.java index 4389b03ca1e..0697767f0fd 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/LocalZonedTimestampFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/LocalZonedTimestampFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LocalZonedTimestampFormatInfo; + import java.util.Collection; import java.util.Collections; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/LongFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/LongFormatInfoTest.java index d36e3cf9bf2..c4a04c218ac 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/LongFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/LongFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; + import org.junit.Test; import java.util.Collection; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/MapFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/MapFormatInfoTest.java index 93566c140fd..2b72bd7a6eb 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/MapFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/MapFormatInfoTest.java @@ -17,6 +17,15 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ArrayFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.MapFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeFormatInfo; + import java.util.Arrays; import java.util.Collection; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/RowFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/RowFormatInfoTest.java index 3d36d40973c..22cf45c3e47 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/RowFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/RowFormatInfoTest.java @@ -17,6 +17,13 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.MapFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeFormatInfo; + import org.junit.Test; import java.util.Arrays; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/ShortFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/ShortFormatInfoTest.java index c950e9e862a..1eb1d891ddb 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/ShortFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/ShortFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortFormatInfo; + import org.junit.Test; import java.util.Collection; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/StringFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/StringFormatInfoTest.java index f2494d17129..fd863e51431 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/StringFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/StringFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; + import org.junit.Test; import java.util.Collection; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/TimeFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/TimeFormatInfoTest.java index 20ece19548d..1051741862a 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/TimeFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/TimeFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeFormatInfo; + import org.junit.Test; import java.sql.Time; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/TimestampFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/TimestampFormatInfoTest.java index 421cb12121f..1dc61019abb 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/TimestampFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/TimestampFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; + import org.junit.Test; import java.sql.Timestamp; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/VarBinaryFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/VarBinaryFormatInfoTest.java index d5fc0083892..4cf956f45f3 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/VarBinaryFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/VarBinaryFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.VarBinaryFormatInfo; + import org.junit.Test; import java.nio.charset.StandardCharsets; diff --git a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/VarCharFormatInfoTest.java b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/VarCharFormatInfoTest.java index a8237d2cdf8..2f22b29b8a5 100644 --- a/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/VarCharFormatInfoTest.java +++ b/inlong-sort/sort-formats/format-common/src/test/java/org/apache/inlong/sort/formats/common/VarCharFormatInfoTest.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.common; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.VarCharFormatInfo; + import org.junit.Test; import java.util.Collection; diff --git a/inlong-sort/sort-formats/format-row/format-base/src/test/java/org/apache/inlong/sort/formats/base/TableFormatUtilsTest.java b/inlong-sort/sort-formats/format-row/format-base/src/test/java/org/apache/inlong/sort/formats/base/TableFormatUtilsTest.java index 189fda1e0ed..1487cea9e24 100644 --- a/inlong-sort/sort-formats/format-row/format-base/src/test/java/org/apache/inlong/sort/formats/base/TableFormatUtilsTest.java +++ b/inlong-sort/sort-formats/format-row/format-base/src/test/java/org/apache/inlong/sort/formats/base/TableFormatUtilsTest.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.formats.base; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.junit.Assert; import org.junit.Test; diff --git a/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvDeserializationSchema.java b/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvDeserializationSchema.java index f070cfef175..39bfb5f7a20 100644 --- a/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvDeserializationSchema.java +++ b/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvDeserializationSchema.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.formats.csv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.DefaultDeserializationSchema; import org.apache.inlong.sort.formats.base.TableFormatForRowUtils; import org.apache.inlong.sort.formats.base.util.LogCounter; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.types.Row; diff --git a/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatBuilder.java b/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatBuilder.java index 1e8d5f023a3..c7f61accf5f 100644 --- a/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatBuilder.java +++ b/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatBuilder.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.formats.csv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TextFormatBuilder; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.flink.table.descriptors.DescriptorProperties; diff --git a/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatFactory.java b/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatFactory.java index b2835e3e2b8..7d006b8802b 100644 --- a/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatFactory.java +++ b/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatFactory.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.csv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BasicFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.DefaultTableFormatDeserializer; import org.apache.inlong.sort.formats.base.DefaultTableFormatSerializer; import org.apache.inlong.sort.formats.base.ProjectedDeserializationSchemaFactory; @@ -25,9 +28,6 @@ import org.apache.inlong.sort.formats.base.TableFormatDeserializerFactory; import org.apache.inlong.sort.formats.base.TableFormatSerializer; import org.apache.inlong.sort.formats.base.TableFormatSerializerFactory; -import org.apache.inlong.sort.formats.common.BasicFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.serialization.SerializationSchema; diff --git a/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvSerializationSchema.java b/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvSerializationSchema.java index 71620f98d90..ec8bfadf2df 100644 --- a/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvSerializationSchema.java +++ b/inlong-sort/sort-formats/format-row/format-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvSerializationSchema.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.formats.csv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.DefaultSerializationSchema; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.flink.types.Row; import org.slf4j.Logger; diff --git a/inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvDeserializationSchemaTest.java b/inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvDeserializationSchemaTest.java index 9ddc0c4a748..968f46d5c3d 100644 --- a/inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvDeserializationSchemaTest.java +++ b/inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvDeserializationSchemaTest.java @@ -17,21 +17,21 @@ package org.apache.inlong.sort.formats.csv; -import org.apache.inlong.sort.formats.common.BasicFormatInfo; -import org.apache.inlong.sort.formats.common.BooleanFormatInfo; -import org.apache.inlong.sort.formats.common.ByteFormatInfo; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.ShortFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimeFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BasicFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.flink.types.Row; import org.junit.Test; diff --git a/inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvFormatFactoryTest.java b/inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvFormatFactoryTest.java index 44c16eec25b..df9bc2d8059 100644 --- a/inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvFormatFactoryTest.java +++ b/inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvFormatFactoryTest.java @@ -17,17 +17,17 @@ package org.apache.inlong.sort.formats.csv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.base.DefaultTableFormatDeserializer; import org.apache.inlong.sort.formats.base.DefaultTableFormatSerializer; import org.apache.inlong.sort.formats.base.TableFormatDeserializer; import org.apache.inlong.sort.formats.base.TableFormatForRowUtils; import org.apache.inlong.sort.formats.base.TableFormatSerializer; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.serialization.SerializationSchema; diff --git a/inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvSerializationSchemaTest.java b/inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvSerializationSchemaTest.java index 36b89aa7e61..0bfcc2847d1 100644 --- a/inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvSerializationSchemaTest.java +++ b/inlong-sort/sort-formats/format-row/format-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvSerializationSchemaTest.java @@ -17,21 +17,21 @@ package org.apache.inlong.sort.formats.csv; -import org.apache.inlong.sort.formats.common.BasicFormatInfo; -import org.apache.inlong.sort.formats.common.BooleanFormatInfo; -import org.apache.inlong.sort.formats.common.ByteFormatInfo; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.ShortFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimeFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BasicFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.flink.types.Row; import org.junit.Test; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatConverterBuilder.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatConverterBuilder.java index 3abf9042047..2e289d4faa3 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatConverterBuilder.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatConverterBuilder.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.formats.inlongmsg; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.flink.table.descriptors.DescriptorProperties; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgUtils.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgUtils.java index 39a05b6986e..1a85eddd1e3 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgUtils.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgUtils.java @@ -18,10 +18,10 @@ package org.apache.inlong.sort.formats.inlongmsg; import org.apache.inlong.common.msg.InLongMsg; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatConstants; import org.apache.inlong.sort.formats.base.TableFormatForRowUtils; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.util.StringUtils; import org.apache.flink.api.common.typeinfo.TypeInformation; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlog.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlog.java index 02fad5a8eb4..bdc607c548c 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlog.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlog.java @@ -17,10 +17,10 @@ package org.apache.inlong.sort.formats.inlongmsgbinlog; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.FormatDescriptor; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.FormatUtils; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.sort.formats.util.FormatUtils; import org.apache.flink.table.descriptors.DescriptorProperties; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatBuilder.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatBuilder.java index 9dad5d9349e..57c795548ad 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatBuilder.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatBuilder.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.formats.inlongmsgbinlog; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.flink.table.descriptors.DescriptorProperties; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatDeserializer.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatDeserializer.java index 538e02e8154..866a6be6ce2 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatDeserializer.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatDeserializer.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.formats.inlongmsgbinlog; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgFormatDeserializer; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatFactory.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatFactory.java index 1f35f2a3a44..45b9992837d 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatFactory.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatFactory.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.formats.inlongmsgbinlog; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatDeserializer; import org.apache.inlong.sort.formats.base.TableFormatDeserializerFactory; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgFormatDeserializer; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgMixedFormatConverter; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgMixedFormatDeserializer; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogMixedFormatConverter.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogMixedFormatConverter.java index e92b2b1217a..9bd4cf3c613 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogMixedFormatConverter.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogMixedFormatConverter.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.formats.inlongmsgbinlog; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgMixedFormatConverter; import org.apache.flink.api.common.typeinfo.TypeInformation; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogUtils.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogUtils.java index b2a6a26d175..40f398d6c5e 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogUtils.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogUtils.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.formats.inlongmsgbinlog; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.binlog.InLongBinlog; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatDeserializerTest.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatDeserializerTest.java index 5bcca7f72ab..8fc09507097 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatDeserializerTest.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatDeserializerTest.java @@ -17,10 +17,10 @@ package org.apache.inlong.sort.formats.inlongmsgbinlog; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeinfo.Types; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatFactoryTest.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatFactoryTest.java index 35ad72d6dcb..e7a44305a52 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatFactoryTest.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatFactoryTest.java @@ -17,13 +17,13 @@ package org.apache.inlong.sort.formats.inlongmsgbinlog; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatDeserializer; import org.apache.inlong.sort.formats.base.TableFormatForRowUtils; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.junit.Test; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogTest.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogTest.java index 29a27b7d134..bc9fb6335a2 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogTest.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogTest.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.formats.inlongmsgbinlog; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.flink.table.api.ValidationException; import org.apache.flink.table.descriptors.Descriptor; @@ -34,8 +34,8 @@ import java.util.List; import java.util.Map; -import static org.apache.inlong.sort.formats.common.FormatUtils.marshall; import static org.apache.inlong.sort.formats.inlongmsgbinlog.InLongMsgBinlogUtils.DEFAULT_METADATA_FIELD_NAME; +import static org.apache.inlong.sort.formats.util.FormatUtils.marshall; public class InLongMsgBinlogTest extends DescriptorTestBase { diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializer.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializer.java index e500a9c386a..e43266e3583 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializer.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializer.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.formats.inlongmsgcsv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TextFormatBuilder; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgFormatDeserializer; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactory.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactory.java index 613c478301a..8e21aa1d511 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactory.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactory.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.formats.inlongmsgcsv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatDeserializer; import org.apache.inlong.sort.formats.base.TableFormatDeserializerFactory; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgMixedFormatConverter; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgMixedFormatDeserializer; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgMixedFormatConverterValidator; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvMixedFormatConverter.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvMixedFormatConverter.java index c0d4d1de62d..ea9f691cc68 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvMixedFormatConverter.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvMixedFormatConverter.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.formats.inlongmsgcsv; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgMixedFormatConverter; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgMixedFormatConverterBuilder; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgUtils; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvUtils.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvUtils.java index fdccdc2b61b..caa82e8fafe 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvUtils.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvUtils.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.formats.inlongmsgcsv; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializerTest.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializerTest.java index c2c02395181..a6aaa9c8d0d 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializerTest.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializerTest.java @@ -18,10 +18,10 @@ package org.apache.inlong.sort.formats.inlongmsgcsv; import org.apache.inlong.common.msg.InLongMsg; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactoryTest.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactoryTest.java index 8adaa6acbf7..d7d30d8ecab 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactoryTest.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactoryTest.java @@ -17,15 +17,15 @@ package org.apache.inlong.sort.formats.inlongmsgcsv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatDeserializer; import org.apache.inlong.sort.formats.base.TableFormatForRowUtils; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.FormatUtils; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgUtils; +import org.apache.inlong.sort.formats.util.FormatUtils; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.table.api.TableSchema; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializer.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializer.java index c7c16dcf307..24a8f09ec04 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializer.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializer.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.formats.inlongmsgkv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TextFormatBuilder; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgFormatDeserializer; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactory.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactory.java index b3a0b54c9d5..405069112fe 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactory.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactory.java @@ -17,10 +17,10 @@ package org.apache.inlong.sort.formats.inlongmsgkv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatDeserializer; import org.apache.inlong.sort.formats.base.TableFormatDeserializer.TableFormatContext; import org.apache.inlong.sort.formats.base.TableFormatDeserializerFactory; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgMixedFormatConverter; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgMixedFormatDeserializer; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgMixedFormatConverterValidator; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvMixedFormatConverter.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvMixedFormatConverter.java index efc1c7642cc..6eef05212a1 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvMixedFormatConverter.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvMixedFormatConverter.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.formats.inlongmsgkv; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgMixedFormatConverter; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgMixedFormatConverterBuilder; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgUtils; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvUtils.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvUtils.java index 7fb79669920..5d5d3b860ad 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvUtils.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvUtils.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.formats.inlongmsgkv; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializerTest.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializerTest.java index abfb25a5360..045b423f944 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializerTest.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializerTest.java @@ -18,10 +18,10 @@ package org.apache.inlong.sort.formats.inlongmsgkv; import org.apache.inlong.common.msg.InLongMsg; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactoryTest.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactoryTest.java index 659b01ce62d..16a7adc8b07 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactoryTest.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactoryTest.java @@ -17,13 +17,13 @@ package org.apache.inlong.sort.formats.inlongmsgkv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatDeserializer; import org.apache.inlong.sort.formats.base.TableFormatForRowUtils; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.table.api.TableSchema; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializer.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializer.java index 191df7fd168..a606ad14e87 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializer.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializer.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.formats.inlongmsgtlogcsv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TextFormatBuilder; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgFormatDeserializer; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatFactory.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatFactory.java index bb83ad65582..5f678801781 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatFactory.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatFactory.java @@ -17,10 +17,10 @@ package org.apache.inlong.sort.formats.inlongmsgtlogcsv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatDeserializer; import org.apache.inlong.sort.formats.base.TableFormatDeserializer.TableFormatContext; import org.apache.inlong.sort.formats.base.TableFormatDeserializerFactory; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgMixedFormatConverter; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgMixedFormatDeserializer; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgMixedFormatConverterValidator; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvMixedFormatConverter.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvMixedFormatConverter.java index d97bb341dad..27a1157dcd5 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvMixedFormatConverter.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvMixedFormatConverter.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.formats.inlongmsgtlogcsv; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgMixedFormatConverter; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgMixedFormatConverterBuilder; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgUtils; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvUtils.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvUtils.java index 6683e08f5e6..79784249e78 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvUtils.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvUtils.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.formats.inlongmsgtlogcsv; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializerTest.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializerTest.java index fae60c03a41..f24e7887874 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializerTest.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializerTest.java @@ -18,10 +18,10 @@ package org.apache.inlong.sort.formats.inlongmsgtlogcsv; import org.apache.inlong.common.msg.InLongMsg; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatFactoryTest.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatFactoryTest.java index 10e2fbcbcdb..379f124aadf 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatFactoryTest.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatFactoryTest.java @@ -17,15 +17,15 @@ package org.apache.inlong.sort.formats.inlongmsgtlogcsv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatDeserializer; import org.apache.inlong.sort.formats.base.TableFormatForRowUtils; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.FormatUtils; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgUtils; +import org.apache.inlong.sort.formats.util.FormatUtils; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.table.api.TableSchema; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializer.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializer.java index 19a82503fab..9f3df07d5d9 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializer.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializer.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.formats.inlongmsgtlogkv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TextFormatBuilder; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgFormatDeserializer; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatFactory.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatFactory.java index 0dbf0723ee9..611a3dc3031 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatFactory.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatFactory.java @@ -17,10 +17,10 @@ package org.apache.inlong.sort.formats.inlongmsgtlogkv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatDeserializer; import org.apache.inlong.sort.formats.base.TableFormatDeserializer.TableFormatContext; import org.apache.inlong.sort.formats.base.TableFormatDeserializerFactory; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgMixedFormatConverter; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgMixedFormatDeserializer; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgMixedFormatConverterValidator; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvMixedFormatConverter.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvMixedFormatConverter.java index 560d5716855..417343351e1 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvMixedFormatConverter.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvMixedFormatConverter.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.formats.inlongmsgtlogkv; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgMixedFormatConverter; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgMixedFormatConverterBuilder; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgUtils; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvUtils.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvUtils.java index 8628d6cb794..298cc650e0a 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvUtils.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvUtils.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.formats.inlongmsgtlogkv; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializerTest.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializerTest.java index 72d9604719d..d3613139166 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializerTest.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializerTest.java @@ -18,10 +18,10 @@ package org.apache.inlong.sort.formats.inlongmsgtlogkv; import org.apache.inlong.common.msg.InLongMsg; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatFactoryTest.java b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatFactoryTest.java index 941a633a5a1..062a71f760d 100644 --- a/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatFactoryTest.java +++ b/inlong-sort/sort-formats/format-row/format-inlongmsg-tlogkv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatFactoryTest.java @@ -17,15 +17,15 @@ package org.apache.inlong.sort.formats.inlongmsgtlogkv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatDeserializer; import org.apache.inlong.sort.formats.base.TableFormatForRowUtils; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.FormatUtils; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgUtils; +import org.apache.inlong.sort.formats.util.FormatUtils; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.table.api.TableSchema; diff --git a/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvDeserializationSchema.java b/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvDeserializationSchema.java index c5de08cae63..0e3f35180e2 100644 --- a/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvDeserializationSchema.java +++ b/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvDeserializationSchema.java @@ -17,10 +17,10 @@ package org.apache.inlong.sort.formats.kv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.DefaultDeserializationSchema; import org.apache.inlong.sort.formats.base.TableFormatForRowUtils; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.types.Row; diff --git a/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatBuilder.java b/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatBuilder.java index c6e73ab1d55..9f5c8bd7b4a 100644 --- a/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatBuilder.java +++ b/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatBuilder.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.formats.kv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TextFormatBuilder; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.flink.table.descriptors.DescriptorProperties; diff --git a/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatFactory.java b/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatFactory.java index 77009f733ef..edfd938926d 100644 --- a/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatFactory.java +++ b/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatFactory.java @@ -17,6 +17,9 @@ package org.apache.inlong.sort.formats.kv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BasicFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.DefaultTableFormatDeserializer; import org.apache.inlong.sort.formats.base.DefaultTableFormatSerializer; import org.apache.inlong.sort.formats.base.ProjectedDeserializationSchemaFactory; @@ -25,9 +28,6 @@ import org.apache.inlong.sort.formats.base.TableFormatDeserializerFactory; import org.apache.inlong.sort.formats.base.TableFormatSerializer; import org.apache.inlong.sort.formats.base.TableFormatSerializerFactory; -import org.apache.inlong.sort.formats.common.BasicFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.serialization.SerializationSchema; diff --git a/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvSerializationSchema.java b/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvSerializationSchema.java index 0996dceab9a..acc94973f33 100644 --- a/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvSerializationSchema.java +++ b/inlong-sort/sort-formats/format-row/format-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvSerializationSchema.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.formats.kv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.DefaultSerializationSchema; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.flink.types.Row; import org.slf4j.Logger; diff --git a/inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvDeserializationSchemaTest.java b/inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvDeserializationSchemaTest.java index 144c2aa8896..f9579d60699 100644 --- a/inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvDeserializationSchemaTest.java +++ b/inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvDeserializationSchemaTest.java @@ -17,21 +17,21 @@ package org.apache.inlong.sort.formats.kv; -import org.apache.inlong.sort.formats.common.BasicFormatInfo; -import org.apache.inlong.sort.formats.common.BooleanFormatInfo; -import org.apache.inlong.sort.formats.common.ByteFormatInfo; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.ShortFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimeFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BasicFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.flink.types.Row; import org.junit.Test; diff --git a/inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvFormatFactoryTest.java b/inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvFormatFactoryTest.java index 021cb89fa38..0f18dba2a8a 100644 --- a/inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvFormatFactoryTest.java +++ b/inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvFormatFactoryTest.java @@ -17,17 +17,17 @@ package org.apache.inlong.sort.formats.kv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.base.DefaultTableFormatDeserializer; import org.apache.inlong.sort.formats.base.DefaultTableFormatSerializer; import org.apache.inlong.sort.formats.base.TableFormatDeserializer; import org.apache.inlong.sort.formats.base.TableFormatForRowUtils; import org.apache.inlong.sort.formats.base.TableFormatSerializer; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.serialization.SerializationSchema; @@ -43,7 +43,7 @@ import java.util.HashMap; import java.util.Map; -import static org.apache.inlong.sort.formats.common.FormatUtils.marshall; +import static org.apache.inlong.sort.formats.util.FormatUtils.marshall; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvSerializationSchemaTest.java b/inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvSerializationSchemaTest.java index 26351289507..90377c942a3 100644 --- a/inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvSerializationSchemaTest.java +++ b/inlong-sort/sort-formats/format-row/format-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvSerializationSchemaTest.java @@ -17,21 +17,21 @@ package org.apache.inlong.sort.formats.kv; -import org.apache.inlong.sort.formats.common.BasicFormatInfo; -import org.apache.inlong.sort.formats.common.BooleanFormatInfo; -import org.apache.inlong.sort.formats.common.ByteFormatInfo; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.ShortFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimeFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BasicFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.flink.types.Row; import org.junit.Test; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatConverterBuilder.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatConverterBuilder.java index 82bf820d509..6067688902c 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatConverterBuilder.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgMixedFormatConverterBuilder.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.formats.inlongmsg; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.flink.table.descriptors.DescriptorProperties; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgUtils.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgUtils.java index fae71b09f8a..02bca5450ea 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgUtils.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgUtils.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.formats.inlongmsg; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters; import org.apache.inlong.sort.formats.base.TableFormatUtils; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.table.data.GenericRowData; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatDeserializer.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatDeserializer.java index 6a915b48fb8..53a0ba64f4c 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatDeserializer.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatDeserializer.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.formats.inlongmsgbinlog; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgFormatDeserializer; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogRowDataDeserializationSchema.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogRowDataDeserializationSchema.java index 3d0d88d401d..63cb4bec38b 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogRowDataDeserializationSchema.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogRowDataDeserializationSchema.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.formats.inlongmsgbinlog; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgDeserializationSchema; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgFormatDeserializer; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogUtils.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogUtils.java index 06d7174bb01..16ed2a7056f 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogUtils.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/main/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogUtils.java @@ -17,10 +17,10 @@ package org.apache.inlong.sort.formats.inlongmsgbinlog; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatUtils; import org.apache.inlong.sort.formats.binlog.InLongBinlog; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatFactoryTest.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatFactoryTest.java index ccb05d7f081..cef23dc7b9f 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatFactoryTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-binlog/src/test/java/org/apache/inlong/sort/formats/inlongmsgbinlog/InLongMsgBinlogFormatFactoryTest.java @@ -17,12 +17,12 @@ package org.apache.inlong.sort.formats.inlongmsgbinlog; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.FormatUtils; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.sort.formats.util.FormatUtils; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.typeinfo.TypeInformation; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializer.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializer.java index 60417f9ce6c..3e9f0843f5c 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializer.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializer.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.formats.inlongmsgcsv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters.FieldToRowDataConverter; import org.apache.inlong.sort.formats.base.TableFormatUtils; import org.apache.inlong.sort.formats.base.TextFormatBuilder; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgFormatDeserializer; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvRowDataDeserializationSchema.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvRowDataDeserializationSchema.java index 5c021e8be93..d90cedb28df 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvRowDataDeserializationSchema.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvRowDataDeserializationSchema.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.formats.inlongmsgcsv; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgDeserializationSchema; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgFormatDeserializer; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvUtils.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvUtils.java index cd737eb1b11..a7f0fd1905e 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvUtils.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvUtils.java @@ -17,10 +17,10 @@ package org.apache.inlong.sort.formats.inlongmsgcsv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters.FieldToRowDataConverter; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializerTest.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializerTest.java index fcd6f468e74..7c6159a0ded 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializerTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializerTest.java @@ -18,14 +18,14 @@ package org.apache.inlong.sort.formats.inlongmsgcsv; import org.apache.inlong.common.msg.InLongMsg; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.MapFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters.FieldToRowDataConverter; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.MapFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactoryTest.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactoryTest.java index bc524678a3c..f9710d9e95b 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactoryTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatFactoryTest.java @@ -17,14 +17,14 @@ package org.apache.inlong.sort.formats.inlongmsgcsv; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.FormatUtils; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.MapFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.MapFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; +import org.apache.inlong.sort.formats.util.FormatUtils; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.typeinfo.TypeInformation; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializer.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializer.java index a125a2786db..b3dff0dec8f 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializer.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializer.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.formats.inlongmsgkv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters.FieldToRowDataConverter; import org.apache.inlong.sort.formats.base.TableFormatUtils; import org.apache.inlong.sort.formats.base.TextFormatBuilder; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgFormatDeserializer; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvRowDataDeserializationSchema.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvRowDataDeserializationSchema.java index caa27078c01..e2fbc293368 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvRowDataDeserializationSchema.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvRowDataDeserializationSchema.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.formats.inlongmsgkv; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgDeserializationSchema; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgFormatDeserializer; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvUtils.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvUtils.java index dd9cf955128..8bcf77c1ecb 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvUtils.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvUtils.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.formats.inlongmsgkv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters.FieldToRowDataConverter; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializerTest.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializerTest.java index 9025cbc4392..d99882c30fa 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializerTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatDeserializerTest.java @@ -18,11 +18,11 @@ package org.apache.inlong.sort.formats.inlongmsgkv; import org.apache.inlong.common.msg.InLongMsg; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactoryTest.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactoryTest.java index 2e66ee93e8e..331e4310d1f 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactoryTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/inlongmsgkv/InLongMsgKvFormatFactoryTest.java @@ -17,14 +17,14 @@ package org.apache.inlong.sort.formats.inlongmsgkv; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.FormatUtils; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.MapFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.MapFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; +import org.apache.inlong.sort.formats.util.FormatUtils; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.typeinfo.TypeInformation; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvDeserializationSchema.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvDeserializationSchema.java index 3fb30ccecd1..6d29d839eeb 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvDeserializationSchema.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvDeserializationSchema.java @@ -17,7 +17,7 @@ package org.apache.inlong.sort.formats.inlongmsgtlogcsv; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgDeserializationSchema; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgFormatDeserializer; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializer.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializer.java index 3a9f4c001b5..c0cdc68b30f 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializer.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializer.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.formats.inlongmsgtlogcsv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters.FieldToRowDataConverter; import org.apache.inlong.sort.formats.base.TableFormatUtils; import org.apache.inlong.sort.formats.base.TextFormatBuilder; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgFormatDeserializer; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvUtils.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvUtils.java index 19c77fca7dc..8523ff544d0 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvUtils.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvUtils.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.formats.inlongmsgtlogcsv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializerTest.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializerTest.java index 664e8de31c0..8d44ae4dd68 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializerTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatDeserializerTest.java @@ -18,11 +18,11 @@ package org.apache.inlong.sort.formats.inlongmsgtlogcsv; import org.apache.inlong.common.msg.InLongMsg; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatFactoryTest.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatFactoryTest.java index 33aed19033c..90c7a7fe404 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatFactoryTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogcsv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogcsv/InLongMsgTlogCsvFormatFactoryTest.java @@ -17,14 +17,14 @@ package org.apache.inlong.sort.formats.inlongmsgtlogcsv; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.FormatUtils; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.MapFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.MapFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; +import org.apache.inlong.sort.formats.util.FormatUtils; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.typeinfo.TypeInformation; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializer.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializer.java index 2b8ad4c07c8..dee2a5b7917 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializer.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializer.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.formats.inlongmsgtlogkv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters.FieldToRowDataConverter; import org.apache.inlong.sort.formats.base.TableFormatUtils; import org.apache.inlong.sort.formats.base.TextFormatBuilder; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.AbstractInLongMsgFormatDeserializer; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvUtils.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvUtils.java index 4ec1a4d1499..7e5dc6f864b 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvUtils.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogkv/src/main/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvUtils.java @@ -17,9 +17,9 @@ package org.apache.inlong.sort.formats.inlongmsgtlogkv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters.FieldToRowDataConverter; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogkv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializerTest.java b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogkv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializerTest.java index e797a9774fd..f8b4c9c5191 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogkv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializerTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-inlongmsg-rowdata-tlogkv/src/test/java/org/apache/inlong/sort/formats/inlongmsgtlogkv/InLongMsgTlogKvFormatDeserializerTest.java @@ -18,11 +18,11 @@ package org.apache.inlong.sort.formats.inlongmsgtlogkv; import org.apache.inlong.common.msg.InLongMsg; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.inlong.sort.formats.inlongmsg.FailureHandler; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgBody; import org.apache.inlong.sort.formats.inlongmsg.InLongMsgHead; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatForRowDataUtils.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatForRowDataUtils.java index 2f3567e4aec..358045c283d 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatForRowDataUtils.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatForRowDataUtils.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.formats.base; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.flink.table.types.DataType; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-base/src/test/java/org/apache/inlong/sort/formats/base/TableFormatUtilsTest.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-base/src/test/java/org/apache/inlong/sort/formats/base/TableFormatUtilsTest.java index 39126370a7e..22e5b5cb9ea 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-base/src/test/java/org/apache/inlong/sort/formats/base/TableFormatUtilsTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-base/src/test/java/org/apache/inlong/sort/formats/base/TableFormatUtilsTest.java @@ -17,16 +17,16 @@ package org.apache.inlong.sort.formats.base; -import org.apache.inlong.sort.formats.common.ArrayTypeInfo; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.IntTypeInfo; -import org.apache.inlong.sort.formats.common.LongTypeInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.StringTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ArrayTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongTypeInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringTypeInfo; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.catalog.Column; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatFactory.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatFactory.java index e55f5c39248..9ec4f83677c 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatFactory.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvFormatFactory.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.formats.csv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatForRowDataUtils; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.commons.lang3.StringEscapeUtils; import org.apache.flink.api.common.serialization.DeserializationSchema; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvRowDataDeserializationSchema.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvRowDataDeserializationSchema.java index 4541d0d555a..2a7182e39b4 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvRowDataDeserializationSchema.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvRowDataDeserializationSchema.java @@ -17,12 +17,12 @@ package org.apache.inlong.sort.formats.csv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.DefaultDeserializationSchema; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters.FieldToRowDataConverter; import org.apache.inlong.sort.formats.base.TableFormatUtils; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeinfo.TypeInformation; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvRowDataSerializationSchema.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvRowDataSerializationSchema.java index 9842e3cc988..227e1dadd14 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvRowDataSerializationSchema.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/main/java/org/apache/inlong/sort/formats/csv/CsvRowDataSerializationSchema.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.formats.csv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.DefaultSerializationSchema; import org.apache.inlong.sort.formats.base.RowDataToFieldConverters; import org.apache.inlong.sort.formats.base.TableFormatForRowDataUtils; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvFormatFactoryTest.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvFormatFactoryTest.java index 8ce9024c2a4..4404cb68461 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvFormatFactoryTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvFormatFactoryTest.java @@ -17,12 +17,12 @@ package org.apache.inlong.sort.formats.csv; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.FormatUtils; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.sort.formats.util.FormatUtils; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.serialization.SerializationSchema; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvRowDataDeserializationSchemaTest.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvRowDataDeserializationSchemaTest.java index d804bc6fa98..a02cb198e81 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvRowDataDeserializationSchemaTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvRowDataDeserializationSchemaTest.java @@ -17,22 +17,22 @@ package org.apache.inlong.sort.formats.csv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BasicFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatUtils; -import org.apache.inlong.sort.formats.common.BasicFormatInfo; -import org.apache.inlong.sort.formats.common.BooleanFormatInfo; -import org.apache.inlong.sort.formats.common.ByteFormatInfo; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.ShortFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimeFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.table.api.DataTypes; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvRowDataSerializationSchemaTest.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvRowDataSerializationSchemaTest.java index d97a8a8fe72..612b40e290d 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvRowDataSerializationSchemaTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-csv/src/test/java/org/apache/inlong/sort/formats/csv/CsvRowDataSerializationSchemaTest.java @@ -17,21 +17,21 @@ package org.apache.inlong.sort.formats.csv; -import org.apache.inlong.sort.formats.common.BasicFormatInfo; -import org.apache.inlong.sort.formats.common.BooleanFormatInfo; -import org.apache.inlong.sort.formats.common.ByteFormatInfo; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.ShortFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimeFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BasicFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.table.api.DataTypes; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/main/java/org/apache/inlong/sort/formats/json/JsonRowDeserializationSchema.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/main/java/org/apache/inlong/sort/formats/json/JsonRowDeserializationSchema.java index d499886389a..55e919d4fc2 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/main/java/org/apache/inlong/sort/formats/json/JsonRowDeserializationSchema.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/main/java/org/apache/inlong/sort/formats/json/JsonRowDeserializationSchema.java @@ -17,13 +17,13 @@ package org.apache.inlong.sort.formats.json; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ArrayFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BasicFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.MapFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatUtils; -import org.apache.inlong.sort.formats.common.ArrayFormatInfo; -import org.apache.inlong.sort.formats.common.BasicFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.MapFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.typeinfo.TypeInformation; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/main/java/org/apache/inlong/sort/formats/json/JsonRowSerializationSchema.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/main/java/org/apache/inlong/sort/formats/json/JsonRowSerializationSchema.java index 61a6aca1ac1..828d186d51a 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/main/java/org/apache/inlong/sort/formats/json/JsonRowSerializationSchema.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/main/java/org/apache/inlong/sort/formats/json/JsonRowSerializationSchema.java @@ -17,19 +17,19 @@ package org.apache.inlong.sort.formats.json; -import org.apache.inlong.sort.formats.common.ArrayFormatInfo; -import org.apache.inlong.sort.formats.common.BasicFormatInfo; -import org.apache.inlong.sort.formats.common.BooleanFormatInfo; -import org.apache.inlong.sort.formats.common.ByteFormatInfo; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.MapFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.ShortFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ArrayFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BasicFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.MapFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortFormatInfo; import org.apache.flink.api.common.serialization.SerializationSchema; import org.apache.flink.configuration.Configuration; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/test/java/org/apache/inlong/sort/formats/json/JsonRowDeserializationSchemaTest.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/test/java/org/apache/inlong/sort/formats/json/JsonRowDeserializationSchemaTest.java index 033bac3f07a..6e3688a4c02 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/test/java/org/apache/inlong/sort/formats/json/JsonRowDeserializationSchemaTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/test/java/org/apache/inlong/sort/formats/json/JsonRowDeserializationSchemaTest.java @@ -17,22 +17,22 @@ package org.apache.inlong.sort.formats.json; -import org.apache.inlong.sort.formats.common.ArrayFormatInfo; -import org.apache.inlong.sort.formats.common.BooleanFormatInfo; -import org.apache.inlong.sort.formats.common.ByteFormatInfo; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.MapFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.ShortFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimeFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ArrayFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.MapFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.flink.configuration.Configuration; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/test/java/org/apache/inlong/sort/formats/json/JsonRowSerializationSchemaTest.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/test/java/org/apache/inlong/sort/formats/json/JsonRowSerializationSchemaTest.java index 7fc3557c2e9..82ff1810ce8 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/test/java/org/apache/inlong/sort/formats/json/JsonRowSerializationSchemaTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-json/src/test/java/org/apache/inlong/sort/formats/json/JsonRowSerializationSchemaTest.java @@ -17,22 +17,22 @@ package org.apache.inlong.sort.formats.json; -import org.apache.inlong.sort.formats.common.ArrayFormatInfo; -import org.apache.inlong.sort.formats.common.BooleanFormatInfo; -import org.apache.inlong.sort.formats.common.ByteFormatInfo; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.MapFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.ShortFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimeFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ArrayFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.MapFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatBuilder.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatBuilder.java index 7f42e43b6ad..fb603dac295 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatBuilder.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatBuilder.java @@ -17,8 +17,8 @@ package org.apache.inlong.sort.formats.kv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TextFormatBuilder; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.flink.table.descriptors.DescriptorProperties; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatFactory.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatFactory.java index dff4adff04f..b9ca0d9599f 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatFactory.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvFormatFactory.java @@ -17,10 +17,10 @@ package org.apache.inlong.sort.formats.kv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatForRowDataUtils; import org.apache.inlong.sort.formats.base.TableFormatOptions; import org.apache.inlong.sort.formats.base.TextFormatOptions; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.commons.lang3.StringEscapeUtils; import org.apache.flink.api.common.serialization.DeserializationSchema; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvRowDataDeserializationSchema.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvRowDataDeserializationSchema.java index 033a51135e1..0f4e2b4a630 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvRowDataDeserializationSchema.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvRowDataDeserializationSchema.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.formats.kv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.DefaultDeserializationSchema; import org.apache.inlong.sort.formats.base.FieldToRowDataConverters; import org.apache.inlong.sort.formats.base.TableFormatForRowDataUtils; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.table.data.GenericRowData; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvRowDataSerializationSchema.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvRowDataSerializationSchema.java index 2b684bbe7f1..c79960639e2 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvRowDataSerializationSchema.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/main/java/org/apache/inlong/sort/formats/kv/KvRowDataSerializationSchema.java @@ -17,11 +17,11 @@ package org.apache.inlong.sort.formats.kv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; import org.apache.inlong.sort.formats.base.DefaultSerializationSchema; import org.apache.inlong.sort.formats.base.RowDataToFieldConverters; import org.apache.inlong.sort.formats.base.TableFormatForRowDataUtils; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; import org.apache.flink.table.data.RowData; import org.slf4j.Logger; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvFormatFactoryTest.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvFormatFactoryTest.java index 13bc3a2c5fb..d567e1709ec 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvFormatFactoryTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvFormatFactoryTest.java @@ -17,15 +17,15 @@ package org.apache.inlong.sort.formats.kv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatConstants; import org.apache.inlong.sort.formats.base.TableFormatOptions; import org.apache.inlong.sort.formats.base.TableFormatUtils; -import org.apache.inlong.sort.formats.common.BooleanFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.FormatUtils; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; +import org.apache.inlong.sort.formats.util.FormatUtils; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.serialization.SerializationSchema; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvRowDataDeserializationSchemaTest.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvRowDataDeserializationSchemaTest.java index bcc0dc39110..8c467dc34d3 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvRowDataDeserializationSchemaTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvRowDataDeserializationSchemaTest.java @@ -17,22 +17,22 @@ package org.apache.inlong.sort.formats.kv; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BasicFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.inlong.sort.formats.base.TableFormatUtils; -import org.apache.inlong.sort.formats.common.BasicFormatInfo; -import org.apache.inlong.sort.formats.common.BooleanFormatInfo; -import org.apache.inlong.sort.formats.common.ByteFormatInfo; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.ShortFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimeFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.table.data.DecimalData; diff --git a/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvRowDataSerializationSchemaTest.java b/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvRowDataSerializationSchemaTest.java index 02616b61a9e..9e0ced94a56 100644 --- a/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvRowDataSerializationSchemaTest.java +++ b/inlong-sort/sort-formats/format-rowdata/format-rowdata-kv/src/test/java/org/apache/inlong/sort/formats/kv/KvRowDataSerializationSchemaTest.java @@ -17,21 +17,21 @@ package org.apache.inlong.sort.formats.kv; -import org.apache.inlong.sort.formats.common.BasicFormatInfo; -import org.apache.inlong.sort.formats.common.BooleanFormatInfo; -import org.apache.inlong.sort.formats.common.ByteFormatInfo; -import org.apache.inlong.sort.formats.common.DateFormatInfo; -import org.apache.inlong.sort.formats.common.DecimalFormatInfo; -import org.apache.inlong.sort.formats.common.DoubleFormatInfo; -import org.apache.inlong.sort.formats.common.FloatFormatInfo; -import org.apache.inlong.sort.formats.common.FormatInfo; -import org.apache.inlong.sort.formats.common.IntFormatInfo; -import org.apache.inlong.sort.formats.common.LongFormatInfo; -import org.apache.inlong.sort.formats.common.RowFormatInfo; -import org.apache.inlong.sort.formats.common.ShortFormatInfo; -import org.apache.inlong.sort.formats.common.StringFormatInfo; -import org.apache.inlong.sort.formats.common.TimeFormatInfo; -import org.apache.inlong.sort.formats.common.TimestampFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BasicFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.BooleanFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ByteFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DateFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DecimalFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.DoubleFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FloatFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.FormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.IntFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.LongFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.RowFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.ShortFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.StringFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimeFormatInfo; +import org.apache.inlong.common.pojo.sort.dataflow.field.format.TimestampFormatInfo; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.data.RowData;