You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by do...@apache.org on 2022/11/28 01:46:03 UTC
[inlong] branch master updated: [INLONG-5231][CheckStyle] Add spotless to CI (#6635)
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 0811496ae [INLONG-5231][CheckStyle] Add spotless to CI (#6635)
0811496ae is described below
commit 0811496aea86d8181db31b78b6fe064be2fcfaac
Author: Charles Zhang <do...@apache.org>
AuthorDate: Mon Nov 28 09:45:56 2022 +0800
[INLONG-5231][CheckStyle] Add spotless to CI (#6635)
---
.github/workflows/ci_check_format.yml | 37 ++
.gitignore | 16 +
codestyle/checkstyle.xml | 460 --------------------
codestyle/spotless_inlong_formatter.xml | 51 +++
codestyle/suppressions.xml | 29 --
inlong-agent/agent-common/pom.xml | 23 +-
.../apache/inlong/agent/cache/LocalFileCache.java | 1 +
.../inlong/agent/conf/AbstractConfiguration.java | 1 -
.../inlong/agent/constant/CommandConstants.java | 1 +
.../inlong/agent/constant/CommonConstants.java | 3 +-
.../apache/inlong/agent/constant/JobConstants.java | 8 +-
.../inlong/agent/constant/KubernetesConstants.java | 2 +-
.../main/java/org/apache/inlong/agent/db/Db.java | 1 -
.../org/apache/inlong/agent/db/LocalProfile.java | 2 +-
.../inlong/agent/metrics/AgentMetricItem.java | 12 +-
.../org/apache/inlong/agent/pojo/BinlogJob.java | 40 +-
.../apache/inlong/agent/pojo/CommandInfoDto.java | 1 +
.../inlong/agent/pojo/ConfirmAgentIpRequest.java | 1 +
.../apache/inlong/agent/pojo/DebeziumFormat.java | 1 -
.../java/org/apache/inlong/agent/pojo/FileJob.java | 8 +-
.../org/apache/inlong/agent/pojo/KafkaJob.java | 7 +-
.../apache/inlong/agent/pojo/ManagerReturnDto.java | 1 +
.../org/apache/inlong/agent/pojo/MongoJob.java | 3 +
.../apache/inlong/agent/utils/AgentDbUtils.java | 3 +-
.../org/apache/inlong/agent/utils/ByteUtil.java | 6 +-
.../org/apache/inlong/agent/utils/ThreadUtils.java | 1 -
.../apache/inlong/agent/common/TestAgentUtils.java | 7 +-
.../inlong/agent/metrics/TestAgentMetrics.java | 2 +-
.../agent/metrics/TestPrometheusListener.java | 1 +
inlong-agent/agent-core/pom.xml | 13 +-
.../org/apache/inlong/agent/core/AgentManager.java | 3 +-
.../inlong/agent/core/conf/ResponseResult.java | 1 +
.../java/org/apache/inlong/agent/core/job/Job.java | 1 +
.../org/apache/inlong/agent/core/task/Task.java | 2 +-
.../agent/core/task/TaskPositionManager.java | 3 +-
.../apache/inlong/agent/core/task/TaskWrapper.java | 1 -
.../apache/inlong/agent/task/TestTaskWrapper.java | 3 +-
inlong-agent/agent-docker/pom.xml | 175 ++++----
inlong-agent/agent-plugins/pom.xml | 23 +-
.../inlong/agent/plugin/channel/MemoryChannel.java | 2 +-
.../agent/plugin/fetcher/ManagerFetcher.java | 8 +-
.../agent/plugin/filter/DateFormatRegex.java | 6 +-
.../inlong/agent/plugin/sinks/AbstractSink.java | 2 +-
.../inlong/agent/plugin/sinks/ProxySink.java | 2 +-
.../agent/plugin/sources/AbstractSource.java | 4 +-
.../inlong/agent/plugin/sources/KafkaSource.java | 2 +-
.../plugin/sources/reader/AbstractReader.java | 2 +-
.../agent/plugin/sources/reader/KafkaReader.java | 3 +-
.../agent/plugin/sources/reader/MongoDBReader.java | 2 +-
.../agent/plugin/sources/reader/MqttReader.java | 1 +
.../agent/plugin/sources/reader/OracleReader.java | 2 +-
.../plugin/sources/reader/PostgreSQLReader.java | 2 +-
.../agent/plugin/sources/reader/RedisReader.java | 81 ++--
.../plugin/sources/reader/SQLServerReader.java | 2 +-
.../plugin/sources/reader/file/TextFileReader.java | 2 +-
.../plugin/sources/snapshot/AbstractSnapshot.java | 2 +-
.../agent/plugin/trigger/DirectoryTrigger.java | 2 +-
.../inlong/agent/plugin/utils/FileDataUtils.java | 2 +-
.../agent/plugin/utils/InLongDatabaseHistory.java | 3 +-
.../apache/inlong/agent/plugin/TestFileAgent.java | 6 +-
.../apache/inlong/agent/plugin/TestOOMExit.java | 1 +
.../agent/plugin/filter/TestDateFormatRegex.java | 2 +-
.../agent/plugin/filter/TestStreamIdFilter.java | 5 +-
.../sources/PostgreSQLOffsetManagerTest.java | 6 +-
.../agent/plugin/sources/TestMongoDBReader.java | 1 -
.../agent/plugin/sources/TestMqttConnect.java | 1 +
.../agent/plugin/sources/TestMqttReader.java | 8 +-
.../agent/plugin/sources/TestOracleReader.java | 10 +-
.../agent/plugin/sources/TestSQLServerReader.java | 10 +-
.../agent/plugin/validators/TestValidators.java | 1 +
inlong-agent/agent-release/pom.xml | 11 +-
inlong-agent/pom.xml | 8 +-
inlong-audit/audit-common/pom.xml | 26 +-
.../apache/inlong/audit/file/ConfigManager.java | 6 +-
.../apache/inlong/audit/protocol/AuditData.java | 1 +
inlong-audit/audit-docker/pom.xml | 22 +-
inlong-audit/audit-proxy/pom.xml | 12 +-
.../audit/base/HighPriorityThreadFactory.java | 5 +-
.../audit/channel/FailoverChannelProcessor.java | 10 +-
.../org/apache/inlong/audit/node/Application.java | 2 +-
.../org/apache/inlong/audit/sink/EventStat.java | 1 +
.../org/apache/inlong/audit/sink/PulsarSink.java | 46 +-
.../org/apache/inlong/audit/sink/TubeSink.java | 11 +-
.../audit/sink/pulsar/PulsarClientService.java | 10 +-
.../inlong/audit/source/DefaultServiceDecoder.java | 2 +-
.../apache/inlong/audit/utils/EventLoopUtil.java | 9 +-
.../utils/FailoverChannelProcessorHolder.java | 1 +
.../apache/inlong/audit/sink/PulsarSinkTest.java | 1 +
inlong-audit/audit-release/pom.xml | 11 +-
inlong-audit/audit-sdk/pom.xml | 6 +-
.../org/apache/inlong/audit/AuditOperator.java | 1 +
.../inlong/audit/send/ClientPipelineFactory.java | 2 +-
.../org/apache/inlong/audit/send/SenderGroup.java | 2 +-
.../org/apache/inlong/audit/util/AuditConfig.java | 1 +
.../java/org/apache/inlong/audit/util/Config.java | 6 +-
.../java/org/apache/inlong/audit/util/Decoder.java | 3 +-
.../apache/inlong/audit/util/EventLoopUtil.java | 9 +-
.../java/org/apache/inlong/audit/util/IpPort.java | 2 +-
.../org/apache/inlong/audit/util/StatInfo.java | 1 +
.../apache/inlong/audit/send/SenderGroupTest.java | 1 +
.../inlong/audit/send/SenderManagerTest.java | 1 +
.../org/apache/inlong/audit/util/IpPortTest.java | 1 +
inlong-audit/audit-store/pom.xml | 86 ++--
.../java/org/apache/inlong/audit/Application.java | 1 +
.../inlong/audit/config/ClickHouseConfig.java | 2 +-
.../inlong/audit/config/DataServerConfig.java | 4 +-
.../inlong/audit/config/ElasticsearchConfig.java | 4 +-
.../apache/inlong/audit/db/entities/ESDataPo.java | 1 +
inlong-audit/pom.xml | 10 +-
inlong-common/pom.xml | 14 +-
.../common/heartbeat/ComponentHeartbeat.java | 10 +-
.../common/metric/MetricListenerRunnable.java | 4 +-
.../apache/inlong/common/monitor/CounterGroup.java | 1 -
.../inlong/common/monitor/CounterGroupExt.java | 1 -
.../apache/inlong/common/monitor/MonitorIndex.java | 4 +-
.../inlong/common/monitor/MonitorIndexExt.java | 7 +-
.../apache/inlong/common/monitor/StatRunner.java | 4 +-
.../inlong/common/msg/AttributeConstants.java | 2 +-
.../apache/inlong/common/msg/DataInputBuffer.java | 2 +
.../org/apache/inlong/common/msg/InLongMsg.java | 13 +-
.../inlong/common/msg/InLongMsgAttrBuilder.java | 3 +
.../common/pojo/agent/TaskSnapshotRequest.java | 3 +-
.../apache/inlong/common/pojo/sdk/CacheZone.java | 1 +
.../inlong/common/pojo/sdk/CacheZoneConfig.java | 1 +
.../common/pojo/sdk/SortSourceConfigResponse.java | 3 +-
.../org/apache/inlong/common/pojo/sdk/Topic.java | 1 +
.../pojo/sortstandalone/SortClusterConfig.java | 1 +
.../common/pojo/sortstandalone/SortTaskConfig.java | 1 +
.../apache/inlong/common/util/MaskDataUtils.java | 6 +-
.../common/metric/set/DataProxyMetricItem.java | 1 +
inlong-dashboard/pom.xml | 24 +-
inlong-dataproxy/dataproxy-dist/pom.xml | 12 +-
inlong-dataproxy/dataproxy-docker/pom.xml | 154 +++----
inlong-dataproxy/dataproxy-source/pom.xml | 12 +-
.../dataproxy/base/HighPriorityThreadFactory.java | 2 +-
.../channel/FailoverChannelProcessor.java | 10 +-
.../dataproxy/channel/FailoverChannelSelector.java | 2 +-
.../inlong/dataproxy/config/ConfigManager.java | 13 +-
.../config/holder/SourceReportConfigHolder.java | 6 +-
.../config/remote/ConfigMessageServlet.java | 2 +-
.../inlong/dataproxy/consts/ConfigConstants.java | 2 +-
.../inlong/dataproxy/exception/ErrorCode.java | 1 +
.../dataproxy/exception/MessageIDException.java | 1 -
.../dataproxy/heartbeat/HeartbeatManager.java | 3 +-
.../inlong/dataproxy/http/MessageFilter.java | 6 +-
.../inlong/dataproxy/http/SimpleHttpSource.java | 9 +-
.../dataproxy/http/SimpleMessageHandler.java | 4 +-
.../http/exception/MessageProcessException.java | 3 +-
.../dataproxy/metrics/DataProxyMetricItemSet.java | 7 +-
.../apache/inlong/dataproxy/node/Application.java | 2 +
.../apache/inlong/dataproxy/sink/PulsarSink.java | 22 +-
.../dataproxy/sink/SimpleMessageTubeSink.java | 36 +-
.../org/apache/inlong/dataproxy/sink/TubeSink.java | 19 +-
.../dataproxy/sink/common/DefaultEventHandler.java | 8 +-
.../dataproxy/sink/common/MsgDedupHandler.java | 1 +
.../dataproxy/sink/common/TubeProducerHolder.java | 7 +-
.../inlong/dataproxy/sink/mq/BatchPackProfile.java | 1 +
.../dataproxy/sink/mq/pulsar/PulsarHandler.java | 12 +-
.../dataproxy/sink/mqzone/AbstactZoneWorker.java | 3 +-
.../sink/mqzone/AbstractZoneProducer.java | 6 +-
.../dataproxy/sink/mqzone/AbstractZoneSink.java | 11 +-
.../sink/mqzone/AbstractZoneSinkContext.java | 3 +-
.../sink/mqzone/ZoneClusterProducerCalculator.java | 3 +-
.../sink/mqzone/ZoneWorkerCalculator.java | 1 +
.../mqzone/impl/kafkazone/KafkaZoneProducer.java | 5 +-
.../sink/mqzone/impl/kafkazone/KafkaZoneSink.java | 4 +-
.../impl/kafkazone/KafkaZoneSinkContext.java | 2 +-
.../impl/pulsarzone/PulsarClusterProducer.java | 12 +-
.../mqzone/impl/pulsarzone/PulsarZoneProducer.java | 4 +-
.../mqzone/impl/pulsarzone/PulsarZoneSink.java | 4 +-
.../impl/pulsarzone/PulsarZoneSinkContext.java | 2 +-
.../mqzone/impl/tubezone/TubeClusterProducer.java | 14 +-
.../mqzone/impl/tubezone/TubeZoneProducer.java | 5 +-
.../mqzone/impl/tubezone/TubeZoneSinkContext.java | 3 +-
.../dataproxy/sink/pulsar/PulsarClientService.java | 14 +-
.../dataproxy/sink/pulsar/SendMessageCallBack.java | 4 +-
.../inlong/dataproxy/sink/pulsar/SinkTask.java | 27 +-
.../pulsar/federation/PulsarProducerCluster.java | 16 +-
.../apache/inlong/dataproxy/source/BaseSource.java | 479 +++++++++++----------
.../dataproxy/source/DefaultServiceDecoder.java | 28 +-
.../apache/inlong/dataproxy/source/MsgType.java | 1 +
.../dataproxy/source/ServerMessageFactory.java | 12 +-
.../dataproxy/source/ServerMessageHandler.java | 21 +-
.../inlong/dataproxy/source/ServiceDecoder.java | 2 +-
.../dataproxy/source/SimpleMessageHandler.java | 2 +-
.../inlong/dataproxy/source/SimpleTcpSource.java | 11 +-
.../inlong/dataproxy/source/SimpleUdpSource.java | 15 +-
.../source/tcp/InlongTcpChannelHandler.java | 4 +-
.../tcp/InlongTcpChannelPipelineFactory.java | 5 +-
.../dataproxy/source/tcp/InlongTcpSource.java | 5 +-
.../inlong/dataproxy/utils/DateTimeUtils.java | 4 +-
.../inlong/dataproxy/utils/EventLoopUtil.java | 9 +-
.../utils/FailoverChannelProcessorHolder.java | 1 +
.../inlong/dataproxy/utils/InLongMsgVer.java | 1 +
.../inlong/dataproxy/utils/MessageUtils.java | 13 +-
inlong-dataproxy/pom.xml | 10 +-
inlong-distribution/pom.xml | 10 +-
inlong-manager/manager-client-examples/pom.xml | 8 +-
.../inlong/manager/client/File2IcebergExample.java | 2 +-
.../apache/inlong/manager/client/ut/BaseTest.java | 3 +-
.../inlong/manager/client/ut/Kafka2HiveTest.java | 78 +---
inlong-manager/manager-client-tools/pom.xml | 14 +-
.../inlong/manager/client/cli/CreateCommand.java | 4 +-
.../inlong/manager/client/cli/UpdateCommand.java | 3 +-
.../manager/client/cli/util/ParseStatus.java | 1 +
inlong-manager/manager-client/pom.xml | 11 +-
.../manager/client/api/InlongStreamBuilder.java | 3 -
.../manager/client/api/impl/InlongClientImpl.java | 4 +-
.../manager/client/api/impl/InlongStreamImpl.java | 22 +-
.../client/api/impl/InlongStreamImplTest.java | 6 +-
.../client/api/inner/ClientFactoryTest.java | 233 +++-------
.../client/api/inner/HeartbeatClientTest.java | 48 +--
.../client/api/inner/InlongConsumeClientTest.java | 27 +-
.../manager/client/api/inner/NoAuthClientTest.java | 5 +-
.../api/inner/WorkflowApproverClientTest.java | 11 +-
.../client/api/inner/WorkflowClientTest.java | 13 +-
inlong-manager/manager-common/pom.xml | 8 +-
.../inlong/manager/common/auth/Authentication.java | 1 +
.../inlong/manager/common/consts/SourceType.java | 3 +-
.../manager/common/conversion/HoursToMinute.java | 1 -
.../manager/common/enums/ApplicationEnv.java | 4 +-
.../inlong/manager/common/enums/ClusterType.java | 1 +
.../manager/common/enums/SimpleGroupStatus.java | 1 -
.../manager/common/util/InlongCollectionUtils.java | 9 +-
.../common/validation/InEnumIntValidator.java | 6 +-
.../common/validation/InEnumStringValidator.java | 4 +-
inlong-manager/manager-dao/pom.xml | 26 +-
.../manager/dao/config/JDBCSourceConfig.java | 4 +-
.../manager/dao/entity/SortSourceConfigEntity.java | 1 +
inlong-manager/manager-docker/pom.xml | 23 +-
inlong-manager/manager-plugins/pom.xml | 26 +-
.../manager/plugin/flink/FlinkOperation.java | 7 +-
.../manager/plugin/flink/dto/JarRunRequest.java | 1 -
.../manager/plugin/flink/enums/Constants.java | 6 +-
.../plugin/listener/StartupSortListener.java | 4 +-
.../manager/plugin/poller/SortStatusPoller.java | 3 +-
.../manager/plugin/util/FlinkConfiguration.java | 1 -
inlong-manager/manager-pojo/pom.xml | 6 +-
.../manager/pojo/cluster/ClusterTagResponse.java | 1 -
.../pojo/cluster/pulsar/PulsarClusterDTO.java | 3 +-
.../pojo/cluster/pulsar/PulsarClusterInfo.java | 3 +-
.../pojo/cluster/pulsar/PulsarClusterRequest.java | 3 +-
.../pojo/cluster/tubemq/TubeClusterDTO.java | 3 +-
.../pojo/cluster/tubemq/TubeClusterInfo.java | 3 +-
.../pojo/cluster/tubemq/TubeClusterRequest.java | 3 +-
.../pojo/group/InlongGroupApproveRequest.java | 3 +-
.../inlong/manager/pojo/group/InlongGroupInfo.java | 6 +-
.../manager/pojo/group/InlongGroupRequest.java | 9 +-
.../pojo/group/InlongGroupResetRequest.java | 5 +-
.../manager/pojo/queue/tubemq/TubeBrokerInfo.java | 4 +-
.../inlong/manager/pojo/sink/SinkRequest.java | 3 +-
.../inlong/manager/pojo/sink/StreamSink.java | 3 +-
.../manager/pojo/sink/ck/ClickHouseSink.java | 3 +-
.../manager/pojo/sink/ck/ClickHouseSinkDTO.java | 3 +-
.../pojo/sink/ck/ClickHouseSinkRequest.java | 3 +-
.../manager/pojo/sink/ck/ClickHouseTableInfo.java | 1 +
.../manager/pojo/sink/doris/DorisSinkRequest.java | 1 +
.../pojo/sink/greenplum/GreenplumSinkDTO.java | 1 -
.../pojo/sink/iceberg/IcebergColumnInfo.java | 1 -
.../pojo/sink/iceberg/IcebergPartition.java | 1 +
.../inlong/manager/pojo/sink/kafka/KafkaSink.java | 3 +-
.../manager/pojo/sink/kafka/KafkaSinkDTO.java | 3 +-
.../manager/pojo/sink/kafka/KafkaSinkRequest.java | 3 +-
.../inlong/manager/pojo/sort/BaseSortConf.java | 1 +
.../pojo/sort/standalone/SortFieldInfo.java | 1 +
.../manager/pojo/sort/standalone/SortIdInfo.java | 1 +
.../manager/pojo/sort/standalone/SortSinkInfo.java | 1 +
.../pojo/sort/standalone/SortSourceStreamInfo.java | 1 +
.../manager/pojo/sort/standalone/SortTaskInfo.java | 1 +
.../manager/pojo/sort/util/ExtractNodeUtils.java | 21 +-
.../manager/pojo/sort/util/FieldInfoUtils.java | 77 ++--
.../manager/pojo/sort/util/FieldRelationUtils.java | 4 +-
.../manager/pojo/sort/util/LoadNodeUtils.java | 38 +-
.../manager/pojo/sort/util/StreamParseUtils.java | 1 +
.../inlong/manager/pojo/source/SourceRequest.java | 3 +-
.../manager/pojo/source/file/FileSource.java | 2 +-
.../manager/pojo/source/kafka/KafkaOffset.java | 1 -
.../manager/pojo/source/kafka/KafkaSource.java | 8 +-
.../manager/pojo/source/kafka/KafkaSourceDTO.java | 14 +-
.../pojo/source/kafka/KafkaSourceRequest.java | 14 +-
.../pojo/source/mysql/MySQLBinlogSourceDTO.java | 6 +-
.../source/mysql/MySQLBinlogSourceRequest.java | 6 +-
.../manager/pojo/stream/InlongStreamInfo.java | 8 +-
.../manager/pojo/stream/InlongStreamRequest.java | 8 +-
.../pojo/transform/DeleteTransformRequest.java | 1 -
.../manager/pojo/transform/TransformRequest.java | 4 +-
.../pojo/workflow/WorkflowApprovalRequest.java | 3 +-
inlong-manager/manager-service/pom.xml | 10 +-
.../service/cluster/InlongClusterServiceImpl.java | 7 +-
.../service/cluster/TubeClusterOperator.java | 18 +-
.../service/consume/ConsumePulsarOperator.java | 2 +-
.../consume/InlongConsumeOperatorFactory.java | 3 +-
.../service/consume/InlongConsumeServiceImpl.java | 8 +-
.../inlong/manager/service/core/AuditService.java | 1 -
.../service/core/impl/AgentServiceImpl.java | 6 +-
.../service/core/impl/AuditServiceImpl.java | 3 +-
.../service/core/impl/SortConfigLoaderImpl.java | 1 +
.../service/core/impl/SortSourceServiceImpl.java | 11 +-
.../core/impl/WorkflowApproverServiceImpl.java | 4 +-
.../service/group/InlongGroupOperator4Pulsar.java | 3 +-
.../service/group/InlongGroupServiceImpl.java | 7 +-
.../service/heartbeat/HeartbeatServiceImpl.java | 8 +-
.../listener/group/InitGroupCompleteListener.java | 3 +-
.../source/AbstractSourceOperateListener.java | 6 +-
.../service/operationlog/OperationLogPool.java | 3 +-
.../inlong/manager/service/plugin/JarHell.java | 3 +-
.../manager/service/plugin/PluginClassLoader.java | 1 +
.../service/resource/sink/es/ElasticsearchApi.java | 2 +-
.../sink/greenplum/GreenplumResourceOperator.java | 3 +-
.../sink/greenplum/GreenplumSqlBuilder.java | 2 +-
.../resource/sink/hbase/HBaseResourceOperator.java | 2 +-
.../resource/sink/iceberg/IcebergCatalogUtils.java | 4 +-
.../sink/oracle/OracleResourceOperator.java | 1 -
.../postgresql/PostgreSQLResourceOperator.java | 3 +-
.../sink/postgresql/PostgreSQLSqlBuilder.java | 2 +-
.../sink/sqlserver/SQLServerResourceOperator.java | 3 +-
.../sink/sqlserver/SQLServerSqlBuilder.java | 6 +-
.../manager/service/sink/AbstractSinkOperator.java | 6 +-
.../service/sink/hbase/HBaseSinkOperator.java | 1 -
.../service/sink/hdfs/HDFSSinkOperator.java | 1 -
.../service/sink/oracle/OracleSinkOperator.java | 1 -
.../service/source/SourceSnapshotOperator.java | 1 +
.../service/source/StreamSourceServiceImpl.java | 23 +-
.../service/source/file/FileSourceOperator.java | 8 +-
.../source/pulsar/PulsarSourceOperator.java | 3 +-
.../manager/service/user/UserServiceImpl.java | 4 +-
.../service/workflow/WorkflowServiceImpl.java | 3 +-
.../service/core/impl/AuditServiceTest.java | 4 +-
.../group/InlongGroupProcessServiceTest.java | 8 +-
.../service/sink/GreenplumSinkServiceTest.java | 7 +-
.../manager/service/sink/MySQLSinkServiceTest.java | 6 +-
.../service/sink/OracleSinkServiceTest.java | 6 +-
.../service/sink/PostgreSQLSinkServiceTest.java | 6 +-
.../service/sink/SQLServerSinkServiceTest.java | 6 +-
.../manager/service/sort/DisableZkForSortTest.java | 20 +-
inlong-manager/manager-test/pom.xml | 11 +-
inlong-manager/manager-web/pom.xml | 48 +--
.../manager/web/auth/web/WebAuthorizingRealm.java | 3 +-
.../web/config/ControllerExceptionHandler.java | 9 +-
.../web/controller/HeartbeatController.java | 1 -
.../openapi/OpenHeartbeatController.java | 1 -
.../org/apache/inlong/manager/web/WebBaseTest.java | 56 +--
.../manager/web/controller/AnnoControllerTest.java | 43 +-
inlong-manager/manager-workflow/pom.xml | 10 +-
.../manager/workflow/core/ProcessorExecutor.java | 1 -
.../workflow/core/impl/ProcessServiceImpl.java | 6 +-
.../workflow/core/impl/ProcessorExecutorImpl.java | 4 +-
.../core/impl/WorkflowContextBuilderImpl.java | 3 +-
.../core/impl/WorkflowQueryServiceImpl.java | 4 +-
.../workflow/processor/EndEventProcessor.java | 4 +-
.../workflow/processor/ServiceTaskProcessor.java | 3 +-
.../workflow/processor/UserTaskProcessor.java | 6 +-
inlong-manager/pom.xml | 32 +-
inlong-sdk/dataproxy-sdk/pom.xml | 6 +-
.../inlong/sdk/dataproxy/ConfigConstants.java | 2 +-
.../inlong/sdk/dataproxy/DefaultMessageSender.java | 29 +-
.../apache/inlong/sdk/dataproxy/FileCallback.java | 1 +
.../apache/inlong/sdk/dataproxy/MessageSender.java | 40 +-
.../inlong/sdk/dataproxy/ProxyClientConfig.java | 2 +-
.../inlong/sdk/dataproxy/SendMessageCallback.java | 1 +
.../inlong/sdk/dataproxy/codec/EncodeObject.java | 2 +-
.../sdk/dataproxy/codec/ProtocolEncoder.java | 46 +-
.../inlong/sdk/dataproxy/config/HostInfo.java | 3 +-
.../sdk/dataproxy/config/ProxyClusterConfig.java | 1 +
.../sdk/dataproxy/config/ProxyConfigEntry.java | 1 +
.../sdk/dataproxy/config/ProxyConfigManager.java | 10 +-
.../apache/inlong/sdk/dataproxy/example/Event.java | 1 +
.../sdk/dataproxy/example/HttpClientExample.java | 17 +-
.../sdk/dataproxy/example/MyFileCallBack.java | 1 +
.../sdk/dataproxy/example/MyMessageCallBack.java | 1 +
.../sdk/dataproxy/example/SendMsgThread.java | 1 +
.../sdk/dataproxy/example/TcpClientExample.java | 9 +-
.../sdk/dataproxy/example/UdpClientExample.java | 7 +-
.../sdk/dataproxy/http/InternalHttpSender.java | 12 +-
.../inlong/sdk/dataproxy/metric/MessageRecord.java | 4 +-
.../sdk/dataproxy/network/ClientHandler.java | 1 +
.../inlong/sdk/dataproxy/network/ClientMgr.java | 38 +-
.../dataproxy/network/ClientPipelineFactory.java | 1 +
.../inlong/sdk/dataproxy/network/HashRing.java | 1 +
.../inlong/sdk/dataproxy/network/HttpMessage.java | 3 +-
.../sdk/dataproxy/network/HttpProxySender.java | 9 +-
.../inlong/sdk/dataproxy/network/NettyClient.java | 5 +-
.../inlong/sdk/dataproxy/network/QueueObject.java | 13 +-
.../inlong/sdk/dataproxy/network/Sender.java | 20 +-
.../inlong/sdk/dataproxy/network/SequentialID.java | 1 +
.../sdk/dataproxy/network/SyncMessageCallable.java | 3 +-
.../pb/config/ProxyClusterConfigHolder.java | 10 +-
.../inlong/sdk/dataproxy/pb/context/Constants.java | 2 +-
.../sdk/dataproxy/pb/context/SdkProfile.java | 2 +-
.../sdk/dataproxy/pb/context/SdkSinkContext.java | 12 +-
.../sdk/dataproxy/pb/network/TcpChannelGroup.java | 54 +--
.../dataproxy/threads/ManagerFetcherThread.java | 3 +-
.../sdk/dataproxy/threads/TimeoutScanThread.java | 3 +-
.../sdk/dataproxy/utils/ConsistencyHashUtil.java | 1 +
.../inlong/sdk/dataproxy/utils/EncryptUtil.java | 8 +-
.../inlong/sdk/dataproxy/utils/EventLoopUtil.java | 9 +-
.../inlong/sdk/dataproxy/utils/ProxyUtils.java | 6 +-
.../sdk/dataproxy/utils/ServiceDiscoveryUtils.java | 4 +-
inlong-sdk/pom.xml | 10 +-
inlong-sdk/sdk-common/pom.xml | 84 ++--
.../inlong/sdk/commons/admin/AdminHttpSource.java | 8 +-
.../admin/PropertiesConfigurationProvider.java | 5 +-
.../sdk/commons/protocol/EventConstants.java | 1 +
.../inlong/sdk/commons/protocol/EventUtils.java | 32 +-
.../inlong/sdk/commons/protocol/SdkEvent.java | 4 +-
inlong-sdk/sort-sdk/pom.xml | 5 +-
.../sdk/sort/api/AbstractTopicFetcherBuilder.java | 1 +
.../sdk/sort/api/InlongTopicManagerFactory.java | 9 +-
.../inlong/sdk/sort/api/InlongTopicTypeEnum.java | 1 +
.../inlong/sdk/sort/api/MultiTopicsFetcher.java | 1 +
.../org/apache/inlong/sdk/sort/api/ReportApi.java | 1 +
.../inlong/sdk/sort/api/SingleTopicFetcher.java | 1 +
.../apache/inlong/sdk/sort/api/TopicManager.java | 1 +
.../inlong/sdk/sort/entity/HeartBeatResult.java | 2 +-
.../inlong/sdk/sort/entity/InLongMessage.java | 2 +-
.../apache/inlong/sdk/sort/entity/InLongTopic.java | 2 +-
.../sort/fetcher/kafka/AckOffsetOnRebalance.java | 3 +-
.../fetcher/kafka/KafkaMultiTopicsFetcher.java | 1 +
.../inlong/sdk/sort/fetcher/kafka/KafkaSeeker.java | 5 +-
.../fetcher/kafka/KafkaSingleTopicFetcher.java | 3 +-
.../sdk/sort/fetcher/pulsar/PulsarConsumer.java | 1 +
.../fetcher/pulsar/PulsarMultiTopicsFetcher.java | 3 +-
.../fetcher/pulsar/PulsarSingleTopicFetcher.java | 3 +-
.../sdk/sort/fetcher/tube/TubeConsumerCreator.java | 2 +-
.../sort/fetcher/tube/TubeSingleTopicFetcher.java | 1 +
.../sdk/sort/impl/InlongTopicManagerImpl.java | 15 +-
.../inlong/sdk/sort/impl/ManagerReporter.java | 6 +-
.../sdk/sort/impl/QueryConsumeConfigImpl.java | 8 +-
.../inlong/sdk/sort/impl/SortClientImplV2.java | 2 +-
.../sdk/sort/impl/decode/MessageDeserializer.java | 2 +-
.../sort/impl/pulsar/InLongPulsarFetcherImpl.java | 8 +-
.../sdk/sort/interceptor/MsgTimeInterceptor.java | 1 +
.../sdk/sort/manager/InlongSingleTopicManager.java | 12 +-
.../inlong/sdk/sort/metrics/SortSdkMetricItem.java | 14 +-
.../apache/inlong/sdk/sort/util/StringUtil.java | 6 +-
.../org/apache/inlong/sdk/sort/util/TimeUtil.java | 1 +
.../org/apache/inlong/sdk/sort/util/Utils.java | 3 +-
inlong-sort-standalone/pom.xml | 22 +-
.../sort-standalone-common/pom.xml | 14 +-
.../sort/standalone/config/holder/AckPolicy.java | 6 +-
.../sort/standalone/config/pojo/type/SortType.java | 3 +-
.../inlong/sort/standalone/utils/Constants.java | 2 +-
.../standalone/utils/FlumeConfigGenerator.java | 4 +-
.../metrics/TestMetricListenerRunnable.java | 2 +-
.../standalone/metrics/TestSortMetricItemSet.java | 2 +-
.../sort-standalone-dist/pom.xml | 12 +-
.../sort-standalone-source/pom.xml | 14 +-
.../PropertiesConfigurationProvider.java | 5 +-
.../admin/ConsumerServiceAdminEventHandler.java | 6 +-
.../rollback/TimeBasedFilterInterceptor.java | 2 +-
.../sink/clickhouse/DefaultEventHandler.java | 26 +-
.../sort/standalone/sink/cls/ClsChannelWorker.java | 1 +
.../sort/standalone/sink/cls/ClsIdConfig.java | 1 +
.../inlong/sort/standalone/sink/cls/ClsSink.java | 1 +
.../sort/standalone/sink/hive/HiveSinkContext.java | 12 +-
.../kafka/DefaultEvent2KafkaRecordHandler.java | 10 +-
.../standalone/sink/kafka/KafkaFederationSink.java | 1 +
.../sink/kafka/KafkaFederationWorker.java | 1 +
.../pulsar/DefaultEvent2PulsarRecordHandler.java | 10 +-
.../sink/pulsar/PulsarProducerCluster.java | 12 +-
.../standalone/source/sortsdk/SortSdkSource.java | 6 +-
.../source/sortsdk/SubscribeFetchResult.java | 2 +-
.../sink/kafka/PartitionerSelectorTest.java | 2 +-
inlong-sort/pom.xml | 15 +-
inlong-sort/sort-api/pom.xml | 6 +-
inlong-sort/sort-common/pom.xml | 6 +-
.../inlong/sort/configuration/ConfigOption.java | 8 +-
.../inlong/sort/configuration/Configuration.java | 2 +-
.../inlong/sort/configuration/Constants.java | 29 +-
.../inlong/sort/configuration/FallbackKey.java | 2 +-
.../org/apache/inlong/sort/protocol/FieldInfo.java | 5 +-
.../org/apache/inlong/sort/protocol/GroupInfo.java | 4 +-
.../apache/inlong/sort/protocol/LookupOptions.java | 5 +-
.../inlong/sort/protocol/constant/DLCConstant.java | 20 +-
.../sort/protocol/constant/IcebergConstant.java | 2 +
.../sort/protocol/constant/OracleConstant.java | 1 +
.../deserialization/DeserializationInfo.java | 5 +-
.../InLongMsgKvDeserializationInfo.java | 3 +-
.../InLongMsgTlogKvDeserializationInfo.java | 3 +-
.../sort/protocol/enums/KafkaScanStartupMode.java | 1 +
.../inlong/sort/protocol/node/ExtractNode.java | 5 +-
.../apache/inlong/sort/protocol/node/LoadNode.java | 5 +-
.../org/apache/inlong/sort/protocol/node/Node.java | 5 +-
.../protocol/node/extract/DorisExtractNode.java | 16 +-
.../protocol/node/extract/MySqlExtractNode.java | 14 +-
.../protocol/node/extract/OracleExtractNode.java | 3 +-
.../protocol/node/extract/PostgresExtractNode.java | 4 +-
.../protocol/node/extract/PulsarExtractNode.java | 1 +
.../protocol/node/extract/TubeMQExtractNode.java | 5 +-
.../sort/protocol/node/format/CanalJsonFormat.java | 3 +-
.../protocol/node/format/DebeziumJsonFormat.java | 3 +-
.../inlong/sort/protocol/node/format/Format.java | 6 +-
.../sort/protocol/node/format/JsonFormat.java | 3 +-
.../protocol/node/load/ClickHouseLoadNode.java | 3 +-
.../protocol/node/load/ElasticsearchLoadNode.java | 28 +-
.../sort/protocol/node/load/KafkaLoadNode.java | 1 -
.../sort/protocol/node/load/MySqlLoadNode.java | 1 +
.../sort/protocol/node/load/OracleLoadNode.java | 1 +
.../sort/protocol/node/load/SqlServerLoadNode.java | 10 +-
.../protocol/node/transform/TransformNode.java | 5 +-
.../protocol/serialization/SerializationInfo.java | 5 +-
.../protocol/transformation/CascadeFunction.java | 5 +-
.../protocol/transformation/CompareOperator.java | 5 +-
.../protocol/transformation/ConstantParam.java | 5 +-
.../protocol/transformation/FieldRelation.java | 6 +-
.../protocol/transformation/FilterFunction.java | 5 +-
.../sort/protocol/transformation/Function.java | 5 +-
.../protocol/transformation/FunctionParam.java | 5 +-
.../transformation/GroupTimeWindowFunction.java | 5 +-
.../protocol/transformation/LogicOperator.java | 5 +-
.../transformation/MultiValueCompareOperator.java | 5 +-
.../sort/protocol/transformation/Operator.java | 5 +-
.../transformation/SingleValueCompareOperator.java | 5 +-
.../transformation/TimeWindowFunction.java | 5 +-
.../function/JsonGetterFunction.java | 8 +-
.../function/MultiValueFilterFunction.java | 1 -
.../function/SingleValueFilterFunction.java | 1 -
.../transformation/function/TumbleFunction.java | 1 -
.../function/TumbleStartFunction.java | 1 -
.../relation/FullOuterJoinRelation.java | 4 +-
.../relation/InnerJoinNodeRelation.java | 4 +-
.../transformation/relation/JoinRelation.java | 5 +-
.../transformation/relation/NodeRelation.java | 5 +-
.../relation/TemporalJoinRelation.java | 5 +-
.../transformation/relation/UnionNodeRelation.java | 2 +-
.../apache/inlong/sort/util/InstantiationUtil.java | 7 +-
.../org/apache/inlong/sort/util/ParameterTool.java | 2 +-
.../apache/inlong/sort/protocol/FieldInfoTest.java | 1 -
.../apache/inlong/sort/protocol/GroupInfoTest.java | 5 +-
.../inlong/sort/protocol/StreamInfoTest.java | 10 +-
.../node/extract/DorisExtractNodeTest.java | 4 +-
.../node/extract/MongoExtractNodeTest.java | 3 +-
.../node/extract/TubeMQExtractNodeTest.java | 2 +-
.../protocol/node/load/ClickHouseLoadNodeTest.java | 4 +-
.../protocol/node/load/DLCIcebergLoadNodeTest.java | 1 +
.../sort/protocol/node/load/DorisLoadNodeTest.java | 8 +-
.../protocol/node/load/ElasticSearchNodeTest.java | 18 +-
.../protocol/node/load/GreenplumLoadNodeTest.java | 3 +-
.../sort/protocol/node/load/HbaseLoadNodeTest.java | 3 +-
.../sort/protocol/node/load/HiveLoadNodeTest.java | 3 +-
.../sort/protocol/node/load/KafkaLoadNodeTest.java | 3 +-
.../protocol/node/load/PostgresLoadNodeTest.java | 3 +-
.../protocol/node/load/SqlServerLoadNodeTest.java | 5 +-
.../node/load/TDSQLPostgresLoadNodeTest.java | 3 +-
.../protocol/node/transform/DistinctNodeTest.java | 3 +-
.../function/CascadeFunctionWrapperTest.java | 3 +-
.../relation/FullOuterJoinNodeRelationTest.java | 4 +-
.../relation/InnerJoinNodeRelationTest.java | 4 +-
.../relation/InnerTemporalJoinRelationTest.java | 2 +-
.../relation/IntervalJoinRelationTest.java | 2 +-
.../relation/LeftOuterJoinNodeRelationTest.java | 4 +-
.../relation/LeftTemporalJoinRelationTest.java | 2 +-
.../relation/RightOuterJoinNodeRelationTest.java | 4 +-
inlong-sort/sort-connectors/base/pom.xml | 14 +-
.../inlong/sort/base/filter/RowKindValidator.java | 10 +-
.../base/format/DynamicSchemaFormatFactory.java | 8 +-
.../sort/base/format/JsonDynamicSchemaFormat.java | 3 +-
.../sort/base/format/JsonToRowDataConverters.java | 16 +-
.../inlong/sort/base/metric/MetricOption.java | 2 +
.../inlong/sort/base/sink/MultipleSinkOption.java | 1 +
.../base/sink/SchemaUpdateExceptionPolicy.java | 1 +
.../apache/inlong/sort/base/sink/TableChange.java | 7 +
.../apache/inlong/sort/base/util/JdbcUrlUtils.java | 4 +-
.../format/CanalJsonDynamicSchemaFormatTest.java | 1 +
.../DebeziumJsonDynamicSchemaFormatTest.java | 1 +
...eziumJsonDynamicSchemaFormatWithSchemaTest.java | 1 +
.../inlong/sort/base/metric/TestUrlValidate.java | 8 +-
inlong-sort/sort-connectors/doris/pom.xml | 23 +-
.../doris/internal/GenericDorisSinkFunction.java | 3 +-
.../inlong/sort/doris/model/RespContent.java | 1 -
.../table/DorisDynamicSchemaOutputFormat.java | 7 +-
.../sort/doris/table/DorisDynamicTableSink.java | 1 -
.../inlong/sort/doris/table/DorisStreamLoad.java | 1 +
.../sort-connectors/elasticsearch-6/pom.xml | 42 +-
.../Elasticsearch6ApiCallBridge.java | 3 +-
.../sort/elasticsearch6/ElasticsearchSink.java | 3 +-
.../table/Elasticsearch6Configuration.java | 1 +
.../table/Elasticsearch6DynamicSink.java | 5 +-
.../table/Elasticsearch6DynamicSinkFactory.java | 76 ++--
.../table/Elasticsearch6DynamicSinkITCase.java | 93 ++--
.../sort-connectors/elasticsearch-7/pom.xml | 50 +--
.../Elasticsearch7ApiCallBridge.java | 6 +-
.../Elasticsearch7BulkProcessorIndexer.java | 1 -
.../table/Elasticsearch7Configuration.java | 1 +
.../table/Elasticsearch7DynamicSink.java | 5 +-
.../table/Elasticsearch7DynamicSinkFactory.java | 76 ++--
.../table/Elasticsearch7DynamicSinkITCase.java | 77 ++--
.../sort-connectors/elasticsearch-base/pom.xml | 16 +-
.../sort/elasticsearch/ElasticsearchSinkBase.java | 9 +-
.../elasticsearch/ElasticsearchSinkFunction.java | 2 +-
.../table/ElasticsearchConfiguration.java | 6 +-
.../elasticsearch/table/IndexGeneratorFactory.java | 4 +
.../sort/elasticsearch/table/KeyExtractor.java | 14 +-
.../sort/elasticsearch/table/RequestFactory.java | 1 +
.../sort/elasticsearch/table/RoutingExtractor.java | 1 +
.../table/RowElasticsearchSinkFunction.java | 4 +-
inlong-sort/sort-connectors/filesystem/pom.xml | 20 +-
.../sort/filesystem/FileSystemTableSink.java | 30 +-
.../filesystem/stream/AbstractStreamingWriter.java | 15 +-
.../filesystem/stream/StreamingFileWriter.java | 5 +-
.../sort/filesystem/stream/StreamingSink.java | 16 +-
.../stream/compact/CompactFileWriter.java | 8 +-
inlong-sort/sort-connectors/hbase/pom.xml | 59 ++-
.../sort/hbase/HBase2DynamicTableFactory.java | 4 +-
.../inlong/sort/hbase/sink/HBaseSinkFunction.java | 6 +-
inlong-sort/sort-connectors/hive/pom.xml | 82 ++--
.../org/apache/inlong/sort/hive/HiveOptions.java | 1 -
.../sort/hive/HiveTableMetaStoreFactory.java | 6 +-
.../org/apache/inlong/sort/hive/HiveTableSink.java | 18 +-
.../hive/filesystem/AbstractStreamingWriter.java | 15 +-
.../sort/hive/filesystem/CompactFileWriter.java | 7 +-
.../sort/hive/filesystem/StreamingFileWriter.java | 5 +-
.../inlong/sort/hive/filesystem/StreamingSink.java | 18 +-
.../sort/hive/table/HiveTableInlongFactory.java | 8 +-
inlong-sort/sort-connectors/iceberg-dlc/pom.xml | 25 +-
.../iceberg/catalog/hybris/CachedClientPool.java | 3 +-
.../catalog/hybris/DLCWrappedHybrisClientPool.java | 2 +-
.../catalog/hybris/DlcWrappedHybrisCatalog.java | 20 +-
.../catalog/hybris/HiveTableOperations.java | 13 +-
.../sort/iceberg/flink/CompactTableProperties.java | 35 +-
.../inlong/sort/iceberg/flink/FlinkCatalog.java | 4 +-
.../iceberg/flink/FlinkDynamicTableFactory.java | 1 +
.../sort/iceberg/flink/IcebergTableSink.java | 1 +
.../sort/iceberg/flink/actions/RewriteResult.java | 1 +
.../flink/actions/SyncRewriteDataFilesAction.java | 5 +-
.../actions/SyncRewriteDataFilesActionOption.java | 7 +-
.../iceberg/flink/sink/BaseDeltaTaskWriter.java | 5 +-
.../flink/sink/DeltaManifestsSerializer.java | 1 +
.../sort/iceberg/flink/sink/FlinkManifestUtil.java | 1 +
.../inlong/sort/iceberg/flink/sink/FlinkSink.java | 2 +
.../iceberg/flink/sink/IcebergFilesCommitter.java | 19 +-
.../iceberg/flink/sink/IcebergStreamWriter.java | 6 +-
.../flink/sink/ManifestOutputFileFactory.java | 3 +-
.../iceberg/flink/sink/PartitionedDeltaWriter.java | 78 ++--
.../flink/sink/RowDataTaskWriterFactory.java | 1 +
.../flink/sink/UnpartitionedDeltaWriter.java | 47 +-
inlong-sort/sort-connectors/iceberg/pom.xml | 21 +-
.../sort/iceberg/FlinkDynamicTableFactory.java | 1 -
.../sort/iceberg/sink/BaseDeltaTaskWriter.java | 5 +-
.../iceberg/sink/DeltaManifestsSerializer.java | 1 +
.../sort/iceberg/sink/FlinkManifestUtil.java | 1 +
.../apache/inlong/sort/iceberg/sink/FlinkSink.java | 3 +-
.../iceberg/sink/ManifestOutputFileFactory.java | 1 +
.../sort/iceberg/sink/PartitionedDeltaWriter.java | 78 ++--
.../iceberg/sink/RowDataTaskWriterFactory.java | 1 +
.../iceberg/sink/UnpartitionedDeltaWriter.java | 47 +-
.../sink/multiple/DynamicSchemaHandleOperator.java | 4 +-
.../multiple/IcebergMultipleFilesCommiter.java | 5 +-
.../sink/multiple/IcebergMultipleStreamWriter.java | 21 +-
.../sink/multiple/IcebergProcessFunction.java | 1 +
.../sink/multiple/IcebergProcessOperator.java | 9 +-
.../sink/multiple/IcebergSingleFileCommiter.java | 16 +-
.../sink/multiple/IcebergSingleStreamWriter.java | 6 +-
.../iceberg/sink/multiple/MultipleWriteResult.java | 1 +
.../iceberg/sink/multiple/RecordWithSchema.java | 9 +-
.../iceberg/sink/multiple/SchemaChangeUtils.java | 1 +
.../sink/multiple/SchemaEvolutionFunction.java | 1 +
inlong-sort/sort-connectors/jdbc/pom.xml | 12 +-
.../jdbc/converter/AbstractJdbcRowConverter.java | 50 +--
.../jdbc/converter/oracle/OracleRowConverter.java | 100 ++---
.../inlong/sort/jdbc/dialect/PostgresDialect.java | 2 +-
.../inlong/sort/jdbc/dialect/SqlServerDialect.java | 31 +-
.../sort/jdbc/dialect/TDSQLPostgresDialect.java | 2 +-
.../jdbc/internal/GenericJdbcSinkFunction.java | 3 +-
.../jdbc/internal/JdbcBatchingOutputFormat.java | 24 +-
.../jdbc/internal/TableJdbcUpsertOutputFormat.java | 76 ++--
.../sort/jdbc/table/AbstractJdbcDialect.java | 7 +-
.../jdbc/table/JdbcDynamicOutputFormatBuilder.java | 55 ++-
inlong-sort/sort-connectors/kafka/pom.xml | 18 +-
.../kafka/DynamicKafkaSerializationSchema.java | 17 +-
.../inlong/sort/kafka/FlinkKafkaConsumer.java | 7 +-
.../inlong/sort/kafka/FlinkKafkaConsumerBase.java | 65 +--
.../inlong/sort/kafka/FlinkKafkaProducer.java | 53 +--
.../apache/inlong/sort/kafka/KafkaDynamicSink.java | 19 +-
.../table/DynamicKafkaDeserializationSchema.java | 7 +-
.../sort/kafka/table/KafkaDynamicSource.java | 42 +-
.../sort/kafka/table/KafkaDynamicTableFactory.java | 10 +-
.../inlong/sort/kafka/table/KafkaOptions.java | 1 +
.../table/UpsertKafkaDynamicTableFactory.java | 10 +-
inlong-sort/sort-connectors/mongodb-cdc/pom.xml | 36 +-
.../sort/cdc/mongodb/DebeziumSourceFunction.java | 23 +-
.../sort/cdc/mongodb/table/MongoDBTableSource.java | 9 +-
inlong-sort/sort-connectors/mysql-cdc/pom.xml | 36 +-
.../sort/cdc/debezium/DebeziumSourceFunction.java | 16 +-
.../JsonDebeziumDeserializationSchema.java | 2 +-
.../StringDebeziumDeserializationSchema.java | 3 +-
.../debezium/internal/DebeziumChangeConsumer.java | 4 +-
.../debezium/internal/DebeziumChangeFetcher.java | 4 +-
.../sort/cdc/debezium/internal/DebeziumOffset.java | 1 +
.../internal/DebeziumOffsetSerializer.java | 1 +
.../debezium/internal/FlinkOffsetBackingStore.java | 1 +
.../sort/cdc/debezium/internal/SchemaRecord.java | 6 +-
.../sort/cdc/debezium/table/DebeziumOptions.java | 1 +
.../table/DeserializationRuntimeConverter.java | 1 +
.../table/RowDataDebeziumDeserializeSchema.java | 19 +-
.../cdc/mysql/SeekBinlogToTimestampFilter.java | 1 +
.../debezium/dispatcher/SignalEventDispatcher.java | 1 +
.../mysql/debezium/reader/BinlogSplitReader.java | 14 +-
.../mysql/debezium/reader/SnapshotSplitReader.java | 12 +-
.../debezium/task/MySqlSnapshotSplitReadTask.java | 27 +-
.../debezium/task/context/MySqlErrorHandler.java | 1 +
.../debezium/task/context/StatefulTaskContext.java | 6 +-
.../cdc/mysql/schema/MySqlFieldDefinition.java | 1 +
.../inlong/sort/cdc/mysql/schema/MySqlSchema.java | 1 +
.../cdc/mysql/schema/MySqlTableDefinition.java | 3 +-
.../inlong/sort/cdc/mysql/source/MySqlSource.java | 13 +-
.../sort/cdc/mysql/source/MySqlSourceBuilder.java | 1 +
.../cdc/mysql/source/assigners/AssignerStatus.java | 6 +
.../cdc/mysql/source/assigners/ChunkRange.java | 1 +
.../assigners/MySqlSnapshotSplitAssigner.java | 1 +
.../assigners/state/HybridPendingSplitsState.java | 1 +
.../source/assigners/state/PendingSplitsState.java | 4 +-
.../cdc/mysql/source/config/MySqlSourceConfig.java | 1 +
.../mysql/source/config/MySqlSourceOptions.java | 20 +-
.../cdc/mysql/source/config/ServerIdRange.java | 1 +
.../cdc/mysql/source/events/WakeupReaderEvent.java | 1 +
.../mysql/source/reader/MySqlRecordEmitter.java | 22 +-
.../cdc/mysql/source/reader/MySqlSourceReader.java | 4 +-
.../sort/cdc/mysql/source/split/MySqlRecords.java | 9 +-
.../sort/cdc/mysql/source/utils/ChunkUtils.java | 5 +-
.../sort/cdc/mysql/source/utils/RecordUtils.java | 2 +-
.../cdc/mysql/source/utils/SerializerUtils.java | 6 +-
.../cdc/mysql/source/utils/StatementUtils.java | 9 +-
.../mysql/source/utils/TableDiscoveryUtils.java | 1 +
.../MySqlDeserializationConverterFactory.java | 1 +
.../cdc/mysql/table/MySqlReadableMetadata.java | 148 ++++---
.../mysql/table/MySqlTableInlongSourceFactory.java | 3 +-
.../sort/cdc/mysql/table/MySqlTableSource.java | 21 +-
.../cdc/mysql/table/OldFieldMetadataConverter.java | 6 +
.../sort/cdc/mysql/table/StartupOptions.java | 1 +
inlong-sort/sort-connectors/oracle-cdc/pom.xml | 44 +-
.../oracle/debezium/DebeziumSourceFunction.java | 14 +-
.../debezium/internal/DebeziumChangeConsumer.java | 4 +-
.../oracle/debezium/internal/DebeziumOffset.java | 1 +
.../internal/DebeziumOffsetSerializer.java | 1 +
.../debezium/internal/FlinkOffsetBackingStore.java | 1 +
.../cdc/oracle/debezium/internal/SchemaRecord.java | 6 +-
.../cdc/oracle/debezium/table/DebeziumOptions.java | 1 +
.../table/DeserializationRuntimeConverter.java | 1 +
.../table/RowDataDebeziumDeserializeSchema.java | 33 +-
.../OracleDeserializationConverterFactory.java | 44 +-
.../cdc/oracle/table/OracleReadableMetaData.java | 17 +
.../sort/cdc/oracle/table/OracleTableSource.java | 9 +-
inlong-sort/sort-connectors/pom.xml | 12 +-
inlong-sort/sort-connectors/postgres-cdc/pom.xml | 32 +-
.../DebeziumSourceFunction.java | 13 +-
.../cdc/postgres/table/PostgreSQLTableSource.java | 9 +-
inlong-sort/sort-connectors/pulsar/pom.xml | 18 +-
.../table/DynamicPulsarDeserializationSchema.java | 1 +
.../table/DynamicPulsarSerializationSchema.java | 10 +-
.../pulsar/table/PulsarDynamicTableFactory.java | 24 +-
.../sort/pulsar/table/PulsarDynamicTableSink.java | 22 +-
.../pulsar/table/PulsarDynamicTableSource.java | 66 ++-
.../table/UpsertPulsarDynamicTableFactory.java | 3 +-
.../pulsar/withoutadmin/FlinkPulsarSource.java | 97 ++---
.../sort/pulsar/withoutadmin/PulsarFetcher.java | 18 +-
.../pulsar/withoutadmin/PulsarMetadataReader.java | 6 +-
.../sort/pulsar/withoutadmin/ReaderThread.java | 2 +
inlong-sort/sort-connectors/redis/pom.xml | 24 +-
.../redis/source/RedisRowDataLookupFunction.java | 9 +-
.../sort/redis/table/RedisDynamicTableFactory.java | 2 +
.../inlong/sort/redis/table/SchemaValidator.java | 2 +-
inlong-sort/sort-connectors/sqlserver-cdc/pom.xml | 28 +-
.../inlong/sort/cdc/sqlserver/SqlServerSource.java | 2 +-
.../sqlserver/table/DebeziumSourceFunction.java | 25 +-
.../cdc/sqlserver/table/SqlServerTableFactory.java | 2 +-
.../cdc/sqlserver/table/SqlServerTableSource.java | 19 +-
inlong-sort/sort-connectors/tubemq/pom.xml | 14 +-
.../inlong/sort/tubemq/FlinkTubeMQConsumer.java | 11 +-
.../table/DynamicTubeMQDeserializationSchema.java | 4 +-
.../inlong/sort/tubemq/table/TubeMQOptions.java | 8 +-
.../sort/tubemq/table/TubeMQTableSource.java | 4 +-
inlong-sort/sort-core/pom.xml | 8 +-
.../inlong/sort/parser/impl/FlinkSqlParser.java | 4 +-
.../sort/function/CascadeFunctionWrapperTest.java | 4 +-
.../inlong/sort/function/EncryptFunctionTest.java | 7 +-
.../sort/function/JsonGetterFunctionTest.java | 21 +-
.../function/RegexpReplaceFirstFunctionTest.java | 7 +-
.../sort/function/RegexpReplaceFunctionTest.java | 4 +-
.../sort/function/SplitIndexFunctionTest.java | 4 +-
.../apache/inlong/sort/parser/AllMigrateTest.java | 46 +-
.../sort/parser/ClickHouseSqlParserTest.java | 3 +-
.../sort/parser/CustomFunctionSqlParseTest.java | 8 +-
.../inlong/sort/parser/DLCIcebergSqlParseTest.java | 3 +-
.../sort/parser/DataTypeConvertSqlParseTest.java | 34 +-
.../sort/parser/DecimalFormatSqlParseTest.java | 9 +-
.../sort/parser/DistinctNodeSqlParseTest.java | 42 +-
.../DorisExtractNodeToDorisLoadNodeTest.java | 11 +-
.../DorisExtractNodeToMySqlLoadNodeTest.java | 11 +-
.../sort/parser/Elasticsearch6SqlParseTest.java | 2 +-
.../sort/parser/Elasticsearch7SqlParseTest.java | 2 +-
.../sort/parser/ElasticsearchSqlParseTest.java | 38 +-
.../sort/parser/FilesystemSqlParserTest.java | 5 +-
.../apache/inlong/sort/parser/FilterParseTest.java | 22 +-
.../inlong/sort/parser/FlinkSqlParserTest.java | 23 +-
.../sort/parser/FullOuterJoinSqlParseTest.java | 66 ++-
.../sort/parser/GreenplumLoadSqlParseTest.java | 8 +-
.../sort/parser/HbaseLoadFlinkSqlParseTest.java | 5 +-
.../sort/parser/IcebergNodeSqlParserTest.java | 11 +-
.../sort/parser/InnerJoinRelationSqlParseTest.java | 74 ++--
.../parser/IntervalJoinRelationSqlParseTest.java | 22 +-
.../inlong/sort/parser/KafkaLoadSqlParseTest.java | 2 +-
.../inlong/sort/parser/KafkaSqlParseTest.java | 11 +-
.../sort/parser/LeftOuterJoinSqlParseTest.java | 66 ++-
.../inlong/sort/parser/MetaFieldSyncTest.java | 26 +-
.../sort/parser/MongoExtractFlinkSqlParseTest.java | 9 +-
.../MySqlExtractNodeToDorisLoadNodeTest.java | 8 +-
.../inlong/sort/parser/MySqlLoadSqlParseTest.java | 8 +-
.../MySqlTemporalJoinRelationSqlParseTest.java | 27 +-
.../sort/parser/OracleExtractSqlParseTest.java | 9 +-
.../inlong/sort/parser/OracleLoadSqlParseTest.java | 8 +-
.../parser/PostgresExtractFlinkSqlParseTest.java | 9 +-
.../parser/PostgresLoadNodeFlinkSqlParseTest.java | 5 +-
.../inlong/sort/parser/PulsarSqlParserTest.java | 2 +-
.../RedisTemporalJoinRelationSqlParseTest.java | 11 +-
.../sort/parser/RightOuterJoinSqlParseTest.java | 66 ++-
.../sort/parser/SqlServerNodeSqlParseTest.java | 11 +-
.../TDSQLPostgresLoadNodeFlinkSqlParseTest.java | 5 +-
.../inlong/sort/parser/TubeMQNodeSqlParseTest.java | 5 +-
.../inlong/sort/parser/UnionSqlParseTest.java | 24 +-
inlong-sort/sort-dist/pom.xml | 12 +-
inlong-sort/sort-end-to-end-tests/pom.xml | 45 +-
.../apache/inlong/sort/tests/ClickHouseCase.java | 7 +-
.../org/apache/inlong/sort/tests/KafkaE2ECase.java | 6 +
.../sort/tests/utils/FlinkContainerTestEnv.java | 7 +-
.../inlong/sort/tests/utils/MySqlContainer.java | 1 +
.../sort/tests/utils/PlaceholderResolver.java | 1 +
.../apache/inlong/sort/tests/utils/TestUtils.java | 8 +-
inlong-sort/sort-formats/format-base/pom.xml | 8 +-
.../base/DefaultTableFormatDeserializer.java | 17 +-
.../formats/base/DefaultTableFormatSerializer.java | 11 +-
.../ProjectedDeserializationSchemaFactory.java | 3 +-
.../base/ProjectedSerializationSchemaFactory.java | 3 +-
.../base/TableFormatDeserializerFactory.java | 3 +-
.../formats/base/TableFormatSerializerFactory.java | 3 +-
.../inlong/sort/formats/base/TableFormatUtils.java | 60 +--
.../sort/formats/base/TableFormatUtilsTest.java | 57 +--
inlong-sort/sort-formats/format-common/pom.xml | 8 +-
.../sort/formats/common/ArrayFormatInfo.java | 3 +-
.../inlong/sort/formats/common/ArrayTypeInfo.java | 3 +-
.../inlong/sort/formats/common/DateFormatInfo.java | 3 +-
.../inlong/sort/formats/common/FormatUtils.java | 20 +-
.../inlong/sort/formats/common/MapFormatInfo.java | 5 +-
.../inlong/sort/formats/common/MapTypeInfo.java | 5 +-
.../inlong/sort/formats/common/RowFormatInfo.java | 6 +-
.../inlong/sort/formats/common/RowTypeInfo.java | 6 +-
.../inlong/sort/formats/util/StringUtils.java | 36 +-
.../sort/formats/common/ArrayFormatInfoTest.java | 7 +-
.../sort/formats/common/BinaryFormatInfoTest.java | 6 +-
.../sort/formats/common/DecimalFormatInfoTest.java | 8 +-
.../sort/formats/common/DoubleFormatInfoTest.java | 6 +-
.../sort/formats/common/FloatFormatInfoTest.java | 6 +-
.../sort/formats/common/IntFormatInfoTest.java | 6 +-
.../sort/formats/common/LongFormatInfoTest.java | 6 +-
.../sort/formats/common/MapFormatInfoTest.java | 12 +-
.../sort/formats/common/RowFormatInfoTest.java | 24 +-
.../sort/formats/common/ShortFormatInfoTest.java | 6 +-
.../formats/common/VarBinaryFormatInfoTest.java | 6 +-
inlong-sort/sort-formats/format-csv/pom.xml | 12 +-
.../sort/formats/csv/CsvDeserializationSchema.java | 27 +-
.../inlong/sort/formats/csv/CsvFormatFactory.java | 42 +-
.../sort/formats/csv/CsvSerializationSchema.java | 25 +-
.../formats/csv/CsvDeserializationSchemaTest.java | 42 +-
.../sort/formats/csv/CsvFormatFactoryTest.java | 48 +--
.../formats/csv/CsvSerializationSchemaTest.java | 33 +-
.../apache/inlong/sort/formats/csv/CsvTest.java | 3 +-
.../inlong/sort/formats/csv/CsvUtilsTest.java | 42 +-
.../sort-formats/format-inlongmsg-base/pom.xml | 8 +-
.../AbstractInLongMsgFormatDeserializer.java | 3 +-
.../AbstractInLongMsgMixedFormatDeserializer.java | 3 +-
.../sort/formats/inlongmsg/InLongMsgBody.java | 5 +-
.../formats/inlongmsg/InLongMsgDecodingFormat.java | 14 +-
.../inlongmsg/InLongMsgDeserializationSchema.java | 1 +
.../formats/inlongmsg/InLongMsgFormatFactory.java | 4 +-
.../sort/formats/inlongmsg/InLongMsgHead.java | 19 +-
.../inlongmsg/InLongMsgMixedFormatConverter.java | 4 +-
.../inlongmsg/InLongMsgMixedFormatFactory.java | 6 +-
.../sort/formats/inlongmsg/InLongMsgOptions.java | 5 +-
.../sort/formats/inlongmsg/InLongMsgUtils.java | 24 +-
.../inlongmsg/InLongMsgFormatFactoryTest.java | 2 +-
.../inlongmsg/InLongMsgRowDataSerDeTest.java | 15 +-
.../sort-formats/format-inlongmsg-csv/pom.xml | 12 +-
.../InLongMsgCsvFormatDeserializer.java | 31 +-
.../inlongmsgcsv/InLongMsgCsvFormatFactory.java | 25 +-
.../InLongMsgCsvMixedFormatConverter.java | 11 +-
.../InLongMsgCsvMixedFormatDeserializer.java | 17 +-
.../formats/inlongmsgcsv/InLongMsgCsvUtils.java | 17 +-
.../InLongMsgCsvFormatDeserializerTest.java | 86 ++--
.../InLongMsgCsvFormatFactoryTest.java | 18 +-
.../formats/inlongmsgcsv/InLongMsgCsvTest.java | 3 +-
.../sort-formats/format-inlongmsg-pb/pom.xml | 6 +-
.../inlongmsgpb/InLongMsgPbDecodingFormat.java | 13 +-
.../InLongMsgPbDeserializationSchema.java | 2 +
.../inlongmsgpb/InLongMsgPbFormatFactory.java | 4 +-
.../formats/inlongmsgpb/InLongMsgPbOptions.java | 5 +-
inlong-sort/sort-formats/format-json/pom.xml | 12 +-
.../inlong/sort/formats/json/canal/CanalJson.java | 1 -
.../json/canal/CanalJsonDecodingFormat.java | 19 +-
.../json/canal/CanalJsonDeserializationSchema.java | 6 +-
.../canal/CanalJsonEnhancedDecodingFormat.java | 13 +
.../CanalJsonEnhancedDeserializationSchema.java | 7 +-
.../canal/CanalJsonEnhancedEncodingFormat.java | 22 +-
.../json/canal/CanalJsonEnhancedFormatFactory.java | 4 +-
.../CanalJsonEnhancedSerializationSchema.java | 13 +-
.../json/canal/CanalJsonSerializationSchema.java | 6 +-
.../sort/formats/json/debezium/DebeziumJson.java | 1 +
.../json/debezium/DebeziumJsonDecodingFormat.java | 20 +-
.../DebeziumJsonDeserializationSchema.java | 9 +-
.../canal/CanalJsonEnhancedFormatFactoryTest.java | 5 +-
.../canal/CanalJsonEnhancedSerDeSchemaTest.java | 15 +-
inlong-sort/sort-formats/format-kv/pom.xml | 12 +-
.../sort/formats/kv/KvDeserializationSchema.java | 27 +-
.../inlong/sort/formats/kv/KvFormatFactory.java | 42 +-
.../sort/formats/kv/KvSerializationSchema.java | 32 +-
.../formats/kv/KvDeserializationSchemaTest.java | 71 ++-
.../sort/formats/kv/KvFormatFactoryTest.java | 51 +--
.../sort/formats/kv/KvSerializationSchemaTest.java | 50 +--
.../org/apache/inlong/sort/formats/kv/KvTest.java | 3 +-
.../apache/inlong/sort/formats/kv/KvUtilsTest.java | 268 ++++++------
inlong-sort/sort-formats/pom.xml | 42 +-
inlong-tubemq/pom.xml | 102 +++--
inlong-tubemq/tubemq-client/pom.xml | 76 ++--
.../tubemq/client/common/ClientStatsInfo.java | 24 +-
.../inlong/tubemq/client/common/ConfirmResult.java | 7 +-
.../inlong/tubemq/client/common/ConsumeResult.java | 1 +
.../inlong/tubemq/client/common/PeerInfo.java | 1 +
.../inlong/tubemq/client/common/StatsConfig.java | 5 +-
.../inlong/tubemq/client/common/StatsLevel.java | 1 +
.../tubemq/client/config/ConsumerConfig.java | 27 +-
.../tubemq/client/config/TubeClientConfig.java | 25 +-
.../client/config/TubeClientConfigUtils.java | 2 +-
.../client/consumer/BaseMessageConsumer.java | 168 ++++----
.../client/consumer/ClientBalanceConsumer.java | 8 +-
.../tubemq/client/consumer/ClientSubInfo.java | 9 +-
.../tubemq/client/consumer/ConsumeOffsetInfo.java | 11 +-
.../tubemq/client/consumer/ConsumePosition.java | 1 +
.../tubemq/client/consumer/ConsumerResult.java | 11 +-
.../client/consumer/ConsumerSamplePrint.java | 3 +-
.../tubemq/client/consumer/FetchContext.java | 6 +-
.../tubemq/client/consumer/MessageConsumer.java | 6 +-
.../client/consumer/MessageFetchManager.java | 5 +-
.../tubemq/client/consumer/PartitionExt.java | 18 +-
.../client/consumer/PartitionSelectResult.java | 9 +-
.../client/consumer/PullMessageConsumer.java | 4 +-
.../client/consumer/PushMessageConsumer.java | 4 +-
.../tubemq/client/consumer/RmtDataCache.java | 61 ++-
.../consumer/SimpleClientBalanceConsumer.java | 93 ++--
.../client/consumer/SimplePullMessageConsumer.java | 26 +-
.../client/consumer/SimplePushMessageConsumer.java | 20 +-
.../tubemq/client/consumer/TopicProcessor.java | 3 +-
.../client/factory/TubeBaseSessionFactory.java | 4 +-
.../tubemq/client/producer/MaxMsgSizeHolder.java | 1 +
.../tubemq/client/producer/MessageSentResult.java | 7 +-
.../tubemq/client/producer/ProducerManager.java | 29 +-
.../client/producer/SimpleMessageProducer.java | 37 +-
.../qltystats/DefaultBrokerRcvQltyStats.java | 44 +-
.../client/consumer/MessageFetchManagerTest.java | 1 +
.../tubemq/client/consumer/PartitionExtTest.java | 8 +-
.../tubemq/client/consumer/StatsConfigTest.java | 1 +
.../factory/TubeSingleSessionFactoryTest.java | 1 +
inlong-tubemq/tubemq-connectors/pom.xml | 10 +-
.../tubemq-connector-flink/pom.xml | 14 +-
.../flink/connectors/tubemq/TubemqOptions.java | 44 +-
.../connectors/tubemq/TubemqSinkFunction.java | 16 +-
.../connectors/tubemq/TubemqSourceFunction.java | 82 ++--
.../flink/connectors/tubemq/TubemqTableSink.java | 46 +-
.../flink/connectors/tubemq/TubemqTableSource.java | 80 ++--
.../tubemq/TubemqTableSourceSinkFactory.java | 118 +++--
.../apache/flink/connectors/tubemq/TubemqTest.java | 28 +-
.../tubemq-connector-flume/pom.xml | 12 +-
.../org/apache/flume/sink/tubemq/EventStat.java | 1 +
.../apache/flume/sink/tubemq/TubeSinkCounter.java | 3 +-
.../org/apache/flume/sink/tubemq/TubemqSink.java | 2 +
.../apache/flume/sink/tubemq/TestTubemqSink.java | 52 +--
.../tubemq-connector-spark/pom.xml | 12 +-
inlong-tubemq/tubemq-core/pom.xml | 122 +++---
.../org/apache/inlong/tubemq/corebase/Message.java | 6 +-
.../inlong/tubemq/corebase/Shutdownable.java | 1 +
.../inlong/tubemq/corebase/TErrCodeConstants.java | 1 +
.../tubemq/corebase/balance/ConsumerEvent.java | 6 +-
.../tubemq/corebase/balance/EventStatus.java | 2 +-
.../inlong/tubemq/corebase/balance/EventType.java | 3 +-
.../inlong/tubemq/corebase/cluster/BrokerInfo.java | 12 +-
.../inlong/tubemq/corebase/cluster/MasterInfo.java | 2 +-
.../inlong/tubemq/corebase/cluster/Partition.java | 6 +-
.../inlong/tubemq/corebase/cluster/TopicInfo.java | 10 +-
.../inlong/tubemq/corebase/config/TLSConfig.java | 1 +
.../corebase/daemon/AbstractDaemonService.java | 1 +
.../tubemq/corebase/metric/TrafficStatsUnit.java | 1 +
.../tubemq/corebase/metric/impl/BaseMetric.java | 1 +
.../tubemq/corebase/metric/impl/ESTHistogram.java | 7 +-
.../tubemq/corebase/metric/impl/LongMaxGauge.java | 1 +
.../tubemq/corebase/metric/impl/LongMinGauge.java | 1 +
.../corebase/metric/impl/LongOnlineCounter.java | 1 +
.../corebase/metric/impl/LongStatsCounter.java | 1 +
.../corebase/metric/impl/SimpleHistogram.java | 1 +
.../tubemq/corebase/metric/impl/SinceTime.java | 1 +
.../tubemq/corebase/policies/FlowCtrlItem.java | 6 +-
.../tubemq/corebase/policies/FlowCtrlResult.java | 1 +
.../corebase/policies/FlowCtrlRuleHandler.java | 18 +-
.../tubemq/corebase/policies/SSDCtrlResult.java | 1 +
.../apache/inlong/tubemq/corebase/rv/RetValue.java | 1 +
.../tubemq/corebase/utils/AbstractSamplePrint.java | 6 +-
.../inlong/tubemq/corebase/utils/AddressUtils.java | 20 +-
.../inlong/tubemq/corebase/utils/CheckSum.java | 1 +
.../tubemq/corebase/utils/ConcurrentHashSet.java | 3 +-
.../tubemq/corebase/utils/DataConverterUtil.java | 7 +-
.../corebase/utils/DateTimeConvertUtils.java | 12 +-
.../inlong/tubemq/corebase/utils/MixedUtils.java | 5 +-
.../tubemq/corebase/utils/ServiceStatusHolder.java | 29 +-
.../inlong/tubemq/corebase/utils/TStringUtils.java | 10 +-
.../inlong/tubemq/corebase/utils/ThreadUtils.java | 5 +-
.../tubemq/corerpc/AbstractServiceInvoker.java | 6 +-
.../inlong/tubemq/corerpc/RemoteConErrStats.java | 4 +-
.../inlong/tubemq/corerpc/RequestWrapper.java | 6 +-
.../inlong/tubemq/corerpc/ResponseWrapper.java | 12 +-
.../apache/inlong/tubemq/corerpc/RpcConstants.java | 4 +-
.../apache/inlong/tubemq/corerpc/RpcDataPack.java | 1 +
.../inlong/tubemq/corerpc/RpcServiceFactory.java | 31 +-
.../tubemq/corerpc/RpcServiceFailoverInvoker.java | 4 +-
.../inlong/tubemq/corerpc/RpcServiceInvoker.java | 5 +-
.../benchemark/RcpService4BenchmarkClient.java | 3 +-
.../inlong/tubemq/corerpc/client/CallFuture.java | 1 +
.../inlong/tubemq/corerpc/client/Callback.java | 1 +
.../inlong/tubemq/corerpc/client/Client.java | 2 +-
.../inlong/tubemq/corerpc/codec/PbEnDecoder.java | 7 +-
.../corerpc/exception/ClientClosedException.java | 1 +
.../tubemq/corerpc/exception/StandbyException.java | 1 +
.../exception/UnknownProtocolException.java | 1 +
.../corerpc/netty/ByteBufferInputStream.java | 1 +
.../inlong/tubemq/corerpc/netty/EventLoopUtil.java | 18 +-
.../inlong/tubemq/corerpc/netty/NettyClient.java | 21 +-
.../tubemq/corerpc/netty/NettyClientFactory.java | 8 +-
.../tubemq/corerpc/netty/NettyProtocolDecoder.java | 7 +-
.../tubemq/corerpc/netty/NettyRequestContext.java | 5 +-
.../tubemq/corerpc/netty/NettyRpcServer.java | 7 +-
.../inlong/tubemq/corerpc/protocol/Protocol.java | 2 +-
.../tubemq/corerpc/protocol/RpcProtocol.java | 4 +-
.../tubemq/corerpc/server/ServiceRpcServer.java | 2 +-
.../tubemq/corerpc/service/BrokerReadService.java | 8 +-
.../tubemq/corerpc/service/BrokerWriteService.java | 4 +-
.../tubemq/corerpc/service/MasterService.java | 18 +-
.../inlong/tubemq/corerpc/utils/MixUtils.java | 4 +-
.../tubemq/corerpc/utils/TSSLEngineUtil.java | 22 +-
.../corebase/policies/TestFlowCtrlRuleHandler.java | 4 +-
.../corebase/utils/DateTimeConvertUtilsTest.java | 1 +
.../tubemq/corerpc/codec/PbEnDecoderTest.java | 4 +-
.../tubemq/corerpc/utils/TSSLEngineUtilTest.java | 4 +-
inlong-tubemq/tubemq-docker/pom.xml | 10 +-
inlong-tubemq/tubemq-docker/tubemq-all/pom.xml | 157 +++----
inlong-tubemq/tubemq-docker/tubemq-build/pom.xml | 95 ++--
inlong-tubemq/tubemq-docker/tubemq-cpp/pom.xml | 95 ++--
inlong-tubemq/tubemq-docker/tubemq-manager/pom.xml | 157 +++----
inlong-tubemq/tubemq-example/pom.xml | 22 +-
.../example/ClientBalanceConsumerExample.java | 23 +-
.../tubemq/example/MAMessageProducerExample.java | 28 +-
.../tubemq/example/MessageProducerExample.java | 12 +-
.../tubemq/example/MessagePullConsumerExample.java | 38 +-
.../example/MessagePullSetConsumerExample.java | 31 +-
.../tubemq/example/MessagePushConsumerExample.java | 2 +-
.../inlong/tubemq/example/MsgSendReceiveStats.java | 1 +
inlong-tubemq/tubemq-manager/pom.xml | 26 +-
.../tubemq/manager/config/SwaggerConfig.java | 1 +
.../tubemq/manager/controller/TubeMQResult.java | 1 +
.../controller/cluster/ClusterController.java | 14 +-
.../manager/controller/cluster/dto/ClusterDto.java | 1 +
.../controller/cluster/request/AddClusterReq.java | 1 +
.../cluster/request/DeleteClusterReq.java | 1 +
.../cluster/request/SwitchClusterReq.java | 1 +
.../cluster/request/UpdateClusterReq.java | 1 +
.../manager/controller/cluster/vo/ClusterVo.java | 1 +
.../manager/controller/group/GroupController.java | 12 +-
.../controller/group/request/AddBlackGroupReq.java | 1 +
.../group/request/BatchDeleteGroupReq.java | 1 +
.../group/request/DeleteBlackGroupReq.java | 1 +
.../controller/group/request/DeleteOffsetReq.java | 1 +
.../group/request/FilterCondGroupReq.java | 1 +
.../group/request/FlowControlGroupReq.java | 1 +
.../group/request/QueryConsumerGroupReq.java | 1 +
.../controller/group/request/QueryOffsetReq.java | 1 +
.../group/result/AllBrokersOffsetRes.java | 1 +
.../group/result/ConsumerGroupInfoRes.java | 3 +
.../controller/group/result/ConsumerInfoRes.java | 1 +
.../controller/group/result/GroupOffsetRes.java | 1 +
.../group/result/OffsetPartitionRes.java | 1 +
.../controller/group/result/OffsetQueryRes.java | 1 +
.../controller/group/result/TopicOffsetRes.java | 1 +
.../manager/controller/node/NodeController.java | 20 +-
.../manager/controller/node/dto/MasterDto.java | 1 +
.../controller/node/request/AddTopicReq.java | 1 +
.../manager/controller/node/request/BaseReq.java | 1 +
.../controller/node/request/BatchAddTopicReq.java | 1 +
.../node/request/BrokerSetReadOrWriteReq.java | 1 +
.../controller/node/request/CloneBrokersReq.java | 1 +
.../controller/node/request/CloneOffsetReq.java | 1 +
.../controller/node/request/CloneTopicReq.java | 1 +
.../controller/node/request/DeleteBrokerReq.java | 1 +
.../controller/node/request/ModifyBrokerReq.java | 1 +
.../controller/node/request/ModifyMasterReq.java | 1 +
.../node/request/OnlineOfflineBrokerReq.java | 1 +
.../controller/node/request/ReloadBrokerReq.java | 1 +
.../controller/region/RegionController.java | 3 +-
.../controller/region/request/CreateRegionReq.java | 1 +
.../controller/region/request/DeleteRegionReq.java | 1 +
.../controller/region/request/ModifyRegionReq.java | 1 +
.../controller/region/request/QueryRegionReq.java | 1 +
.../manager/controller/task/TaskController.java | 5 +-
.../controller/topic/TopicWebController.java | 10 +-
.../topic/request/BatchAddGroupAuthReq.java | 1 +
.../topic/request/BatchAddTopicAuthReq.java | 1 +
.../topic/request/BatchAddTopicTaskReq.java | 1 +
.../controller/topic/request/DeleteGroupReq.java | 1 +
.../controller/topic/request/DeleteTopicReq.java | 1 +
.../controller/topic/request/GroupAuthItem.java | 1 +
.../controller/topic/request/ModifyTopicReq.java | 1 +
.../controller/topic/request/QueryCanWriteReq.java | 1 +
.../topic/request/RebalanceConsumerReq.java | 1 +
.../topic/request/RebalanceGroupReq.java | 1 +
.../topic/request/SetAuthControlReq.java | 1 +
.../controller/topic/request/SetPublishReq.java | 1 +
.../controller/topic/request/SetSubscribeReq.java | 1 +
.../controller/topic/request/TopicAuthItem.java | 1 +
.../controller/topic/result/TopicInfoRes.java | 2 +
.../controller/topic/result/TopicQueryRes.java | 6 +-
.../controller/topic/result/TopicViewRes.java | 1 +
.../inlong/tubemq/manager/entry/BrokerEntry.java | 4 +-
.../inlong/tubemq/manager/entry/ClusterEntry.java | 4 +-
.../inlong/tubemq/manager/entry/MasterEntry.java | 1 +
.../inlong/tubemq/manager/entry/RegionEntry.java | 10 +-
.../inlong/tubemq/manager/entry/TopicEntry.java | 3 +-
.../tubemq/manager/entry/TopicTaskEntry.java | 7 +-
.../inlong/tubemq/manager/enums/TaskTypeEnum.java | 1 +
.../tubemq/manager/executors/AddTopicExecutor.java | 15 +-
.../tubemq/manager/repository/TopicRepository.java | 1 -
.../tubemq/manager/service/BrokerServiceImpl.java | 4 +-
.../tubemq/manager/service/MasterServiceImpl.java | 4 +-
.../tubemq/manager/service/NodeServiceImpl.java | 6 +-
.../tubemq/manager/service/RegionServiceImpl.java | 2 +-
.../tubemq/manager/service/TaskServiceImpl.java | 26 +-
.../tubemq/manager/service/TopicBackendWorker.java | 3 +-
.../inlong/tubemq/manager/service/TopicFuture.java | 1 +
.../tubemq/manager/service/TopicServiceImpl.java | 12 +-
.../inlong/tubemq/manager/service/TubeConst.java | 1 -
.../tubemq/manager/service/TubeMQErrorConst.java | 1 +
.../manager/service/interfaces/BrokerService.java | 2 +-
.../manager/service/interfaces/NodeService.java | 4 +-
.../manager/service/interfaces/RegionService.java | 2 +-
.../manager/service/tube/AddBrokerResult.java | 1 +
.../manager/service/tube/AddTopicRequest.java | 1 +
.../tubemq/manager/service/tube/BrokerConf.java | 1 -
.../manager/service/tube/BrokerStatusInfo.java | 1 +
.../manager/service/tube/CleanOffsetResult.java | 1 +
.../tubemq/manager/service/tube/IpIdRelation.java | 1 +
.../manager/service/tube/RebalanceGroupResult.java | 1 +
.../tubemq/manager/service/tube/TopicView.java | 1 +
.../service/tube/TubeHttpBrokerInfoList.java | 8 +-
.../service/tube/TubeHttpGroupDetailInfo.java | 1 +
.../manager/service/tube/TubeHttpResponse.java | 1 +
.../service/tube/TubeHttpTopicInfoList.java | 4 +-
.../inlong/tubemq/manager/utils/ConvertUtils.java | 2 +-
.../manager/repository/TestBusinessRepository.java | 1 +
inlong-tubemq/tubemq-server/pom.xml | 166 ++++---
.../inlong/tubemq/server/broker/BrokerConfig.java | 9 +-
.../tubemq/server/broker/BrokerServiceServer.java | 75 ++--
.../inlong/tubemq/server/broker/TubeBroker.java | 125 +++---
.../server/broker/exception/StartupException.java | 1 +
.../server/broker/metadata/BrokerDefMetadata.java | 1 +
.../broker/metadata/BrokerMetadataManager.java | 28 +-
.../broker/metadata/ClusterConfigHolder.java | 1 +
.../server/broker/metadata/MetadataManager.java | 17 +-
.../server/broker/metadata/TopicMetadata.java | 19 +-
.../server/broker/msgstore/MessageStore.java | 94 ++--
.../broker/msgstore/MessageStoreManager.java | 47 +-
.../server/broker/msgstore/StoreService.java | 7 +-
.../server/broker/msgstore/disk/FileSegment.java | 18 +-
.../broker/msgstore/disk/FileSegmentList.java | 7 +-
.../broker/msgstore/disk/GetMessageResult.java | 31 +-
.../server/broker/msgstore/disk/MsgFileStore.java | 83 ++--
.../broker/msgstore/mem/GetCacheMsgResult.java | 5 +-
.../server/broker/msgstore/mem/MsgMemStore.java | 26 +-
.../server/broker/nodeinfo/ConsumerNodeInfo.java | 24 +-
.../server/broker/offset/DefaultOffsetManager.java | 59 ++-
.../tubemq/server/broker/offset/OffsetCsmItem.java | 1 +
.../server/broker/offset/OffsetCsmRecord.java | 3 +-
.../server/broker/offset/OffsetHistoryInfo.java | 7 +-
.../server/broker/offset/OffsetRecordService.java | 1 +
.../tubemq/server/broker/offset/OffsetService.java | 28 +-
.../broker/offset/offsetstorage/OffsetStorage.java | 6 +-
.../offset/offsetstorage/OffsetStorageInfo.java | 4 +-
.../offset/offsetstorage/ZkOffsetStorage.java | 12 +-
.../server/broker/stats/BrokerJMXHolder.java | 2 +-
.../server/broker/stats/BrokerSrvStatsHolder.java | 14 +-
.../server/broker/stats/BrokerStatsType.java | 1 +
.../server/broker/stats/MsgStoreStatsHolder.java | 34 +-
.../tubemq/server/broker/stats/TrafficInfo.java | 1 +
.../server/broker/stats/TrafficStatsService.java | 2 +
.../server/broker/stats/audit/AuditUtils.java | 6 +-
.../stats/prometheus/BrokerPromMetricService.java | 6 +-
.../server/broker/utils/BrokerSamplePrint.java | 5 +-
.../tubemq/server/broker/utils/DataStoreUtils.java | 41 +-
.../server/broker/utils/DiskSamplePrint.java | 25 +-
.../server/broker/utils/GroupOffsetInfo.java | 1 +
.../server/broker/utils/TopicPubStoreInfo.java | 2 +-
.../server/broker/web/BrokerAdminServlet.java | 87 ++--
.../common/aaaserver/CertificateBrokerHandler.java | 8 +-
.../common/aaaserver/CertificateMasterHandler.java | 4 +-
.../server/common/aaaserver/CertifiedResult.java | 1 +
.../aaaserver/SimpleCertificateBrokerHandler.java | 20 +-
.../aaaserver/SimpleCertificateMasterHandler.java | 16 +-
.../tubemq/server/common/fielddef/CliArgDef.java | 4 +-
.../tubemq/server/common/fielddef/WebFieldDef.java | 55 ++-
.../tubemq/server/common/fileconfig/ADConfig.java | 1 +
.../common/fileconfig/AbstractFileConfig.java | 1 +
.../server/common/fileconfig/BdbMetaConfig.java | 1 +
.../server/common/fileconfig/PrometheusConfig.java | 1 +
.../server/common/heartbeat/HeartbeatManager.java | 11 +-
.../server/common/heartbeat/TimeoutInfo.java | 1 +
.../server/common/heartbeat/TimeoutListener.java | 1 +
.../server/common/paramcheck/PBParameterUtils.java | 56 +--
.../server/common/paramcheck/ParamCheckResult.java | 1 +
.../server/common/statusdef/CleanPolType.java | 1 +
.../server/common/statusdef/EnableStatus.java | 1 +
.../server/common/statusdef/ManageStatus.java | 8 +-
.../tubemq/server/common/statusdef/StepStatus.java | 2 +-
.../server/common/statusdef/TopicStatus.java | 1 +
.../server/common/statusdef/TopicStsChgType.java | 1 +
.../tubemq/server/common/utils/AppendResult.java | 1 +
.../inlong/tubemq/server/common/utils/Bytes.java | 19 +-
.../tubemq/server/common/utils/ClientSyncInfo.java | 3 +-
.../tubemq/server/common/utils/HasThread.java | 1 +
.../tubemq/server/common/utils/HttpUtils.java | 5 +-
.../tubemq/server/common/utils/IdWorker.java | 1 +
.../inlong/tubemq/server/common/utils/RowLock.java | 7 +-
.../inlong/tubemq/server/common/utils/Sleeper.java | 1 +
.../server/common/utils/WebParameterUtils.java | 224 +++++-----
.../server/common/utils/WritableComparator.java | 1 +
.../server/common/webbase/WebCallStatsHolder.java | 14 +-
.../server/common/webbase/WebMethodMapper.java | 16 +-
.../tubemq/server/common/zookeeper/Abortable.java | 1 +
.../common/zookeeper/RecoverableZooKeeper.java | 7 +-
.../server/common/zookeeper/RetryCounter.java | 1 +
.../common/zookeeper/RetryCounterFactory.java | 1 +
.../tubemq/server/common/zookeeper/ZKUtil.java | 16 +-
.../zookeeper/ZooKeeperConnectionException.java | 1 +
.../server/common/zookeeper/ZooKeeperWatcher.java | 9 +-
.../inlong/tubemq/server/master/MasterConfig.java | 7 +-
.../inlong/tubemq/server/master/TMaster.java | 250 ++++++-----
.../server/master/balance/DefaultLoadBalancer.java | 33 +-
.../tubemq/server/master/balance/LoadBalancer.java | 18 +-
.../server/master/bdbstore/MasterGroupStatus.java | 5 +-
.../server/master/bdbstore/MasterNodeInfo.java | 1 +
.../bdbstore/bdbentitys/BdbBlackGroupEntity.java | 6 +-
.../bdbstore/bdbentitys/BdbBrokerConfEntity.java | 51 +--
.../bdbentitys/BdbClusterSettingEntity.java | 55 +--
.../bdbentitys/BdbConsumeGroupSettingEntity.java | 6 +-
.../bdbentitys/BdbConsumerGroupEntity.java | 3 +-
.../bdbentitys/BdbGroupFilterCondEntity.java | 15 +-
.../bdbentitys/BdbGroupFlowCtrlEntity.java | 57 +--
.../bdbentitys/BdbTopicAuthControlEntity.java | 8 +-
.../bdbstore/bdbentitys/BdbTopicConfEntity.java | 59 +--
.../server/master/metamanage/DataOpErrCode.java | 1 +
.../master/metamanage/DefaultMetaDataService.java | 167 +++----
.../server/master/metamanage/MetaDataService.java | 148 ++++---
.../metastore/dao/entity/BaseEntity.java | 38 +-
.../metastore/dao/entity/BrokerConfEntity.java | 72 ++--
.../metastore/dao/entity/ClusterSettingEntity.java | 16 +-
.../dao/entity/GroupConsumeCtrlEntity.java | 17 +-
.../metastore/dao/entity/GroupResCtrlEntity.java | 27 +-
.../metastore/dao/entity/TopicCtrlEntity.java | 14 +-
.../metastore/dao/entity/TopicDeployEntity.java | 26 +-
.../metastore/dao/entity/TopicPropGroup.java | 58 +--
.../metastore/dao/mapper/BrokerConfigMapper.java | 12 +-
.../metastore/dao/mapper/ClusterConfigMapper.java | 2 +-
.../metastore/dao/mapper/ConsumeCtrlMapper.java | 6 +-
.../metastore/dao/mapper/GroupResCtrlMapper.java | 6 +-
.../metastore/dao/mapper/MetaConfigMapper.java | 86 ++--
.../metastore/dao/mapper/TopicCtrlMapper.java | 8 +-
.../metastore/dao/mapper/TopicDeployMapper.java | 14 +-
.../metastore/impl/AbsBrokerConfigMapperImpl.java | 39 +-
.../metastore/impl/AbsClusterConfigMapperImpl.java | 5 +-
.../metastore/impl/AbsConsumeCtrlMapperImpl.java | 25 +-
.../metastore/impl/AbsGroupResCtrlMapperImpl.java | 13 +-
.../metastore/impl/AbsMetaConfigMapperImpl.java | 107 ++---
.../metastore/impl/AbsTopicCtrlMapperImpl.java | 18 +-
.../metastore/impl/AbsTopicDeployMapperImpl.java | 63 ++-
.../impl/bdbimpl/BdbBrokerConfigMapperImpl.java | 5 +-
.../impl/bdbimpl/BdbClusterConfigMapperImpl.java | 3 +-
.../impl/bdbimpl/BdbConsumeCtrlMapperImpl.java | 3 +-
.../impl/bdbimpl/BdbGroupResCtrlMapperImpl.java | 3 +-
.../impl/bdbimpl/BdbMetaConfigMapperImpl.java | 8 +-
.../impl/bdbimpl/BdbTopicCtrlMapperImpl.java | 3 +-
.../impl/bdbimpl/BdbTopicDeployMapperImpl.java | 3 +-
.../metastore/impl/zkimpl/TZKNodeKeys.java | 1 +
.../impl/zkimpl/ZKBrokerConfigMapperImpl.java | 10 +-
.../impl/zkimpl/ZKClusterConfigMapperImpl.java | 13 +-
.../impl/zkimpl/ZKConsumeCtrlMapperImpl.java | 10 +-
.../impl/zkimpl/ZKGroupResCtrlMapperImpl.java | 10 +-
.../impl/zkimpl/ZKMetaConfigMapperImpl.java | 5 +-
.../impl/zkimpl/ZKTopicCtrlMapperImpl.java | 10 +-
.../impl/zkimpl/ZKTopicDeployMapperImpl.java | 10 +-
.../nodemanage/nodebroker/BrokerAbnHolder.java | 39 +-
.../nodemanage/nodebroker/BrokerPSInfoHolder.java | 13 +-
.../nodemanage/nodebroker/BrokerRunManager.java | 38 +-
.../nodemanage/nodebroker/BrokerRunStatusInfo.java | 45 +-
.../nodemanage/nodebroker/BrokerSyncData.java | 19 +-
.../nodemanage/nodebroker/BrokerTopicInfoView.java | 24 +-
.../nodemanage/nodebroker/DefBrokerRunManager.java | 38 +-
.../nodemanage/nodebroker/TopicPSInfoManager.java | 8 +-
.../nodemanage/nodeconsumer/ConsumeGroupInfo.java | 35 +-
.../nodemanage/nodeconsumer/ConsumeType.java | 1 +
.../nodeconsumer/ConsumerEventManager.java | 19 +-
.../nodemanage/nodeconsumer/ConsumerInfo.java | 20 +-
.../nodeconsumer/ConsumerInfoHolder.java | 16 +-
.../nodemanage/nodeconsumer/NodeRebInfo.java | 10 +-
.../nodemanage/nodeconsumer/RebProcessInfo.java | 2 +-
.../nodeproducer/ProducerInfoHolder.java | 10 +-
.../server/master/stats/MasterJMXHolder.java | 2 +-
.../server/master/stats/MasterSrvStatsHolder.java | 18 +-
.../server/master/stats/MasterStatsType.java | 1 +
.../stats/prometheus/MasterPromMetricService.java | 1 +
.../master/utils/BrokerStatusSamplePrint.java | 5 +-
.../inlong/tubemq/server/master/utils/Chore.java | 1 +
.../server/master/utils/MetaConfigSamplePrint.java | 5 +-
.../master/utils/SimpleVisitTokenManager.java | 1 +
.../server/master/web/MasterStatusCheckFilter.java | 4 +-
.../inlong/tubemq/server/master/web/WebServer.java | 3 +-
.../server/master/web/action/screen/Master.java | 2 +-
.../web/action/screen/cluster/ClusterManager.java | 1 +
.../web/action/screen/config/BrokerList.java | 16 +-
.../server/master/web/common/BaseResult.java | 1 +
.../master/web/handler/AbstractWebHandler.java | 10 +-
.../master/web/handler/BrokerProcessResult.java | 5 +-
.../master/web/handler/GroupProcessResult.java | 5 +-
.../master/web/handler/TopicProcessResult.java | 5 +-
.../web/handler/WebAdminFlowRuleHandler.java | 24 +-
.../web/handler/WebAdminGroupCtrlHandler.java | 142 +++---
.../web/handler/WebAdminTopicAuthHandler.java | 20 +-
.../master/web/handler/WebBrokerConfHandler.java | 105 ++---
.../web/handler/WebGroupConsumeCtrlHandler.java | 61 ++-
.../master/web/handler/WebGroupResCtrlHandler.java | 52 +--
.../master/web/handler/WebMasterInfoHandler.java | 52 +--
.../master/web/handler/WebOtherInfoHandler.java | 46 +-
.../master/web/handler/WebTopicCtrlHandler.java | 42 +-
.../master/web/handler/WebTopicDeployHandler.java | 94 ++--
.../server/master/web/model/ClusterGroupVO.java | 3 +-
.../server/master/web/model/ClusterNodeVO.java | 3 +-
.../web/simplemvc/MultipartHttpServletRequest.java | 5 +-
.../master/web/simplemvc/RequestDispatcher.java | 2 +-
.../master/web/simplemvc/TemplateEngine.java | 4 +-
.../web/simplemvc/VelocityTemplateEngine.java | 6 +-
.../server/master/web/simplemvc/WebApiServlet.java | 4 +-
.../server/master/web/simplemvc/WebFilter.java | 5 +-
.../web/simplemvc/conf/ConfigFileParser.java | 1 +
.../inlong/tubemq/server/tools/BdbGroupAdmin.java | 10 +-
.../tubemq/server/tools/StoreRepairAdmin.java | 8 +-
.../tubemq/server/tools/cli/CliConsumer.java | 13 +-
.../tubemq/server/tools/cli/CliMetaDataBRU.java | 70 +--
.../tubemq/server/tools/cli/CliProducer.java | 6 +-
.../tubemq/server/broker/BrokerConfigTest.java | 4 +-
.../broker/msgstore/disk/FileSegmentListTest.java | 4 +-
.../tubemq/server/common/HeartbeatManagerTest.java | 12 +-
.../tubemq/server/common/PBParameterTest.java | 1 +
.../tubemq/server/master/MasterConfigTest.java | 1 +
.../metastore/dao/entity/BaseEntityTest.java | 2 +-
.../dao/entity/GroupResCtrlEntityTest.java | 2 +-
.../nodebroker/TopicPSInfoManagerTest.java | 1 +
.../nodeconsumer/ConsumerEventManagerTest.java | 1 +
pom.xml | 245 ++++++-----
1368 files changed, 9081 insertions(+), 9963 deletions(-)
diff --git a/.github/workflows/ci_check_format.yml b/.github/workflows/ci_check_format.yml
new file mode 100644
index 000000000..acacb9070
--- /dev/null
+++ b/.github/workflows/ci_check_format.yml
@@ -0,0 +1,37 @@
+#
+# 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.
+#
+
+name: InLong Code Format Check
+
+on: [ push, pull_request ]
+
+jobs:
+ build:
+ name: Code Format Check
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v3
+
+ - name: Set up JDK
+ uses: actions/setup-java@v3
+ with:
+ java-version: 8
+ distribution: adopt
+
+ - name: Spotless Check
+ run: mvn spotless:check
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 4ab130bdd..4c0d2df5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,19 @@
+#
+# 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.
+#
# Common
*.class
!.github/
diff --git a/codestyle/checkstyle.xml b/codestyle/checkstyle.xml
deleted file mode 100644
index 79628667c..000000000
--- a/codestyle/checkstyle.xml
+++ /dev/null
@@ -1,460 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
- "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
- "https://checkstyle.org/dtds/configuration_1_3.dtd">
-
-<!--
- Checkstyle configuration that checks the Google coding conventions from Google Java Style
- that can be found at https://google.github.io/styleguide/javaguide.html
-
- Checkstyle is very configurable. Be sure to read the documentation at
- http://checkstyle.org (or in your downloaded distribution).
-
- To completely disable a check, just comment it out or delete it from the file.
- To suppress certain violations please review suppression filters.
-
- Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
- -->
-
-<module name = "Checker">
- <property name="charset" value="UTF-8"/>
- <property name="localeCountry" value="ZH"/>
- <property name="localeLanguage" value="zh"/>
-
- <property name="severity" value="error"/>
-
- <module name="RegexpSingleline">
- <property name="format" value="^\s*\*\s*@author"/>
- <property name="minimum" value="0"/>
- <property name="maximum" value="0"/>
- <property name="message" value="ASF project doesn't allow @author copyright."/>
- </module>
-
- <module name="RegexpSingleline">
- <property name="format"
- value=".*[\u3400-\u4DB5\u4E00-\u9FA5\u9FA6-\u9FBB\uF900-\uFA2D\uFA30-\uFA6A\uFA70-\uFAD9\uFF00-\uFFEF\u2E80-\u2EFF\u3000-\u303F\u31C0-\u31EF]+.*"/>
- <property name="message" value="Chinese characters are not allowed!"/>
- </module>
-
- <property name="fileExtensions" value="java, properties, xml"/>
- <!-- Excludes all 'module-info.java' files -->
- <!-- See https://checkstyle.org/config_filefilters.html -->
- <module name="BeforeExecutionExclusionFileFilter">
- <property name="fileNamePattern" value="module\-info\.java$"/>
- </module>
- <!-- https://checkstyle.org/config_filters.html#SuppressionFilter -->
- <module name="SuppressionFilter">
- <property name="file" value="${org.checkstyle.google.suppressionfilter.config}"
- default="checkstyle-suppressions.xml" />
- <property name="optional" value="true"/>
- </module>
- <!-- new add -->
- <module name="SuppressWarningsFilter" />
- <!-- Checks for whitespace -->
- <!-- See http://checkstyle.org/config_whitespace.html -->
- <module name="FileTabCharacter">
- <property name="eachLine" value="true"/>
- </module>
- <module name="LineLength">
- <property name="fileExtensions" value="java"/>
- <property name="max" value="120"/>
- <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
- </module>
- <!-- new add -->
- <module name="FileLength">
- <property name="max" value="3000"/>
- </module>
- <module name="TreeWalker">
- <!-- new add -->
- <module name="SuppressWarningsHolder" />
- <!-- new add -->
- <module name="SuppressionCommentFilter"/>
-
- <module name="OuterTypeFilename"/>
- <module name="IllegalTokenText">
- <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
- <property name="format"
- value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
- <property name="message"
- value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
- </module>
- <module name="AvoidEscapedUnicodeCharacters">
- <property name="allowEscapesForControlCharacters" value="true"/>
- <property name="allowByTailComment" value="true"/>
- <property name="allowNonPrintableEscapes" value="true"/>
- </module>
- <module name="AvoidStarImport">
- <property name="severity" value="error"/>
- </module>
- <module name="OneTopLevelClass"/>
- <module name="NoLineWrap">
- <property name="tokens" value="PACKAGE_DEF, IMPORT, STATIC_IMPORT"/>
- </module>
- <module name="EmptyBlock">
- <property name="option" value="TEXT"/>
- <property name="tokens"
- value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
- </module>
- <module name="NeedBraces">
- <property name="tokens"
- value="LITERAL_DO, LITERAL_ELSE, LITERAL_FOR, LITERAL_IF, LITERAL_WHILE"/>
- </module>
- <module name="LeftCurly">
- <property name="tokens"
- value="ANNOTATION_DEF, CLASS_DEF, CTOR_DEF, ENUM_CONSTANT_DEF, ENUM_DEF,
- INTERFACE_DEF, LAMBDA, LITERAL_CASE, LITERAL_CATCH, LITERAL_DEFAULT,
- LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF,
- LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, METHOD_DEF,
- OBJBLOCK, STATIC_INIT"/>
- </module>
- <module name="RightCurly">
- <property name="id" value="RightCurlySame"/>
- <property name="tokens"
- value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE,
- LITERAL_DO"/>
- </module>
- <module name="RightCurly">
- <property name="id" value="RightCurlyAlone"/>
- <property name="option" value="alone"/>
- <property name="tokens"
- value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT,
- INSTANCE_INIT, ANNOTATION_DEF, ENUM_DEF"/>
- </module>
- <module name="WhitespaceAround">
- <property name="allowEmptyConstructors" value="true"/>
- <property name="allowEmptyLambdas" value="true"/>
- <property name="allowEmptyMethods" value="true"/>
- <property name="allowEmptyTypes" value="true"/>
- <property name="allowEmptyLoops" value="true"/>
- <property name="tokens"
- value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR,
- BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, DO_WHILE, EQUAL, GE, GT, LAMBDA, LAND,
- LCURLY, LE, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY,
- LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SWITCH, LITERAL_SYNCHRONIZED,
- LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN,
- NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR,
- SR_ASSIGN, STAR, STAR_ASSIGN, LITERAL_ASSERT, TYPE_EXTENSION_AND"/>
- <message key="ws.notFollowed"
- value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
- <message key="ws.notPreceded"
- value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
- </module>
- <module name="RedundantImport">
- <!-- Checks for redundant import statements. -->
- <property name="severity" value="error"/>
- <message key="import.redundancy"
- value="Redundant import {0}."/>
- </module>
- <module name="UnusedImports">
- <property name="severity" value="error"/>
- <property name="processJavadoc" value="true"/>
- <message key="import.unused"
- value="Unused import: {0}."/>
- </module>
- <module name="OneStatementPerLine"/>
- <module name="MultipleVariableDeclarations"/>
- <module name="ArrayTypeStyle"/>
-<!-- <module name="MissingSwitchDefault"/>-->
- <module name="UpperEll">
- <!-- Checks that long constants are defined with an upper ell.-->
- <property name="severity" value="error"/>
- </module>
-
- <module name="FallThrough">
- <!-- Warn about falling through to the next case statement. Similar to
- javac -Xlint:fallthrough, but the check is suppressed if a single-line comment
- on the last non-blank line preceding the fallen-into case contains 'fall through' (or
- some other variants that we don't publicized to promote consistency).
- -->
- <property name="reliefPattern"
- value="fall through|Fall through|fallthru|Fallthru|falls through|Falls through|fallthrough|Fallthrough|No break|NO break|no break|continue on"/>
- <property name="severity" value="error"/>
- </module>
- <module name="ModifierOrder"/>
- <module name="EmptyLineSeparator">
- <property name="tokens"
- value="PACKAGE_DEF, IMPORT, STATIC_IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
- STATIC_INIT, INSTANCE_INIT, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
- <property name="allowNoEmptyLineBetweenFields" value="true"/>
- </module>
- <module name="SeparatorWrap">
- <property name="id" value="SeparatorWrapDot"/>
- <property name="tokens" value="DOT"/>
- <property name="option" value="nl"/>
- </module>
- <module name="SeparatorWrap">
- <property name="id" value="SeparatorWrapComma"/>
- <property name="tokens" value="COMMA"/>
- <property name="option" value="EOL"/>
- </module>
- <module name="SeparatorWrap">
- <!-- ELLIPSIS is EOL until https://github.com/google/styleguide/issues/258 -->
- <property name="id" value="SeparatorWrapEllipsis"/>
- <property name="tokens" value="ELLIPSIS"/>
- <property name="option" value="EOL"/>
- </module>
- <module name="SeparatorWrap">
- <!-- ARRAY_DECLARATOR is EOL until https://github.com/google/styleguide/issues/259 -->
- <property name="id" value="SeparatorWrapArrayDeclarator"/>
- <property name="tokens" value="ARRAY_DECLARATOR"/>
- <property name="option" value="EOL"/>
- </module>
- <module name="SeparatorWrap">
- <property name="id" value="SeparatorWrapMethodRef"/>
- <property name="tokens" value="METHOD_REF"/>
- <property name="option" value="nl"/>
- </module>
- <module name="PackageName">
- <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
- <message key="name.invalidPattern"
- value="Package name ''{0}'' must match pattern ''{1}''."/>
- </module>
- <module name="TypeName">
- <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, ANNOTATION_DEF"/>
- <message key="name.invalidPattern"
- value="Type name ''{0}'' must match pattern ''{1}''."/>
- </module>
- <module name="MemberName">
- <!--
- <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
- -->
- <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
- <message key="name.invalidPattern"
- value="Member name ''{0}'' must match pattern ''{1}''."/>
- </module>
- <module name="ParameterName">
- <!--
- <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
- -->
- <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
- <message key="name.invalidPattern"
- value="Parameter name ''{0}'' must match pattern ''{1}''."/>
- </module>
- <module name="LambdaParameterName">
- <!--
- <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
- -->
- <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
- <message key="name.invalidPattern"
- value="Lambda parameter name ''{0}'' must match pattern ''{1}''."/>
- </module>
- <module name="CatchParameterName">
- <!--
- <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
- -->
- <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
- <message key="name.invalidPattern"
- value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
- </module>
- <module name="LocalVariableName">
- <!--
- <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
- -->
- <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
- <message key="name.invalidPattern"
- value="Local variable name ''{0}'' must match pattern ''{1}''."/>
- </module>
- <module name="ClassTypeParameterName">
- <!-- new add -->
- <!--
- <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
- -->
- <property name="format" value="^[A-Z][a-zA-Z0-9]*$"/>
- <message key="name.invalidPattern"
- value="Class type name ''{0}'' must match pattern ''{1}''."/>
- </module>
- <module name="MethodTypeParameterName">
- <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
- <message key="name.invalidPattern"
- value="Method type name ''{0}'' must match pattern ''{1}''."/>
- </module>
- <module name="InterfaceTypeParameterName">
- <!-- new add -->
- <!--
- <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
- -->
- <property name="format" value="^[A-Z][a-zA-Z0-9]*$"/>
- <message key="name.invalidPattern"
- value="Interface type name ''{0}'' must match pattern ''{1}''."/>
- </module>
- <module name="NoFinalizer"/>
- <module name="GenericWhitespace">
- <message key="ws.followed"
- value="GenericWhitespace ''{0}'' is followed by whitespace."/>
- <message key="ws.preceded"
- value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
- <message key="ws.illegalFollow"
- value="GenericWhitespace ''{0}'' should followed by whitespace."/>
- <message key="ws.notPreceded"
- value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
- </module>
- <module name="Indentation">
- <!--
- <property name="basicOffset" value="4"/>
- <property name="braceAdjustment" value="0"/>
- <property name="caseIndent" value="4"/>
- <property name="throwsIndent" value="4"/>
- <property name="lineWrappingIndentation" value="4"/>
- <property name="arrayInitIndent" value="4"/>
- -->
- <!-- new add, because checkstyle does not fix some indentation scenes,
- choose to block the rules first
- https://github.com/checkstyle/checkstyle/issues/3342
- -->
-
- <property name="severity" value="ignore"/>
-
- <property name="basicOffset" value="4"/>
- <property name="braceAdjustment" value="0"/>
- <property name="caseIndent" value="4"/>
- <property name="throwsIndent" value="8"/>
- <property name="lineWrappingIndentation" value="8"/>
- <property name="arrayInitIndent" value="4"/>
- </module>
- <module name="AbbreviationAsWordInName">
- <!-- new add -->
- <property name="severity" value="ignore"/>
- <property name="ignoreFinal" value="false"/>
- <property name="allowedAbbreviationLength" value="1"/>
- <property name="tokens"
- value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, ANNOTATION_DEF, ANNOTATION_FIELD_DEF,
- PARAMETER_DEF, VARIABLE_DEF, METHOD_DEF"/>
- </module>
- <!--
- <module name="DeclarationOrder">
- -->
- <module name="OverloadMethodsDeclarationOrder"/>
- <module name="VariableDeclarationUsageDistance"/>
- <module name="CustomImportOrder">
- <!-- new add -->
- <property name="severity" value="ignore"/>
- <property name="sortImportsInGroupAlphabetically" value="true"/>
- <property name="separateLineBetweenGroups" value="true"/>
- <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
- <property name="tokens" value="IMPORT, STATIC_IMPORT, PACKAGE_DEF"/>
- </module>
- <module name="MethodParamPad">
- <property name="tokens"
- value="CTOR_DEF, LITERAL_NEW, METHOD_CALL, METHOD_DEF,
- SUPER_CTOR_CALL, ENUM_CONSTANT_DEF"/>
- </module>
- <module name="NoWhitespaceBefore">
- <property name="tokens"
- value="COMMA, SEMI, POST_INC, POST_DEC, DOT, ELLIPSIS, METHOD_REF"/>
- <property name="allowLineBreaks" value="true"/>
- </module>
- <module name="ParenPad">
- <property name="tokens"
- value="ANNOTATION, ANNOTATION_FIELD_DEF, CTOR_CALL, CTOR_DEF, DOT, ENUM_CONSTANT_DEF,
- EXPR, LITERAL_CATCH, LITERAL_DO, LITERAL_FOR, LITERAL_IF, LITERAL_NEW,
- LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_WHILE, METHOD_CALL,
- METHOD_DEF, QUESTION, RESOURCE_SPECIFICATION, SUPER_CTOR_CALL, LAMBDA"/>
- </module>
- <module name="OperatorWrap">
- <property name="option" value="NL"/>
- <property name="tokens"
- value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR,
- LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF "/>
- </module>
- <module name="AnnotationLocation">
- <property name="id" value="AnnotationLocationMostCases"/>
- <property name="tokens"
- value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/>
- </module>
- <module name="AnnotationLocation">
- <property name="id" value="AnnotationLocationVariables"/>
- <property name="tokens" value="VARIABLE_DEF"/>
- <property name="allowSamelineMultipleAnnotations" value="true"/>
- </module>
- <module name="NonEmptyAtclauseDescription">
- <!-- new add -->
- <property name="severity" value="ignore"/>
- </module>
- <module name="InvalidJavadocPosition">
- <property name="severity" value="error"/>
- </module>
- <module name="JavadocTagContinuationIndentation">
- <property name="severity" value="error"/>
- </module>
- <module name="SummaryJavadoc">
- <property name="severity" value="error"/>
- <property name="forbiddenSummaryFragments"
- value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
- <!--
- <property name="period" value="."/>
- -->
- <property name="period" value=""/>
- </module>
- <!-- new add
- <module name="JavadocParagraph" />
- -->
- <!-- new add
- <module name="AtclauseOrder">
- <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
- <property name="target"
- value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
- </module>
- -->
- <module name="JavadocMethod">
- <property name="severity" value="error"/>
- <property name="scope" value="public"/>
- <property name="allowMissingParamTags" value="true"/>
- <property name="allowMissingReturnTag" value="true"/>
- <property name="allowedAnnotations" value="Override, Test"/>
- <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF"/>
- </module>
- <module name="MethodName">
- <!--
- <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
- -->
- <property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>
- <message key="name.invalidPattern"
- value="Method name ''{0}'' must match pattern ''{1}''."/>
- </module>
- <!-- new add -->
- <module name="ConstantName">
- <property name="applyToProtected" value="false"/>
- <property name="applyToPackage" value="false"/>
- <property name="applyToPrivate" value="false"/>
- </module>
-
- <module name="SingleLineJavadoc">
- <property name="severity" value="error"/>
- <property name="ignoreInlineTags" value="true"/>
- </module>
- <!--
- <module name="MissingJavadocMethod">
- <property name="severity" value="info"/>
- <property name="scope" value="public"/>
- </module>
- -->
- <module name="EmptyCatchBlock">
- <property name="exceptionVariableName" value="expected"/>
- </module>
- <module name="CommentsIndentation">
- <!--
- <property name="tokens" value="SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN"/>
- -->
- <property name="tokens" value="BLOCK_COMMENT_BEGIN"/>
- </module>
-
- <!-- https://checkstyle.org/config_filters.html#SuppressionXpathFilter -->
- <module name="SuppressionXpathFilter">
- <property name="file" value="${org.checkstyle.google.suppressionxpathfilter.config}"
- default="checkstyle-xpath-suppressions.xml" />
- <property name="optional" value="true"/>
- </module>
-
- <module name="EmptyLineSeparator">
- <!-- Checks for empty line separator between tokens. The only
- excluded token is VARIABLE_DEF, allowing class fields to
- be declared on consecutive lines.
- -->
- <property name="allowMultipleEmptyLines" value="false"/>
- <property name="allowMultipleEmptyLinesInsideClassMembers" value="false"/>
- <property name="tokens" value="PACKAGE_DEF, IMPORT, STATIC_IMPORT, CLASS_DEF,
- INTERFACE_DEF, ENUM_DEF, STATIC_INIT, INSTANCE_INIT, METHOD_DEF,
- CTOR_DEF"/>
- </module>
- </module>
-</module>
diff --git a/codestyle/spotless_inlong_formatter.xml b/codestyle/spotless_inlong_formatter.xml
new file mode 100644
index 000000000..930df2084
--- /dev/null
+++ b/codestyle/spotless_inlong_formatter.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+/**
+ * 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.
+ */
+-->
+<profiles version="1">
+ <profile kind="CodeFormatterProfile" name="'Apache InLong'" version="12">
+ <setting id="org.eclipse.jdt.core.compiler.source" value="1.8" />
+ <setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8" />
+ <setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8" />
+ <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false" />
+ <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4" />
+ <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120" />
+ <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120" />
+ <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space" />
+ <setting id="org.eclipse.jdt.core.formatter.indentation.size" value="1" />
+ <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="1" />
+ <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="false" />
+ <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false" />
+ <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert" />
+ <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert" />
+ <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="16" />
+ <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert" />
+ <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert" />
+ <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80" />
+ <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="16" />
+ <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1" />
+ <setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2" />
+ <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80" />
+ <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16" />
+ <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16" />
+ <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16" />
+ <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16" />
+ <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call.count_dependent" value="16|5|80" />
+ </profile>
+</profiles>
\ No newline at end of file
diff --git a/codestyle/suppressions.xml b/codestyle/suppressions.xml
deleted file mode 100644
index e8505402d..000000000
--- a/codestyle/suppressions.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.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.
- -->
-<!DOCTYPE suppressions PUBLIC
- "-//Puppy Crawl//DTD Suppressions 1.1//EN"
- "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
-
-<suppressions>
- <!-- suppress all checks in the generated directories -->
- <suppress checks=".*" files="AuditApi.java" />
- <suppress checks=".*" files=".+[\\/]classes[\\/].+\.java" />
- <suppress checks=".*" files=".+[\\/]generated[\\/].+\.java" />
- <suppress checks=".*" files=".+[\\/]generated-sources[\\/].+\.java" />
- <suppress checks=".*" files=".+[\\/]generated-test-sources[\\/].+\.java" />
-</suppressions>
diff --git a/inlong-agent/agent-common/pom.xml b/inlong-agent/agent-common/pom.xml
index d06ab7b0e..18f4795c2 100755
--- a/inlong-agent/agent-common/pom.xml
+++ b/inlong-agent/agent-common/pom.xml
@@ -17,16 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-agent</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>agent-common</artifactId>
- <modelVersion>4.0.0</modelVersion>
<name>Apache InLong - Agent Common</name>
<dependencies>
@@ -47,16 +46,16 @@
</exclusions>
</dependency>
<dependency>
- <artifactId>commons-dbutils</artifactId>
<groupId>commons-dbutils</groupId>
+ <artifactId>commons-dbutils</artifactId>
</dependency>
<dependency>
- <artifactId>commons-lang3</artifactId>
<groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
- <artifactId>gson</artifactId>
<groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -71,8 +70,8 @@
<artifactId>log4j-slf4j-impl</artifactId>
</dependency>
<dependency>
- <artifactId>slf4j-api</artifactId>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.rocksdb</groupId>
@@ -84,13 +83,13 @@
</dependency>
<dependency>
- <artifactId>commons-cli</artifactId>
<groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
</dependency>
<dependency>
- <artifactId>commons-io</artifactId>
<groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
</dependency>
<dependency>
@@ -107,8 +106,8 @@
</dependency>
<dependency>
- <artifactId>junit</artifactId>
<groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -125,13 +124,13 @@
<version>3.2.0</version>
<executions>
<execution>
- <phase>compile</phase>
<goals>
<goal>test-jar</goal>
</goals>
+ <phase>compile</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/cache/LocalFileCache.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/cache/LocalFileCache.java
index d37901fcd..1a90538d9 100644
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/cache/LocalFileCache.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/cache/LocalFileCache.java
@@ -31,6 +31,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
* use local file as cache.
*/
public class LocalFileCache {
+
private static final Logger LOGGER = LoggerFactory.getLogger(LocalFileCache.class);
private final File file;
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/conf/AbstractConfiguration.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/conf/AbstractConfiguration.java
index b60d7d6b4..46b67dd7d 100644
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/conf/AbstractConfiguration.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/conf/AbstractConfiguration.java
@@ -276,7 +276,6 @@ public abstract class AbstractConfiguration {
return configStorage;
}
-
/**
* get configStorage list, item format: "key=value"
*/
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/CommandConstants.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/CommandConstants.java
index 38a7ad985..31a9c3ec7 100644
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/CommandConstants.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/CommandConstants.java
@@ -21,6 +21,7 @@ package org.apache.inlong.agent.constant;
* old version of command result
*/
public class CommandConstants {
+
public static final String ID = "id";
public static final String IDC = "idc";
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/CommonConstants.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/CommonConstants.java
index 6418a1252..a34a60a43 100644
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/CommonConstants.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/CommonConstants.java
@@ -61,7 +61,7 @@ public class CommonConstants {
// determine if the send method is sync or async
public static final String PROXY_SEND_SYNC = "proxy.sync";
- // the same task must have the same Partition Key if choose sync
+ // the same task must have the same Partition Key if choose sync
public static final String PROXY_SEND_PARTITION_KEY = "proxy.partitionKey";
// max size of single batch in bytes, default is 200KB.
@@ -167,5 +167,4 @@ public class CommonConstants {
public static final String DELIMITER_UNDERLINE = "_";
public static final String DELIMITER_HYPHEN = "-";
-
}
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/JobConstants.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/JobConstants.java
index 755ab1863..b4b8cb6e3 100755
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/JobConstants.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/JobConstants.java
@@ -44,7 +44,7 @@ public class JobConstants extends CommonConstants {
public static final String DEFAULT_JOB_DESCRIPTION = "default job description";
public static final String DEFAULT_JOB_LINE_FILTER = "";
- //File job
+ // File job
public static final String JOB_TRIGGER = "job.fileJob.trigger";
public static final String JOB_DIR_FILTER_PATTERN = "job.fileJob.dir.pattern";
public static final String JOB_FILE_TIME_OFFSET = "job.fileJob.timeOffset";
@@ -61,7 +61,7 @@ public class JobConstants extends CommonConstants {
public static final String JOB_FILE_MONITOR_STATUS = "job.fileJob.monitorStatus";
public static final String JOB_FILE_MONITOR_EXPIRE = "job.fileJob.monitorExpire";
- //Binlog job
+ // Binlog job
public static final String JOB_DATABASE_USER = "job.binlogJob.user";
public static final String JOB_DATABASE_PASSWORD = "job.binlogJob.password";
public static final String JOB_DATABASE_HOSTNAME = "job.binlogJob.hostname";
@@ -79,7 +79,7 @@ public class JobConstants extends CommonConstants {
public static final String JOB_DATABASE_HISTORY_MONITOR_DDL = "job.binlogJob.ddl";
public static final String JOB_DATABASE_PORT = "job.binlogJob.port";
- //Kafka job
+ // Kafka job
public static final String JOB_KAFKA_TOPIC = "job.kafkaJob.topic";
public static final String JOB_KAFKA_BOOTSTRAP_SERVERS = "job.kafkaJob.bootstrap.servers";
public static final String JOB_KAFKA_GROUP_ID = "job.kafkaJob.group.id";
@@ -89,7 +89,6 @@ public class JobConstants extends CommonConstants {
public static final String JOB_KAFKA_READ_TIMEOUT = "job.kafkaJob.read.timeout";
public static final String JOB_KAFKA_AUTO_COMMIT_OFFSET_RESET = "job.kafkaJob.autoOffsetReset";
-
public static final String JOB_MONGO_HOSTS = "job.mongoJob.hosts";
public static final String JOB_MONGO_USER = "job.mongoJob.user";
public static final String JOB_MONGO_PASSWORD = "job.mongoJob.password";
@@ -187,5 +186,4 @@ public class JobConstants extends CommonConstants {
*/
public static final String JOB_FILE_MONITOR_DEFAULT_EXPIRE = "-1";
-
}
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/KubernetesConstants.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/KubernetesConstants.java
index fb2b41c54..5a5d23f48 100644
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/KubernetesConstants.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/KubernetesConstants.java
@@ -41,5 +41,5 @@ public class KubernetesConstants {
public static final String METADATA_POD_LABEL = "__pod_label__";
public static final String DATA_CONTENT = "__content__";
public static final String DATA_CONTENT_TIME = "__LogTime__";
-
+
}
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/Db.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/Db.java
index 3efaa24db..ed2a876d9 100644
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/Db.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/Db.java
@@ -76,7 +76,6 @@ public interface Db extends Closeable {
*/
List<KeyValueEntity> search(StateSearchKey searchKey);
-
/**
* search keyValue list by search key.
*
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/LocalProfile.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/LocalProfile.java
index 923636c37..7b96a600e 100755
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/LocalProfile.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/LocalProfile.java
@@ -58,7 +58,7 @@ public class LocalProfile {
if (Files.isDirectory(this.filePath)) {
// list parent path and find files which name is end with .json or .properties
try (final Stream<Path> pathStream = Files.list(this.filePath)) {
- for (Iterator<Path> it = pathStream.iterator(); it.hasNext(); ) {
+ for (Iterator<Path> it = pathStream.iterator(); it.hasNext();) {
String childPath = it.next().toString();
JobProfile jobProfile = null;
if (childPath.endsWith(JSON_SUFFIX)) {
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/AgentMetricItem.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/AgentMetricItem.java
index 96d35f97c..9f5d8e735 100644
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/AgentMetricItem.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/AgentMetricItem.java
@@ -28,26 +28,26 @@ import java.util.concurrent.atomic.AtomicLong;
@MetricDomain(name = "Agent")
public class AgentMetricItem extends MetricItem {
- //key
+ // key
public static final String KEY_PLUGIN_ID = "pluginId"; // for source, reader, channel, sink
public static final String KEY_INLONG_GROUP_ID = "inlongGroupId";
public static final String KEY_INLONG_STREAM_ID = "inlongStreamId";
public static final String KEY_COMPONENT_NAME = "componentName"; // for TaskManager, JobManager
- //job
+ // job
public static final String M_JOB_RUNNING_COUNT = "jobRunningCount";
public static final String M_JOB_FATAL_COUNT = "jobFatalCount";
- //task
+ // task
public static final String M_TASK_RUNNING_COUNT = "taskRunningCount";
public static final String M_TASK_RETRYING_COUNT = "taskRetryingCount";
public static final String M_TASK_FATAL_COUNT = "taskFatalCount";
- //sink
+ // sink
public static final String M_SINK_SUCCESS_COUNT = "sinkSuccessCount";
public static final String M_SINK_FAIL_COUNT = "sinkFailCount";
- //source
+ // source
public static final String M_SOURCE_SUCCESS_COUNT = "sourceSuccessCount";
public static final String M_SOURCE_FAIL_COUNT = "sourceFailCount";
- //plugin
+ // plugin
public static final String M_PLUGIN_READ_COUNT = "pluginReadCount";
public static final String M_PLUGIN_SEND_COUNT = "pluginSendCount";
public static final String M_PLUGIN_READ_FAIL_COUNT = "pluginReadFailCount";
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/BinlogJob.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/BinlogJob.java
index 44ae2c1fe..86d41f2ad 100644
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/BinlogJob.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/BinlogJob.java
@@ -22,19 +22,19 @@ import lombok.Data;
@Data
public class BinlogJob {
- private String user;
- private String password;
- private String hostname;
- private String tableWhiteList;
- private String databaseWhiteList;
- private String ddl;
- private String port;
- private String schema;
- private String serverTimezone;
- private String offsets;
-
- private Snapshot snapshot;
- private Offset offset;
+ private String user;
+ private String password;
+ private String hostname;
+ private String tableWhiteList;
+ private String databaseWhiteList;
+ private String ddl;
+ private String port;
+ private String schema;
+ private String serverTimezone;
+ private String offsets;
+
+ private Snapshot snapshot;
+ private Offset offset;
private History history;
@Data
@@ -48,22 +48,24 @@ public class BinlogJob {
@Data
public static class Snapshot {
- private String mode;
+
+ private String mode;
}
@Data
public static class History {
- private String filename;
+
+ private String filename;
}
@Data
public static class BinlogJobTaskConfig {
- private String user;
- private String password;
- private String hostname;
- private String port;
+ private String user;
+ private String password;
+ private String hostname;
+ private String port;
private String includeSchema;
private String databaseWhiteList;
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/CommandInfoDto.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/CommandInfoDto.java
index 040059578..7c29dc17c 100644
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/CommandInfoDto.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/CommandInfoDto.java
@@ -21,6 +21,7 @@ import lombok.Data;
@Data
public class CommandInfoDto {
+
private int commandResult;
private String dataTime;
private String deliveryTime;
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/ConfirmAgentIpRequest.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/ConfirmAgentIpRequest.java
index 275011a5e..cfd3dc4f1 100644
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/ConfirmAgentIpRequest.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/ConfirmAgentIpRequest.java
@@ -24,6 +24,7 @@ import lombok.Data;
@Data
@AllArgsConstructor
public class ConfirmAgentIpRequest {
+
private String type;
private List<String> ipList;
}
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/DebeziumFormat.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/DebeziumFormat.java
index a64c14f89..294b99582 100644
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/DebeziumFormat.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/DebeziumFormat.java
@@ -33,7 +33,6 @@ public class DebeziumFormat {
*/
private Map<String, String> after;
-
/**
* extra info about db
*/
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/FileJob.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/FileJob.java
index 52d78ab72..49657147b 100644
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/FileJob.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/FileJob.java
@@ -35,7 +35,7 @@ public class FileJob {
private String collectType;
private Line line;
- // INCREMENT
+ // INCREMENT
// FULL
private String contentCollectType;
@@ -94,7 +94,7 @@ public class FileJob {
// '1d' means one day after, '-1d' means one day before
// Null means from current timestamp
private String timeOffset;
- //For example: a=b&c=b&e=f
+ // For example: a=b&c=b&e=f
private String additionalAttr;
private String collectType;
@@ -111,10 +111,10 @@ public class FileJob {
private List<Map<String, String>> metaFields;
// Type of data result for column separator
// CSV format, set this parameter to a custom separator: , | :
- // Json format, set this parameter to json
+ // Json format, set this parameter to json
private String dataContentStyle;
- // Column separator of data source
+ // Column separator of data source
private String dataSeparator;
// Metadata filters by label, special parameters for K8S
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/KafkaJob.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/KafkaJob.java
index 58d62480e..db792fc20 100644
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/KafkaJob.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/KafkaJob.java
@@ -33,26 +33,31 @@ public class KafkaJob {
@Data
public static class Group {
+
private String id;
}
@Data
public static class Bootstrap {
+
private String servers;
}
@Data
public static class Partition {
+
private String offset;
}
@Data
public static class RecordSpeed {
+
private String limit;
}
@Data
public static class ByteSpeed {
+
private String limit;
}
@@ -64,6 +69,6 @@ public class KafkaJob {
private String groupId;
private String recordSpeedLimit;
private String byteSpeedLimit;
- private String autoOffsetReset;
+ private String autoOffsetReset;
}
}
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/ManagerReturnDto.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/ManagerReturnDto.java
index 4e85b4a5a..c87996b23 100644
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/ManagerReturnDto.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/ManagerReturnDto.java
@@ -21,6 +21,7 @@ import lombok.Data;
@Data
public class ManagerReturnDto {
+
private boolean success;
private String errMsg;
private String data;
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/MongoJob.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/MongoJob.java
index 087162d05..d37512b5d 100644
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/MongoJob.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/MongoJob.java
@@ -63,16 +63,19 @@ public class MongoJob {
@Data
public static class Snapshot {
+
private String mode;
}
@Data
public static class Capture {
+
private String mode;
}
@Data
public static class History {
+
private String filename;
}
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/utils/AgentDbUtils.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/utils/AgentDbUtils.java
index 87ffe7b1f..0ec6ed830 100644
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/utils/AgentDbUtils.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/utils/AgentDbUtils.java
@@ -64,8 +64,7 @@ public class AgentDbUtils {
/* TODO: try to decrypt password, if failed then use raw password */
/*
- * NOTE: THIS MAY CAUSE DEADLOAK WHEN MULTIPLE THREADS CALLED AT THE
- * SAME TIME
+ * NOTE: THIS MAY CAUSE DEADLOAK WHEN MULTIPLE THREADS CALLED AT THE SAME TIME
* sun.security.jca.ProviderConfig.getProvider(ProviderConfig.java:188)
*/
synchronized (AgentDbUtils.class) {
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/utils/ByteUtil.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/utils/ByteUtil.java
index da0bb296e..55af0580e 100644
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/utils/ByteUtil.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/utils/ByteUtil.java
@@ -75,8 +75,7 @@ public class ByteUtil {
public static List<Range> splitRanges(byte[] source, byte[] separator, int limit) {
List<Range> segments = new ArrayList<Range>();
int start = 0;
- itersource:
- for (int i = 0; i < source.length; i++) {
+ itersource: for (int i = 0; i < source.length; i++) {
for (int j = 0; j < separator.length; j++) {
if (source[i + j] != separator[j]) {
continue itersource;
@@ -160,8 +159,7 @@ public class ByteUtil {
return fromIndex;
}
- firstbyte:
- for (int i = fromIndex; i < array.length - target.length + 1; i++) {
+ firstbyte: for (int i = fromIndex; i < array.length - target.length + 1; i++) {
for (int j = 0; j < target.length; j++) {
if (array[i + j] != target[j]) {
continue firstbyte;
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/utils/ThreadUtils.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/utils/ThreadUtils.java
index a83d747bb..42270ad76 100644
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/utils/ThreadUtils.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/utils/ThreadUtils.java
@@ -51,4 +51,3 @@ public class ThreadUtils {
}
}
-
diff --git a/inlong-agent/agent-common/src/test/java/org/apache/inlong/agent/common/TestAgentUtils.java b/inlong-agent/agent-common/src/test/java/org/apache/inlong/agent/common/TestAgentUtils.java
index abc41410f..404b4721d 100755
--- a/inlong-agent/agent-common/src/test/java/org/apache/inlong/agent/common/TestAgentUtils.java
+++ b/inlong-agent/agent-common/src/test/java/org/apache/inlong/agent/common/TestAgentUtils.java
@@ -27,6 +27,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class TestAgentUtils {
+
private static final Logger LOGGER = LoggerFactory.getLogger(TestAgentUtils.class);
@Test
@@ -41,12 +42,12 @@ public class TestAgentUtils {
result = AgentDbUtils.replaceDynamicSeq("${0x0, 0xf}");
expectResult = new String[]{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a",
- "b", "c", "d", "e", "f"};
+ "b", "c", "d", "e", "f"};
Assert.assertArrayEquals(expectResult, result);
result = AgentDbUtils.replaceDynamicSeq("${O01,O10}");
expectResult = new String[]{"01", "02", "03", "04", "05",
- "06", "07", "10"};
+ "06", "07", "10"};
Assert.assertArrayEquals(expectResult, result);
}
@@ -93,6 +94,6 @@ public class TestAgentUtils {
@Test
public void testCustomFixedIp() {
String ip = AgentUtils.fetchLocalIp();
- Assert.assertNotEquals("127.0.0.1",ip);
+ Assert.assertNotEquals("127.0.0.1", ip);
}
}
diff --git a/inlong-agent/agent-common/src/test/java/org/apache/inlong/agent/metrics/TestAgentMetrics.java b/inlong-agent/agent-common/src/test/java/org/apache/inlong/agent/metrics/TestAgentMetrics.java
index 1ff818345..b46d02a6e 100755
--- a/inlong-agent/agent-common/src/test/java/org/apache/inlong/agent/metrics/TestAgentMetrics.java
+++ b/inlong-agent/agent-common/src/test/java/org/apache/inlong/agent/metrics/TestAgentMetrics.java
@@ -41,7 +41,7 @@ import static org.apache.inlong.agent.metrics.AgentMetricItem.KEY_PLUGIN_ID;
public class TestAgentMetrics {
private static final Logger LOGGER = LoggerFactory.getLogger(TestAgentMetrics.class);
- //metric
+ // metric
protected static final AtomicLong METRIC_INDEX = new AtomicLong(0);
protected static AgentMetricItemSet metricItemSet;
protected static Map<String, String> dimensions;
diff --git a/inlong-agent/agent-common/src/test/java/org/apache/inlong/agent/metrics/TestPrometheusListener.java b/inlong-agent/agent-common/src/test/java/org/apache/inlong/agent/metrics/TestPrometheusListener.java
index 298f87098..54d7ba2ad 100644
--- a/inlong-agent/agent-common/src/test/java/org/apache/inlong/agent/metrics/TestPrometheusListener.java
+++ b/inlong-agent/agent-common/src/test/java/org/apache/inlong/agent/metrics/TestPrometheusListener.java
@@ -110,6 +110,7 @@ public class TestPrometheusListener {
metricItem.pluginReadSuccessCount.incrementAndGet();
// report
MetricListener listener = new MetricListener() {
+
@Override
public void snapshot(String domain, List<MetricItemValue> itemValues) {
for (MetricItemValue itemValue : itemValues) {
diff --git a/inlong-agent/agent-core/pom.xml b/inlong-agent/agent-core/pom.xml
index 518ddebc0..f1e378487 100755
--- a/inlong-agent/agent-core/pom.xml
+++ b/inlong-agent/agent-core/pom.xml
@@ -17,16 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-agent</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>agent-core</artifactId>
- <modelVersion>4.0.0</modelVersion>
<name>Apache InLong - Agent Core</name>
<dependencies>
@@ -74,14 +73,14 @@
<artifactId>akka-stream_2.11</artifactId>
</dependency>
<dependency>
- <artifactId>junit</artifactId>
<groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <artifactId>awaitility</artifactId>
<groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/AgentManager.java b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/AgentManager.java
index ad01243e1..1716cf050 100755
--- a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/AgentManager.java
+++ b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/AgentManager.java
@@ -93,8 +93,7 @@ public class AgentManager extends AbstractDaemon {
Class.forName(conf.get(AgentConstants.AGENT_FETCHER_CLASSNAME))
.getDeclaredConstructor(AgentManager.class);
constructor.setAccessible(true);
- return
- (ProfileFetcher) constructor.newInstance(agentManager);
+ return (ProfileFetcher) constructor.newInstance(agentManager);
} catch (Exception ex) {
LOGGER.warn("cannot find fetcher: ", ex);
}
diff --git a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/conf/ResponseResult.java b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/conf/ResponseResult.java
index b1c5a64a5..acab279a2 100755
--- a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/conf/ResponseResult.java
+++ b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/conf/ResponseResult.java
@@ -21,6 +21,7 @@ package org.apache.inlong.agent.core.conf;
* response json for http requests.
*/
public class ResponseResult {
+
private int code;
private String message;
diff --git a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/job/Job.java b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/job/Job.java
index db99948d8..5f455624c 100644
--- a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/job/Job.java
+++ b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/job/Job.java
@@ -46,6 +46,7 @@ public class Job {
private String description;
private String jobInstanceId;
private ThreadLocal<Integer> threadNum = new ThreadLocal<Integer>() {
+
protected Integer initialValue() {
return 0;
}
diff --git a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/Task.java b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/Task.java
index 9ac2ed4d6..a81a940a9 100755
--- a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/Task.java
+++ b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/Task.java
@@ -34,7 +34,7 @@ public class Task {
private final JobProfile jobConf;
public Task(String taskId, Reader reader, Sink sink, Channel channel,
- JobProfile jobConf) {
+ JobProfile jobConf) {
this.reader = reader;
this.sink = sink;
this.taskId = taskId;
diff --git a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/TaskPositionManager.java b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/TaskPositionManager.java
index c5b944210..1d0c86657 100644
--- a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/TaskPositionManager.java
+++ b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/TaskPositionManager.java
@@ -111,8 +111,7 @@ public class TaskPositionManager extends AbstractDaemon {
private void flushJobProfile(String jobId, JobProfile jobProfile) {
jobTaskPositionMap.get(jobId).forEach(
- (fileName, position) -> jobProfile.setLong(fileName + POSITION_SUFFIX, position)
- );
+ (fileName, position) -> jobProfile.setLong(fileName + POSITION_SUFFIX, position));
if (jobConfDb.checkJobfinished(jobProfile)) {
LOGGER.info("Cannot update job profile {}, delete memory job in jobTaskPosition", jobId);
deleteJobPosition(jobId);
diff --git a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/TaskWrapper.java b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/TaskWrapper.java
index 6e6b8132f..b5694cf19 100755
--- a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/TaskWrapper.java
+++ b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/TaskWrapper.java
@@ -155,7 +155,6 @@ public class TaskWrapper extends AbstractStateWrapper {
task.getReader().setReadTimeout(TimeUnit.MINUTES.toMillis(WAIT_FINISH_TIME_OUT));
}
-
/**
* destroy task
*/
diff --git a/inlong-agent/agent-core/src/test/java/org/apache/inlong/agent/task/TestTaskWrapper.java b/inlong-agent/agent-core/src/test/java/org/apache/inlong/agent/task/TestTaskWrapper.java
index 84846e68e..67bd1f7fc 100755
--- a/inlong-agent/agent-core/src/test/java/org/apache/inlong/agent/task/TestTaskWrapper.java
+++ b/inlong-agent/agent-core/src/test/java/org/apache/inlong/agent/task/TestTaskWrapper.java
@@ -76,8 +76,7 @@ public class TestTaskWrapper {
LOGGER.info("waiting for success");
TimeUnit.MILLISECONDS.sleep(100);
}
- await().atMost(80, TimeUnit.SECONDS).until(()
- -> writer.getWriterCount() > 0);
+ await().atMost(80, TimeUnit.SECONDS).until(() -> writer.getWriterCount() > 0);
Assert.assertEquals("reader and writer are running",
reader.getCount() > 0, writer.getWriterCount() > 0);
}
diff --git a/inlong-agent/agent-docker/pom.xml b/inlong-agent/agent-docker/pom.xml
index e73fc82de..33fe06263 100644
--- a/inlong-agent/agent-docker/pom.xml
+++ b/inlong-agent/agent-docker/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -20,92 +21,92 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>org.apache.inlong</groupId>
- <artifactId>inlong-agent</artifactId>
- <version>1.5.0-SNAPSHOT</version>
- </parent>
- <artifactId>agent-docker</artifactId>
- <modelVersion>4.0.0</modelVersion>
- <name>Apache InLong - Agent Docker</name>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>inlong-agent</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>agent-docker</artifactId>
+ <name>Apache InLong - Agent Docker</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>agent-release</artifactId>
- <version>${project.parent.version}</version>
- <classifier>bin</classifier>
- <exclusions>
- <exclusion>
- <artifactId>log4j-api</artifactId>
- <groupId>org.apache.logging.log4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>log4j-slf4j-impl</artifactId>
- <groupId>org.apache.logging.log4j</groupId>
- </exclusion>
- </exclusions>
- <type>tar.gz</type>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <profiles>
- <profile>
- <id>docker</id>
- <build>
- <plugins>
- <plugin>
- <groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
- <version>${dockerfile.maven.version}</version>
- <executions>
- <execution>
- <id>default</id>
- <goals>
- <goal>build</goal>
- </goals>
- </execution>
- <execution>
- <id>tag-and-push-latest</id>
- <goals>
- <goal>tag</goal>
- <goal>push</goal>
- </goals>
- <configuration>
- <repository>${docker.organization}/agent</repository>
- <tag>latest</tag>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <repository>${docker.organization}/agent</repository>
- <pullNewerImage>false</pullNewerImage>
- <tag>${project.version}</tag>
- <buildArgs>
- <AGENT_TARBALL>target/agent-release-${project.version}-bin.tar.gz</AGENT_TARBALL>
- </buildArgs>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-tarball</id>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <phase>generate-resources</phase>
- <configuration>
- <outputDirectory>${project.build.directory}/</outputDirectory>
- <includeArtifactIds>agent-release</includeArtifactIds>
- <excludeTransitive>true</excludeTransitive>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>agent-release</artifactId>
+ <version>${project.parent.version}</version>
+ <classifier>bin</classifier>
+ <type>tar.gz</type>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ <profiles>
+ <profile>
+ <id>docker</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
+ <version>${dockerfile.maven.version}</version>
+ <configuration>
+ <repository>${docker.organization}/agent</repository>
+ <pullNewerImage>false</pullNewerImage>
+ <tag>${project.version}</tag>
+ <buildArgs>
+ <AGENT_TARBALL>target/agent-release-${project.version}-bin.tar.gz</AGENT_TARBALL>
+ </buildArgs>
+ </configuration>
+ <executions>
+ <execution>
+ <id>default</id>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>tag-and-push-latest</id>
+ <goals>
+ <goal>tag</goal>
+ <goal>push</goal>
+ </goals>
+ <configuration>
+ <repository>${docker.organization}/agent</repository>
+ <tag>latest</tag>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-tarball</id>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <phase>generate-resources</phase>
+ <configuration>
+ <outputDirectory>${project.build.directory}/</outputDirectory>
+ <includeArtifactIds>agent-release</includeArtifactIds>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/inlong-agent/agent-plugins/pom.xml b/inlong-agent/agent-plugins/pom.xml
index 85520f508..b9b5411f2 100644
--- a/inlong-agent/agent-plugins/pom.xml
+++ b/inlong-agent/agent-plugins/pom.xml
@@ -17,16 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-agent</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>agent-plugins</artifactId>
- <modelVersion>4.0.0</modelVersion>
<name>Apache InLong - Agent Plugins</name>
<dependencies>
@@ -46,8 +45,8 @@
<version>${project.version}</version>
<exclusions>
<exclusion>
- <artifactId>log4j-slf4j-impl</artifactId>
<groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -113,13 +112,13 @@
<artifactId>redis-replicator</artifactId>
</dependency>
<dependency>
- <artifactId>awaitility</artifactId>
<groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <artifactId>byte-buddy</artifactId>
<groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -141,21 +140,21 @@
<version>${paho.client.version}</version>
</dependency>
<dependency>
- <artifactId>guava</artifactId>
<groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
- <artifactId>slf4j-api</artifactId>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <artifactId>junit</artifactId>
<groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <artifactId>mockito-core</artifactId>
<groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -173,4 +172,4 @@
<artifactId>kubernetes-client</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/channel/MemoryChannel.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/channel/MemoryChannel.java
index 086d45b8b..24f0c6336 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/channel/MemoryChannel.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/channel/MemoryChannel.java
@@ -49,7 +49,7 @@ public class MemoryChannel implements Channel {
private static final Logger LOGGER = LoggerFactory.getLogger(MemoryChannel.class);
private LinkedBlockingQueue<Message> queue;
- //metric
+ // metric
private AgentMetricItemSet metricItemSet;
private static final AtomicLong METRIC_INDEX = new AtomicLong(0);
private String inlongGroupId;
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/ManagerFetcher.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/ManagerFetcher.java
index 4dd5829d7..1ea04ca6a 100755
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/ManagerFetcher.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/ManagerFetcher.java
@@ -156,7 +156,7 @@ public class ManagerFetcher extends AbstractDaemon implements ProfileFetcher {
private String buildBaseUrl() {
return "http://" + conf.get(AGENT_MANAGER_VIP_HTTP_HOST)
+ ":" + conf.get(AGENT_MANAGER_VIP_HTTP_PORT) + conf.get(
- AGENT_MANAGER_VIP_HTTP_PREFIX_PATH, DEFAULT_AGENT_MANAGER_VIP_HTTP_PREFIX_PATH);
+ AGENT_MANAGER_VIP_HTTP_PREFIX_PATH, DEFAULT_AGENT_MANAGER_VIP_HTTP_PREFIX_PATH);
}
/**
@@ -412,9 +412,9 @@ public class ManagerFetcher extends AbstractDaemon implements ProfileFetcher {
triggerProfile, dataTime);
Collection<File> suitFiles = PluginUtils.findSuitFiles(triggerProfile);
// filter files exited before
- List<File> pendingFiles = suitFiles.stream().filter(file ->
- !agentManager.getJobManager().checkJobExist(file.getAbsolutePath()))
- .collect(Collectors.toList());
+ List<File> pendingFiles =
+ suitFiles.stream().filter(file -> !agentManager.getJobManager().checkJobExist(file.getAbsolutePath()))
+ .collect(Collectors.toList());
for (File pendingFile : pendingFiles) {
JobProfile copiedProfile = copyJobProfile(triggerProfile, dataTime,
pendingFile);
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/filter/DateFormatRegex.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/filter/DateFormatRegex.java
index 1ca91e81f..0d192fc32 100755
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/filter/DateFormatRegex.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/filter/DateFormatRegex.java
@@ -109,12 +109,12 @@ public class DateFormatRegex implements Filter {
for (String regexStr : regexList) {
if (regexStr.contains(YEAR) || regexStr.contains(YEAR_LOWERCASE)) {
String tmpRegexStr = regexStr.replace(YEAR, time.substring(0, 4))
- .replace(YEAR_LOWERCASE,time.substring(0, 4))
+ .replace(YEAR_LOWERCASE, time.substring(0, 4))
.replace(MONTH, time.substring(4, 6))
.replace(DAY, time.substring(6, 8))
- .replace(DAY_LOWERCASE,time.substring(6, 8))
+ .replace(DAY_LOWERCASE, time.substring(6, 8))
.replace(HOUR, time.substring(8, 10))
- .replace(MINUTE,time.substring(10));
+ .replace(MINUTE, time.substring(10));
formattedList.add(tmpRegexStr);
formattedTime = time;
} else {
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/AbstractSink.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/AbstractSink.java
index 34975bdf7..0928d2c3d 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/AbstractSink.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/AbstractSink.java
@@ -47,7 +47,7 @@ public abstract class AbstractSink implements Sink {
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractSink.class);
protected String inlongGroupId;
protected String inlongStreamId;
- //metric
+ // metric
protected AgentMetricItemSet metricItemSet;
protected AgentMetricItem sinkMetric;
protected Map<String, String> dimensions;
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/ProxySink.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/ProxySink.java
index 4f1f44859..dfe4b7a33 100755
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/ProxySink.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/ProxySink.java
@@ -135,7 +135,7 @@ public class ProxySink extends AbstractSink {
if (batchProxyMessage != null) {
senderManager.sendBatch(batchProxyMessage);
LOGGER.info("send group id {}, message key {},with message size {}, the job id is {}, "
- + "read source is {} sendTime is {}", inlongGroupId, batchKey,
+ + "read source is {} sendTime is {}", inlongGroupId, batchKey,
batchProxyMessage.getDataList().size(), jobInstanceId, sourceName,
batchProxyMessage.getDataTime());
}
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/AbstractSource.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/AbstractSource.java
index 76c4252c9..7f77eed1b 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/AbstractSource.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/AbstractSource.java
@@ -39,7 +39,7 @@ public abstract class AbstractSource implements Source {
protected String inlongGroupId;
protected String inlongStreamId;
- //metric
+ // metric
protected AgentMetricItemSet metricItemSet;
protected AgentMetricItem sourceMetric;
protected String metricName;
@@ -49,7 +49,7 @@ public abstract class AbstractSource implements Source {
protected void init(JobProfile conf) {
inlongGroupId = conf.get(PROXY_INLONG_GROUP_ID, DEFAULT_PROXY_INLONG_GROUP_ID);
inlongStreamId = conf.get(PROXY_INLONG_STREAM_ID, DEFAULT_PROXY_INLONG_STREAM_ID);
- //register metric
+ // register metric
this.dimensions = new HashMap<>();
dimensions.put(KEY_PLUGIN_ID, this.getClass().getSimpleName());
dimensions.put(KEY_INLONG_GROUP_ID, inlongGroupId);
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/KafkaSource.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/KafkaSource.java
index cc2c22fff..35b58f238 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/KafkaSource.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/KafkaSource.java
@@ -112,7 +112,7 @@ public class KafkaSource extends AbstractSource {
for (String partitionOffset : partitionOffsets) {
if (partitionOffset.contains(JOB_KAFKA_PARTITION_OFFSET_DELIMITER)
&& partitionOffset.split(JOB_KAFKA_PARTITION_OFFSET_DELIMITER)[0]
- .equals(String.valueOf(partitionInfo.partition()))) {
+ .equals(String.valueOf(partitionInfo.partition()))) {
offset = Long.valueOf(partitionOffset.split(JOB_KAFKA_PARTITION_OFFSET_DELIMITER)[1]);
}
}
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/AbstractReader.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/AbstractReader.java
index 115070dc4..6d14eb10c 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/AbstractReader.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/AbstractReader.java
@@ -49,7 +49,7 @@ public abstract class AbstractReader implements Reader {
protected static final AtomicLong METRIC_INDEX = new AtomicLong(0);
protected String inlongGroupId;
protected String inlongStreamId;
- //metric
+ // metric
protected AgentMetricItemSet metricItemSet;
protected AgentMetricItem readerMetric;
protected String metricName;
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/KafkaReader.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/KafkaReader.java
index 52e72ed10..b64c4fbb3 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/KafkaReader.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/KafkaReader.java
@@ -273,7 +273,8 @@ public class KafkaReader<K, V> extends AbstractReader {
}
// calculate sleep time
long sleepTime = byteLimitSleepTime < recordLimitSleepTime
- ? recordLimitSleepTime : byteLimitSleepTime;
+ ? recordLimitSleepTime
+ : byteLimitSleepTime;
if (sleepTime > 0) {
LOGGER.info("sleep seconds:{}", sleepTime / 1000);
try {
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/MongoDBReader.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/MongoDBReader.java
index eee9e4bea..77e18d79c 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/MongoDBReader.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/MongoDBReader.java
@@ -256,7 +256,7 @@ public class MongoDBReader extends AbstractReader {
* @param error the error, or null if there was no exception
*/
private void handle(boolean success, String message, Throwable error) {
- //jobConf.getInstanceId()
+ // jobConf.getInstanceId()
if (!success) {
LOGGER.error("{}, {}", message, error);
}
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/MqttReader.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/MqttReader.java
index e62f21c70..6a0b0d340 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/MqttReader.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/MqttReader.java
@@ -113,6 +113,7 @@ public class MqttReader extends AbstractReader {
synchronized (MqttReader.class) {
client = new MqttClient(serverURI, clientId, new MemoryPersistence());
client.setCallback(new MqttCallback() {
+
@Override
public void connectionLost(Throwable cause) {
LOGGER.info("the mqtt connection is lost, try to reconnect. jobId:{},serverURI:{},clientId:{}",
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/OracleReader.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/OracleReader.java
index a8e1d4904..170d99cf3 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/OracleReader.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/OracleReader.java
@@ -219,7 +219,7 @@ public class OracleReader extends AbstractReader {
Properties props = getEngineProps();
DebeziumEngine<ChangeEvent<String, String>> engine = DebeziumEngine.create(
- io.debezium.engine.format.Json.class)
+ io.debezium.engine.format.Json.class)
.using(props)
.notifying((records, committer) -> {
try {
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/PostgreSQLReader.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/PostgreSQLReader.java
index 38f02e277..65b48d751 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/PostgreSQLReader.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/PostgreSQLReader.java
@@ -147,7 +147,7 @@ public class PostgreSQLReader extends AbstractReader {
Properties props = getEngineProps();
DebeziumEngine<ChangeEvent<String, String>> engine = DebeziumEngine.create(
- io.debezium.engine.format.Json.class)
+ io.debezium.engine.format.Json.class)
.using(props)
.notifying((records, committer) -> {
try {
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/RedisReader.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/RedisReader.java
index b90dc36b9..394ffc209 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/RedisReader.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/RedisReader.java
@@ -104,6 +104,7 @@ public class RedisReader extends AbstractReader {
redisReplicator = new RedisReplicator(uri);
initReplicator();
redisReplicator.addEventListener(new EventListener() {
+
@Override
public void onEvent(Replicator replicator, Event event) {
try {
@@ -232,46 +233,47 @@ public class RedisReader extends AbstractReader {
private void initGson() {
gson = new GsonBuilder().registerTypeAdapter(KeyStringValueHash.class, new TypeAdapter<KeyStringValueHash>() {
- @Override
- public void write(JsonWriter out, KeyStringValueHash kv) throws IOException {
- out.beginObject();
- out.name("DB").beginObject();
- out.name("dbNumber").value(kv.getDb().getDbNumber());
- out.name("dbSize").value(kv.getDb().getDbsize());
- out.name("expires").value(kv.getDb().getExpires());
- out.endObject();
- out.name("valueRdbType").value(kv.getValueRdbType());
- out.name("key").value(new String(kv.getKey()));
- out.name("value").beginObject();
- for (byte[] b : kv.getValue().keySet()) {
- out.name(new String(b)).value(new String(kv.getValue().get(b)));
- }
- out.endObject();
- out.endObject();
- }
+ @Override
+ public void write(JsonWriter out, KeyStringValueHash kv) throws IOException {
+ out.beginObject();
+ out.name("DB").beginObject();
+ out.name("dbNumber").value(kv.getDb().getDbNumber());
+ out.name("dbSize").value(kv.getDb().getDbsize());
+ out.name("expires").value(kv.getDb().getExpires());
+ out.endObject();
+ out.name("valueRdbType").value(kv.getValueRdbType());
+ out.name("key").value(new String(kv.getKey()));
+ out.name("value").beginObject();
+ for (byte[] b : kv.getValue().keySet()) {
+ out.name(new String(b)).value(new String(kv.getValue().get(b)));
+ }
+ out.endObject();
+ out.endObject();
+ }
- @Override
- public KeyStringValueHash read(JsonReader in) throws IOException {
- return null;
- }
- }).registerTypeAdapter(DefaultCommand.class, new TypeAdapter<DefaultCommand>() {
- @Override
- public void write(JsonWriter out, DefaultCommand dc) throws IOException {
- out.beginObject();
- out.name("key").value(new String(dc.getCommand()));
- out.name("value").beginArray();
- for (byte[] bytes : dc.getArgs()) {
- out.value(new String(bytes));
- }
- out.endArray();
- out.endObject();
- }
+ @Override
+ public KeyStringValueHash read(JsonReader in) throws IOException {
+ return null;
+ }
+ }).registerTypeAdapter(DefaultCommand.class, new TypeAdapter<DefaultCommand>() {
- @Override
- public DefaultCommand read(JsonReader in) throws IOException {
- return null;
- }
- })
+ @Override
+ public void write(JsonWriter out, DefaultCommand dc) throws IOException {
+ out.beginObject();
+ out.name("key").value(new String(dc.getCommand()));
+ out.name("value").beginArray();
+ for (byte[] bytes : dc.getArgs()) {
+ out.value(new String(bytes));
+ }
+ out.endArray();
+ out.endObject();
+ }
+
+ @Override
+ public DefaultCommand read(JsonReader in) throws IOException {
+ return null;
+ }
+ })
.registerTypeAdapter(KeyStringValueList.class, new TypeAdapter<KeyStringValueList>() {
@Override
@@ -292,6 +294,7 @@ public class RedisReader extends AbstractReader {
}
})
.registerTypeAdapter(KeyStringValueSet.class, new TypeAdapter<KeyStringValueSet>() {
+
@Override
public void write(JsonWriter out, KeyStringValueSet kv) throws IOException {
out.beginObject();
@@ -310,6 +313,7 @@ public class RedisReader extends AbstractReader {
}
})
.registerTypeAdapter(KeyStringValueString.class, new TypeAdapter<KeyStringValueString>() {
+
@Override
public void write(JsonWriter out, KeyStringValueString kv) throws IOException {
out.beginObject();
@@ -324,6 +328,7 @@ public class RedisReader extends AbstractReader {
}
})
.registerTypeAdapter(KeyStringValueZSet.class, new TypeAdapter<KeyStringValueZSet>() {
+
@Override
public void write(JsonWriter out, KeyStringValueZSet kv) throws IOException {
out.beginObject();
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/SQLServerReader.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/SQLServerReader.java
index 3a6eeafcc..41957c4e3 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/SQLServerReader.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/SQLServerReader.java
@@ -217,7 +217,7 @@ public class SQLServerReader extends AbstractReader {
Properties props = getEngineProps();
DebeziumEngine<ChangeEvent<String, String>> engine = DebeziumEngine.create(
- io.debezium.engine.format.Json.class)
+ io.debezium.engine.format.Json.class)
.using(props)
.notifying((records, committer) -> {
try {
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/file/TextFileReader.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/file/TextFileReader.java
index cf9707e19..d8e9c9030 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/file/TextFileReader.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/file/TextFileReader.java
@@ -61,7 +61,7 @@ public final class TextFileReader extends AbstractFileReader {
LOGGER.info("path is {}, position is {}, data reads size {}", fileReaderOperator.file.getName(),
fileReaderOperator.position, lines.size());
List<String> resultLines = new ArrayList<>();
- //TODO line regular expression matching
+ // TODO line regular expression matching
if (fileReaderOperator.jobConf.hasKey(JOB_FILE_LINE_END_PATTERN)) {
Pattern pattern = Pattern.compile(fileReaderOperator.jobConf.get(JOB_FILE_LINE_END_PATTERN));
lines.forEach(line -> {
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/snapshot/AbstractSnapshot.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/snapshot/AbstractSnapshot.java
index 8b100149d..a6febc56e 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/snapshot/AbstractSnapshot.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/snapshot/AbstractSnapshot.java
@@ -96,7 +96,7 @@ public abstract class AbstractSnapshot implements SnapshotBase {
public void save(String snapshot, File destFile) {
byte[] bytes = DECODER.decode(snapshot);
if (bytes.length != 0) {
- //offset = bytes;
+ // offset = bytes;
try (OutputStream output = Files.newOutputStream(destFile.toPath())) {
output.write(bytes);
} catch (Throwable e) {
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/trigger/DirectoryTrigger.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/trigger/DirectoryTrigger.java
index 92a3d2406..4bef74b9b 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/trigger/DirectoryTrigger.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/trigger/DirectoryTrigger.java
@@ -163,7 +163,7 @@ public class DirectoryTrigger extends AbstractDaemon implements Trigger {
// check whether parent path is valid.
if (Files.isDirectory(parentPath)) {
try (final Stream<Path> pathStream = Files.list(parentPath)) {
- for (Iterator<Path> it = pathStream.iterator(); it.hasNext(); ) {
+ for (Iterator<Path> it = pathStream.iterator(); it.hasNext();) {
Path childPath = it.next();
registerAllSubDir(entity, parentPath.resolve(childPath), tmpWatchers);
}
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/utils/FileDataUtils.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/utils/FileDataUtils.java
index bbde6f462..3bd9c73d3 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/utils/FileDataUtils.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/utils/FileDataUtils.java
@@ -84,7 +84,7 @@ public class FileDataUtils {
* Filter file by conditions
*/
public static Collection<File> filterFile(Collection<File> allFiles, JobProfile jobConf) {
- // filter file by labels
+ // filter file by labels
Collection<File> files = null;
try {
files = filterByLabels(allFiles, jobConf);
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/utils/InLongDatabaseHistory.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/utils/InLongDatabaseHistory.java
index 29074bbe2..3cbe13b3c 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/utils/InLongDatabaseHistory.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/utils/InLongDatabaseHistory.java
@@ -164,8 +164,7 @@ public class InLongDatabaseHistory extends AbstractDatabaseHistory {
BufferedWriter historyWriter = Files
.newBufferedWriter(this.path, StandardOpenOption.APPEND);
- label58:
- {
+ label58: {
try {
try {
historyWriter.append(line);
diff --git a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/TestFileAgent.java b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/TestFileAgent.java
index 27bb0dc10..67236c3da 100755
--- a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/TestFileAgent.java
+++ b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/TestFileAgent.java
@@ -178,10 +178,8 @@ public class TestFileAgent {
Map<String, JobWrapper> jobs = agent.getManager().getJobManager().getJobs();
AtomicBoolean result = new AtomicBoolean(false);
if (jobs.size() == 1) {
- jobs.forEach((s, jobWrapper) ->
- result.set(jobWrapper.getJob().getJobConf().get(JOB_DIR_FILTER_PATTERN)
- .equals(testRootDir + FileSystems.getDefault().getSeparator() + "test0.dat"))
- );
+ jobs.forEach((s, jobWrapper) -> result.set(jobWrapper.getJob().getJobConf().get(JOB_DIR_FILTER_PATTERN)
+ .equals(testRootDir + FileSystems.getDefault().getSeparator() + "test0.dat")));
}
return result.get();
}
diff --git a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/TestOOMExit.java b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/TestOOMExit.java
index 4bc44a663..838bb6c4e 100644
--- a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/TestOOMExit.java
+++ b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/TestOOMExit.java
@@ -55,6 +55,7 @@ public class TestOOMExit {
}
static class MockJobManager extends AbstractDaemon {
+
private static final Logger LOGGER = LoggerFactory.getLogger(MockJobManager.class);
@Override
diff --git a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/filter/TestDateFormatRegex.java b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/filter/TestDateFormatRegex.java
index 6a17849db..d73195b9a 100755
--- a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/filter/TestDateFormatRegex.java
+++ b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/filter/TestDateFormatRegex.java
@@ -65,7 +65,7 @@ public class TestDateFormatRegex {
dateFormatRegex.match();
dateFormatRegex.getFormattedTime();
Assert.assertEquals(helper.getParentPath().toString() + "/\\w{3}"
- + AgentUtils.formatCurrentTime("yyyyMMdd_HH") + ".log",
+ + AgentUtils.formatCurrentTime("yyyyMMdd_HH") + ".log",
dateFormatRegex.getFormattedRegex());
}
diff --git a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/filter/TestStreamIdFilter.java b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/filter/TestStreamIdFilter.java
index 645a46d8c..eb4068525 100644
--- a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/filter/TestStreamIdFilter.java
+++ b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/filter/TestStreamIdFilter.java
@@ -53,7 +53,7 @@ public class TestStreamIdFilter {
public void testStreamId() {
DefaultMessageFilter messageFilter = new DefaultMessageFilter();
ProxyMessage proxyMessage = new ProxyMessage("streamId|this is a line of file".getBytes(
- StandardCharsets.UTF_8), new HashMap<>());
+ StandardCharsets.UTF_8), new HashMap<>());
String s = messageFilter.filterStreamId(proxyMessage, "|".getBytes(StandardCharsets.UTF_8));
Assert.assertEquals(s, "streamId");
}
@@ -65,7 +65,7 @@ public class TestStreamIdFilter {
jobProfile.set(AGENT_MESSAGE_FILTER_CLASSNAME, "org.apache.inlong.agent.plugin.filter.DefaultMessageFilter");
MessageFilter messageFilter = sinkTest.initMessageFilter(jobProfile);
ProxyMessage proxyMessage = new ProxyMessage("tid|this is a line of file".getBytes(
- StandardCharsets.UTF_8), new HashMap<>());
+ StandardCharsets.UTF_8), new HashMap<>());
String s = messageFilter.filterStreamId(proxyMessage, "|".getBytes(StandardCharsets.UTF_8));
Assert.assertEquals(s, "tid");
}
@@ -94,4 +94,3 @@ public class TestStreamIdFilter {
}
}
-
diff --git a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/PostgreSQLOffsetManagerTest.java b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/PostgreSQLOffsetManagerTest.java
index 658a27f0c..8e06c184b 100644
--- a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/PostgreSQLOffsetManagerTest.java
+++ b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/PostgreSQLOffsetManagerTest.java
@@ -55,13 +55,13 @@ public class PostgreSQLOffsetManagerTest {
@Test
public void testOffset() {
PostgreSQLSnapshotBase snapshotManager = new PostgreSQLSnapshotBase(filePath.toString());
- byte[] snapshotBytes = new byte[]{-65,-14,23};
+ byte[] snapshotBytes = new byte[]{-65, -14, 23};
final Base64 base64 = new Base64();
String encodeSnapshot = base64.encodeAsString(snapshotBytes);
snapshotManager.save(encodeSnapshot, snapshotManager.getFile());
- Assert.assertEquals(snapshotManager.getSnapshot(),encodeSnapshot);
+ Assert.assertEquals(snapshotManager.getSnapshot(), encodeSnapshot);
File file = new File(filePath.toString());
- Assert.assertEquals(file.exists(),true);
+ Assert.assertEquals(file.exists(), true);
System.out.println(file.getAbsolutePath());
}
}
diff --git a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestMongoDBReader.java b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestMongoDBReader.java
index 9f5a06f45..d88ce94fc 100644
--- a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestMongoDBReader.java
+++ b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestMongoDBReader.java
@@ -39,7 +39,6 @@ import static org.apache.inlong.agent.constant.CommonConstants.PROXY_INLONG_STRE
*/
public class TestMongoDBReader {
-
private static final Logger LOGGER = LoggerFactory.getLogger(TestMongoDBReader.class);
/**
diff --git a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestMqttConnect.java b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestMqttConnect.java
index edf05b225..6e14c88ad 100644
--- a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestMqttConnect.java
+++ b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestMqttConnect.java
@@ -56,6 +56,7 @@ public class TestMqttConnect {
ExecutorService threadPool = Executors.newFixedThreadPool(5);
for (Reader reader : readers) {
threadPool.submit(new Runnable() {
+
@Override
public void run() {
reader.init(jobProfile);
diff --git a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestMqttReader.java b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestMqttReader.java
index 127965526..72348f92b 100644
--- a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestMqttReader.java
+++ b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestMqttReader.java
@@ -113,21 +113,21 @@ public class TestMqttReader {
when(jobProfile.getInstanceId()).thenReturn(INSTANCE_ID);
when(jobProfile.getInt(eq(MqttReader.JOB_MQTT_QUEUE_SIZE), eq(1000))).thenReturn(1000);
- //mock MqttClient
+ // mock MqttClient
whenNew(MqttClient.class).withArguments(anyString(), anyString(), any(MemoryPersistence.class))
.thenReturn(mqttClient);
- //mock queue
+ // mock queue
whenNew(LinkedBlockingQueue.class).withArguments(anyInt()).thenReturn(queue);
when(queue.poll()).thenReturn(message);
- //mock metrics
+ // mock metrics
whenNew(AgentMetricItemSet.class).withArguments(anyString()).thenReturn(agentMetricItemSet);
when(agentMetricItemSet.findMetricItem(any())).thenReturn(agentMetricItem);
field(AgentMetricItem.class, "pluginReadCount").set(agentMetricItem, atomicLong);
field(AgentMetricItem.class, "pluginReadSuccessCount").set(agentMetricItem, atomicCountLong);
- //init method
+ // init method
mockStatic(MetricRegister.class);
(reader = new MqttReader(topic)).init(jobProfile);
}
diff --git a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestOracleReader.java b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestOracleReader.java
index db24e3acc..a58a2bc3f 100644
--- a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestOracleReader.java
+++ b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestOracleReader.java
@@ -141,10 +141,10 @@ public class TestOracleReader {
specificOffsetPos);
whenNew(OracleSnapshotBase.class).withAnyArguments().thenReturn(oracleSnapshot);
- //mock oracleMessageQueue
+ // mock oracleMessageQueue
whenNew(LinkedBlockingQueue.class).withAnyArguments().thenReturn(oracleMessageQueue);
- //mock DebeziumEngine
+ // mock DebeziumEngine
mockStatic(DebeziumEngine.class);
when(DebeziumEngine.create(io.debezium.engine.format.Json.class)).thenReturn(builder);
when(builder.using(any(Properties.class))).thenReturn(builder);
@@ -152,17 +152,17 @@ public class TestOracleReader {
when(builder.using(any(DebeziumEngine.CompletionCallback.class))).thenReturn(builder);
when(builder.build()).thenReturn(engine);
- //mock executorService
+ // mock executorService
mockStatic(Executors.class);
when(Executors.newSingleThreadExecutor()).thenReturn(executorService);
- //mock metrics
+ // mock metrics
whenNew(AgentMetricItemSet.class).withArguments(anyString()).thenReturn(agentMetricItemSet);
when(agentMetricItemSet.findMetricItem(any())).thenReturn(agentMetricItem);
field(AgentMetricItem.class, "pluginReadCount").set(agentMetricItem, atomicLong);
field(AgentMetricItem.class, "pluginReadSuccessCount").set(agentMetricItem, atomicCountLong);
- //init method
+ // init method
mockStatic(MetricRegister.class);
(reader = new OracleReader()).init(jobProfile);
}
diff --git a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestSQLServerReader.java b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestSQLServerReader.java
index 33e291fbe..f4d0274b9 100644
--- a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestSQLServerReader.java
+++ b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestSQLServerReader.java
@@ -142,10 +142,10 @@ public class TestSQLServerReader {
specificOffsetPos);
whenNew(SqlServerSnapshotBase.class).withAnyArguments().thenReturn(sqlServerSnapshot);
- //mock sqlServerMessageQueue
+ // mock sqlServerMessageQueue
whenNew(LinkedBlockingQueue.class).withAnyArguments().thenReturn(sqlServerMessageQueue);
- //mock DebeziumEngine
+ // mock DebeziumEngine
mockStatic(DebeziumEngine.class);
when(DebeziumEngine.create(io.debezium.engine.format.Json.class)).thenReturn(builder);
when(builder.using(any(Properties.class))).thenReturn(builder);
@@ -153,17 +153,17 @@ public class TestSQLServerReader {
when(builder.using(any(DebeziumEngine.CompletionCallback.class))).thenReturn(builder);
when(builder.build()).thenReturn(engine);
- //mock executorService
+ // mock executorService
mockStatic(Executors.class);
when(Executors.newSingleThreadExecutor()).thenReturn(executorService);
- //mock metrics
+ // mock metrics
whenNew(AgentMetricItemSet.class).withArguments(anyString()).thenReturn(agentMetricItemSet);
when(agentMetricItemSet.findMetricItem(any())).thenReturn(agentMetricItem);
field(AgentMetricItem.class, "pluginReadCount").set(agentMetricItem, atomicLong);
field(AgentMetricItem.class, "pluginReadSuccessCount").set(agentMetricItem, atomicCountLong);
- //init method
+ // init method
mockStatic(MetricRegister.class);
(reader = new SQLServerReader()).init(jobProfile);
}
diff --git a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/validators/TestValidators.java b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/validators/TestValidators.java
index 377ebf293..42bbd6183 100644
--- a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/validators/TestValidators.java
+++ b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/validators/TestValidators.java
@@ -25,6 +25,7 @@ import org.apache.inlong.agent.plugin.validator.PrefixValidator;
import org.junit.Test;
public class TestValidators {
+
@Test
public void testPatternValidator() {
PatternValidator validator = new PatternValidator("test");
diff --git a/inlong-agent/agent-release/pom.xml b/inlong-agent/agent-release/pom.xml
index 24af3e3cf..6b914d0f3 100644
--- a/inlong-agent/agent-release/pom.xml
+++ b/inlong-agent/agent-release/pom.xml
@@ -17,15 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-agent</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>agent-release</artifactId>
<name>Apache InLong - Agent Release</name>
@@ -61,10 +60,10 @@
<executions>
<execution>
<id>make-assembly</id>
- <phase>package</phase>
<goals>
<goal>single</goal>
</goals>
+ <phase>package</phase>
<configuration>
<finalName>apache-inlong-agent-${project.version}</finalName>
<descriptors>
@@ -78,4 +77,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/inlong-agent/pom.xml b/inlong-agent/pom.xml
index d416eb322..ea536d6ba 100644
--- a/inlong-agent/pom.xml
+++ b/inlong-agent/pom.xml
@@ -17,11 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <packaging>pom</packaging>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.inlong</groupId>
@@ -29,6 +26,7 @@
<version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>inlong-agent</artifactId>
+ <packaging>pom</packaging>
<name>Apache InLong - Agent</name>
<modules>
diff --git a/inlong-audit/audit-common/pom.xml b/inlong-audit/audit-common/pom.xml
index 77bc81135..60ee0d78d 100644
--- a/inlong-audit/audit-common/pom.xml
+++ b/inlong-audit/audit-common/pom.xml
@@ -17,18 +17,16 @@
specific language governing permissions and limitations
under the License.
-->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-audit</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <name>Apache InLong - Audit common</name>
<artifactId>audit-common</artifactId>
+ <name>Apache InLong - Audit common</name>
<dependencies>
<dependency>
@@ -42,13 +40,6 @@
</dependencies>
<build>
- <extensions>
- <extension>
- <groupId>kr.motd.maven</groupId>
- <artifactId>os-maven-plugin</artifactId>
- <version>1.5.0.Final</version>
- </extension>
- </extensions>
<plugins>
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
@@ -68,5 +59,12 @@
</executions>
</plugin>
</plugins>
+ <extensions>
+ <extension>
+ <groupId>kr.motd.maven</groupId>
+ <artifactId>os-maven-plugin</artifactId>
+ <version>1.5.0.Final</version>
+ </extension>
+ </extensions>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/inlong-audit/audit-common/src/main/java/org/apache/inlong/audit/file/ConfigManager.java b/inlong-audit/audit-common/src/main/java/org/apache/inlong/audit/file/ConfigManager.java
index 1bb87cfc1..80fe5a642 100644
--- a/inlong-audit/audit-common/src/main/java/org/apache/inlong/audit/file/ConfigManager.java
+++ b/inlong-audit/audit-common/src/main/java/org/apache/inlong/audit/file/ConfigManager.java
@@ -88,8 +88,7 @@ public class ConfigManager {
private boolean updatePropertiesHolder(Map<String, String> result,
String holderName, boolean addElseRemove) {
if (StringUtils.isNotEmpty(holderName)) {
- PropertiesConfigHolder holder = (PropertiesConfigHolder)
- holderMap.get(holderName + ".properties");
+ PropertiesConfigHolder holder = (PropertiesConfigHolder) holderMap.get(holderName + ".properties");
return updatePropertiesHolder(result, holder, true);
}
return true;
@@ -109,7 +108,8 @@ public class ConfigManager {
boolean changed = false;
for (Entry<String, String> entry : result.entrySet()) {
String oldValue = addElseRemove
- ? tmpHolder.put(entry.getKey(), entry.getValue()) : tmpHolder.remove(entry.getKey());
+ ? tmpHolder.put(entry.getKey(), entry.getValue())
+ : tmpHolder.remove(entry.getKey());
// if addElseRemove is false, that means removing item, changed is true.
if (oldValue == null || !oldValue.equals(entry.getValue()) || !addElseRemove) {
changed = true;
diff --git a/inlong-audit/audit-common/src/main/java/org/apache/inlong/audit/protocol/AuditData.java b/inlong-audit/audit-common/src/main/java/org/apache/inlong/audit/protocol/AuditData.java
index 422fc37f2..ac8d59698 100644
--- a/inlong-audit/audit-common/src/main/java/org/apache/inlong/audit/protocol/AuditData.java
+++ b/inlong-audit/audit-common/src/main/java/org/apache/inlong/audit/protocol/AuditData.java
@@ -18,6 +18,7 @@
package org.apache.inlong.audit.protocol;
public class AuditData {
+
private String ip;
private String dockerId;
private String threadId;
diff --git a/inlong-audit/audit-docker/pom.xml b/inlong-audit/audit-docker/pom.xml
index c78c61ee0..e218307c3 100644
--- a/inlong-audit/audit-docker/pom.xml
+++ b/inlong-audit/audit-docker/pom.xml
@@ -17,15 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-audit</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>audit-docker</artifactId>
- <modelVersion>4.0.0</modelVersion>
<name>Apache InLong - Audit Docker</name>
<dependencies>
@@ -47,6 +47,14 @@
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<version>${dockerfile.maven.version}</version>
+ <configuration>
+ <repository>${docker.organization}/audit</repository>
+ <pullNewerImage>false</pullNewerImage>
+ <tag>${project.version}</tag>
+ <buildArgs>
+ <AUDIT_TARBALL>target/audit-release-${project.version}-bin.tar.gz</AUDIT_TARBALL>
+ </buildArgs>
+ </configuration>
<executions>
<execution>
<id>default</id>
@@ -66,14 +74,6 @@
</configuration>
</execution>
</executions>
- <configuration>
- <repository>${docker.organization}/audit</repository>
- <pullNewerImage>false</pullNewerImage>
- <tag>${project.version}</tag>
- <buildArgs>
- <AUDIT_TARBALL>target/audit-release-${project.version}-bin.tar.gz</AUDIT_TARBALL>
- </buildArgs>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/inlong-audit/audit-proxy/pom.xml b/inlong-audit/audit-proxy/pom.xml
index d4ceec28e..a8d43f239 100644
--- a/inlong-audit/audit-proxy/pom.xml
+++ b/inlong-audit/audit-proxy/pom.xml
@@ -17,18 +17,16 @@
specific language governing permissions and limitations
under the License.
-->
-
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-audit</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <name>Apache InLong - Audit Proxy</name>
<artifactId>audit-proxy</artifactId>
+ <name>Apache InLong - Audit Proxy</name>
<dependencies>
<dependency>
@@ -112,4 +110,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/base/HighPriorityThreadFactory.java b/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/base/HighPriorityThreadFactory.java
index 673b75ced..01fc8a560 100644
--- a/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/base/HighPriorityThreadFactory.java
+++ b/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/base/HighPriorityThreadFactory.java
@@ -21,7 +21,9 @@ import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger;
public class HighPriorityThreadFactory
- implements ThreadFactory {
+ implements
+ ThreadFactory {
+
private static final AtomicInteger poolNumber = new AtomicInteger(1);
private final AtomicInteger threadNumber;
private final ThreadGroup group;
@@ -47,4 +49,3 @@ public class HighPriorityThreadFactory
return t;
}
}
-
diff --git a/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/channel/FailoverChannelProcessor.java b/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/channel/FailoverChannelProcessor.java
index 3f1c67b50..65c922e6f 100644
--- a/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/channel/FailoverChannelProcessor.java
+++ b/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/channel/FailoverChannelProcessor.java
@@ -41,7 +41,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class FailoverChannelProcessor
- extends ChannelProcessor {
+ extends
+ ChannelProcessor {
private static final Logger LOG = LoggerFactory.getLogger(FailoverChannelProcessor.class);
@@ -134,7 +135,7 @@ public class FailoverChannelProcessor
for (Channel ch : reqChannels) {
List<Event> eventQueue = reqChannelQueue
- .computeIfAbsent(ch, k -> new ArrayList<Event>());//reqChannelQueue
+ .computeIfAbsent(ch, k -> new ArrayList<Event>());// reqChannelQueue
eventQueue.add(event);
}
@@ -142,7 +143,7 @@ public class FailoverChannelProcessor
for (Channel ch : optChannels) {
List<Event> eventQueue = optChannelQueue
- .computeIfAbsent(ch, k -> new ArrayList<Event>());//optChannelQueue
+ .computeIfAbsent(ch, k -> new ArrayList<Event>());// optChannelQueue
eventQueue.add(event);
}
@@ -285,7 +286,8 @@ public class FailoverChannelProcessor
} else {
throw new ChannelException(
"FailoverChannelProcessor Unable to put event on "
- + "optionalChannels: " + optChannel, t);
+ + "optionalChannels: " + optChannel,
+ t);
}
} finally {
if (tx != null) {
diff --git a/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/node/Application.java b/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/node/Application.java
index d1cd26904..137f0de0a 100644
--- a/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/node/Application.java
+++ b/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/node/Application.java
@@ -330,7 +330,7 @@ public class Application {
application.handleConfigurationEvent(configurationProvider.getConfiguration());
}
- //start application
+ // start application
application.start();
final Application appReference = application;
diff --git a/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/sink/EventStat.java b/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/sink/EventStat.java
index 31a7223af..ef5686c3b 100644
--- a/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/sink/EventStat.java
+++ b/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/sink/EventStat.java
@@ -24,6 +24,7 @@ import org.apache.flume.Event;
@Getter
@Setter
public class EventStat {
+
private Event event;
private int myRetryCnt;
diff --git a/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/sink/PulsarSink.java b/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/sink/PulsarSink.java
index 8dc4c644a..c8c120537 100644
--- a/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/sink/PulsarSink.java
+++ b/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/sink/PulsarSink.java
@@ -51,8 +51,12 @@ import org.slf4j.LoggerFactory;
*
* send to one pulsar cluster
*/
-public class PulsarSink extends AbstractSink implements Configurable, SendMessageCallBack,
- CreatePulsarClientCallBack {
+public class PulsarSink extends AbstractSink
+ implements
+ Configurable,
+ SendMessageCallBack,
+ CreatePulsarClientCallBack {
+
private static final Logger logger = LoggerFactory.getLogger(PulsarSink.class);
/*
@@ -120,12 +124,10 @@ public class PulsarSink extends AbstractSink implements Configurable, SendMessag
*/
private volatile boolean canTake = false;
-
private static int EVENT_QUEUE_SIZE = 1000;
private int threadNum;
-
/*
* send thread pool
*/
@@ -168,7 +170,7 @@ public class PulsarSink extends AbstractSink implements Configurable, SendMessag
/*
* topic config
*/
- topic = context.getString(TOPIC);
+ topic = context.getString(TOPIC);
logEveryNEvents = context.getInteger(LOG_EVERY_N_EVENTS, DEFAULT_LOG_EVERY_N_EVENTS);
logger.debug(this.getName() + " " + LOG_EVERY_N_EVENTS + " " + logEveryNEvents);
Preconditions.checkArgument(logEveryNEvents > 0, "logEveryNEvents must be > 0");
@@ -181,7 +183,7 @@ public class PulsarSink extends AbstractSink implements Configurable, SendMessag
sinkThreadPool = new Thread[threadNum];
eventQueue = new LinkedBlockingQueue<Event>(EVENT_QUEUE_SIZE);
- diskIORatePerSec = context.getLong(DISK_IO_RATE_PER_SEC,0L);
+ diskIORatePerSec = context.getLong(DISK_IO_RATE_PER_SEC, 0L);
if (diskIORatePerSec != 0) {
diskRateLimiter = RateLimiter.create(diskIORatePerSec);
}
@@ -213,7 +215,7 @@ public class PulsarSink extends AbstractSink implements Configurable, SendMessag
try {
initTopic();
} catch (Exception e) {
- logger.info("meta sink start publish topic fail.",e);
+ logger.info("meta sink start publish topic fail.", e);
}
for (int i = 0; i < sinkThreadPool.length; i++) {
@@ -312,14 +314,14 @@ public class PulsarSink extends AbstractSink implements Configurable, SendMessag
}
@Override
- public void handleMessageSendSuccess(Object result, EventStat eventStat) {
+ public void handleMessageSendSuccess(Object result, EventStat eventStat) {
/*
* Statistics pulsar performance
*/
totalPulsarSuccSendCnt.incrementAndGet();
totalPulsarSuccSendSize.addAndGet(eventStat.getEvent().getBody().length);
/*
- *add to sinkCounter
+ * add to sinkCounter
*/
sinkCounter.incrementEventDrainSuccessCount();
currentInFlightCount.decrementAndGet();
@@ -330,15 +332,16 @@ public class PulsarSink extends AbstractSink implements Configurable, SendMessag
lastSuccessSendCnt.set(nowCnt);
t2 = System.currentTimeMillis();
logger.info("metasink {}, succ put {} events to pulsar,"
- + " in the past {} millsec", new Object[] {
- getName(), (nowCnt - oldCnt), (t2 - t1)
- });
+ + " in the past {} millsec",
+ new Object[]{
+ getName(), (nowCnt - oldCnt), (t2 - t1)
+ });
t1 = t2;
}
}
@Override
- public void handleMessageSendException(EventStat eventStat, Object e) {
+ public void handleMessageSendException(EventStat eventStat, Object e) {
if (e instanceof TooLongFrameException) {
PulsarSink.this.overflow = true;
} else if (e instanceof ProducerQueueIsFullError) {
@@ -374,6 +377,7 @@ public class PulsarSink extends AbstractSink implements Configurable, SendMessag
}
static class PulsarPerformanceTask implements Runnable {
+
@Override
public void run() {
try {
@@ -397,6 +401,7 @@ public class PulsarSink extends AbstractSink implements Configurable, SendMessag
}
class SinkTask implements Runnable {
+
@Override
public void run() {
logger.info("Sink task {} started.", Thread.currentThread().getName());
@@ -421,16 +426,15 @@ public class PulsarSink extends AbstractSink implements Configurable, SendMessag
} else {
if (currentInFlightCount.get() > BATCH_SIZE) {
/*
- * Under the condition that the number of unresponsive messages
- * is greater than 1w, the number of unresponsive messages sent
- * to pulsar will be printed periodically
+ * Under the condition that the number of unresponsive messages is greater than 1w, the
+ * number of unresponsive messages sent to pulsar will be printed periodically
*/
logCounter++;
if (logCounter == 1 || logCounter % 100000 == 0) {
logger.info(getName()
- + " currentInFlightCount={} resendQueue"
- + ".size={}",
- currentInFlightCount.get(),resendQueue.size());
+ + " currentInFlightCount={} resendQueue"
+ + ".size={}",
+ currentInFlightCount.get(), resendQueue.size());
}
if (logCounter > Long.MAX_VALUE - 10) {
logCounter = 0;
@@ -440,7 +444,7 @@ public class PulsarSink extends AbstractSink implements Configurable, SendMessag
eventStat = new EventStat(event);
sinkCounter.incrementEventDrainAttemptCount();
}
- logger.debug("Event is {}, topic = {} ",event, topic);
+ logger.debug("Event is {}, topic = {} ", event, topic);
if (event == null) {
continue;
@@ -473,7 +477,7 @@ public class PulsarSink extends AbstractSink implements Configurable, SendMessag
try {
Thread.sleep(100);
} catch (InterruptedException e) {
- //ignore..
+ // ignore..
}
}
}
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 4f9390a2c..0caf67ef7 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
@@ -309,7 +309,7 @@ public class TubeSink extends AbstractSink implements Configurable {
* Send message of success.
*/
public void handleMessageSendSuccess(EventStat es) {
- //Statistics tube performance
+ // Statistics tube performance
totalTubeSuccSendCnt.incrementAndGet();
totalTubeSuccSendSize.addAndGet(es.getEvent().getBody().length);
@@ -322,9 +322,10 @@ public class TubeSink extends AbstractSink implements Configurable {
lastSuccessSendCnt.set(nowCnt);
t2 = System.currentTimeMillis();
logger.info("tubesink {}, succ put {} events to tube,"
- + " in the past {} millsec", new Object[]{
- getName(), (nowCnt - oldCnt), (t2 - t1)
- });
+ + " in the past {} millsec",
+ new Object[]{
+ getName(), (nowCnt - oldCnt), (t2 - t1)
+ });
t1 = t2;
}
@@ -561,7 +562,7 @@ public class TubeSink extends AbstractSink implements Configurable {
try {
Thread.sleep(100);
} catch (InterruptedException e) {
- //ignore..
+ // ignore..
}
}
}
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 5de44676d..9d95b36e9 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
@@ -138,7 +138,7 @@ public class PulsarClientService {
* @return
*/
public boolean sendMessage(String topic, Event event,
- SendMessageCallBack sendMessageCallBack, EventStat es) {
+ SendMessageCallBack sendMessageCallBack, EventStat es) {
Producer producer = null;
try {
producer = getProducer(topic);
@@ -194,14 +194,14 @@ public class PulsarClientService {
} catch (PulsarClientException e) {
callBack.handleCreateClientException(pulsarServerUrl);
logger.error("create connnection error in metasink, "
- + "maybe pulsar master set error, please re-check.url{}, ex1 {}",
+ + "maybe pulsar master set error, please re-check.url{}, ex1 {}",
pulsarServerUrl,
e.getMessage());
} catch (Throwable e) {
callBack.handleCreateClientException(pulsarServerUrl);
logger.error("create connnection error in metasink, "
- + "maybe pulsar master set error/shutdown in progress, please "
- + "re-check. url{}, ex2 {}",
+ + "maybe pulsar master set error/shutdown in progress, please "
+ + "re-check. url{}, ex2 {}",
pulsarServerUrl,
e.getMessage());
}
@@ -224,7 +224,7 @@ public class PulsarClientService {
Producer producer = null;
try {
producer = pulsarClient.newProducer().sendTimeout(sendTimeout,
- TimeUnit.MILLISECONDS)
+ TimeUnit.MILLISECONDS)
.topic(topic)
.enableBatching(enableBatch)
.blockIfQueueFull(blockIfQueueFull)
diff --git a/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/source/DefaultServiceDecoder.java b/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/source/DefaultServiceDecoder.java
index 3f419ca77..7b68d237d 100644
--- a/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/source/DefaultServiceDecoder.java
+++ b/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/source/DefaultServiceDecoder.java
@@ -30,7 +30,7 @@ public class DefaultServiceDecoder implements ServiceDecoder {
@Override
public BaseCommand extractData(ByteBuf cb, Channel channel) throws Exception {
- /*[cmd size] | [cmd]*/
+ /* [cmd size] | [cmd] */
if (null == cb) {
LOG.error("cb == null");
return null;
diff --git a/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/utils/EventLoopUtil.java b/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/utils/EventLoopUtil.java
index 675d6d9ad..2501d6b93 100644
--- a/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/utils/EventLoopUtil.java
+++ b/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/utils/EventLoopUtil.java
@@ -60,17 +60,20 @@ public class EventLoopUtil {
public static Class<? extends SocketChannel> getClientSocketChannelClass(EventLoopGroup eventLoopGroup) {
return eventLoopGroup instanceof EpollEventLoopGroup
- ? EpollSocketChannel.class : NioSocketChannel.class;
+ ? EpollSocketChannel.class
+ : NioSocketChannel.class;
}
public static Class<? extends ServerSocketChannel> getServerSocketChannelClass(EventLoopGroup eventLoopGroup) {
return eventLoopGroup instanceof EpollEventLoopGroup
- ? EpollServerSocketChannel.class : NioServerSocketChannel.class;
+ ? EpollServerSocketChannel.class
+ : NioServerSocketChannel.class;
}
public static Class<? extends DatagramChannel> getDatagramChannelClass(EventLoopGroup eventLoopGroup) {
return eventLoopGroup instanceof EpollEventLoopGroup
- ? EpollDatagramChannel.class : NioDatagramChannel.class;
+ ? EpollDatagramChannel.class
+ : NioDatagramChannel.class;
}
public static void enableTriggeredMode(ServerBootstrap bootstrap) {
diff --git a/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/utils/FailoverChannelProcessorHolder.java b/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/utils/FailoverChannelProcessorHolder.java
index 6b10477fd..ab3910a2d 100644
--- a/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/utils/FailoverChannelProcessorHolder.java
+++ b/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/utils/FailoverChannelProcessorHolder.java
@@ -20,6 +20,7 @@ package org.apache.inlong.audit.utils;
import org.apache.flume.channel.ChannelProcessor;
public class FailoverChannelProcessorHolder {
+
private static ChannelProcessor channelProcessor;
public static ChannelProcessor getChannelProcessor() {
diff --git a/inlong-audit/audit-proxy/src/test/java/org/apache/inlong/audit/sink/PulsarSinkTest.java b/inlong-audit/audit-proxy/src/test/java/org/apache/inlong/audit/sink/PulsarSinkTest.java
index 70e217704..958e066a7 100644
--- a/inlong-audit/audit-proxy/src/test/java/org/apache/inlong/audit/sink/PulsarSinkTest.java
+++ b/inlong-audit/audit-proxy/src/test/java/org/apache/inlong/audit/sink/PulsarSinkTest.java
@@ -36,6 +36,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class PulsarSinkTest {
+
private static final Logger logger = LoggerFactory
.getLogger(PulsarSinkTest.class);
private static final String hostname = "127.0.0.1";
diff --git a/inlong-audit/audit-release/pom.xml b/inlong-audit/audit-release/pom.xml
index 0b2ff3c54..c14cbc970 100644
--- a/inlong-audit/audit-release/pom.xml
+++ b/inlong-audit/audit-release/pom.xml
@@ -17,15 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-audit</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>audit-release</artifactId>
<name>Apache InLong - Audit Release</name>
@@ -51,10 +50,10 @@
<executions>
<execution>
<id>make-assembly</id>
- <phase>package</phase>
<goals>
<goal>single</goal>
</goals>
+ <phase>package</phase>
<configuration>
<finalName>apache-inlong-audit-${project.version}</finalName>
<descriptors>
@@ -68,4 +67,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/inlong-audit/audit-sdk/pom.xml b/inlong-audit/audit-sdk/pom.xml
index 43694f48d..b76c6d3c0 100644
--- a/inlong-audit/audit-sdk/pom.xml
+++ b/inlong-audit/audit-sdk/pom.xml
@@ -15,9 +15,7 @@
specific language governing permissions and limitations
under the License.
-->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -68,4 +66,4 @@
<scope>compile</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/AuditOperator.java b/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/AuditOperator.java
index ddbafd916..1fc8b6308 100644
--- a/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/AuditOperator.java
+++ b/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/AuditOperator.java
@@ -61,6 +61,7 @@ public class AuditOperator {
private SenderManager manager;
private final TimerTask timerTask = new TimerTask() {
+
@Override
public void run() {
try {
diff --git a/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/send/ClientPipelineFactory.java b/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/send/ClientPipelineFactory.java
index 5f22c1793..45edb1dc3 100644
--- a/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/send/ClientPipelineFactory.java
+++ b/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/send/ClientPipelineFactory.java
@@ -24,6 +24,7 @@ import io.netty.channel.socket.SocketChannel;
import org.apache.inlong.audit.util.Decoder;
public class ClientPipelineFactory extends ChannelInitializer<SocketChannel> {
+
private final SimpleChannelInboundHandler sendHandler;
public ClientPipelineFactory(SimpleChannelInboundHandler sendHandler) {
@@ -36,4 +37,3 @@ public class ClientPipelineFactory extends ChannelInitializer<SocketChannel> {
ch.pipeline().addLast("handler", sendHandler);
}
}
-
diff --git a/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/send/SenderGroup.java b/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/send/SenderGroup.java
index 33b12e58d..e36d069bb 100644
--- a/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/send/SenderGroup.java
+++ b/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/send/SenderGroup.java
@@ -33,6 +33,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.LinkedBlockingQueue;
public class SenderGroup {
+
private static final Logger logger = LoggerFactory.getLogger(SenderGroup.class);
// maximum number of sending
public static final int MAX_SEND_TIMES = 3;
@@ -230,4 +231,3 @@ public class SenderGroup {
}
}
-
diff --git a/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/util/AuditConfig.java b/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/util/AuditConfig.java
index 67e8f9463..c7ac2f3ef 100644
--- a/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/util/AuditConfig.java
+++ b/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/util/AuditConfig.java
@@ -21,6 +21,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class AuditConfig {
+
private static final Logger logger = LoggerFactory.getLogger(AuditConfig.class);
private static String FILE_PATH = "/data/inlong/audit/";
private static final int FILE_SIZE = 500 * 1024 * 1024;
diff --git a/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/util/Config.java b/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/util/Config.java
index 32f9e7f68..e4acd2878 100644
--- a/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/util/Config.java
+++ b/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/util/Config.java
@@ -29,6 +29,7 @@ import java.net.SocketException;
import java.util.Enumeration;
public class Config {
+
private static final Logger logger = LoggerFactory.getLogger(Config.class);
private String localIP = "";
private String dockerId = "";
@@ -48,12 +49,11 @@ public class Config {
private void initIP() {
try {
- for (Enumeration<NetworkInterface> en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements(); ) {
+ for (Enumeration<NetworkInterface> en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements();) {
NetworkInterface intf = en.nextElement();
String name = intf.getName();
if (!name.contains("docker") && !name.contains("lo")) {
- for (Enumeration<InetAddress> enumIpAddr = intf.getInetAddresses();
- enumIpAddr.hasMoreElements(); ) {
+ for (Enumeration<InetAddress> enumIpAddr = intf.getInetAddresses(); enumIpAddr.hasMoreElements();) {
InetAddress inetAddress = enumIpAddr.nextElement();
if (!inetAddress.isLoopbackAddress()) {
String ipaddress = inetAddress.getHostAddress();
diff --git a/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/util/Decoder.java b/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/util/Decoder.java
index cf14e471f..050700738 100644
--- a/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/util/Decoder.java
+++ b/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/util/Decoder.java
@@ -23,6 +23,7 @@ import io.netty.handler.codec.MessageToMessageDecoder;
import java.util.List;
public class Decoder extends MessageToMessageDecoder<ByteBuf> {
+
// Maximum return packet size
private static final int MAX_RESPONSE_LENGTH = 8 * 1024 * 1024;
@@ -36,7 +37,7 @@ public class Decoder extends MessageToMessageDecoder<ByteBuf> {
// otherwise only the first one will be parsed correctly,
// which will adversely affect the parsing of the subsequent package
buffer.markReaderIndex();
- //Packet composition: 4 bytes length content + ProtocolBuffer content
+ // Packet composition: 4 bytes length content + ProtocolBuffer content
int totalLen = buffer.readInt();
// Respond to abnormal channel, interrupt in time to avoid stuck
if (totalLen > MAX_RESPONSE_LENGTH) {
diff --git a/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/util/EventLoopUtil.java b/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/util/EventLoopUtil.java
index 9a8de8f9f..8fe8d5768 100644
--- a/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/util/EventLoopUtil.java
+++ b/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/util/EventLoopUtil.java
@@ -60,17 +60,20 @@ public class EventLoopUtil {
public static Class<? extends SocketChannel> getClientSocketChannelClass(EventLoopGroup eventLoopGroup) {
return eventLoopGroup instanceof EpollEventLoopGroup
- ? EpollSocketChannel.class : NioSocketChannel.class;
+ ? EpollSocketChannel.class
+ : NioSocketChannel.class;
}
public static Class<? extends ServerSocketChannel> getServerSocketChannelClass(EventLoopGroup eventLoopGroup) {
return eventLoopGroup instanceof EpollEventLoopGroup
- ? EpollServerSocketChannel.class : NioServerSocketChannel.class;
+ ? EpollServerSocketChannel.class
+ : NioServerSocketChannel.class;
}
public static Class<? extends DatagramChannel> getDatagramChannelClass(EventLoopGroup eventLoopGroup) {
return eventLoopGroup instanceof EpollEventLoopGroup
- ? EpollDatagramChannel.class : NioDatagramChannel.class;
+ ? EpollDatagramChannel.class
+ : NioDatagramChannel.class;
}
public static void enableTriggeredMode(ServerBootstrap bootstrap) {
diff --git a/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/util/IpPort.java b/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/util/IpPort.java
index 494864b60..2b6208df3 100644
--- a/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/util/IpPort.java
+++ b/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/util/IpPort.java
@@ -23,6 +23,7 @@ import org.apache.commons.lang3.math.NumberUtils;
import java.net.InetSocketAddress;
public class IpPort {
+
public static final String SEPARATOR = ":";
public final String ip;
public final int port;
@@ -145,4 +146,3 @@ public class IpPort {
return key;
}
}
-
diff --git a/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/util/StatInfo.java b/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/util/StatInfo.java
index aecc22c29..a20d1657b 100644
--- a/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/util/StatInfo.java
+++ b/inlong-audit/audit-sdk/src/main/java/org/apache/inlong/audit/util/StatInfo.java
@@ -20,6 +20,7 @@ package org.apache.inlong.audit.util;
import java.util.concurrent.atomic.AtomicLong;
public class StatInfo {
+
public AtomicLong count = new AtomicLong(0);
public AtomicLong size = new AtomicLong(0);
public AtomicLong delay = new AtomicLong(0);
diff --git a/inlong-audit/audit-sdk/src/test/java/org/apache/inlong/audit/send/SenderGroupTest.java b/inlong-audit/audit-sdk/src/test/java/org/apache/inlong/audit/send/SenderGroupTest.java
index bea1f2419..7cde60b46 100644
--- a/inlong-audit/audit-sdk/src/test/java/org/apache/inlong/audit/send/SenderGroupTest.java
+++ b/inlong-audit/audit-sdk/src/test/java/org/apache/inlong/audit/send/SenderGroupTest.java
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
public class SenderGroupTest {
+
AuditConfig testConfig = new AuditConfig();
SenderManager testManager = new SenderManager(testConfig);
SenderHandler clientHandler = new org.apache.inlong.audit.send.SenderHandler(testManager);
diff --git a/inlong-audit/audit-sdk/src/test/java/org/apache/inlong/audit/send/SenderManagerTest.java b/inlong-audit/audit-sdk/src/test/java/org/apache/inlong/audit/send/SenderManagerTest.java
index 4ddf3d67a..dcb674b6d 100644
--- a/inlong-audit/audit-sdk/src/test/java/org/apache/inlong/audit/send/SenderManagerTest.java
+++ b/inlong-audit/audit-sdk/src/test/java/org/apache/inlong/audit/send/SenderManagerTest.java
@@ -23,6 +23,7 @@ import org.junit.Test;
import static org.junit.Assert.assertTrue;
public class SenderManagerTest {
+
private AuditConfig testConfig = new AuditConfig();
@Test
diff --git a/inlong-audit/audit-sdk/src/test/java/org/apache/inlong/audit/util/IpPortTest.java b/inlong-audit/audit-sdk/src/test/java/org/apache/inlong/audit/util/IpPortTest.java
index 23daf8049..65d2bcb3f 100644
--- a/inlong-audit/audit-sdk/src/test/java/org/apache/inlong/audit/util/IpPortTest.java
+++ b/inlong-audit/audit-sdk/src/test/java/org/apache/inlong/audit/util/IpPortTest.java
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
public class IpPortTest {
+
private IpPort test = new IpPort("127.0.0.1", 80);
@Test
diff --git a/inlong-audit/audit-store/pom.xml b/inlong-audit/audit-store/pom.xml
index 5e26a0f36..64d0240ae 100644
--- a/inlong-audit/audit-store/pom.xml
+++ b/inlong-audit/audit-store/pom.xml
@@ -17,17 +17,16 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-audit</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <name>Apache InLong - Audit store</name>
<artifactId>audit-store</artifactId>
+ <name>Apache InLong - Audit store</name>
<dependencies>
<dependency>
@@ -45,12 +44,12 @@
<artifactId>mybatis-spring-boot-starter</artifactId>
<exclusions>
<exclusion>
- <artifactId>spring-boot-autoconfigure</artifactId>
<groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-autoconfigure</artifactId>
</exclusion>
<exclusion>
- <artifactId>log4j-api</artifactId>
<groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -82,20 +81,20 @@
<artifactId>junit-vintage-engine</artifactId>
</exclusion>
<exclusion>
- <artifactId>spring-boot-starter</artifactId>
<groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
</exclusion>
<exclusion>
- <artifactId>spring-boot-autoconfigure</artifactId>
<groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-autoconfigure</artifactId>
</exclusion>
<exclusion>
- <artifactId>junit-jupiter-api</artifactId>
<groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
</exclusion>
<exclusion>
- <artifactId>spring-boot</artifactId>
<groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -104,8 +103,8 @@
<artifactId>druid-spring-boot-starter</artifactId>
<exclusions>
<exclusion>
- <artifactId>spring-boot</artifactId>
<groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework.boot</groupId>
@@ -135,16 +134,16 @@
<artifactId>elasticsearch-rest-high-level-client</artifactId>
<exclusions>
<exclusion>
- <artifactId>commons-codec</artifactId>
<groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
</exclusion>
<exclusion>
- <artifactId>jackson-core</artifactId>
<groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
</exclusion>
<exclusion>
- <artifactId>snakeyaml</artifactId>
<groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -193,8 +192,8 @@
<build>
<resources>
<resource>
- <directory>${basedir}/src/main/resources</directory>
<filtering>true</filtering>
+ <directory>${basedir}/src/main/resources</directory>
<includes>
<include>**/application*.yml</include>
<include>**/application*.yaml</include>
@@ -223,17 +222,17 @@
<executions>
<execution>
<id>compile</id>
- <phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
+ <phase>compile</phase>
</execution>
<execution>
<id>test-compile</id>
- <phase>test-compile</phase>
<goals>
<goal>test-compile</goal>
</goals>
+ <phase>test-compile</phase>
</execution>
</executions>
</plugin>
@@ -247,6 +246,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <classesDirectory>${project.build.outputDirectory}</classesDirectory>
+ </configuration>
<executions>
<execution>
<goals>
@@ -255,9 +257,6 @@
</goals>
</execution>
</executions>
- <configuration>
- <classesDirectory>${project.build.outputDirectory}</classesDirectory>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -266,8 +265,7 @@
<archive>
<manifest>
<mainClass>${start-class}</mainClass>
- <addDefaultImplementationEntries>true
- </addDefaultImplementationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
</archive>
</configuration>
@@ -279,8 +277,7 @@
<archive>
<manifest>
<mainClass>${start-class}</mainClass>
- <addDefaultImplementationEntries>true
- </addDefaultImplementationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
</archive>
</configuration>
@@ -298,6 +295,12 @@
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
+ <configuration>
+ <verbose>true</verbose>
+ <dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
+ <generateGitPropertiesFile>true</generateGitPropertiesFile>
+ <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
+ </configuration>
<executions>
<execution>
<goals>
@@ -305,19 +308,14 @@
</goals>
</execution>
</executions>
- <configuration>
- <verbose>true</verbose>
- <dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
- <generateGitPropertiesFile>true</generateGitPropertiesFile>
- <generateGitPropertiesFilename>
- ${project.build.outputDirectory}/git.properties
- </generateGitPropertiesFilename>
- </configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring.plugin.version}</version>
+ <configuration>
+ <mainClass>${start-class}</mainClass>
+ </configuration>
<executions>
<execution>
<id>repackage</id>
@@ -326,9 +324,6 @@
</goals>
</execution>
</executions>
- <configuration>
- <mainClass>${start-class}</mainClass>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -356,28 +351,23 @@
</dependencies>
<executions>
<execution>
- <phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
+ <phase>package</phase>
<configuration>
<transformers>
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+ <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/spring.handlers</resource>
</transformer>
- <transformer
- implementation="org.springframework.boot.maven.PropertiesMergingResourceTransformer">
+ <transformer implementation="org.springframework.boot.maven.PropertiesMergingResourceTransformer">
<resource>META-INF/spring.factories</resource>
</transformer>
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+ <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/spring.schemas</resource>
</transformer>
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>${start-class}</mainClass>
</transformer>
</transformers>
@@ -415,4 +405,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/inlong-audit/audit-store/src/main/java/org/apache/inlong/audit/Application.java b/inlong-audit/audit-store/src/main/java/org/apache/inlong/audit/Application.java
index 604e530f5..0bcb3aa97 100644
--- a/inlong-audit/audit-store/src/main/java/org/apache/inlong/audit/Application.java
+++ b/inlong-audit/audit-store/src/main/java/org/apache/inlong/audit/Application.java
@@ -24,6 +24,7 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
public class Application {
+
public static void main(String[] args) {
new SpringApplicationBuilder().sources(Application.class)
.web(WebApplicationType.NONE).run(args);
diff --git a/inlong-audit/audit-store/src/main/java/org/apache/inlong/audit/config/ClickHouseConfig.java b/inlong-audit/audit-store/src/main/java/org/apache/inlong/audit/config/ClickHouseConfig.java
index df26241e6..fb058359d 100644
--- a/inlong-audit/audit-store/src/main/java/org/apache/inlong/audit/config/ClickHouseConfig.java
+++ b/inlong-audit/audit-store/src/main/java/org/apache/inlong/audit/config/ClickHouseConfig.java
@@ -42,7 +42,7 @@ public class ClickHouseConfig {
@Value("${clickhouse.batchIntervalMs:1000}")
private int batchIntervalMs;
-
+
@Value("${clickhouse.batchThreshold:500}")
private int batchThreshold;
diff --git a/inlong-audit/audit-store/src/main/java/org/apache/inlong/audit/config/DataServerConfig.java b/inlong-audit/audit-store/src/main/java/org/apache/inlong/audit/config/DataServerConfig.java
index 96c287424..c366e6cd4 100644
--- a/inlong-audit/audit-store/src/main/java/org/apache/inlong/audit/config/DataServerConfig.java
+++ b/inlong-audit/audit-store/src/main/java/org/apache/inlong/audit/config/DataServerConfig.java
@@ -30,8 +30,7 @@ import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
@Configuration
-@ComponentScan(basePackages = "org.apache.inlong.audit", useDefaultFilters = false,
- includeFilters = {
+@ComponentScan(basePackages = "org.apache.inlong.audit", useDefaultFilters = false, includeFilters = {
@Filter(type = FilterType.ANNOTATION, value = Component.class),
@Filter(type = FilterType.ANNOTATION, value = Service.class)})
@MapperScan(basePackages = "org.apache.inlong.audit.db.dao")
@@ -40,6 +39,7 @@ import org.springframework.stereotype.Service;
})
public class DataServerConfig {
+
@Bean
public static PropertySourcesPlaceholderConfigurer propertyPlaceholderConfigurer() {
return new PropertySourcesPlaceholderConfigurer();
diff --git a/inlong-audit/audit-store/src/main/java/org/apache/inlong/audit/config/ElasticsearchConfig.java b/inlong-audit/audit-store/src/main/java/org/apache/inlong/audit/config/ElasticsearchConfig.java
index 80c9b4238..9b8e197f3 100644
--- a/inlong-audit/audit-store/src/main/java/org/apache/inlong/audit/config/ElasticsearchConfig.java
+++ b/inlong-audit/audit-store/src/main/java/org/apache/inlong/audit/config/ElasticsearchConfig.java
@@ -104,8 +104,8 @@ public class ElasticsearchConfig {
if (authEnable) {
final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(username, password));
- restClientBuilder.setHttpClientConfigCallback(httpAsyncClientBuilder ->
- httpAsyncClientBuilder.setDefaultCredentialsProvider(credentialsProvider));
+ restClientBuilder.setHttpClientConfigCallback(httpAsyncClientBuilder -> httpAsyncClientBuilder
+ .setDefaultCredentialsProvider(credentialsProvider));
}
restClientBuilder.setRequestConfigCallback(requestConfigBuilder -> requestConfigBuilder
diff --git a/inlong-audit/audit-store/src/main/java/org/apache/inlong/audit/db/entities/ESDataPo.java b/inlong-audit/audit-store/src/main/java/org/apache/inlong/audit/db/entities/ESDataPo.java
index bdff8c126..9ec42eebc 100644
--- a/inlong-audit/audit-store/src/main/java/org/apache/inlong/audit/db/entities/ESDataPo.java
+++ b/inlong-audit/audit-store/src/main/java/org/apache/inlong/audit/db/entities/ESDataPo.java
@@ -25,6 +25,7 @@ import java.util.Date;
@Getter
@Setter
public class ESDataPo {
+
private String ip;
private String dockerId;
private String threadId;
diff --git a/inlong-audit/pom.xml b/inlong-audit/pom.xml
index 5f143e159..9b9fe43d0 100644
--- a/inlong-audit/pom.xml
+++ b/inlong-audit/pom.xml
@@ -17,19 +17,17 @@
specific language governing permissions and limitations
under the License.
-->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
- <packaging>pom</packaging>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-audit</artifactId>
+ <packaging>pom</packaging>
<name>Apache InLong - Audit</name>
<modules>
@@ -73,4 +71,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/inlong-common/pom.xml b/inlong-common/pom.xml
index c1c4b420e..e7ef42919 100644
--- a/inlong-common/pom.xml
+++ b/inlong-common/pom.xml
@@ -17,16 +17,16 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
- <packaging>jar</packaging>
<artifactId>inlong-common</artifactId>
+ <packaging>jar</packaging>
<name>Apache InLong - Common</name>
<dependencies>
@@ -39,8 +39,8 @@
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
- <artifactId>gson</artifactId>
<groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -100,17 +100,17 @@
</descriptorRefs>
<archive>
<manifest>
- <mainClass/>
+ <mainClass />
</manifest>
</archive>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
- <phase>package</phase>
<goals>
<goal>single</goal>
</goals>
+ <phase>package</phase>
</execution>
</executions>
</plugin>
@@ -128,4 +128,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/inlong-common/src/main/java/org/apache/inlong/common/heartbeat/ComponentHeartbeat.java b/inlong-common/src/main/java/org/apache/inlong/common/heartbeat/ComponentHeartbeat.java
index a7e301abd..567992918 100644
--- a/inlong-common/src/main/java/org/apache/inlong/common/heartbeat/ComponentHeartbeat.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/heartbeat/ComponentHeartbeat.java
@@ -50,8 +50,8 @@ public class ComponentHeartbeat {
}
public ComponentHeartbeat(String clusterTag, String clusterName,
- String componentType, String ip, String port,
- String inCharges, String protocolType) {
+ String componentType, String ip, String port,
+ String inCharges, String protocolType) {
this.nodeSrvStatus = NodeSrvStatus.OK;
this.clusterTag = clusterTag;
this.clusterName = clusterName;
@@ -64,9 +64,9 @@ public class ComponentHeartbeat {
}
public ComponentHeartbeat(NodeSrvStatus nodeSrvStatus,
- String clusterTag, String clusterName,
- String componentType, String ip, String port,
- String inCharges, String protocolType, int loadValue) {
+ String clusterTag, String clusterName,
+ String componentType, String ip, String port,
+ String inCharges, String protocolType, int loadValue) {
this.nodeSrvStatus = nodeSrvStatus;
this.clusterTag = clusterTag;
this.clusterName = clusterName;
diff --git a/inlong-common/src/main/java/org/apache/inlong/common/metric/MetricListenerRunnable.java b/inlong-common/src/main/java/org/apache/inlong/common/metric/MetricListenerRunnable.java
index 10c28ebfb..5e6eb5b3c 100644
--- a/inlong-common/src/main/java/org/apache/inlong/common/metric/MetricListenerRunnable.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/metric/MetricListenerRunnable.java
@@ -118,9 +118,9 @@ public class MetricListenerRunnable implements Runnable {
ObjectName metricObjectName = mbean.getObjectName();
List<MetricItem> items =
(List<MetricItem>) mbs.invoke(metricObjectName,
- MetricItemMBean.METHOD_SNAPSHOT, null, null);
+ MetricItemMBean.METHOD_SNAPSHOT, null, null);
/*
- * ut will throw classCaseException if use MetricItem without Object
+ * ut will throw classCaseException if use MetricItem without Object
*/
for (Object itemT : items) {
if (itemT instanceof MetricItem) {
diff --git a/inlong-common/src/main/java/org/apache/inlong/common/monitor/CounterGroup.java b/inlong-common/src/main/java/org/apache/inlong/common/monitor/CounterGroup.java
index 9e3034b67..c8aaa146f 100644
--- a/inlong-common/src/main/java/org/apache/inlong/common/monitor/CounterGroup.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/monitor/CounterGroup.java
@@ -84,4 +84,3 @@ public class CounterGroup {
this.counters = counters;
}
}
-
diff --git a/inlong-common/src/main/java/org/apache/inlong/common/monitor/CounterGroupExt.java b/inlong-common/src/main/java/org/apache/inlong/common/monitor/CounterGroupExt.java
index 75b7152c0..d25c0ea7e 100644
--- a/inlong-common/src/main/java/org/apache/inlong/common/monitor/CounterGroupExt.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/monitor/CounterGroupExt.java
@@ -107,4 +107,3 @@ public class CounterGroupExt {
this.counters = counters;
}
}
-
diff --git a/inlong-common/src/main/java/org/apache/inlong/common/monitor/MonitorIndex.java b/inlong-common/src/main/java/org/apache/inlong/common/monitor/MonitorIndex.java
index 3adcf7365..29ed10f42 100644
--- a/inlong-common/src/main/java/org/apache/inlong/common/monitor/MonitorIndex.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/monitor/MonitorIndex.java
@@ -98,7 +98,8 @@ public class MonitorIndex {
}
private class IndexCollectThread
- extends Thread {
+ extends
+ Thread {
private boolean bShutDown = false;
@@ -135,4 +136,3 @@ public class MonitorIndex {
}
}
}
-
diff --git a/inlong-common/src/main/java/org/apache/inlong/common/monitor/MonitorIndexExt.java b/inlong-common/src/main/java/org/apache/inlong/common/monitor/MonitorIndexExt.java
index bbcfe7869..ac0f20f1b 100644
--- a/inlong-common/src/main/java/org/apache/inlong/common/monitor/MonitorIndexExt.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/monitor/MonitorIndexExt.java
@@ -38,8 +38,7 @@ public class MonitorIndexExt {
public MonitorIndexExt(String name, int intervalSec, int maxCnt) {
/*
- * key
- * Almost unchanging. Component indicators, flume_monitors.log
+ * key Almost unchanging. Component indicators, flume_monitors.log
*/
this.intervalSec = intervalSec;
/*
@@ -91,7 +90,8 @@ public class MonitorIndexExt {
}
private class IndexCollectThread
- extends Thread {
+ extends
+ Thread {
private boolean bShutDown = false;
@@ -131,4 +131,3 @@ public class MonitorIndexExt {
}
}
}
-
diff --git a/inlong-common/src/main/java/org/apache/inlong/common/monitor/StatRunner.java b/inlong-common/src/main/java/org/apache/inlong/common/monitor/StatRunner.java
index 047a5e7ae..95a74f34a 100644
--- a/inlong-common/src/main/java/org/apache/inlong/common/monitor/StatRunner.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/monitor/StatRunner.java
@@ -23,7 +23,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class StatRunner
- implements Runnable {
+ implements
+ Runnable {
private static final Logger logger = LoggerFactory.getLogger(StatRunner.class);
private boolean shutDownFlag = false;
@@ -109,4 +110,3 @@ public class StatRunner
this.shutDownFlag = true;
}
}
-
diff --git a/inlong-common/src/main/java/org/apache/inlong/common/msg/AttributeConstants.java b/inlong-common/src/main/java/org/apache/inlong/common/msg/AttributeConstants.java
index 6cd635ea7..6e6463182 100644
--- a/inlong-common/src/main/java/org/apache/inlong/common/msg/AttributeConstants.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/msg/AttributeConstants.java
@@ -58,7 +58,7 @@ public interface AttributeConstants {
/* sort type */
String METHOD = "m";
- /* global unique id for a message*/
+ /* global unique id for a message */
String SEQUENCE_ID = "sid";
String UNIQ_ID = "uniq";
diff --git a/inlong-common/src/main/java/org/apache/inlong/common/msg/DataInputBuffer.java b/inlong-common/src/main/java/org/apache/inlong/common/msg/DataInputBuffer.java
index d40270d1b..dd84d98a0 100644
--- a/inlong-common/src/main/java/org/apache/inlong/common/msg/DataInputBuffer.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/msg/DataInputBuffer.java
@@ -37,7 +37,9 @@ import java.io.DataInputStream;
* }
*/
public class DataInputBuffer extends DataInputStream {
+
private static class Buffer extends ByteArrayInputStream {
+
public Buffer() {
super(new byte[]{
//
diff --git a/inlong-common/src/main/java/org/apache/inlong/common/msg/InLongMsg.java b/inlong-common/src/main/java/org/apache/inlong/common/msg/InLongMsg.java
index 80d12767f..5a51df89b 100644
--- a/inlong-common/src/main/java/org/apache/inlong/common/msg/InLongMsg.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/msg/InLongMsg.java
@@ -31,6 +31,7 @@ import java.util.Set;
import org.xerial.snappy.Snappy;
public class InLongMsg {
+
private static final int DEFAULT_CAPACITY = 4096;
private final int capacity;
@@ -107,6 +108,7 @@ public class InLongMsg {
}
private enum Version {
+
vn(-1), v0(0), v1(1),
v2(2), v3(3), v4(4);
@@ -587,6 +589,7 @@ public class InLongMsg {
// private LinkedHashMap<String, ByteBuffer> attr2Rawdata = null;
static class DataByteBuffer {
+
final int cnt;
ByteBuffer buffer;
DataOutputBuffer inoutBuffer;
@@ -753,7 +756,7 @@ public class InLongMsg {
+ bodyLen + BIN_MSG_ATTRLEN_SIZE + attrLen) & 0xFFFF);
dataTime = dataTime * 1000;
- //read common attributes
+ // read common attributes
if (attrLen != 0) {
byte[] attr = new byte[attrLen];
parsedBinInput.position(BIN_MSG_BODY_OFFSET + bodyLen + BIN_MSG_ATTRLEN_SIZE);
@@ -765,7 +768,7 @@ public class InLongMsg {
commonAttrMap.put(AttributeConstants.DATA_TIME, String.valueOf(dataTime));
- //unzip data
+ // unzip data
ByteBuffer bodyBuffer;
byte[] body = new byte[bodyLen + 1];
parsedBinInput.position(BIN_MSG_BODY_OFFSET);
@@ -784,13 +787,13 @@ public class InLongMsg {
case (BIN_MSG_NO_ZIP):
default:
- //set uncompress flag
+ // set uncompress flag
body[0] = 0;
bodyBuffer = ByteBuffer.wrap(body, 0, body.length);
break;
}
- //number groupId/streamId
+ // number groupId/streamId
boolean isUseNumGroupId = ((extField & 0x4) == 0x0);
if (isUseNumGroupId) {
commonAttrMap.put(AttributeConstants.GROUP_ID, String.valueOf(groupIdNum));
@@ -811,7 +814,7 @@ public class InLongMsg {
this.msgcnt * 10 / 7);
Map<String, String> finalAttrMap = commonAttrMap;
- //skip compress flag
+ // skip compress flag
bodyBuffer.get();
int bodyBufLen = bodyBuffer.capacity() - 1;
while (bodyBufLen > 0) {
diff --git a/inlong-common/src/main/java/org/apache/inlong/common/msg/InLongMsgAttrBuilder.java b/inlong-common/src/main/java/org/apache/inlong/common/msg/InLongMsgAttrBuilder.java
index cfbe523f2..b7578a905 100644
--- a/inlong-common/src/main/java/org/apache/inlong/common/msg/InLongMsgAttrBuilder.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/msg/InLongMsgAttrBuilder.java
@@ -25,6 +25,7 @@ import java.util.Map;
public class InLongMsgAttrBuilder {
public enum PartitionUnit {
+
DAY("d"), HOUR("h"), HALFHOUR("n"),
QUARTER("q"), TENMINS("t"), FIVEMINS("f");
private static final Map<String, PartitionUnit> STRING_TO_TYPE_MAP =
@@ -57,6 +58,7 @@ public class InLongMsgAttrBuilder {
}
public enum TimeType {
+
MS("#ms"), S("#s"),
STANDARD("#")/* yyyy-MM-dd HH:mm:ss */,
NORMAL("#n")/* yyyyMMddHH */;
@@ -90,6 +92,7 @@ public class InLongMsgAttrBuilder {
}
public static class MsgAttrProtocolM0 {
+
private final StringBuffer attrBuffer;
private String id = null;
private String t = null;
diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/agent/TaskSnapshotRequest.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/agent/TaskSnapshotRequest.java
index 6df3d59ce..232a3fd32 100644
--- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/agent/TaskSnapshotRequest.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/agent/TaskSnapshotRequest.java
@@ -37,7 +37,7 @@ public class TaskSnapshotRequest {
/**
* The mac UUID of agent
*/
- private String uuid;
+ private String uuid;
/**
* Report Time
@@ -50,5 +50,4 @@ public class TaskSnapshotRequest {
*/
private List<TaskSnapshotMessage> snapshotList;
-
}
diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sdk/CacheZone.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sdk/CacheZone.java
index 1d5d17168..bd39b8738 100644
--- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sdk/CacheZone.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sdk/CacheZone.java
@@ -30,6 +30,7 @@ import java.util.Map;
@AllArgsConstructor
@NoArgsConstructor
public class CacheZone {
+
String zoneName;
String serviceUrl;
String authentication;
diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sdk/CacheZoneConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sdk/CacheZoneConfig.java
index decc81112..89a1986e5 100644
--- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sdk/CacheZoneConfig.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sdk/CacheZoneConfig.java
@@ -29,6 +29,7 @@ import java.util.Map;
@AllArgsConstructor
@NoArgsConstructor
public class CacheZoneConfig {
+
String sortClusterName;
String sortTaskId;
Map<String, CacheZone> cacheZones;
diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sdk/SortSourceConfigResponse.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sdk/SortSourceConfigResponse.java
index 46f73cd79..b421b8fc6 100644
--- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sdk/SortSourceConfigResponse.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sdk/SortSourceConfigResponse.java
@@ -27,11 +27,10 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
@NoArgsConstructor
public class SortSourceConfigResponse {
+
String msg;
int code;
String md5;
CacheZoneConfig data;
}
-
-
diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sdk/Topic.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sdk/Topic.java
index e3374169c..632cca71b 100644
--- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sdk/Topic.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sdk/Topic.java
@@ -29,6 +29,7 @@ import java.util.Map;
@AllArgsConstructor
@NoArgsConstructor
public class Topic {
+
String topic;
int partitionCnt;
Map<String, String> topicProperties;
diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sortstandalone/SortClusterConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sortstandalone/SortClusterConfig.java
index 2abcc7902..905cd61ae 100644
--- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sortstandalone/SortClusterConfig.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sortstandalone/SortClusterConfig.java
@@ -29,6 +29,7 @@ import java.util.List;
@NoArgsConstructor
@AllArgsConstructor
public class SortClusterConfig {
+
String clusterName;
List<SortTaskConfig> sortTasks;
}
diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sortstandalone/SortTaskConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sortstandalone/SortTaskConfig.java
index 0b44fee20..20fa5f06e 100644
--- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sortstandalone/SortTaskConfig.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sortstandalone/SortTaskConfig.java
@@ -30,6 +30,7 @@ import java.util.Map;
@NoArgsConstructor
@AllArgsConstructor
public class SortTaskConfig {
+
String name;
String type;
List<Map<String, String>> idParams;
diff --git a/inlong-common/src/main/java/org/apache/inlong/common/util/MaskDataUtils.java b/inlong-common/src/main/java/org/apache/inlong/common/util/MaskDataUtils.java
index 2f5e9e570..9a79cba9a 100644
--- a/inlong-common/src/main/java/org/apache/inlong/common/util/MaskDataUtils.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/util/MaskDataUtils.java
@@ -59,7 +59,7 @@ public class MaskDataUtils {
if (!maskedThisCharacter) {
while (pos < length
&& !(Character.isWhitespace(stringBuilder.charAt(pos))
- || STOP_CHARACTERS.contains(stringBuilder.charAt(pos)))) {
+ || STOP_CHARACTERS.contains(stringBuilder.charAt(pos)))) {
pos++;
}
}
@@ -101,7 +101,7 @@ public class MaskDataUtils {
int keywordStart = 0;
int keywordLength = 0;
String keywordUsed = null;
- for (String keyword: KEYWORDS) {
+ for (String keyword : KEYWORDS) {
keywordStart = StringUtils.indexOfIgnoreCase(builder, keyword, charPos);
if (keywordStartAtRightPosition(keywordStart, charPos)) {
keywordLength = keyword.length();
@@ -115,7 +115,7 @@ public class MaskDataUtils {
}
int idxSeparator;
- for (String separator: SEPARATORS) {
+ for (String separator : SEPARATORS) {
idxSeparator = StringUtils.indexOf(builder, separator, keywordStart + keywordLength);
if (idxSeparator == keywordStart + keywordLength) {
charPos = maskStartPosition(keywordStart, keywordLength, separator, builder);
diff --git a/inlong-common/src/test/java/org/apache/inlong/common/metric/set/DataProxyMetricItem.java b/inlong-common/src/test/java/org/apache/inlong/common/metric/set/DataProxyMetricItem.java
index 6639354ac..860e87b0f 100644
--- a/inlong-common/src/test/java/org/apache/inlong/common/metric/set/DataProxyMetricItem.java
+++ b/inlong-common/src/test/java/org/apache/inlong/common/metric/set/DataProxyMetricItem.java
@@ -30,6 +30,7 @@ import org.apache.inlong.common.metric.MetricItem;
*/
@MetricDomain(name = "DataProxy")
public class DataProxyMetricItem extends MetricItem {
+
@Dimension
public String setId;
@Dimension
diff --git a/inlong-dashboard/pom.xml b/inlong-dashboard/pom.xml
index 281458e37..66363ecc3 100644
--- a/inlong-dashboard/pom.xml
+++ b/inlong-dashboard/pom.xml
@@ -17,11 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <packaging>pom</packaging>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.inlong</groupId>
@@ -29,6 +26,7 @@
<version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>inlong-dashboard</artifactId>
+ <packaging>pom</packaging>
<name>Apache InLong - Dashboard</name>
<build>
@@ -79,6 +77,14 @@
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<version>${dockerfile.maven.version}</version>
+ <configuration>
+ <repository>${docker.organization}/dashboard</repository>
+ <pullNewerImage>false</pullNewerImage>
+ <tag>${project.version}</tag>
+ <buildArgs>
+ <DASHBOARD_FILE>build</DASHBOARD_FILE>
+ </buildArgs>
+ </configuration>
<executions>
<execution>
<id>default</id>
@@ -98,17 +104,9 @@
</configuration>
</execution>
</executions>
- <configuration>
- <repository>${docker.organization}/dashboard</repository>
- <pullNewerImage>false</pullNewerImage>
- <tag>${project.version}</tag>
- <buildArgs>
- <DASHBOARD_FILE>build</DASHBOARD_FILE>
- </buildArgs>
- </configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
diff --git a/inlong-dataproxy/dataproxy-dist/pom.xml b/inlong-dataproxy/dataproxy-dist/pom.xml
index 4f368013b..fb52e962f 100644
--- a/inlong-dataproxy/dataproxy-dist/pom.xml
+++ b/inlong-dataproxy/dataproxy-dist/pom.xml
@@ -17,16 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-dataproxy</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>dataproxy-dist</artifactId>
<packaging>pom</packaging>
@@ -49,10 +47,10 @@
<executions>
<execution>
<id>assemble</id>
- <phase>package</phase>
<goals>
<goal>single</goal>
</goals>
+ <phase>package</phase>
<configuration>
<finalName>apache-inlong-dataproxy-${project.version}</finalName>
<descriptors>
@@ -64,4 +62,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/inlong-dataproxy/dataproxy-docker/pom.xml b/inlong-dataproxy/dataproxy-docker/pom.xml
index 6ef4c3c7f..bab36ce4e 100644
--- a/inlong-dataproxy/dataproxy-docker/pom.xml
+++ b/inlong-dataproxy/dataproxy-docker/pom.xml
@@ -19,82 +19,82 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>org.apache.inlong</groupId>
- <artifactId>inlong-dataproxy</artifactId>
- <version>1.5.0-SNAPSHOT</version>
- </parent>
- <artifactId>dataproxy-docker</artifactId>
- <modelVersion>4.0.0</modelVersion>
- <name>Apache InLong - DataProxy Docker</name>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>inlong-dataproxy</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>dataproxy-docker</artifactId>
+ <name>Apache InLong - DataProxy Docker</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>dataproxy-dist</artifactId>
- <version>${project.parent.version}</version>
- <classifier>bin</classifier>
- <type>tar.gz</type>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <profiles>
- <profile>
- <id>docker</id>
- <build>
- <plugins>
- <plugin>
- <groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
- <version>${dockerfile.maven.version}</version>
- <executions>
- <execution>
- <id>default</id>
- <goals>
- <goal>build</goal>
- </goals>
- </execution>
- <execution>
- <id>tag-and-push-latest</id>
- <goals>
- <goal>tag</goal>
- <goal>push</goal>
- </goals>
- <configuration>
- <repository>${docker.organization}/dataproxy</repository>
- <tag>latest</tag>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <repository>${docker.organization}/dataproxy</repository>
- <pullNewerImage>false</pullNewerImage>
- <tag>${project.version}</tag>
- <buildArgs>
- <DATAPROXY_TARBALL>target/dataproxy-dist-${project.version}-bin.tar.gz</DATAPROXY_TARBALL>
- </buildArgs>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-tarball</id>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <phase>generate-resources</phase>
- <configuration>
- <outputDirectory>${project.build.directory}/</outputDirectory>
- <includeArtifactIds>dataproxy-dist</includeArtifactIds>
- <excludeTransitive>true</excludeTransitive>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>dataproxy-dist</artifactId>
+ <version>${project.parent.version}</version>
+ <classifier>bin</classifier>
+ <type>tar.gz</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <profiles>
+ <profile>
+ <id>docker</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
+ <version>${dockerfile.maven.version}</version>
+ <configuration>
+ <repository>${docker.organization}/dataproxy</repository>
+ <pullNewerImage>false</pullNewerImage>
+ <tag>${project.version}</tag>
+ <buildArgs>
+ <DATAPROXY_TARBALL>target/dataproxy-dist-${project.version}-bin.tar.gz</DATAPROXY_TARBALL>
+ </buildArgs>
+ </configuration>
+ <executions>
+ <execution>
+ <id>default</id>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>tag-and-push-latest</id>
+ <goals>
+ <goal>tag</goal>
+ <goal>push</goal>
+ </goals>
+ <configuration>
+ <repository>${docker.organization}/dataproxy</repository>
+ <tag>latest</tag>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-tarball</id>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <phase>generate-resources</phase>
+ <configuration>
+ <outputDirectory>${project.build.directory}/</outputDirectory>
+ <includeArtifactIds>dataproxy-dist</includeArtifactIds>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/inlong-dataproxy/dataproxy-source/pom.xml b/inlong-dataproxy/dataproxy-source/pom.xml
index da13fdbd7..7e4adafc8 100644
--- a/inlong-dataproxy/dataproxy-source/pom.xml
+++ b/inlong-dataproxy/dataproxy-source/pom.xml
@@ -17,18 +17,16 @@
specific language governing permissions and limitations
under the License.
-->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-dataproxy</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <name>Apache InLong - DataProxy Source</name>
<artifactId>dataproxy-source</artifactId>
+ <name>Apache InLong - DataProxy Source</name>
<dependencies>
<dependency>
@@ -56,4 +54,4 @@
<artifactId>jetty-util</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/base/HighPriorityThreadFactory.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/base/HighPriorityThreadFactory.java
index 07557fcba..9cbee94b7 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/base/HighPriorityThreadFactory.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/base/HighPriorityThreadFactory.java
@@ -21,6 +21,7 @@ import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger;
public class HighPriorityThreadFactory implements ThreadFactory {
+
static final AtomicInteger poolNumber = new AtomicInteger(1);
final AtomicInteger threadNumber;
final ThreadGroup group;
@@ -50,4 +51,3 @@ public class HighPriorityThreadFactory implements ThreadFactory {
return t;
}
}
-
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/channel/FailoverChannelProcessor.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/channel/FailoverChannelProcessor.java
index 32998feac..dba8a63db 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/channel/FailoverChannelProcessor.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/channel/FailoverChannelProcessor.java
@@ -43,7 +43,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class FailoverChannelProcessor
- extends ChannelProcessor {
+ extends
+ ChannelProcessor {
private static final Logger LOG = LoggerFactory.getLogger(FailoverChannelProcessor.class);
private static final LogCounter logPrinter = new LogCounter(10, 10000, 60 * 1000);
@@ -151,7 +152,7 @@ public class FailoverChannelProcessor
for (Channel ch : reqChannels) {
List<Event> eventQueue = reqChannelQueue
- .computeIfAbsent(ch, k -> new ArrayList<Event>());//reqChannelQueue
+ .computeIfAbsent(ch, k -> new ArrayList<Event>());// reqChannelQueue
eventQueue.add(event);
}
@@ -159,7 +160,7 @@ public class FailoverChannelProcessor
for (Channel ch : optChannels) {
List<Event> eventQueue = optChannelQueue
- .computeIfAbsent(ch, k -> new ArrayList<Event>());//optChannelQueue
+ .computeIfAbsent(ch, k -> new ArrayList<Event>());// optChannelQueue
eventQueue.add(event);
}
@@ -315,7 +316,8 @@ public class FailoverChannelProcessor
} else {
throw new ChannelException(
"FailoverChannelProcessor Unable to put event on "
- + "optionalChannels: " + optChannel, t);
+ + "optionalChannels: " + optChannel,
+ t);
}
} finally {
if (tx != null) {
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/channel/FailoverChannelSelector.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/channel/FailoverChannelSelector.java
index 08c8191b7..2c7aad22e 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/channel/FailoverChannelSelector.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/channel/FailoverChannelSelector.java
@@ -112,7 +112,7 @@ public class FailoverChannelSelector extends AbstractChannelSelector {
@Override
public void configure(Context context) {
-// LOG.info(context.toString());
+ // LOG.info(context.toString());
String masters = context.getString(MASTER_CHANNEL);
String transfer = context.getString(TRANSFER_CHANNEL);
String fileMertic = context.getString(FILE_METRIC_CHANNEL);
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/ConfigManager.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/ConfigManager.java
index fcff9c3cd..a2eebfdc7 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/ConfigManager.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/ConfigManager.java
@@ -59,6 +59,7 @@ import static org.apache.inlong.dataproxy.consts.ConfigConstants.CONFIG_CHECK_IN
* Config manager class.
*/
public class ConfigManager {
+
private static final Logger LOG = LoggerFactory.getLogger(ConfigManager.class);
public static final List<ConfigHolder> CONFIG_HOLDER_LIST = new ArrayList<>();
@@ -167,7 +168,7 @@ public class ConfigManager {
* @return true if changed else false.
*/
private boolean updatePropertiesHolder(Map<String, String> result,
- PropertiesConfigHolder holder) {
+ PropertiesConfigHolder holder) {
boolean changed = false;
Map<String, String> tmpHolder = holder.forkHolder();
// Delete non-existent configuration records
@@ -203,8 +204,8 @@ public class ConfigManager {
* @return true if changed else false.
*/
private boolean updatePropertiesHolder(Map<String, String> result,
- PropertiesConfigHolder holder,
- boolean addElseRemove) {
+ PropertiesConfigHolder holder,
+ boolean addElseRemove) {
Map<String, String> tmpHolder = holder.forkHolder();
boolean changed = false;
@@ -371,9 +372,9 @@ public class ConfigManager {
if (configJson.isSuccess() && configJson.getData() != null) {
LOG.info("getConfig result: {}", returnStr);
/*
- * get mqUrls <->token maps;
- * if mq is pulsar, store format: mq_cluster.index1=cluster1url1,cluster1url2=token
- * if mq is tubemq, token is "", store format: mq_cluster.index1=cluster1url1,cluster1url2=
+ * get mqUrls <->token maps; if mq is pulsar, store format:
+ * mq_cluster.index1=cluster1url1,cluster1url2=token if mq is tubemq, token is "", store format:
+ * mq_cluster.index1=cluster1url1,cluster1url2=
*/
int index = 1;
List<MQClusterInfo> clusterSet = configJson.getData().getMqClusterList();
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/holder/SourceReportConfigHolder.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/holder/SourceReportConfigHolder.java
index f9384350d..bd7850944 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/holder/SourceReportConfigHolder.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/holder/SourceReportConfigHolder.java
@@ -38,9 +38,9 @@ public class SourceReportConfigHolder {
private final ReadWriteLock readWriteLock = new ReentrantReadWriteLock();
private final Map<String, SourceReportInfo> sourceConfMap = new HashMap<>();
// Begin: this part can be optimized later
- // after optimizing the implementation of the heartbeat reporting interface
- // between Manager and DataProxy, the report is directly configured according to
- // the SourceReportInfo of each source, instead of splicing report items separately.
+ // after optimizing the implementation of the heartbeat reporting interface
+ // between Manager and DataProxy, the report is directly configured according to
+ // the SourceReportInfo of each source, instead of splicing report items separately.
private String ipSet = "";
private String portSet = "";
private String protocolTypeSet = "";
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/remote/ConfigMessageServlet.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/remote/ConfigMessageServlet.java
index f6760081e..d6830be60 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/remote/ConfigMessageServlet.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/remote/ConfigMessageServlet.java
@@ -80,7 +80,7 @@ public class ConfigMessageServlet extends HttpServlet {
}
private void responseToJson(HttpServletResponse response,
- ResponseResult result) throws IOException {
+ ResponseResult result) throws IOException {
response.setContentType("application/json");
response.setCharacterEncoding("UTF-8");
String jsonStr = gson.toJson(result);
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/consts/ConfigConstants.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/consts/ConfigConstants.java
index 1ede782ea..55f4e74ed 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/consts/ConfigConstants.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/consts/ConfigConstants.java
@@ -137,7 +137,7 @@ public class ConfigConstants {
public static final String MANAGER_AUTH_SECRET_ID = "manager.auth.secretId";
public static final String MANAGER_AUTH_SECRET_KEY = "manager.auth.secretKey";
- //Pulsar config
+ // Pulsar config
public static final String KEY_TENANT = "tenant";
public static final String KEY_NAMESPACE = "namespace";
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/exception/ErrorCode.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/exception/ErrorCode.java
index a4ccb979e..119fc6916 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/exception/ErrorCode.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/exception/ErrorCode.java
@@ -18,6 +18,7 @@
package org.apache.inlong.dataproxy.exception;
public enum ErrorCode {
+
/**
* attr error
*/
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/exception/MessageIDException.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/exception/MessageIDException.java
index 301b0597e..352a88aef 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/exception/MessageIDException.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/exception/MessageIDException.java
@@ -36,4 +36,3 @@ public class MessageIDException extends Exception {
return errorCode;
}
}
-
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/heartbeat/HeartbeatManager.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/heartbeat/HeartbeatManager.java
index 114d2f636..208f46bab 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/heartbeat/HeartbeatManager.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/heartbeat/HeartbeatManager.java
@@ -129,7 +129,8 @@ public class HeartbeatManager implements AbstractHeartbeatManager {
return null;
}
heartbeatMsg.setNodeSrvStatus(ConfigManager.getInstance().isMqClusterReady()
- ? NodeSrvStatus.OK : NodeSrvStatus.SERVICE_UNREADY);
+ ? NodeSrvStatus.OK
+ : NodeSrvStatus.SERVICE_UNREADY);
heartbeatMsg.setIp(reportInfo.getIp());
heartbeatMsg.setPort(reportInfo.getPort());
heartbeatMsg.setProtocolType(reportInfo.getProtocolType());
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/MessageFilter.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/MessageFilter.java
index a4c23ca24..dd13fff17 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/MessageFilter.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/MessageFilter.java
@@ -52,8 +52,8 @@ public class MessageFilter implements Filter {
@Override
public void doFilter(ServletRequest request,
- ServletResponse response,
- FilterChain chain) throws IOException {
+ ServletResponse response,
+ FilterChain chain) throws IOException {
HttpServletRequest req = (HttpServletRequest) request;
HttpServletResponse resp = (HttpServletResponse) response;
@@ -136,7 +136,7 @@ public class MessageFilter implements Filter {
}
private void returnRspPackage(HttpServletResponse resp, String charEncoding,
- int errCode, String errMsg) throws IOException {
+ int errCode, String errMsg) throws IOException {
StringBuilder builder =
new StringBuilder().append("{\"code\":\"").append(errCode)
.append("\",\"msg\":\"").append(errMsg).append("\"}");
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/SimpleHttpSource.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/SimpleHttpSource.java
index 8af37dbbe..18d5f6a33 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/SimpleHttpSource.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/SimpleHttpSource.java
@@ -97,8 +97,8 @@ public class SimpleHttpSource extends HttpBaseSource {
"Keystore password is required for SSL Configuration");
}
- //ref: http://docs.codehaus.org/display/JETTY/Embedding+Jetty
- //ref: http://jetty.codehaus.org/jetty/jetty-6/apidocs/org/mortbay/jetty/servlet
+ // ref: http://docs.codehaus.org/display/JETTY/Embedding+Jetty
+ // ref: http://jetty.codehaus.org/jetty/jetty-6/apidocs/org/mortbay/jetty/servlet
// /Context.html
subProps = context.getSubProperties(
HTTPSourceConfigurationConstants.CONFIG_HANDLER_PREFIX);
@@ -118,13 +118,14 @@ public class SimpleHttpSource extends HttpBaseSource {
super.start();
try {
- @SuppressWarnings("unchecked") Class<? extends MessageHandler> clazz =
+ @SuppressWarnings("unchecked")
+ Class<? extends MessageHandler> clazz =
(Class<? extends MessageHandler>) Class.forName(messageHandlerName);
Constructor ctor = clazz.getConstructor(ChannelProcessor.class,
MonitorIndex.class, MonitorIndexExt.class, DataProxyMetricItemSet.class, ServiceDecoder.class);
LOG.info("Using channel processor:{}", getChannelProcessor().getClass().getName());
messageHandler = (MessageHandler) ctor
- .newInstance(getChannelProcessor(), monitorIndex, monitorIndexExt, metricItemSet,null);
+ .newInstance(getChannelProcessor(), monitorIndex, monitorIndexExt, metricItemSet, null);
messageHandler.configure(new Context(subProps));
srv = new Server(new QueuedThreadPool(threadPoolSize));
Connector[] connectors = new Connector[1];
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/SimpleMessageHandler.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/SimpleMessageHandler.java
index c85096acc..a94a3b72c 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/SimpleMessageHandler.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/SimpleMessageHandler.java
@@ -64,8 +64,8 @@ public class SimpleMessageHandler implements MessageHandler {
private long channelTrace = 0L;
public SimpleMessageHandler(ChannelProcessor processor, MonitorIndex monitorIndex,
- MonitorIndexExt monitorIndexExt, DataProxyMetricItemSet metricItemSet,
- ServiceDecoder decoder) {
+ MonitorIndexExt monitorIndexExt, DataProxyMetricItemSet metricItemSet,
+ ServiceDecoder decoder) {
this.processor = processor;
this.monitorIndex = monitorIndex;
this.monitorIndexExt = monitorIndexExt;
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/exception/MessageProcessException.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/exception/MessageProcessException.java
index 4d608b603..1848c325d 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/exception/MessageProcessException.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/exception/MessageProcessException.java
@@ -18,7 +18,8 @@
package org.apache.inlong.dataproxy.http.exception;
public class MessageProcessException
- extends Exception {
+ extends
+ Exception {
public MessageProcessException() {
}
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/metrics/DataProxyMetricItemSet.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/metrics/DataProxyMetricItemSet.java
index ced60b3a3..31303a4d6 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/metrics/DataProxyMetricItemSet.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/metrics/DataProxyMetricItemSet.java
@@ -33,6 +33,7 @@ import org.apache.inlong.dataproxy.consts.ConfigConstants;
*/
@MetricDomain(name = "DataProxy")
public class DataProxyMetricItemSet extends MetricItemSet<DataProxyMetricItem> {
+
private String clusterId = null;
private String sourceDataId = null;
@@ -89,7 +90,7 @@ public class DataProxyMetricItemSet extends MetricItemSet<DataProxyMetricItem> {
* @param size the message size
*/
public void fillSinkSendMetricItemsByEvent(Event event, long sentTime,
- boolean isSuccess, long size) {
+ boolean isSuccess, long size) {
fillMetricItemsByEvent(event, false, false, isSuccess, size, sentTime);
}
@@ -103,8 +104,8 @@ public class DataProxyMetricItemSet extends MetricItemSet<DataProxyMetricItem> {
* @param size the message size
*/
private void fillMetricItemsByEvent(Event event, boolean isSource,
- boolean isReadOp, boolean isSuccess,
- long size, long sendTime) {
+ boolean isReadOp, boolean isSuccess,
+ long size, long sendTime) {
Map<String, String> dimensions = new HashMap<>();
dimensions.put(DataProxyMetricItem.KEY_CLUSTER_ID, clusterId);
dimensions.put(DataProxyMetricItem.KEY_INLONG_GROUP_ID,
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/node/Application.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/node/Application.java
index 881e2b0b2..98a8c21a7 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/node/Application.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/node/Application.java
@@ -216,6 +216,7 @@ public class Application {
final Application appReference = application;
Runtime.getRuntime().addShutdownHook(new Thread("data-proxy-shutdown-hook") {
+
@Override
public void run() {
AuditUtils.send();
@@ -243,6 +244,7 @@ public class Application {
final Application appReference = application;
Runtime.getRuntime().addShutdownHook(new Thread("data-proxy-shutdown-hook") {
+
@Override
public void run() {
appReference.stop();
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/PulsarSink.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/PulsarSink.java
index 0e0330231..9891987a2 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/PulsarSink.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/PulsarSink.java
@@ -121,6 +121,7 @@ public class PulsarSink extends AbstractSink implements Configurable, SendMessag
private static final LoadingCache<String, Long> AGENT_ID_CACHE = CacheBuilder.newBuilder()
.concurrencyLevel(4 * 8).initialCapacity(500).expireAfterAccess(30, TimeUnit.SECONDS)
.build(new CacheLoader<String, Long>() {
+
@Nonnull
@Override
public Long load(@Nonnull String key) {
@@ -173,7 +174,7 @@ public class PulsarSink extends AbstractSink implements Configurable, SendMessag
private MonitorIndexExt monitorIndexExt;
/*
- * metric
+ * metric
*/
private DataProxyMetricItemSet metricItemSet;
private ConfigManager configManager;
@@ -197,7 +198,7 @@ public class PulsarSink extends AbstractSink implements Configurable, SendMessag
configManager = ConfigManager.getInstance();
topicProperties = configManager.getTopicProperties();
pulsarCluster = configManager.getMqClusterUrl2Token();
- pulsarConfig = configManager.getMqClusterConfig(); //pulsar common config
+ pulsarConfig = configManager.getMqClusterConfig(); // pulsar common config
sinkThreadPoolSize = pulsarConfig.getThreadNum();
if (sinkThreadPoolSize <= 0) {
sinkThreadPoolSize = 1;
@@ -205,6 +206,7 @@ public class PulsarSink extends AbstractSink implements Configurable, SendMessag
pulsarClientService = new PulsarClientService(pulsarConfig, sinkThreadPoolSize);
configManager.getTopicConfig().addUpdateCallback(new ConfigUpdateCallback() {
+
@Override
public void update() {
if (pulsarClientService != null) {
@@ -214,6 +216,7 @@ public class PulsarSink extends AbstractSink implements Configurable, SendMessag
}
});
configManager.getMqClusterHolder().addUpdateCallback(new ConfigUpdateCallback() {
+
@Override
public void update() {
if (pulsarClientService != null) {
@@ -250,7 +253,7 @@ public class PulsarSink extends AbstractSink implements Configurable, SendMessag
* When topic.properties is re-enabled, the producer update is triggered
*/
public void diffSetPublish(PulsarClientService pulsarClientService,
- Set<String> curTopicSet, Set<String> newTopicSet) {
+ Set<String> curTopicSet, Set<String> newTopicSet) {
boolean changed = false;
// create producers for new topics
for (String newTopic : newTopicSet) {
@@ -298,7 +301,7 @@ public class PulsarSink extends AbstractSink implements Configurable, SendMessag
Map<String, MapDifference.ValueDifference<String>> differentToken = mapDifference.entriesDiffering();
for (String url : differentToken.keySet()) {
needToClose.put(url, originalCluster.get(url));
- needToStart.put(url, endCluster.get(url));//token changed
+ needToStart.put(url, endCluster.get(url));// token changed
}
pulsarClientService.updatePulsarClients(this, needToClose, needToStart,
@@ -459,14 +462,14 @@ public class PulsarSink extends AbstractSink implements Configurable, SendMessag
@Override
public void handleMessageSendSuccess(String topic, Object result,
- EventStat eventStat, long startTime) {
+ EventStat eventStat, long startTime) {
/*
* Statistics pulsar performance
*/
TOTAL_PULSAR_SUCC_SEND_CNT.incrementAndGet();
TOTAL_PULSAR_SUCC_SEND_SIZE.addAndGet(eventStat.getEvent().getBody().length);
/*
- *add to sinkCounter
+ * add to sinkCounter
*/
sinkCounter.incrementEventDrainSuccessCount();
currentInFlightCount.decrementAndGet();
@@ -492,7 +495,7 @@ public class PulsarSink extends AbstractSink implements Configurable, SendMessag
@Override
public void handleMessageSendException(String topic, EventStat eventStat,
- Object e, DataProxyErrCode errCode, String errMsg) {
+ Object e, DataProxyErrCode errCode, String errMsg) {
// decrease inflight count
currentInFlightCount.decrementAndGet();
// check whether retry send message
@@ -525,7 +528,7 @@ public class PulsarSink extends AbstractSink implements Configurable, SendMessag
@Override
public void handleRequestProcError(String topic, EventStat eventStat, boolean needRetry,
- DataProxyErrCode errCode, String errMsg) {
+ DataProxyErrCode errCode, String errMsg) {
if (logPrinterB.shouldPrint()) {
logger.error(errMsg);
}
@@ -627,8 +630,7 @@ public class PulsarSink extends AbstractSink implements Configurable, SendMessag
return;
}
/*
- * If the failure requires retransmission to pulsar,
- * the sid needs to be removed before retransmission.
+ * If the failure requires retransmission to pulsar, the sid needs to be removed before retransmission.
*/
if (pulsarConfig.getClientIdCache()) {
String clientId = eventStat.getEvent().getHeaders().get(ConfigConstants.SEQUENCE_ID);
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/SimpleMessageTubeSink.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/SimpleMessageTubeSink.java
index 28dea521b..f8cbece8b 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/SimpleMessageTubeSink.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/SimpleMessageTubeSink.java
@@ -210,7 +210,7 @@ public class SimpleMessageTubeSink extends AbstractSink implements Configurable
* @throws FlumeException if an RPC client connection could not be opened
*/
private void createConnection() throws FlumeException {
-// synchronized (tubeSessionLock) {
+ // synchronized (tubeSessionLock) {
// if already connected, just skip
if (sessionFactory != null) {
return;
@@ -218,7 +218,7 @@ public class SimpleMessageTubeSink extends AbstractSink implements Configurable
try {
TubeClientConfig conf = initTubeConfig();
- //sessionFactory = new TubeMutilMessageSessionFactory(conf);
+ // sessionFactory = new TubeMutilMessageSessionFactory(conf);
sessionFactory = new TubeMultiSessionFactory(conf);
} catch (TubeClientException e) {
logger.error("create connnection error in metasink, "
@@ -227,7 +227,7 @@ public class SimpleMessageTubeSink extends AbstractSink implements Configurable
+ "maybe zkstr/zkroot set error, please re-check");
} catch (Throwable e) {
logger.error("create connnection error in metasink, "
- + "maybe tube master set error/shutdown in progress, please re-check. ex2 {}",
+ + "maybe tube master set error/shutdown in progress, please re-check. ex2 {}",
e.getMessage());
throw new FlumeException("connect to meta error2, "
+ "maybe tube master set error/shutdown in progress, please re-check");
@@ -237,7 +237,7 @@ public class SimpleMessageTubeSink extends AbstractSink implements Configurable
producerMap = new HashMap<String, MessageProducer>();
}
logger.debug("building tube producer");
-// }
+ // }
}
private void destroyConnection() {
@@ -310,11 +310,11 @@ public class SimpleMessageTubeSink extends AbstractSink implements Configurable
this.dimensions = new HashMap<>();
this.dimensions.put(DataProxyMetricItem.KEY_CLUSTER_ID, "DataProxy");
this.dimensions.put(DataProxyMetricItem.KEY_SINK_ID, this.getName());
- //register metrics
+ // register metrics
this.metricItemSet = new DataProxyMetricItemSet(this.getName());
MetricRegister.register(metricItemSet);
-
- //create tube connection
+
+ // create tube connection
try {
createConnection();
} catch (FlumeException e) {
@@ -348,7 +348,7 @@ public class SimpleMessageTubeSink extends AbstractSink implements Configurable
class SinkTask implements Runnable {
private void sendMessage(Event event, String topic, AtomicBoolean flag, EventStat es)
- throws TubeClientException, InterruptedException {
+ throws TubeClientException, InterruptedException {
if (msgDedupHandler.judgeDupAndPutMsgSeqId(
event.getHeaders().get(ConfigConstants.SEQUENCE_ID))) {
logger.info("{} agent package {} existed,just discard.",
@@ -364,7 +364,7 @@ public class SimpleMessageTubeSink extends AbstractSink implements Configurable
if (t instanceof TubeClientException) {
String message = t.getMessage();
if (message != null && (message.contains("No available queue for topic")
- || message.contains("The brokers of topic are all forbidden"))) {
+ || message.contains("The brokers of topic are all forbidden"))) {
illegalTopicMap.put(topic, System.currentTimeMillis() + 60 * 1000);
logger.info("IllegalTopicMap.put " + topic);
return;
@@ -372,13 +372,13 @@ public class SimpleMessageTubeSink extends AbstractSink implements Configurable
try {
Thread.sleep(100);
} catch (InterruptedException e) {
- //ignore..
+ // ignore..
}
}
}
logger.error("Sink task fail to send the message, decrementFlag=" + decrementFlag + ",sink.name="
- + Thread.currentThread().getName()
- + ",event.headers=" + es.getEvent().getHeaders(), t);
+ + Thread.currentThread().getName()
+ + ",event.headers=" + es.getEvent().getHeaders(), t);
}
@Override
@@ -408,7 +408,7 @@ public class SimpleMessageTubeSink extends AbstractSink implements Configurable
} else {
event = eventQueue.take();
es = new EventStat(event);
-// sendCnt.incrementAndGet();
+ // sendCnt.incrementAndGet();
if (event.getHeaders().containsKey(TOPIC)) {
topic = event.getHeaders().get(TOPIC);
}
@@ -431,7 +431,7 @@ public class SimpleMessageTubeSink extends AbstractSink implements Configurable
if (expireTime > currentTime) {
// TODO: need to be improved.
-// reChannelEvent(es, topic);
+ // reChannelEvent(es, topic);
continue;
} else {
@@ -466,6 +466,7 @@ public class SimpleMessageTubeSink extends AbstractSink implements Configurable
}
public class MyCallback implements MessageSentCallback {
+
private EventStat myEventStat;
private long sendTime;
@@ -511,7 +512,7 @@ public class SimpleMessageTubeSink extends AbstractSink implements Configurable
dimensions.put(DataProxyMetricItem.KEY_SINK_DATA_ID, event.getHeaders().getOrDefault(TOPIC, ""));
DataProxyMetricItem.fillInlongId(event, dimensions);
DataProxyMetricItem.fillAuditFormatTime(event, dimensions);
-
+
DataProxyMetricItem metricItem = SimpleMessageTubeSink.this.metricItemSet.findMetricItem(dimensions);
if (result) {
metricItem.sendSuccessCount.incrementAndGet();
@@ -622,11 +623,12 @@ public class SimpleMessageTubeSink extends AbstractSink implements Configurable
@Override
public void configure(Context context) {
logger.info(context.toString());
-// logger.info("sinktest:"+getName()+getChannel());//sinktest:meta-sink-msg2null
+ // logger.info("sinktest:"+getName()+getChannel());//sinktest:meta-sink-msg2null
configManager = ConfigManager.getInstance();
topicProperties = configManager.getTopicProperties();
configManager.getTopicConfig().addUpdateCallback(new ConfigUpdateCallback() {
+
@Override
public void update() {
@@ -708,5 +710,5 @@ public class SimpleMessageTubeSink extends AbstractSink implements Configurable
public DataProxyMetricItemSet getMetricItemSet() {
return metricItemSet;
}
-
+
}
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/TubeSink.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/TubeSink.java
index e1dbf90a3..fdd15c4c0 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/TubeSink.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/TubeSink.java
@@ -142,24 +142,25 @@ public class TubeSink extends AbstractSink implements Configurable {
statIntervalSec = tubeConfig.getStatIntervalSec();
Preconditions.checkArgument(statIntervalSec >= 0, "statIntervalSec must be >= 0");
// initial TubeMQ configure
- // initial resend queue size
+ // initial resend queue size
int badEventQueueSize = tubeConfig.getBadEventQueueSize();
Preconditions.checkArgument(badEventQueueSize > 0, "badEventQueueSize must be > 0");
resendQueue = new LinkedBlockingQueue<>(badEventQueueSize);
- // initial sink thread pool
+ // initial sink thread pool
int threadNum = tubeConfig.getThreadNum();
Preconditions.checkArgument(threadNum > 0, "threadNum must be > 0");
sinkThreadPool = new Thread[threadNum];
- // initial event queue size
+ // initial event queue size
int eventQueueSize = tubeConfig.getEventQueueSize();
Preconditions.checkArgument(eventQueueSize > 0, "eventQueueSize must be > 0");
eventQueue = new LinkedBlockingQueue<>(eventQueueSize);
- // initial disk rate limiter
+ // initial disk rate limiter
if (tubeConfig.getDiskIoRatePerSec() != 0) {
diskRateLimiter = RateLimiter.create(tubeConfig.getDiskIoRatePerSec());
}
// register configure change callback functions
configManager.getTopicConfig().addUpdateCallback(new ConfigUpdateCallback() {
+
@Override
public void update() {
diffSetPublish(new HashSet<>(topicProperties.values()),
@@ -167,6 +168,7 @@ public class TubeSink extends AbstractSink implements Configurable {
}
});
configManager.getMqClusterHolder().addUpdateCallback(new ConfigUpdateCallback() {
+
@Override
public void update() {
diffUpdateTubeClient(masterHostAndPortLists,
@@ -301,6 +303,7 @@ public class TubeSink extends AbstractSink implements Configurable {
}
private class TubeSinkTask implements Runnable {
+
public TubeSinkTask() {
// ignore
}
@@ -478,7 +481,7 @@ public class TubeSink extends AbstractSink implements Configurable {
* @param sendTime the send time when success processed
*/
private void addStatistics(Event event, boolean isSuccess,
- boolean isException, long sendTime) {
+ boolean isException, long sendTime) {
if (event == null) {
return;
}
@@ -547,7 +550,7 @@ public class TubeSink extends AbstractSink implements Configurable {
* resend event
*/
private void resendEvent(EventStat es, boolean sendFinished,
- DataProxyErrCode errCode, String errMsg) {
+ DataProxyErrCode errCode, String errMsg) {
try {
if (sendFinished) {
inflightMsgCnt.decrementAndGet();
@@ -635,7 +638,7 @@ public class TubeSink extends AbstractSink implements Configurable {
* @param newClusterSet new masterHostAndPortList set
*/
private void diffUpdateTubeClient(Set<String> curClusterSet,
- Set<String> newClusterSet) {
+ Set<String> newClusterSet) {
if (!this.started.get()) {
logger.info(getName() + " not started, ignore this change!");
}
@@ -654,7 +657,7 @@ public class TubeSink extends AbstractSink implements Configurable {
newProducerHolder.start(new HashSet<>(configManager.getTopicProperties().values()));
} catch (Throwable e) {
logger.error(getName() + " create new producer holder for " + newMasterAddr
- + " failure, throw exception is {}", e.getMessage());
+ + " failure, throw exception is {}", e.getMessage());
return;
}
// replace current producer holder
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/common/DefaultEventHandler.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/common/DefaultEventHandler.java
index 22ae6113a..186654d98 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/common/DefaultEventHandler.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/common/DefaultEventHandler.java
@@ -99,14 +99,14 @@ public class DefaultEventHandler implements EventHandler {
// compress
byte[] compressBytes = null;
switch (compressType) {
- case INLONG_SNAPPY :
+ case INLONG_SNAPPY:
compressBytes = Snappy.compress(srcBytes);
break;
- case INLONG_GZ :
+ case INLONG_GZ:
compressBytes = GzipUtils.compress(srcBytes);
break;
- case INLONG_NO_COMPRESS :
- default :
+ case INLONG_NO_COMPRESS:
+ default:
compressBytes = srcBytes;
break;
}
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/common/MsgDedupHandler.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/common/MsgDedupHandler.java
index e3ff37b7a..01af66f5b 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/common/MsgDedupHandler.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/common/MsgDedupHandler.java
@@ -58,6 +58,7 @@ public class MsgDedupHandler {
.expireAfterAccess(maxSurviveTime, TimeUnit.MILLISECONDS)
.maximumSize(maxSurviveSize)
.build(new CacheLoader<String, Long>() {
+
@Override
public Long load(String key) {
return System.currentTimeMillis();
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/common/TubeProducerHolder.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/common/TubeProducerHolder.java
index 905db9e10..2db6c36d1 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/common/TubeProducerHolder.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/common/TubeProducerHolder.java
@@ -39,6 +39,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class TubeProducerHolder {
+
private static final Logger logger =
LoggerFactory.getLogger(TubeProducerHolder.class);
private static final long SEND_FAILURE_WAIT = 30000L;
@@ -51,8 +52,7 @@ public class TubeProducerHolder {
private final Map<String, MessageProducer> producerMap = new ConcurrentHashMap<>();
private MessageProducer lastProducer = null;
private final AtomicInteger lastPubTopicCnt = new AtomicInteger(0);
- private static final ConcurrentHashMap<String, AtomicLong> FROZEN_TOPIC_MAP
- = new ConcurrentHashMap<>();
+ private static final ConcurrentHashMap<String, AtomicLong> FROZEN_TOPIC_MAP = new ConcurrentHashMap<>();
public TubeProducerHolder(String sinkName, String clusterAddr, MQClusterConfig tubeConfig) {
Preconditions.checkState(StringUtils.isNotBlank(clusterAddr),
@@ -234,7 +234,8 @@ public class TubeProducerHolder {
int allocTotalCnt = filteredTopics.size();
List<Integer> topicGroupCnt = new ArrayList<>();
int paddingCnt = (lastPubTopicCnt.get() <= 0)
- ? 0 : (maxPublishTopicCnt - lastPubTopicCnt.get());
+ ? 0
+ : (maxPublishTopicCnt - lastPubTopicCnt.get());
while (allocTotalCnt > 0) {
if (paddingCnt > 0) {
topicGroupCnt.add(Math.min(allocTotalCnt, paddingCnt));
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mq/BatchPackProfile.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mq/BatchPackProfile.java
index a4dfb3a11..39b2588d7 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mq/BatchPackProfile.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mq/BatchPackProfile.java
@@ -27,6 +27,7 @@ import java.util.List;
* DispatchProfile
*/
public class BatchPackProfile {
+
public static final long MINUTE_MS = 60L * 1000;
private final String inlongGroupId;
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mq/pulsar/PulsarHandler.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mq/pulsar/PulsarHandler.java
index cfc7bb0df..23333a0ac 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mq/pulsar/PulsarHandler.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mq/pulsar/PulsarHandler.java
@@ -264,17 +264,17 @@ public class PulsarHandler implements MessageQueueHandler {
Context context = sinkContext.getProducerContext();
String type = context.getString(KEY_COMPRESSIONTYPE, CompressionType.SNAPPY.name());
switch (type) {
- case "LZ4" :
+ case "LZ4":
return CompressionType.LZ4;
- case "NONE" :
+ case "NONE":
return CompressionType.NONE;
- case "ZLIB" :
+ case "ZLIB":
return CompressionType.ZLIB;
- case "ZSTD" :
+ case "ZSTD":
return CompressionType.ZSTD;
- case "SNAPPY" :
+ case "SNAPPY":
return CompressionType.SNAPPY;
- default :
+ default:
return CompressionType.NONE;
}
}
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/AbstactZoneWorker.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/AbstactZoneWorker.java
index 8372658a9..c083986c3 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/AbstactZoneWorker.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/AbstactZoneWorker.java
@@ -23,6 +23,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class AbstactZoneWorker extends Thread {
+
public static final Logger LOG = LoggerFactory.getLogger(AbstactZoneWorker.class);
protected final String workerName;
@@ -41,7 +42,7 @@ public class AbstactZoneWorker extends Thread {
* @param context
*/
public AbstactZoneWorker(String sinkName, int workerIndex, AbstractZoneSinkContext context,
- AbstractZoneProducer zoneProducer) {
+ AbstractZoneProducer zoneProducer) {
super();
this.workerName = sinkName + "-worker-" + workerIndex;
this.workerIndex = workerIndex;
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/AbstractZoneProducer.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/AbstractZoneProducer.java
index 4beb2d2d4..565c3de5b 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/AbstractZoneProducer.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/AbstractZoneProducer.java
@@ -45,7 +45,7 @@ public abstract class AbstractZoneProducer {
protected AtomicInteger clusterIndex = new AtomicInteger(0);
public AbstractZoneProducer(String workerName,
- AbstractZoneSinkContext context) {
+ AbstractZoneSinkContext context) {
this.workerName = workerName;
this.context = context;
}
@@ -125,14 +125,14 @@ public abstract class AbstractZoneProducer {
}
}
// remove
- for (AbstractZoneClusterProducer cluster : this.clusterList) {
+ for (AbstractZoneClusterProducer cluster : this.clusterList) {
if (newClusterNames.contains(cluster.getCacheClusterName())) {
newClusterList.add(cluster);
} else {
deletingClusterList.add(cluster);
}
}
- this.clusterList = newClusterList;
+ this.clusterList = newClusterList;
} catch (Throwable e) {
LOG.error(e.getMessage(), e);
}
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/AbstractZoneSink.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/AbstractZoneSink.java
index 0fd04406e..412b37088 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/AbstractZoneSink.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/AbstractZoneSink.java
@@ -42,6 +42,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public abstract class AbstractZoneSink extends AbstractSink implements Configurable {
+
public static final Logger LOG = LoggerFactory.getLogger(AbstractZoneSink.class);
protected Context parentContext;
@@ -81,10 +82,10 @@ public abstract class AbstractZoneSink extends AbstractSink implements Configura
// dispatch
this.scheduledPool.scheduleWithFixedDelay(new Runnable() {
- public void run() {
- dispatchManager.setNeedOutputOvertimeData();
- }
- }, this.dispatchManager.getDispatchTimeout(),
+ public void run() {
+ dispatchManager.setNeedOutputOvertimeData();
+ }
+ }, this.dispatchManager.getDispatchTimeout(),
this.dispatchManager.getDispatchTimeout(),
TimeUnit.MILLISECONDS);
// create worker
@@ -106,7 +107,7 @@ public abstract class AbstractZoneSink extends AbstractSink implements Configura
@Deprecated
public void diffUpdatePulsarClient(PulsarClientService pulsarClientService, Map<String, String> originalCluster,
- Map<String, String> endCluster) {
+ Map<String, String> endCluster) {
this.workers.forEach(worker -> {
worker.zoneProducer.reload();
});
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/AbstractZoneSinkContext.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/AbstractZoneSinkContext.java
index 1d5a80d7f..d04d8b225 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/AbstractZoneSinkContext.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/AbstractZoneSinkContext.java
@@ -64,7 +64,6 @@ public abstract class AbstractZoneSinkContext {
protected final DataProxyMetricItemSet metricItemSet;
protected Timer reloadTimer;
-
public static final String KEY_NODE_ID = "nodeId";
public static final String PREFIX_PRODUCER = "producer.";
public static final String KEY_COMPRESS_TYPE = "compressType";
@@ -82,7 +81,7 @@ public abstract class AbstractZoneSinkContext {
* Constructor
*/
public AbstractZoneSinkContext(String sinkName, Context context, Channel channel,
- ArrayList<LinkedBlockingQueue<DispatchProfile>> dispatchQueues) {
+ ArrayList<LinkedBlockingQueue<DispatchProfile>> dispatchQueues) {
this.sinkName = sinkName;
this.sinkContext = context;
this.channel = channel;
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/ZoneClusterProducerCalculator.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/ZoneClusterProducerCalculator.java
index e3804f869..2f10b793f 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/ZoneClusterProducerCalculator.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/ZoneClusterProducerCalculator.java
@@ -21,6 +21,7 @@ import org.apache.inlong.dataproxy.config.pojo.CacheClusterConfig;
@FunctionalInterface
public interface ZoneClusterProducerCalculator {
+
AbstractZoneClusterProducer calculator(String workerName,
- CacheClusterConfig config, AbstractZoneSinkContext context);
+ CacheClusterConfig config, AbstractZoneSinkContext context);
}
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/ZoneWorkerCalculator.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/ZoneWorkerCalculator.java
index ab64f4fe1..29bfe0943 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/ZoneWorkerCalculator.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/ZoneWorkerCalculator.java
@@ -18,5 +18,6 @@
package org.apache.inlong.dataproxy.sink.mqzone;
public interface ZoneWorkerCalculator {
+
AbstactZoneWorker calculator(String sinkName, int workerIndex, AbstractZoneSinkContext context);
}
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/kafkazone/KafkaZoneProducer.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/kafkazone/KafkaZoneProducer.java
index 59f3fb594..9eed6fabe 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/kafkazone/KafkaZoneProducer.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/kafkazone/KafkaZoneProducer.java
@@ -24,6 +24,7 @@ import org.apache.inlong.dataproxy.sink.mqzone.AbstractZoneSinkContext;
import org.apache.inlong.dataproxy.sink.mqzone.ZoneClusterProducerCalculator;
public class KafkaZoneProducer extends AbstractZoneProducer implements ZoneClusterProducerCalculator {
+
/**
* Constructor
*
@@ -43,7 +44,7 @@ public class KafkaZoneProducer extends AbstractZoneProducer implements ZoneClust
@Override
public AbstractZoneClusterProducer calculator(String workerName, CacheClusterConfig config,
- AbstractZoneSinkContext context) {
- return new KafkaClusterProducer(workerName, config, (KafkaZoneSinkContext) context);
+ AbstractZoneSinkContext context) {
+ return new KafkaClusterProducer(workerName, config, (KafkaZoneSinkContext) context);
}
}
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/kafkazone/KafkaZoneSink.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/kafkazone/KafkaZoneSink.java
index a7cdd7c15..f788e9018 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/kafkazone/KafkaZoneSink.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/kafkazone/KafkaZoneSink.java
@@ -35,8 +35,8 @@ public class KafkaZoneSink extends AbstractZoneSink {
public void start() {
try {
super.context = new KafkaZoneSinkContext(getName(), parentContext, getChannel(), super.dispatchQueues);
- super.start((sinkName, workIndex, context)
- -> new KafkaZoneWorker(sinkName, workIndex, (KafkaZoneSinkContext) context));
+ super.start((sinkName, workIndex, context) -> new KafkaZoneWorker(sinkName, workIndex,
+ (KafkaZoneSinkContext) context));
} catch (Exception e) {
LOG.error(e.getMessage(), e);
}
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/kafkazone/KafkaZoneSinkContext.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/kafkazone/KafkaZoneSinkContext.java
index 8a02cdec3..679ecbd7c 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/kafkazone/KafkaZoneSinkContext.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/kafkazone/KafkaZoneSinkContext.java
@@ -37,7 +37,7 @@ public class KafkaZoneSinkContext extends AbstractZoneSinkContext {
* @param context
*/
public KafkaZoneSinkContext(String sinkName, Context context, Channel channel,
- ArrayList<LinkedBlockingQueue<DispatchProfile>> dispatchQueues) {
+ ArrayList<LinkedBlockingQueue<DispatchProfile>> dispatchQueues) {
super(sinkName, context, channel, dispatchQueues);
}
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/pulsarzone/PulsarClusterProducer.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/pulsarzone/PulsarClusterProducer.java
index f53eacd6f..ca6bcd1fc 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/pulsarzone/PulsarClusterProducer.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/pulsarzone/PulsarClusterProducer.java
@@ -141,17 +141,17 @@ public class PulsarClusterProducer extends AbstractZoneClusterProducer {
private CompressionType getPulsarCompressionType() {
String type = this.producerContext.getString(KEY_COMPRESSIONTYPE, CompressionType.SNAPPY.name());
switch (type) {
- case "LZ4" :
+ case "LZ4":
return CompressionType.LZ4;
- case "NONE" :
+ case "NONE":
return CompressionType.NONE;
- case "ZLIB" :
+ case "ZLIB":
return CompressionType.ZLIB;
- case "ZSTD" :
+ case "ZSTD":
return CompressionType.ZSTD;
- case "SNAPPY" :
+ case "SNAPPY":
return CompressionType.SNAPPY;
- default :
+ default:
return CompressionType.NONE;
}
}
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/pulsarzone/PulsarZoneProducer.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/pulsarzone/PulsarZoneProducer.java
index 5578990fe..233600f92 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/pulsarzone/PulsarZoneProducer.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/pulsarzone/PulsarZoneProducer.java
@@ -38,8 +38,8 @@ public class PulsarZoneProducer extends AbstractZoneProducer implements ZoneClus
@Override
public AbstractZoneClusterProducer calculator(String workerName, CacheClusterConfig config,
- AbstractZoneSinkContext context) {
- return new PulsarClusterProducer(workerName, config, (PulsarZoneSinkContext) context);
+ AbstractZoneSinkContext context) {
+ return new PulsarClusterProducer(workerName, config, (PulsarZoneSinkContext) context);
}
}
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/pulsarzone/PulsarZoneSink.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/pulsarzone/PulsarZoneSink.java
index 676bb086b..c9e026f4e 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/pulsarzone/PulsarZoneSink.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/pulsarzone/PulsarZoneSink.java
@@ -35,8 +35,8 @@ public class PulsarZoneSink extends AbstractZoneSink {
public void start() {
try {
super.context = new PulsarZoneSinkContext(getName(), parentContext, getChannel(), super.dispatchQueues);
- super.start((sinkName, workIndex, context)
- -> new PulsarZoneWorker(sinkName, workIndex, (PulsarZoneSinkContext) context));
+ super.start((sinkName, workIndex, context) -> new PulsarZoneWorker(sinkName, workIndex,
+ (PulsarZoneSinkContext) context));
} catch (Exception e) {
LOG.error(e.getMessage(), e);
}
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/pulsarzone/PulsarZoneSinkContext.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/pulsarzone/PulsarZoneSinkContext.java
index 485d4376b..3ea95cc7f 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/pulsarzone/PulsarZoneSinkContext.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/pulsarzone/PulsarZoneSinkContext.java
@@ -37,7 +37,7 @@ public class PulsarZoneSinkContext extends AbstractZoneSinkContext {
* @param context
*/
public PulsarZoneSinkContext(String sinkName, Context context, Channel channel,
- ArrayList<LinkedBlockingQueue<DispatchProfile>> dispatchQueues) {
+ ArrayList<LinkedBlockingQueue<DispatchProfile>> dispatchQueues) {
super(sinkName, context, channel, dispatchQueues);
}
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/tubezone/TubeClusterProducer.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/tubezone/TubeClusterProducer.java
index a12c47684..c0f1feecc 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/tubezone/TubeClusterProducer.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/tubezone/TubeClusterProducer.java
@@ -65,7 +65,7 @@ public class TubeClusterProducer extends AbstractZoneClusterProducer {
* @param context
*/
public TubeClusterProducer(String workerName, CacheClusterConfig config, TubeZoneSinkContext context) {
- super(workerName, config, context);
+ super(workerName, config, context);
}
/**
@@ -142,12 +142,12 @@ public class TubeClusterProducer extends AbstractZoneClusterProducer {
}
}
- /**
- * send
- *
- * @param event
- */
- @Override
+ /**
+ * send
+ *
+ * @param event
+ */
+ @Override
public boolean send(DispatchProfile event) {
try {
// topic
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/tubezone/TubeZoneProducer.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/tubezone/TubeZoneProducer.java
index a18901382..87ffb9c6e 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/tubezone/TubeZoneProducer.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/tubezone/TubeZoneProducer.java
@@ -24,6 +24,7 @@ import org.apache.inlong.dataproxy.sink.mqzone.AbstractZoneSinkContext;
import org.apache.inlong.dataproxy.sink.mqzone.ZoneClusterProducerCalculator;
public class TubeZoneProducer extends AbstractZoneProducer implements ZoneClusterProducerCalculator {
+
/**
* Constructor
*
@@ -44,7 +45,7 @@ public class TubeZoneProducer extends AbstractZoneProducer implements ZoneCluste
@Override
public AbstractZoneClusterProducer calculator(String workerName, CacheClusterConfig config,
- AbstractZoneSinkContext context) {
- return new TubeClusterProducer(workerName, config, (TubeZoneSinkContext) context);
+ AbstractZoneSinkContext context) {
+ return new TubeClusterProducer(workerName, config, (TubeZoneSinkContext) context);
}
}
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/tubezone/TubeZoneSinkContext.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/tubezone/TubeZoneSinkContext.java
index ea5b6a0f8..4593a6582 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/tubezone/TubeZoneSinkContext.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/mqzone/impl/tubezone/TubeZoneSinkContext.java
@@ -30,13 +30,14 @@ import java.util.concurrent.LinkedBlockingQueue;
* TubeZoneSinkContext
*/
public class TubeZoneSinkContext extends AbstractZoneSinkContext {
+
/**
* Constructor
*
* @param context
*/
public TubeZoneSinkContext(String sinkName, Context context, Channel channel,
- ArrayList<LinkedBlockingQueue<DispatchProfile>> dispatchQueues) {
+ ArrayList<LinkedBlockingQueue<DispatchProfile>> dispatchQueues) {
super(sinkName, context, channel, dispatchQueues);
}
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/pulsar/PulsarClientService.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/pulsar/PulsarClientService.java
index 13d58c4fc..4e98a08e0 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/pulsar/PulsarClientService.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/pulsar/PulsarClientService.java
@@ -138,7 +138,7 @@ public class PulsarClientService {
* send message
*/
public boolean sendMessage(int poolIndex, String topic,
- EventStat es, PulsarSink pulsarSink) {
+ EventStat es, PulsarSink pulsarSink) {
boolean result;
TopicProducerInfo producerInfo = null;
Event event = es.getEvent();
@@ -155,15 +155,13 @@ public class PulsarClientService {
errMsg = "Get producer failed for topic=" + topic + ", reason is " + e.getMessage();
}
/*
- * If the producer is a null value,\ it means that the topic is not yet
- * ready, and it needs to be played back into the file channel
+ * If the producer is a null value,\ it means that the topic is not yet ready, and it needs to be played back
+ * into the file channel
*/
if (producerInfo == null) {
/*
- * Data within 30s is placed in the exception channel to
- * prevent frequent checks
- * After 30s, reopen the topic check, if it is still a null value,
- * put it back into the illegal map
+ * Data within 30s is placed in the exception channel to prevent frequent checks After 30s, reopen the topic
+ * check, if it is still a null value, put it back into the illegal map
*/
pulsarSink.handleRequestProcError(topic, es,
false, DataProxyErrCode.NO_AVAILABLE_PRODUCER, errMsg);
@@ -402,7 +400,7 @@ public class PulsarClientService {
pulsarClients.put(url, client);
callBack.handleCreateClientSuccess(url);
- //create related topicProducers
+ // create related topicProducers
for (String topic : topicSet) {
TopicProducerInfo info = new TopicProducerInfo(client, sinkThreadPoolSize,
topic);
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/pulsar/SendMessageCallBack.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/pulsar/SendMessageCallBack.java
index 98574a17c..bd1d9cd29 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/pulsar/SendMessageCallBack.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/pulsar/SendMessageCallBack.java
@@ -25,9 +25,9 @@ public interface SendMessageCallBack {
void handleMessageSendSuccess(String topic, Object msgId, EventStat es, long startTime);
void handleRequestProcError(String topic, EventStat es,
- boolean needRetry, DataProxyErrCode errCode, String errMsg);
+ boolean needRetry, DataProxyErrCode errCode, String errMsg);
void handleMessageSendException(String topic, EventStat es, Object exception,
- DataProxyErrCode errCode, String errMsg);
+ DataProxyErrCode errCode, String errMsg);
}
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/pulsar/SinkTask.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/pulsar/SinkTask.java
index efae823a8..c97e45c70 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/pulsar/SinkTask.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/pulsar/SinkTask.java
@@ -63,7 +63,7 @@ public class SinkTask extends Thread {
private SinkCounter sinkCounter;
- private LoadingCache<String, Long> agentIdCache;
+ private LoadingCache<String, Long> agentIdCache;
private MQClusterConfig pulsarConfig;
@@ -129,15 +129,14 @@ public class SinkTask extends Thread {
} else {
if (currentInFlightCount.get() > BATCH_SIZE) {
/*
- * Under the condition that the number of unresponsive messages
- * is greater than 1w, the number of unresponsive messages sent
- * to pulsar will be printed periodically
+ * Under the condition that the number of unresponsive messages is greater than 1w, the number
+ * of unresponsive messages sent to pulsar will be printed periodically
*/
logCounter++;
if (logCounter == 1 || logCounter % 100000 == 0) {
logger.info(getName()
- + " currentInFlightCount={} resendQueue"
- + ".size={}",
+ + " currentInFlightCount={} resendQueue"
+ + ".size={}",
currentInFlightCount.get(), resendQueue.size());
}
if (logCounter > Long.MAX_VALUE - 10) {
@@ -203,14 +202,13 @@ public class SinkTask extends Thread {
} else {
try {
/*
- * The exception of pulsar will cause the sending thread to block
- * and prevent further pressure on pulsar. Here you should pay
- * attention to the type of exception to prevent the error of
- * a topic from affecting the global
+ * The exception of pulsar will cause the sending thread to block and prevent further
+ * pressure on pulsar. Here you should pay attention to the type of exception to prevent the
+ * error of a topic from affecting the global
*/
Thread.sleep(100);
} catch (InterruptedException e) {
- //ignore..
+ // ignore..
}
}
}
@@ -221,11 +219,10 @@ public class SinkTask extends Thread {
+ eventStat.getEvent().getHeaders(), t);
}
/*
- * producer.sendMessage is abnormal,
- * so currentInFlightCount is not added,
- * so there is no need to subtract
+ * producer.sendMessage is abnormal, so currentInFlightCount is not added, so there is no need to
+ * subtract
*/
- pulsarSink.handleRequestProcError(topic, eventStat,false,
+ pulsarSink.handleRequestProcError(topic, eventStat, false,
DataProxyErrCode.SEND_REQUEST_TO_MQ_FAILURE, t.getMessage());
}
}
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/pulsar/federation/PulsarProducerCluster.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/pulsar/federation/PulsarProducerCluster.java
index 7006ade80..5f99efa82 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/pulsar/federation/PulsarProducerCluster.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/pulsar/federation/PulsarProducerCluster.java
@@ -123,8 +123,8 @@ public class PulsarProducerCluster implements LifecycleAware {
.connectionsPerBroker(context.getInteger(KEY_CONNECTIONSPERBROKER, 10))
.build();
this.baseBuilder = client.newProducer();
-// Map<String, Object> builderConf = new HashMap<>();
-// builderConf.putAll(context.getParameters());
+ // Map<String, Object> builderConf = new HashMap<>();
+ // builderConf.putAll(context.getParameters());
this.baseBuilder
.sendTimeout(context.getInteger(KEY_SENDTIMEOUT, 0), TimeUnit.MILLISECONDS)
.maxPendingMessages(context.getInteger(KEY_MAXPENDINGMESSAGES, 500))
@@ -158,17 +158,17 @@ public class PulsarProducerCluster implements LifecycleAware {
private CompressionType getPulsarCompressionType() {
String type = this.context.getString(KEY_COMPRESSIONTYPE);
switch (type) {
- case "LZ4" :
+ case "LZ4":
return CompressionType.LZ4;
- case "NONE" :
+ case "NONE":
return CompressionType.NONE;
- case "ZLIB" :
+ case "ZLIB":
return CompressionType.ZLIB;
- case "ZSTD" :
+ case "ZSTD":
return CompressionType.ZSTD;
- case "SNAPPY" :
+ case "SNAPPY":
return CompressionType.SNAPPY;
- default :
+ default:
return CompressionType.NONE;
}
}
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/BaseSource.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/BaseSource.java
index b790fae69..af17bc6ff 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/BaseSource.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/BaseSource.java
@@ -51,303 +51,308 @@ import org.slf4j.LoggerFactory;
*
*/
public abstract class BaseSource
- extends AbstractSource
- implements EventDrivenSource, Configurable {
- private static final Logger logger = LoggerFactory.getLogger(BaseSource.class);
+ extends
+ AbstractSource
+ implements
+ EventDrivenSource,
+ Configurable {
- protected Context context;
+ private static final Logger logger = LoggerFactory.getLogger(BaseSource.class);
- protected int port;
+ protected Context context;
- protected String host = null;
+ protected int port;
- protected String msgFactoryName;
+ protected String host = null;
- protected String serviceDecoderName;
+ protected String msgFactoryName;
- protected String messageHandlerName;
+ protected String serviceDecoderName;
- protected int maxMsgLength;
+ protected String messageHandlerName;
- protected boolean isCompressed;
+ protected int maxMsgLength;
- protected String topic;
+ protected boolean isCompressed;
- protected String attr;
+ protected String topic;
- protected boolean filterEmptyMsg;
+ protected String attr;
- private int statIntervalSec;
+ protected boolean filterEmptyMsg;
- protected int pkgTimeoutSec;
+ private int statIntervalSec;
- protected int maxConnections = Integer.MAX_VALUE;
+ protected int pkgTimeoutSec;
- private static final String CONNECTIONS = "connections";
+ protected int maxConnections = Integer.MAX_VALUE;
- protected boolean customProcessor = false;
+ private static final String CONNECTIONS = "connections";
- private DataProxyMetricItemSet metricItemSet;
+ protected boolean customProcessor = false;
- /*
- * monitor
- */
- private MonitorIndex monitorIndex;
+ private DataProxyMetricItemSet metricItemSet;
- private MonitorIndexExt monitorIndexExt;
+ /*
+ * monitor
+ */
+ private MonitorIndex monitorIndex;
- /*
- * netty server
- */
+ private MonitorIndexExt monitorIndexExt;
- protected EventLoopGroup acceptorGroup;
+ /*
+ * netty server
+ */
- protected EventLoopGroup workerGroup;
+ protected EventLoopGroup acceptorGroup;
- protected DefaultThreadFactory acceptorThreadFactory;
+ protected EventLoopGroup workerGroup;
- protected boolean enableBusyWait = false;
+ protected DefaultThreadFactory acceptorThreadFactory;
- protected ChannelGroup allChannels;
+ protected boolean enableBusyWait = false;
- protected ChannelFuture channelFuture;
+ protected ChannelGroup allChannels;
- private static String HOST_DEFAULT_VALUE = "0.0.0.0";
+ protected ChannelFuture channelFuture;
- private static int maxMonitorCnt = 300000;
+ private static String HOST_DEFAULT_VALUE = "0.0.0.0";
- private static int DEFAULT_MAX_CONNECTIONS = 5000;
+ private static int maxMonitorCnt = 300000;
- private static int STAT_INTERVAL_MUST_THAN = 0;
+ private static int DEFAULT_MAX_CONNECTIONS = 5000;
- private static int PKG_TIMEOUT_DEFAULT_SEC = 3;
+ private static int STAT_INTERVAL_MUST_THAN = 0;
- private static int MSG_MIN_LENGTH = 4;
+ private static int PKG_TIMEOUT_DEFAULT_SEC = 3;
- private static int MAX_MSG_DEFAULT_LENGTH = 1024 * 64;
+ private static int MSG_MIN_LENGTH = 4;
- private static int INTERVAL_SEC = 60;
+ private static int MAX_MSG_DEFAULT_LENGTH = 1024 * 64;
- protected static int BUFFER_SIZE_MUST_THAN = 0;
+ private static int INTERVAL_SEC = 60;
- protected static int DEFAULT_MAX_THREADS = 32;
+ protected static int BUFFER_SIZE_MUST_THAN = 0;
- protected static int RECEIVE_BUFFER_DEFAULT_SIZE = 64 * 1024;
+ protected static int DEFAULT_MAX_THREADS = 32;
- protected static int SEND_BUFFER_DEFAULT_SIZE = 64 * 1024;
+ protected static int RECEIVE_BUFFER_DEFAULT_SIZE = 64 * 1024;
- protected static int RECEIVE_BUFFER_MAX_SIZE = 16 * 1024 * 1024;
+ protected static int SEND_BUFFER_DEFAULT_SIZE = 64 * 1024;
- protected static int SEND_BUFFER_MAX_SIZE = 16 * 1024 * 1024;
+ protected static int RECEIVE_BUFFER_MAX_SIZE = 16 * 1024 * 1024;
- protected int receiveBufferSize;
+ protected static int SEND_BUFFER_MAX_SIZE = 16 * 1024 * 1024;
- protected int sendBufferSize;
+ protected int receiveBufferSize;
- protected int maxThreads = 32;
+ protected int sendBufferSize;
- protected int acceptorThreads = 1;
+ protected int maxThreads = 32;
- public BaseSource() {
- super();
- allChannels = new DefaultChannelGroup("DefaultChannelGroup", GlobalEventExecutor.INSTANCE);
- }
+ protected int acceptorThreads = 1;
- @Override
- public synchronized void start() {
- if (customProcessor) {
- ChannelSelector selector = getChannelProcessor().getSelector();
- FailoverChannelProcessor newProcessor = new FailoverChannelProcessor(selector);
- newProcessor.configure(this.context);
- setChannelProcessor(newProcessor);
- FailoverChannelProcessorHolder.setChannelProcessor(newProcessor);
- }
- super.start();
- // initial metric item set
- ConfigManager configManager = ConfigManager.getInstance();
- String clusterId =
- configManager.getCommonProperties().getOrDefault(
- ConfigConstants.PROXY_CLUSTER_NAME,
- ConfigConstants.DEFAULT_PROXY_CLUSTER_NAME);
- this.metricItemSet =
- new DataProxyMetricItemSet(clusterId, this.getName(), String.valueOf(port));
- MetricRegister.register(metricItemSet);
- /*
- * init monitor logic
- */
- monitorIndex = new MonitorIndex("Source",INTERVAL_SEC, maxMonitorCnt);
- monitorIndexExt = new MonitorIndexExt("DataProxy_monitors#"
- + this.getProtocolName(),INTERVAL_SEC, maxMonitorCnt);
- startSource();
- }
-
- @Override
- public synchronized void stop() {
- logger.info("[STOP {} SOURCE]{} stopping...", this.getProtocolName(), this.getName());
- if (!allChannels.isEmpty()) {
- try {
- allChannels.close().awaitUninterruptibly();
- } catch (Exception e) {
- logger.warn("Simple Source netty server stop ex, {}", e);
- } finally {
- allChannels.clear();
- }
+ public BaseSource() {
+ super();
+ allChannels = new DefaultChannelGroup("DefaultChannelGroup", GlobalEventExecutor.INSTANCE);
}
- super.stop();
- if (monitorIndex != null) {
- monitorIndex.shutDown();
- }
- if (monitorIndexExt != null) {
- monitorIndexExt.shutDown();
+ @Override
+ public synchronized void start() {
+ if (customProcessor) {
+ ChannelSelector selector = getChannelProcessor().getSelector();
+ FailoverChannelProcessor newProcessor = new FailoverChannelProcessor(selector);
+ newProcessor.configure(this.context);
+ setChannelProcessor(newProcessor);
+ FailoverChannelProcessorHolder.setChannelProcessor(newProcessor);
+ }
+ super.start();
+ // initial metric item set
+ ConfigManager configManager = ConfigManager.getInstance();
+ String clusterId =
+ configManager.getCommonProperties().getOrDefault(
+ ConfigConstants.PROXY_CLUSTER_NAME,
+ ConfigConstants.DEFAULT_PROXY_CLUSTER_NAME);
+ this.metricItemSet =
+ new DataProxyMetricItemSet(clusterId, this.getName(), String.valueOf(port));
+ MetricRegister.register(metricItemSet);
+ /*
+ * init monitor logic
+ */
+ monitorIndex = new MonitorIndex("Source", INTERVAL_SEC, maxMonitorCnt);
+ monitorIndexExt = new MonitorIndexExt("DataProxy_monitors#"
+ + this.getProtocolName(), INTERVAL_SEC, maxMonitorCnt);
+ startSource();
}
- if (channelFuture != null) {
- try {
- channelFuture.channel().closeFuture().sync();
- } catch (InterruptedException e) {
- logger.warn("Simple Source netty server stop ex, {}", e);
- }
+ @Override
+ public synchronized void stop() {
+ logger.info("[STOP {} SOURCE]{} stopping...", this.getProtocolName(), this.getName());
+ if (!allChannels.isEmpty()) {
+ try {
+ allChannels.close().awaitUninterruptibly();
+ } catch (Exception e) {
+ logger.warn("Simple Source netty server stop ex, {}", e);
+ } finally {
+ allChannels.clear();
+ }
+ }
+
+ super.stop();
+ if (monitorIndex != null) {
+ monitorIndex.shutDown();
+ }
+ if (monitorIndexExt != null) {
+ monitorIndexExt.shutDown();
+ }
+
+ if (channelFuture != null) {
+ try {
+ channelFuture.channel().closeFuture().sync();
+ } catch (InterruptedException e) {
+ logger.warn("Simple Source netty server stop ex, {}", e);
+ }
+ }
+ logger.info("[STOP {} SOURCE]{} stopped", this.getProtocolName(), this.getName());
}
- logger.info("[STOP {} SOURCE]{} stopped", this.getProtocolName(), this.getName());
- }
-
- @Override
- public void configure(Context context) {
-
- this.context = context;
-
- port = context.getInteger(ConfigConstants.CONFIG_PORT);
-
- host = context.getString(ConfigConstants.CONFIG_HOST, HOST_DEFAULT_VALUE);
-
- Configurables.ensureRequiredNonNull(context, ConfigConstants.CONFIG_PORT);
-
- Preconditions.checkArgument(ConfStringUtils.isValidIp(host), "ip config not valid");
- Preconditions.checkArgument(ConfStringUtils.isValidPort(port), "port config not valid");
- msgFactoryName =
- context.getString(ConfigConstants.MSG_FACTORY_NAME,
- "org.apache.inlong.dataproxy.source.ServerMessageFactory");
- msgFactoryName = msgFactoryName.trim();
- Preconditions.checkArgument(StringUtils.isNotBlank(msgFactoryName),
- "msgFactoryName is empty");
-
- serviceDecoderName =
- context.getString(ConfigConstants.SERVICE_PROCESSOR_NAME,
- "org.apache.inlong.dataproxy.source.DefaultServiceDecoder");
- serviceDecoderName = serviceDecoderName.trim();
- Preconditions.checkArgument(StringUtils.isNotBlank(serviceDecoderName),
- "serviceProcessorName is empty");
-
- messageHandlerName =
- context.getString(ConfigConstants.MESSAGE_HANDLER_NAME,
- "org.apache.inlong.dataproxy.source.ServerMessageHandler");
- messageHandlerName = messageHandlerName.trim();
- Preconditions.checkArgument(StringUtils.isNotBlank(messageHandlerName),
- "messageHandlerName is empty");
-
- maxMsgLength = context.getInteger(ConfigConstants.MAX_MSG_LENGTH, MAX_MSG_DEFAULT_LENGTH);
- Preconditions.checkArgument(
- (maxMsgLength >= MSG_MIN_LENGTH && maxMsgLength <= ConfigConstants.MSG_MAX_LENGTH_BYTES),
- "maxMsgLength must be >= 4 and <= " + ConfigConstants.MSG_MAX_LENGTH_BYTES);
- isCompressed = context.getBoolean(ConfigConstants.MSG_COMPRESSED, true);
-
- filterEmptyMsg = context.getBoolean(ConfigConstants.FILTER_EMPTY_MSG, false);
-
- topic = context.getString(ConfigConstants.TOPIC, "");
- attr = context.getString(ConfigConstants.ATTR);
- Configurables.ensureRequiredNonNull(context, ConfigConstants.ATTR);
-
- topic = topic.trim();
- attr = attr.trim();
- Preconditions.checkArgument(!attr.isEmpty(), "attr is empty");
-
- statIntervalSec = context.getInteger(ConfigConstants.STAT_INTERVAL_SEC, INTERVAL_SEC);
- Preconditions.checkArgument((statIntervalSec >= STAT_INTERVAL_MUST_THAN), "statIntervalSec must be >= 0");
-
- pkgTimeoutSec = context.getInteger(ConfigConstants.PACKAGE_TIMEOUT_SEC, PKG_TIMEOUT_DEFAULT_SEC);
-
- try {
- maxConnections = context.getInteger(CONNECTIONS, DEFAULT_MAX_CONNECTIONS);
- } catch (NumberFormatException e) {
- logger.warn("BaseSource\'s \"connections\" property must specify an integer value.",
- context.getString(CONNECTIONS));
+ @Override
+ public void configure(Context context) {
+
+ this.context = context;
+
+ port = context.getInteger(ConfigConstants.CONFIG_PORT);
+
+ host = context.getString(ConfigConstants.CONFIG_HOST, HOST_DEFAULT_VALUE);
+
+ Configurables.ensureRequiredNonNull(context, ConfigConstants.CONFIG_PORT);
+
+ Preconditions.checkArgument(ConfStringUtils.isValidIp(host), "ip config not valid");
+ Preconditions.checkArgument(ConfStringUtils.isValidPort(port), "port config not valid");
+
+ msgFactoryName =
+ context.getString(ConfigConstants.MSG_FACTORY_NAME,
+ "org.apache.inlong.dataproxy.source.ServerMessageFactory");
+ msgFactoryName = msgFactoryName.trim();
+ Preconditions.checkArgument(StringUtils.isNotBlank(msgFactoryName),
+ "msgFactoryName is empty");
+
+ serviceDecoderName =
+ context.getString(ConfigConstants.SERVICE_PROCESSOR_NAME,
+ "org.apache.inlong.dataproxy.source.DefaultServiceDecoder");
+ serviceDecoderName = serviceDecoderName.trim();
+ Preconditions.checkArgument(StringUtils.isNotBlank(serviceDecoderName),
+ "serviceProcessorName is empty");
+
+ messageHandlerName =
+ context.getString(ConfigConstants.MESSAGE_HANDLER_NAME,
+ "org.apache.inlong.dataproxy.source.ServerMessageHandler");
+ messageHandlerName = messageHandlerName.trim();
+ Preconditions.checkArgument(StringUtils.isNotBlank(messageHandlerName),
+ "messageHandlerName is empty");
+
+ maxMsgLength = context.getInteger(ConfigConstants.MAX_MSG_LENGTH, MAX_MSG_DEFAULT_LENGTH);
+ Preconditions.checkArgument(
+ (maxMsgLength >= MSG_MIN_LENGTH && maxMsgLength <= ConfigConstants.MSG_MAX_LENGTH_BYTES),
+ "maxMsgLength must be >= 4 and <= " + ConfigConstants.MSG_MAX_LENGTH_BYTES);
+ isCompressed = context.getBoolean(ConfigConstants.MSG_COMPRESSED, true);
+
+ filterEmptyMsg = context.getBoolean(ConfigConstants.FILTER_EMPTY_MSG, false);
+
+ topic = context.getString(ConfigConstants.TOPIC, "");
+ attr = context.getString(ConfigConstants.ATTR);
+ Configurables.ensureRequiredNonNull(context, ConfigConstants.ATTR);
+
+ topic = topic.trim();
+ attr = attr.trim();
+ Preconditions.checkArgument(!attr.isEmpty(), "attr is empty");
+
+ statIntervalSec = context.getInteger(ConfigConstants.STAT_INTERVAL_SEC, INTERVAL_SEC);
+ Preconditions.checkArgument((statIntervalSec >= STAT_INTERVAL_MUST_THAN), "statIntervalSec must be >= 0");
+
+ pkgTimeoutSec = context.getInteger(ConfigConstants.PACKAGE_TIMEOUT_SEC, PKG_TIMEOUT_DEFAULT_SEC);
+
+ try {
+ maxConnections = context.getInteger(CONNECTIONS, DEFAULT_MAX_CONNECTIONS);
+ } catch (NumberFormatException e) {
+ logger.warn("BaseSource\'s \"connections\" property must specify an integer value.",
+ context.getString(CONNECTIONS));
+ }
+
+ try {
+ maxThreads = context.getInteger(ConfigConstants.MAX_THREADS, DEFAULT_MAX_THREADS);
+ } catch (NumberFormatException e) {
+ logger.warn("Simple TCP Source max-threads property must specify an integer value. {}",
+ context.getString(ConfigConstants.MAX_THREADS));
+ }
+
+ receiveBufferSize = context.getInteger(ConfigConstants.RECEIVE_BUFFER_SIZE, RECEIVE_BUFFER_DEFAULT_SIZE);
+ if (receiveBufferSize > RECEIVE_BUFFER_MAX_SIZE) {
+ receiveBufferSize = RECEIVE_BUFFER_MAX_SIZE;
+ }
+ Preconditions.checkArgument(receiveBufferSize > BUFFER_SIZE_MUST_THAN,
+ "receiveBufferSize must be > 0");
+
+ sendBufferSize = context.getInteger(ConfigConstants.SEND_BUFFER_SIZE, SEND_BUFFER_DEFAULT_SIZE);
+ if (sendBufferSize > SEND_BUFFER_MAX_SIZE) {
+ sendBufferSize = SEND_BUFFER_MAX_SIZE;
+ }
+ Preconditions.checkArgument(sendBufferSize > BUFFER_SIZE_MUST_THAN,
+ "sendBufferSize must be > 0");
+
+ enableBusyWait = context.getBoolean(ConfigConstants.ENABLE_BUSY_WAIT, false);
+
+ this.customProcessor = context.getBoolean(ConfigConstants.CUSTOM_CHANNEL_PROCESSOR, false);
}
- try {
- maxThreads = context.getInteger(ConfigConstants.MAX_THREADS, DEFAULT_MAX_THREADS);
- } catch (NumberFormatException e) {
- logger.warn("Simple TCP Source max-threads property must specify an integer value. {}",
- context.getString(ConfigConstants.MAX_THREADS));
+ /**
+ * channel factory
+ * @return
+ */
+ public ChannelInitializer getChannelInitializerFactory() {
+ logger.info(new StringBuffer("load msgFactory=").append(msgFactoryName)
+ .append(" and serviceDecoderName=").append(serviceDecoderName).toString());
+ ChannelInitializer fac = null;
+ try {
+ ServiceDecoder serviceDecoder = (ServiceDecoder) Class.forName(serviceDecoderName).newInstance();
+ Class<? extends ChannelInitializer> clazz =
+ (Class<? extends ChannelInitializer>) Class.forName(msgFactoryName);
+ Constructor ctor = clazz.getConstructor(BaseSource.class, ChannelGroup.class,
+ String.class, ServiceDecoder.class, String.class, Integer.class,
+ String.class, String.class, Boolean.class,
+ Integer.class, Boolean.class, MonitorIndex.class,
+ MonitorIndexExt.class, String.class);
+ logger.info("Using channel processor:{}", getChannelProcessor().getClass().getName());
+ fac = (ChannelInitializer) ctor.newInstance(this, allChannels,
+ this.getProtocolName(), serviceDecoder, messageHandlerName, maxMsgLength,
+ topic, attr, filterEmptyMsg,
+ maxConnections, isCompressed, monitorIndex,
+ monitorIndexExt, this.getProtocolName());
+ } catch (Exception e) {
+ logger.error(
+ "Simple {} Source start error, fail to construct ChannelPipelineFactory with name "
+ + "{}, ex {}",
+ this.getProtocolName(), msgFactoryName, e);
+ stop();
+ throw new FlumeException(e.getMessage());
+ }
+ return fac;
}
- receiveBufferSize = context.getInteger(ConfigConstants.RECEIVE_BUFFER_SIZE, RECEIVE_BUFFER_DEFAULT_SIZE);
- if (receiveBufferSize > RECEIVE_BUFFER_MAX_SIZE) {
- receiveBufferSize = RECEIVE_BUFFER_MAX_SIZE;
+ /**
+ * get metricItemSet
+ * @return the metricItemSet
+ */
+ public DataProxyMetricItemSet getMetricItemSet() {
+ return metricItemSet;
}
- Preconditions.checkArgument(receiveBufferSize > BUFFER_SIZE_MUST_THAN,
- "receiveBufferSize must be > 0");
- sendBufferSize = context.getInteger(ConfigConstants.SEND_BUFFER_SIZE, SEND_BUFFER_DEFAULT_SIZE);
- if (sendBufferSize > SEND_BUFFER_MAX_SIZE) {
- sendBufferSize = SEND_BUFFER_MAX_SIZE;
+ public Context getContext() {
+ return context;
}
- Preconditions.checkArgument(sendBufferSize > BUFFER_SIZE_MUST_THAN,
- "sendBufferSize must be > 0");
-
- enableBusyWait = context.getBoolean(ConfigConstants.ENABLE_BUSY_WAIT, false);
-
- this.customProcessor = context.getBoolean(ConfigConstants.CUSTOM_CHANNEL_PROCESSOR, false);
- }
-
- /**
- * channel factory
- * @return
- */
- public ChannelInitializer getChannelInitializerFactory() {
- logger.info(new StringBuffer("load msgFactory=").append(msgFactoryName)
- .append(" and serviceDecoderName=").append(serviceDecoderName).toString());
- ChannelInitializer fac = null;
- try {
- ServiceDecoder serviceDecoder = (ServiceDecoder)Class.forName(serviceDecoderName).newInstance();
- Class<? extends ChannelInitializer> clazz =
- (Class<? extends ChannelInitializer>) Class.forName(msgFactoryName);
- Constructor ctor = clazz.getConstructor(BaseSource.class, ChannelGroup.class,
- String.class, ServiceDecoder.class, String.class, Integer.class,
- String.class, String.class, Boolean.class,
- Integer.class, Boolean.class, MonitorIndex.class,
- MonitorIndexExt.class, String.class);
- logger.info("Using channel processor:{}", getChannelProcessor().getClass().getName());
- fac = (ChannelInitializer) ctor.newInstance(this, allChannels,
- this.getProtocolName(), serviceDecoder, messageHandlerName, maxMsgLength,
- topic, attr, filterEmptyMsg,
- maxConnections, isCompressed, monitorIndex,
- monitorIndexExt, this.getProtocolName());
- } catch (Exception e) {
- logger.error(
- "Simple {} Source start error, fail to construct ChannelPipelineFactory with name "
- + "{}, ex {}",this.getProtocolName(), msgFactoryName, e);
- stop();
- throw new FlumeException(e.getMessage());
- }
- return fac;
- }
-
- /**
- * get metricItemSet
- * @return the metricItemSet
- */
- public DataProxyMetricItemSet getMetricItemSet() {
- return metricItemSet;
- }
-
- public Context getContext() {
- return context;
- }
- public abstract String getProtocolName();
+ public abstract String getProtocolName();
- public abstract void startSource();
+ public abstract void startSource();
}
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/DefaultServiceDecoder.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/DefaultServiceDecoder.java
index c436f303e..a537e09c0 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/DefaultServiceDecoder.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/DefaultServiceDecoder.java
@@ -88,8 +88,8 @@ public class DefaultServiceDecoder implements ServiceDecoder {
+ attrLen + BIN_HB_FORMAT_SIZE)) || (msgMagic != BIN_MSG_MAGIC)) {
LOG.error("err msg, bodyLen + attrLen > totalDataLen, "
- + "and bodyLen={},attrLen={},totalDataLen={},magic={};Connection "
- + "info:{}",
+ + "and bodyLen={},attrLen={},totalDataLen={},magic={};Connection "
+ + "info:{}",
bodyLen, attrLen, totalDataLen, Integer.toHexString(msgMagic), channel.toString());
return resultMap;
@@ -110,8 +110,8 @@ public class DefaultServiceDecoder implements ServiceDecoder {
}
private void handleDateTime(Map<String, String> commonAttrMap, long uniq,
- long dataTime, int msgCount, String strRemoteIP,
- long msgRcvTime) {
+ long dataTime, int msgCount, String strRemoteIP,
+ long msgRcvTime) {
commonAttrMap.put(AttributeConstants.UNIQ_ID, String.valueOf(uniq));
String time = String.valueOf(dataTime);
commonAttrMap.put(AttributeConstants.SEQUENCE_ID,
@@ -151,8 +151,8 @@ public class DefaultServiceDecoder implements ServiceDecoder {
}
private ByteBuffer handleTrace(Channel channel, ByteBuf cb, int extendField,
- int msgHeadPos, int totalDataLen, int attrLen,
- String strAttr, int bodyLen, long msgRcvTime) {
+ int msgHeadPos, int totalDataLen, int attrLen,
+ String strAttr, int bodyLen, long msgRcvTime) {
// whether enable trace
ByteBuffer dataBuf;
boolean enableTrace = (((extendField & 0x2) >> 1) == 0x1);
@@ -205,10 +205,10 @@ public class DefaultServiceDecoder implements ServiceDecoder {
* extract bin data, message type is 7
*/
private Map<String, Object> extractNewBinData(Map<String, Object> resultMap,
- ByteBuf cb, Channel channel,
- int totalDataLen, MsgType msgType,
- String strRemoteIP,
- long msgRcvTime) throws Exception {
+ ByteBuf cb, Channel channel,
+ int totalDataLen, MsgType msgType,
+ String strRemoteIP,
+ long msgRcvTime) throws Exception {
int msgHeadPos = cb.readerIndex() - 5;
// get body length
int bodyLen = cb.getInt(msgHeadPos + BIN_MSG_BODYLEN_OFFSET);
@@ -309,9 +309,9 @@ public class DefaultServiceDecoder implements ServiceDecoder {
* extract bin data, message type less than 7
*/
private Map<String, Object> extractDefaultData(Map<String, Object> resultMap,
- ByteBuf cb, int totalDataLen,
- MsgType msgType, String strRemoteIP,
- long msgRcvTime) throws Exception {
+ ByteBuf cb, int totalDataLen,
+ MsgType msgType, String strRemoteIP,
+ long msgRcvTime) throws Exception {
int bodyLen = cb.readInt();
if (bodyLen == 0) {
throw new Exception("Error msg: bodyLen is empty, connection info:" + strRemoteIP);
@@ -426,7 +426,7 @@ public class DefaultServiceDecoder implements ServiceDecoder {
*/
@Override
public Map<String, Object> extractData(ByteBuf cb, String strRemoteIP,
- long msgRcvTime, Channel channel) throws Exception {
+ long msgRcvTime, Channel channel) throws Exception {
Map<String, Object> resultMap = new HashMap<>();
if (null == cb) {
LOG.error("cb == null");
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/MsgType.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/MsgType.java
index 55479736a..a1cba48ec 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/MsgType.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/MsgType.java
@@ -18,6 +18,7 @@
package org.apache.inlong.dataproxy.source;
public enum MsgType {
+
/**
* heartbeat
*/
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/ServerMessageFactory.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/ServerMessageFactory.java
index 93a2a8c95..242f4a083 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/ServerMessageFactory.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/ServerMessageFactory.java
@@ -33,7 +33,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class ServerMessageFactory
- extends ChannelInitializer<SocketChannel> {
+ extends
+ ChannelInitializer<SocketChannel> {
private static final Logger LOG = LoggerFactory.getLogger(ServerMessageFactory.class);
@@ -129,9 +130,9 @@ public class ServerMessageFactory
if (processor != null) {
try {
- Class<? extends ChannelInboundHandlerAdapter> clazz
- = (Class<? extends ChannelInboundHandlerAdapter>) Class
- .forName(messageHandlerName);
+ Class<? extends ChannelInboundHandlerAdapter> clazz =
+ (Class<? extends ChannelInboundHandlerAdapter>) Class
+ .forName(messageHandlerName);
Constructor<?> ctor = clazz.getConstructor(
BaseSource.class, ServiceDecoder.class, ChannelGroup.class,
@@ -142,8 +143,7 @@ public class ServerMessageFactory
ChannelInboundHandlerAdapter messageHandler = (ChannelInboundHandlerAdapter) ctor
.newInstance(source, serviceDecoder, allChannels, topic, attr,
filterEmptyMsg, maxConnections,
- isCompressed, monitorIndex, monitorIndexExt, protocolType
- );
+ isCompressed, monitorIndex, monitorIndexExt, protocolType);
ch.pipeline().addLast("messageHandler", messageHandler);
} catch (Exception e) {
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/ServerMessageHandler.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/ServerMessageHandler.java
index 7c3636fe1..442e70699 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/ServerMessageHandler.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/ServerMessageHandler.java
@@ -65,6 +65,7 @@ import org.slf4j.LoggerFactory;
*
*/
public class ServerMessageHandler extends ChannelInboundHandlerAdapter {
+
private static final Logger logger = LoggerFactory.getLogger(ServerMessageHandler.class);
private static final String DEFAULT_REMOTE_IP_VALUE = "0.0.0.0";
@@ -365,8 +366,8 @@ public class ServerMessageHandler extends ChannelInboundHandlerAdapter {
* @return convert result
*/
private boolean convertMsgList(List<ProxyMessage> msgList, Map<String, String> commonAttrMap,
- Map<String, HashMap<String, List<ProxyMessage>>> messageMap,
- String strRemoteIP) {
+ Map<String, HashMap<String, List<ProxyMessage>>> messageMap,
+ String strRemoteIP) {
for (ProxyMessage message : msgList) {
String configTopic = null;
String groupId = message.getGroupId();
@@ -381,11 +382,13 @@ public class ServerMessageHandler extends ChannelInboundHandlerAdapter {
&& configManager.getStreamIdMappingProperties() != null) {
groupId = configManager.getGroupIdMappingProperties().get(groupIdNum);
streamId = (configManager.getStreamIdMappingProperties().get(groupIdNum) == null)
- ? null : configManager.getStreamIdMappingProperties().get(groupIdNum).get(streamIdNum);
+ ? null
+ : configManager.getStreamIdMappingProperties().get(groupIdNum).get(streamIdNum);
if (groupId != null && streamId != null) {
String enableTrans =
(configManager.getGroupIdEnableMappingProperties() == null)
- ? null : configManager.getGroupIdEnableMappingProperties().get(groupIdNum);
+ ? null
+ : configManager.getGroupIdEnableMappingProperties().get(groupIdNum);
if (("TRUE".equalsIgnoreCase(enableTrans)
&& "TRUE".equalsIgnoreCase(num2name))) {
String extraAttr = "groupId=" + groupId + "&" + "streamId=" + streamId;
@@ -406,7 +409,7 @@ public class ServerMessageHandler extends ChannelInboundHandlerAdapter {
String dcInterfaceId = message.getStreamId();
if (StringUtils.isNotEmpty(dcInterfaceId)
&& configManager.getDcMappingProperties()
- .containsKey(dcInterfaceId.trim())) {
+ .containsKey(dcInterfaceId.trim())) {
groupId = configManager.getDcMappingProperties()
.get(dcInterfaceId.trim()).trim();
message.setGroupId(groupId);
@@ -468,9 +471,9 @@ public class ServerMessageHandler extends ChannelInboundHandlerAdapter {
* @param msgRcvTime the received time
*/
private void formatMessagesAndSend(ChannelHandlerContext ctx, Map<String, String> commonAttrMap,
- Map<String, Object> resultMap,
- Map<String, HashMap<String, List<ProxyMessage>>> messageMap,
- String strRemoteIP, MsgType msgType, long msgRcvTime) throws MessageIDException {
+ Map<String, Object> resultMap,
+ Map<String, HashMap<String, List<ProxyMessage>>> messageMap,
+ String strRemoteIP, MsgType msgType, long msgRcvTime) throws MessageIDException {
int inLongMsgVer = 1;
if (MsgType.MSG_MULTI_BODY_ATTR.equals(msgType)) {
@@ -525,7 +528,7 @@ public class ServerMessageHandler extends ChannelInboundHandlerAdapter {
headers.put(AttributeConstants.RCV_TIME,
commonAttrMap.get(AttributeConstants.RCV_TIME));
headers.put(ConfigConstants.DECODER_ATTRS,
- (String)resultMap.get(ConfigConstants.DECODER_ATTRS));
+ (String) resultMap.get(ConfigConstants.DECODER_ATTRS));
// add extra key-value information
headers.put(AttributeConstants.UNIQ_ID,
commonAttrMap.get(AttributeConstants.UNIQ_ID));
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/ServiceDecoder.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/ServiceDecoder.java
index 3f13f7e1d..a3cbb502d 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/ServiceDecoder.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/ServiceDecoder.java
@@ -36,5 +36,5 @@ public interface ServiceDecoder {
* @throws Exception
*/
Map<String, Object> extractData(ByteBuf cb, String strRemoteIP,
- long msgRcvTime, Channel channel) throws Exception;
+ long msgRcvTime, Channel channel) throws Exception;
}
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/SimpleMessageHandler.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/SimpleMessageHandler.java
index 508398d25..2b31a3e80 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/SimpleMessageHandler.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/SimpleMessageHandler.java
@@ -302,7 +302,7 @@ public class SimpleMessageHandler extends ChannelInboundHandlerAdapter {
checkGroupIdInfo(message, commonAttrMap, attrMap, topicInfo);
topic = topicInfo.get();
-// if(groupId==null)groupId="b_test";//default groupId
+ // if(groupId==null)groupId="b_test";//default groupId
message.setTopic(topic);
commonAttrMap.put(AttributeConstants.NODE_IP, strRemoteIP);
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/SimpleTcpSource.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/SimpleTcpSource.java
index 851d37bb1..32c59fa2c 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/SimpleTcpSource.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/SimpleTcpSource.java
@@ -50,7 +50,9 @@ import org.slf4j.LoggerFactory;
*
*/
public class SimpleTcpSource extends BaseSource
- implements Configurable, EventDrivenSource {
+ implements
+ Configurable,
+ EventDrivenSource {
private static final Logger logger = LoggerFactory.getLogger(SimpleTcpSource.class);
@@ -145,6 +147,7 @@ public class SimpleTcpSource extends BaseSource
}
private class CheckBlackListThread extends Thread {
+
private boolean shutdown = false;
public void shutdouwn() {
@@ -181,7 +184,7 @@ public class SimpleTcpSource extends BaseSource
logger.info("start " + this.getName());
checkBlackListThread = new CheckBlackListThread();
checkBlackListThread.start();
-// ThreadRenamingRunnable.setThreadNameDeterminer(ThreadNameDeterminer.CURRENT);
+ // ThreadRenamingRunnable.setThreadNameDeterminer(ThreadNameDeterminer.CURRENT);
logger.info("Set max workers : {} ;", maxThreads);
@@ -201,7 +204,7 @@ public class SimpleTcpSource extends BaseSource
bootstrap.childOption(ChannelOption.SO_KEEPALIVE, keepAlive);
bootstrap.childOption(ChannelOption.SO_RCVBUF, receiveBufferSize);
bootstrap.childOption(ChannelOption.SO_SNDBUF, sendBufferSize);
-// serverBootstrap.childOption("child.trafficClass", trafficClass);
+ // serverBootstrap.childOption("child.trafficClass", trafficClass);
bootstrap.childOption(ChannelOption.WRITE_BUFFER_HIGH_WATER_MARK, highWaterMark);
bootstrap.channel(EventLoopUtil.getServerSocketChannelClass(workerGroup));
EventLoopUtil.enableTriggeredMode(bootstrap);
@@ -256,7 +259,7 @@ public class SimpleTcpSource extends BaseSource
trafficClass = context.getInteger(ConfigConstants.TRAFFIC_CLASS, TRAFFIC_CLASS_TYPE_0);
Preconditions.checkArgument((trafficClass == TRAFFIC_CLASS_TYPE_0
- || trafficClass == TRAFFIC_CLASS_TYPE_96),
+ || trafficClass == TRAFFIC_CLASS_TYPE_96),
"trafficClass must be == 0 or == 96");
try {
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/SimpleUdpSource.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/SimpleUdpSource.java
index a5dc933a2..404b40f1d 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/SimpleUdpSource.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/SimpleUdpSource.java
@@ -33,8 +33,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class SimpleUdpSource
- extends BaseSource
- implements EventDrivenSource, Configurable {
+ extends
+ BaseSource
+ implements
+ EventDrivenSource,
+ Configurable {
private static final Logger logger = LoggerFactory
.getLogger(SimpleUdpSource.class);
@@ -47,13 +50,13 @@ public class SimpleUdpSource
super();
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
+ @SuppressWarnings({"unchecked", "rawtypes"})
@Override
public void startSource() {
// setup Netty server
logger.info("start " + this.getName());
bootstrap = new Bootstrap();
- logger.info("Set max workers : {} ;",maxThreads);
+ logger.info("Set max workers : {} ;", maxThreads);
bootstrap.channel(NioDatagramChannel.class);
bootstrap.option(ChannelOption.SO_RCVBUF, receiveBufferSize);
bootstrap.option(ChannelOption.SO_SNDBUF, sendBufferSize);
@@ -68,9 +71,9 @@ public class SimpleUdpSource
}
} catch (Exception e) {
logger.error("Simple UDP Source error bind host {} port {}, program will exit!",
- new Object[] { host, port});
+ new Object[]{host, port});
System.exit(-1);
- //throw new FlumeException(e.getMessage());
+ // throw new FlumeException(e.getMessage());
}
ConfigManager.getInstance().addSourceReportInfo(
host, String.valueOf(port), getProtocolName().toUpperCase());
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/tcp/InlongTcpChannelHandler.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/tcp/InlongTcpChannelHandler.java
index 4a1c6f59b..7d9f0d6bb 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/tcp/InlongTcpChannelHandler.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/tcp/InlongTcpChannelHandler.java
@@ -112,12 +112,12 @@ public class InlongTcpChannelHandler extends ChannelInboundHandlerAdapter {
// read version
int version = cb.readShort();
switch (version) {
- case VERSION_1 :
+ case VERSION_1:
// decode version 1
int bodyLength = totalPackLength - VERSION_PARAM_LENGTH;
decodeVersion1(ctx, cb, bodyLength);
break;
- default :
+ default:
this.addMetric(false, 0, null);
throw new Exception("err version, unknown version:" + version);
}
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/tcp/InlongTcpChannelPipelineFactory.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/tcp/InlongTcpChannelPipelineFactory.java
index 95fcb878f..2a01e1625 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/tcp/InlongTcpChannelPipelineFactory.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/tcp/InlongTcpChannelPipelineFactory.java
@@ -39,7 +39,8 @@ import com.google.common.base.Preconditions;
* InlongTcpChannelPipelineFactory
*/
public class InlongTcpChannelPipelineFactory extends ChannelInitializer<SocketChannel>
- implements Configurable {
+ implements
+ Configurable {
public static final Logger LOG = LoggerFactory.getLogger(InlongTcpChannelPipelineFactory.class);
public static final int DEFAULT_LENGTH_FIELD_OFFSET = 0;
@@ -79,7 +80,7 @@ public class InlongTcpChannelPipelineFactory extends ChannelInitializer<SocketCh
try {
Class<? extends ChannelInboundHandlerAdapter> clazz =
(Class<? extends ChannelInboundHandlerAdapter>) Class
- .forName(messageHandlerName);
+ .forName(messageHandlerName);
Constructor<?> ctor = clazz.getConstructor(SourceContext.class);
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/tcp/InlongTcpSource.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/tcp/InlongTcpSource.java
index 1d98aebd9..ae26d3510 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/tcp/InlongTcpSource.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/tcp/InlongTcpSource.java
@@ -40,7 +40,10 @@ import io.netty.channel.ChannelInitializer;
* Inlong tcp source
*/
public class InlongTcpSource extends SimpleTcpSource
- implements Configurable, EventDrivenSource, ProxyServiceMBean {
+ implements
+ Configurable,
+ EventDrivenSource,
+ ProxyServiceMBean {
public static final Logger LOG = LoggerFactory.getLogger(InlongTcpSource.class);
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/utils/DateTimeUtils.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/utils/DateTimeUtils.java
index af98a48e7..5673369dc 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/utils/DateTimeUtils.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/utils/DateTimeUtils.java
@@ -23,8 +23,8 @@ import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
public class DateTimeUtils {
- private static final DateTimeFormatter DATE_FORMATTER
- = DateTimeFormatter.ofPattern("yyyyMMddHHmm");
+
+ private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMddHHmm");
private static final ZoneId defZoneId = ZoneId.systemDefault();
/**
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/utils/EventLoopUtil.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/utils/EventLoopUtil.java
index eda249558..35d6d0630 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/utils/EventLoopUtil.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/utils/EventLoopUtil.java
@@ -60,17 +60,20 @@ public class EventLoopUtil {
public static Class<? extends SocketChannel> getClientSocketChannelClass(EventLoopGroup eventLoopGroup) {
return eventLoopGroup instanceof EpollEventLoopGroup
- ? EpollSocketChannel.class : NioSocketChannel.class;
+ ? EpollSocketChannel.class
+ : NioSocketChannel.class;
}
public static Class<? extends ServerSocketChannel> getServerSocketChannelClass(EventLoopGroup eventLoopGroup) {
return eventLoopGroup instanceof EpollEventLoopGroup
- ? EpollServerSocketChannel.class : NioServerSocketChannel.class;
+ ? EpollServerSocketChannel.class
+ : NioServerSocketChannel.class;
}
public static Class<? extends DatagramChannel> getDatagramChannelClass(EventLoopGroup eventLoopGroup) {
return eventLoopGroup instanceof EpollEventLoopGroup
- ? EpollDatagramChannel.class : NioDatagramChannel.class;
+ ? EpollDatagramChannel.class
+ : NioDatagramChannel.class;
}
public static void enableTriggeredMode(ServerBootstrap bootstrap) {
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/utils/FailoverChannelProcessorHolder.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/utils/FailoverChannelProcessorHolder.java
index 4757bdeda..3ae6b51c4 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/utils/FailoverChannelProcessorHolder.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/utils/FailoverChannelProcessorHolder.java
@@ -20,6 +20,7 @@ package org.apache.inlong.dataproxy.utils;
import org.apache.flume.channel.ChannelProcessor;
public class FailoverChannelProcessorHolder {
+
private static ChannelProcessor channelProcessor;
public static ChannelProcessor getChannelProcessor() {
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/utils/InLongMsgVer.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/utils/InLongMsgVer.java
index c5ca08291..f0430d06a 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/utils/InLongMsgVer.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/utils/InLongMsgVer.java
@@ -18,6 +18,7 @@
package org.apache.inlong.dataproxy.utils;
public enum InLongMsgVer {
+
INLONG_V0(0, "V0", "The inlong-msg V0 format"),
INLONG_V1(1, "V1", "The inlong-msg V1 format");
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/utils/MessageUtils.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/utils/MessageUtils.java
index 970e2dfbb..790b6f8fb 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/utils/MessageUtils.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/utils/MessageUtils.java
@@ -38,6 +38,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class MessageUtils {
+
// log print count
private static final LogCounter logCounter =
new LogCounter(10, 100000, 30 * 1000);
@@ -93,9 +94,9 @@ public class MessageUtils {
* @param msgType the message type
*/
public static void sourceReturnRspPackage(Map<String, String> commonAttrMap,
- Map<String, Object> resultMap,
- Channel remoteChannel,
- MsgType msgType) throws Exception {
+ Map<String, Object> resultMap,
+ Channel remoteChannel,
+ MsgType msgType) throws Exception {
ByteBuf binBuffer;
String origAttrs = null;
final StringBuilder strBuff = new StringBuilder(512);
@@ -155,7 +156,7 @@ public class MessageUtils {
commonAttrMap.get(AttributeConstants.UNIQ_ID));
} else if (MsgType.MSG_BIN_HEARTBEAT.equals(msgType)) {
binBuffer = buildHBRspPackage(destAttrs,
- (Byte)resultMap.get(ConfigConstants.VERSION_TYPE), 0);
+ (Byte) resultMap.get(ConfigConstants.VERSION_TYPE), 0);
} else {
// MsgType.MSG_ACK_SERVICE.equals(msgType)
// MsgType.MSG_ORIGINAL_RETURN.equals(msgType)
@@ -187,8 +188,8 @@ public class MessageUtils {
* @param errMsg error message
*/
public static void sinkReturnRspPackage(SinkRspEvent event,
- DataProxyErrCode errCode,
- String errMsg) {
+ DataProxyErrCode errCode,
+ String errMsg) {
ByteBuf binBuffer;
final StringBuilder strBuff = new StringBuilder(512);
// get and check channel context
diff --git a/inlong-dataproxy/pom.xml b/inlong-dataproxy/pom.xml
index 338ffbcab..998d748fa 100644
--- a/inlong-dataproxy/pom.xml
+++ b/inlong-dataproxy/pom.xml
@@ -17,9 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -27,8 +25,8 @@
<artifactId>inlong</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
- <packaging>pom</packaging>
<artifactId>inlong-dataproxy</artifactId>
+ <packaging>pom</packaging>
<name>Apache InLong - DataProxy</name>
<modules>
@@ -41,13 +39,13 @@
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>tubemq-client</artifactId>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.inlong</groupId>
@@ -159,4 +157,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/inlong-distribution/pom.xml b/inlong-distribution/pom.xml
index 6cb2b1ece..ff85f51d7 100644
--- a/inlong-distribution/pom.xml
+++ b/inlong-distribution/pom.xml
@@ -15,10 +15,8 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -43,10 +41,10 @@
<executions>
<execution>
<id>release</id>
- <phase>package</phase>
<goals>
<goal>single</goal>
</goals>
+ <phase>package</phase>
<configuration>
<descriptors>
<descriptor>src/main/assemblies/release.xml</descriptor>
@@ -55,10 +53,10 @@
</execution>
<execution>
<id>sort-plugin</id>
- <phase>package</phase>
<goals>
<goal>single</goal>
</goals>
+ <phase>package</phase>
<configuration>
<descriptors>
<descriptor>src/main/assemblies/sort-connectors.xml</descriptor>
diff --git a/inlong-manager/manager-client-examples/pom.xml b/inlong-manager/manager-client-examples/pom.xml
index b05e55df5..8c1203de3 100644
--- a/inlong-manager/manager-client-examples/pom.xml
+++ b/inlong-manager/manager-client-examples/pom.xml
@@ -15,10 +15,8 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.inlong</groupId>
@@ -47,4 +45,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/File2IcebergExample.java b/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/File2IcebergExample.java
index 1bb4f6f5f..95596f743 100644
--- a/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/File2IcebergExample.java
+++ b/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/File2IcebergExample.java
@@ -142,7 +142,7 @@ public class File2IcebergExample extends BaseExample {
// field3: decimal column example
IcebergColumnInfo info3 = new IcebergColumnInfo();
info3.setScale(5);
- info3.setPrecision(10); // scale must be less than or equal to precision
+ info3.setPrecision(10); // scale must be less than or equal to precision
field3.setExtParams(JsonUtils.toJsonString(info3));
// field4: hour partition example
diff --git a/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/BaseTest.java b/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/BaseTest.java
index 4c8c122da..1818f657d 100644
--- a/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/BaseTest.java
+++ b/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/BaseTest.java
@@ -143,8 +143,7 @@ public class BaseTest {
hiveSink.setDataPath("hdfs://{ip:port}/usr/hive/warehouse/{db.name}");
hiveSink.setSinkFieldList(Lists.newArrayList(
new SinkField(0, FieldType.INT.toString(), "age", FieldType.INT.toString(), "age"),
- new SinkField(1, FieldType.STRING.toString(), "name", FieldType.STRING.toString(), "name")
- ));
+ new SinkField(1, FieldType.STRING.toString(), "name", FieldType.STRING.toString(), "name")));
hiveSink.setTableName("{table.name}");
hiveSink.setSinkName("{hive.sink.name}");
diff --git a/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/Kafka2HiveTest.java b/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/Kafka2HiveTest.java
index a052ae253..0b0b499fb 100644
--- a/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/Kafka2HiveTest.java
+++ b/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/Kafka2HiveTest.java
@@ -63,51 +63,37 @@ class Kafka2HiveTest extends BaseTest {
stubFor(
get(urlMatching(MANAGER_URL_PREFIX + "/group/exist/test_group009.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(Response.success(false)))
- )
- );
+ okJson(JsonUtils.toJsonString(Response.success(false)))));
stubFor(
post(urlMatching(MANAGER_URL_PREFIX + "/group/save.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(Response.success("test_group009")))
- )
- );
+ okJson(JsonUtils.toJsonString(Response.success("test_group009")))));
stubFor(
get(urlMatching(MANAGER_URL_PREFIX + "/stream/exist/test_group009/test_stream009.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(Response.success(false)))
- )
- );
+ okJson(JsonUtils.toJsonString(Response.success(false)))));
stubFor(
get(urlMatching(MANAGER_URL_PREFIX + "/stream/exist/test_group009/test_stream009.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(Response.success(false)))
- )
- );
+ okJson(JsonUtils.toJsonString(Response.success(false)))));
stubFor(
post(urlMatching(MANAGER_URL_PREFIX + "/stream/save.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(Response.success(6)))
- )
- );
+ okJson(JsonUtils.toJsonString(Response.success(6)))));
stubFor(
post(urlMatching(MANAGER_URL_PREFIX + "/source/save.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(Response.success(6)))
- )
- );
+ okJson(JsonUtils.toJsonString(Response.success(6)))));
stubFor(
post(urlMatching(MANAGER_URL_PREFIX + "/sink/save.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(Response.success(6)))
- )
- );
+ okJson(JsonUtils.toJsonString(Response.success(6)))));
WorkflowResult initWorkflowResult = new WorkflowResult();
initWorkflowResult.setProcessInfo(
@@ -139,10 +125,8 @@ class Kafka2HiveTest extends BaseTest {
+ "\"name\":\"test_stream009\",\"sinkList\":[{\"id\":6,"
+ "\"inlongGroupId\":\"test_group009\",\"inlongStreamId\":\"test_stream009\","
+ "\"sinkType\":\"HIVE\",\"sinkName\":\"{hive.sink.name}\",\"clusterId\":null,"
- + "\"clusterUrl\":null}],\"modifyTime\":\"2022-06-06 02:11:03\"}]}"
- ))
- .build()
- );
+ + "\"clusterUrl\":null}],\"modifyTime\":\"2022-06-06 02:11:03\"}]}"))
+ .build());
initWorkflowResult.setNewTasks(
Lists.newArrayList(
TaskResponse.builder()
@@ -157,15 +141,11 @@ class Kafka2HiveTest extends BaseTest {
.approvers(Lists.newArrayList("admin"))
.status(TaskStatus.PENDING)
.startTime(new Date())
- .build()
- )
- );
+ .build()));
stubFor(
post(urlMatching(MANAGER_URL_PREFIX + "/group/startProcess/test_group009.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(Response.success(initWorkflowResult)))
- )
- );
+ okJson(JsonUtils.toJsonString(Response.success(initWorkflowResult)))));
WorkflowResult startWorkflowResult = new WorkflowResult();
startWorkflowResult.setProcessInfo(
@@ -196,15 +176,12 @@ class Kafka2HiveTest extends BaseTest {
+ "\"inlongStreamId\":\"test_stream011\",\"sinkType\":\"HIVE\","
+ "\"sinkName\":\"{hive.sink.name}\",\"clusterId\":null,\"clusterUrl\":null}],"
+ "\"modifyTime\":\"2022-06-06 08:36:38\"}]}")
- .build()
- );
+ .build());
startWorkflowResult.setNewTasks(new ArrayList<>());
stubFor(
post(urlMatching(MANAGER_URL_PREFIX + "/workflow/approve/12.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(Response.success(startWorkflowResult)))
- )
- );
+ okJson(JsonUtils.toJsonString(Response.success(startWorkflowResult)))));
InlongPulsarInfo pulsarInfo = new InlongPulsarInfo();
pulsarInfo.setId(8);
@@ -229,9 +206,7 @@ class Kafka2HiveTest extends BaseTest {
stubFor(
get(urlMatching(MANAGER_URL_PREFIX + "/group/get/test_group009.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(Response.success(pulsarInfo)))
- )
- );
+ okJson(JsonUtils.toJsonString(Response.success(pulsarInfo)))));
InlongStreamInfo streamInfo = new InlongStreamInfo();
streamInfo.setId(8);
@@ -260,8 +235,7 @@ class Kafka2HiveTest extends BaseTest {
.modifier("admin")
.createTime(new Date())
.modifyTime(new Date())
- .build()
- );
+ .build());
ArrayList<StreamSink> hiveSinks = Lists.newArrayList(
HiveSink.builder()
@@ -298,21 +272,17 @@ class Kafka2HiveTest extends BaseTest {
.fieldComment("name")
.sourceFieldName("name")
.sourceFieldType("STRING")
- .build()
- ))
+ .build()))
.build());
streamInfo.setSourceList(kafkaSources);
streamInfo.setSinkList(hiveSinks);
Response<PageResult<InlongStreamInfo>> fullStreamResponsePage = Response.success(
- new PageResult<>(Lists.newArrayList(streamInfo))
- );
+ new PageResult<>(Lists.newArrayList(streamInfo)));
stubFor(
post(urlMatching(MANAGER_URL_PREFIX + "/stream/listAll.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(fullStreamResponsePage))
- )
- );
+ okJson(JsonUtils.toJsonString(fullStreamResponsePage))));
EventLogResponse eventLogView1 = EventLogResponse.builder()
.id(38)
@@ -347,17 +317,12 @@ class Kafka2HiveTest extends BaseTest {
get(urlMatching(MANAGER_URL_PREFIX + "/workflow/event/list.*"))
.willReturn(
okJson(JsonUtils.toJsonString(Response.success(new PageResult<>(
- Lists.newArrayList(eventLogView1, eventLogView2)
- ))))
- )
- );
+ Lists.newArrayList(eventLogView1, eventLogView2)))))));
stubFor(
get(urlMatching(MANAGER_URL_PREFIX + "/stream/config/log/list.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(Response.success(new PageResult<>())))
- )
- );
+ okJson(JsonUtils.toJsonString(Response.success(new PageResult<>())))));
}
private static KafkaSource createKafkaSource() {
@@ -372,8 +337,7 @@ class Kafka2HiveTest extends BaseTest {
private static List<StreamField> createStreamFields() {
return Lists.newArrayList(
new StreamField(0, FieldType.STRING.toString(), "name", null, null),
- new StreamField(1, FieldType.INT.toString(), "age", null, null)
- );
+ new StreamField(1, FieldType.INT.toString(), "age", null, null));
}
@Test
diff --git a/inlong-manager/manager-client-tools/pom.xml b/inlong-manager/manager-client-tools/pom.xml
index 1cdb57f25..6edd9c80f 100644
--- a/inlong-manager/manager-client-tools/pom.xml
+++ b/inlong-manager/manager-client-tools/pom.xml
@@ -15,16 +15,14 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>inlong-manager</artifactId>
<groupId>org.apache.inlong</groupId>
+ <artifactId>inlong-manager</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>manager-client-tools</artifactId>
<name>Apache InLong - Manager Client Tools</name>
@@ -62,10 +60,10 @@
<executions>
<execution>
<id>copy-dependencies</id>
- <phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
+ <phase>package</phase>
<configuration>
<outputDirectory>target/</outputDirectory>
<includeArtifactIds>jcommander</includeArtifactIds>
@@ -75,4 +73,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/CreateCommand.java b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/CreateCommand.java
index 165293c27..60c722f35 100644
--- a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/CreateCommand.java
+++ b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/CreateCommand.java
@@ -62,9 +62,7 @@ public class CreateCommand extends AbstractCommand {
@Parameter()
private List<String> params;
- @Parameter(names = {"-f", "--file"},
- converter = FileConverter.class,
- description = "json file")
+ @Parameter(names = {"-f", "--file"}, converter = FileConverter.class, description = "json file")
private File file;
@Parameter(names = {"-s"}, description = "optional log string to create file")
diff --git a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/UpdateCommand.java b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/UpdateCommand.java
index 03285814a..342faf5c8 100644
--- a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/UpdateCommand.java
+++ b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/UpdateCommand.java
@@ -66,8 +66,7 @@ public class UpdateCommand extends AbstractCommand {
@Parameter(names = {"--group", "-g"}, required = true, description = "inlong group id")
private String inlongGroupId;
- @Parameter(names = {"-c", "--config"},
- required = true, description = "json file")
+ @Parameter(names = {"-c", "--config"}, required = true, description = "json file")
private File file;
@Override
diff --git a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/util/ParseStatus.java b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/util/ParseStatus.java
index 733a06cdb..fbb4497f3 100644
--- a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/util/ParseStatus.java
+++ b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/util/ParseStatus.java
@@ -29,5 +29,6 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
public @interface ParseStatus {
+
Class<?> clazz();
}
diff --git a/inlong-manager/manager-client/pom.xml b/inlong-manager/manager-client/pom.xml
index 885d31291..fc1c792e9 100644
--- a/inlong-manager/manager-client/pom.xml
+++ b/inlong-manager/manager-client/pom.xml
@@ -15,13 +15,12 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>inlong-manager</artifactId>
<groupId>org.apache.inlong</groupId>
+ <artifactId>inlong-manager</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>manager-client</artifactId>
@@ -102,10 +101,10 @@
<executions>
<execution>
<id>copy-dependencies</id>
- <phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
+ <phase>package</phase>
<configuration>
<outputDirectory>target/</outputDirectory>
<includeArtifactIds>converter-jackson,retrofit</includeArtifactIds>
@@ -115,4 +114,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/InlongStreamBuilder.java b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/InlongStreamBuilder.java
index 5c816f1e8..fa89ada92 100644
--- a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/InlongStreamBuilder.java
+++ b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/InlongStreamBuilder.java
@@ -71,6 +71,3 @@ public abstract class InlongStreamBuilder {
*/
public abstract InlongStream initOrUpdate();
}
-
-
-
diff --git a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongClientImpl.java b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongClientImpl.java
index 2852e0a16..c8f988e44 100644
--- a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongClientImpl.java
+++ b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongClientImpl.java
@@ -164,8 +164,8 @@ public class InlongClientImpl implements InlongClient {
if (CollectionUtils.isNotEmpty(sortStatusInfos)) {
Map<String, SortStatus> sortStatusMap = sortStatusInfos.stream()
.collect(Collectors.toMap(SortStatusInfo::getInlongGroupId, SortStatusInfo::getSortStatus));
- groupStatusMap.forEach((groupId, groupStatusInfo) ->
- groupStatusInfo.setSortStatus(sortStatusMap.getOrDefault(groupId, SortStatus.NOT_EXISTS)));
+ groupStatusMap.forEach((groupId, groupStatusInfo) -> groupStatusInfo
+ .setSortStatus(sortStatusMap.getOrDefault(groupId, SortStatus.NOT_EXISTS)));
}
return groupStatusMap;
diff --git a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongStreamImpl.java b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongStreamImpl.java
index 283331c5d..a592df2ab 100644
--- a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongStreamImpl.java
+++ b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongStreamImpl.java
@@ -102,16 +102,15 @@ public class InlongStreamImpl implements InlongStream {
if (CollectionUtils.isNotEmpty(streamFields)) {
this.streamFields = streamFields.stream()
.map(fieldInfo -> new StreamField(
- fieldInfo.getId(),
- fieldInfo.getFieldType(),
- fieldInfo.getFieldName(),
- fieldInfo.getFieldComment(),
- fieldInfo.getFieldValue(),
- fieldInfo.getIsMetaField(),
- fieldInfo.getMetaFieldName(),
- fieldInfo.getOriginNodeName()
- )
- ).collect(Collectors.toList());
+ fieldInfo.getId(),
+ fieldInfo.getFieldType(),
+ fieldInfo.getFieldName(),
+ fieldInfo.getFieldComment(),
+ fieldInfo.getFieldValue(),
+ fieldInfo.getIsMetaField(),
+ fieldInfo.getMetaFieldName(),
+ fieldInfo.getOriginNodeName()))
+ .collect(Collectors.toList());
}
List<? extends StreamSink> sinkInfos = streamInfo.getSinkList();
@@ -130,8 +129,7 @@ public class InlongStreamImpl implements InlongStream {
(source1, source2) -> {
throw new RuntimeException(String.format("duplicate sourceName: %s in streamId: %s",
source1.getSourceName(), this.inlongStreamId));
- }
- ));
+ }));
}
}
diff --git a/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/impl/InlongStreamImplTest.java b/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/impl/InlongStreamImplTest.java
index 5cb00426e..8b8af536f 100644
--- a/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/impl/InlongStreamImplTest.java
+++ b/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/impl/InlongStreamImplTest.java
@@ -76,12 +76,10 @@ public class InlongStreamImplTest {
JoinMode.INNER_JOIN),
"A", "B");
StreamTransform singleDependencyTransform1 = new SingleDependencyTransform(
- "D", new FilterDefinition(FilterStrategy.REMOVE, Lists.newArrayList()), "C", "E", "F"
- );
+ "D", new FilterDefinition(FilterStrategy.REMOVE, Lists.newArrayList()), "C", "E", "F");
StreamTransform singleDependencyTransform2 = new SingleDependencyTransform(
- "G", new SplitterDefinition(Lists.newArrayList()), "C", "I"
- );
+ "G", new SplitterDefinition(Lists.newArrayList()), "C", "I");
inlongStream.addTransform(multiDependencyTransform);
inlongStream.addTransform(singleDependencyTransform1);
inlongStream.addTransform(singleDependencyTransform2);
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 8918edb26..9f1351307 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
@@ -158,9 +158,7 @@ class ClientFactoryTest {
stubFor(
get(urlMatching("/inlong/manager/api/group/exist/123.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(Response.success(true)))
- )
- );
+ okJson(JsonUtils.toJsonString(Response.success(true)))));
Boolean groupExists = groupClient.isGroupExists("123");
Assertions.assertTrue(groupExists);
}
@@ -180,17 +178,13 @@ class ClientFactoryTest {
.inlongGroupId("1")
.keyName("keyName")
.keyValue("keyValue")
- .build()
- )
- );
+ .build()));
pulsarInfo.setSortConf(flinkSortConf);
stubFor(
get(urlMatching("/inlong/manager/api/group/get/1.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(Response.success(pulsarInfo)))
- )
- );
+ okJson(JsonUtils.toJsonString(Response.success(pulsarInfo)))));
InlongGroupInfo groupInfo = groupClient.getGroupInfo("1");
Assertions.assertTrue(groupInfo instanceof InlongPulsarInfo);
@@ -212,17 +206,13 @@ class ClientFactoryTest {
.inlongStreamId("2")
.sourceType(SourceType.AUTO_PUSH)
.dataProxyGroup("111")
- .build()
- )
- ).build()
- );
+ .build()))
+ .build());
stubFor(
post(urlMatching("/inlong/manager/api/group/list.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(Response.success(new PageResult<>(groupBriefInfos))))
- )
- );
+ okJson(JsonUtils.toJsonString(Response.success(new PageResult<>(groupBriefInfos))))));
PageResult<InlongGroupBriefInfo> pageInfo = groupClient.listGroups("keyword", 1, 1, 10);
Assertions.assertEquals(JsonUtils.toJsonString(groupBriefInfos),
@@ -247,17 +237,13 @@ class ClientFactoryTest {
.user("root")
.password("pwd")
.databaseWhiteList("")
- .build()
- )
- ).build()
- );
+ .build()))
+ .build());
stubFor(
post(urlMatching("/inlong/manager/api/group/list.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(Response.success(new PageResult<>(groupBriefInfos))))
- )
- );
+ okJson(JsonUtils.toJsonString(Response.success(new PageResult<>(groupBriefInfos))))));
PageResult<InlongGroupBriefInfo> pageInfo = groupClient.listGroups("keyword", 1, 1, 10);
Assertions.assertEquals(JsonUtils.toJsonString(groupBriefInfos),
@@ -285,17 +271,13 @@ class ClientFactoryTest {
.status(1)
.agentIp("127.0.0.1")
.pattern("pattern")
- .build()
- )
- ).build()
- );
+ .build()))
+ .build());
stubFor(
post(urlMatching("/inlong/manager/api/group/list.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(Response.success(new PageResult<>(groupBriefInfos))))
- )
- );
+ okJson(JsonUtils.toJsonString(Response.success(new PageResult<>(groupBriefInfos))))));
PageResult<InlongGroupBriefInfo> pageInfo = groupClient.listGroups("keyword", 1, 1, 10);
Assertions.assertEquals(JsonUtils.toJsonString(groupBriefInfos),
@@ -324,18 +306,13 @@ class ClientFactoryTest {
.bootstrapServers("bootstrapServers")
.recordSpeedLimit("recordSpeedLimit")
.primaryKey("primaryKey")
- .build()
- )
- )
- .build()
- );
+ .build()))
+ .build());
stubFor(
post(urlMatching("/inlong/manager/api/group/list.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(Response.success(new PageResult<>(groupBriefInfos))))
- )
- );
+ okJson(JsonUtils.toJsonString(Response.success(new PageResult<>(groupBriefInfos))))));
PageResult<InlongGroupBriefInfo> pageInfo = groupClient.listGroups("keyword", 1, 1, 10);
Assertions.assertEquals(JsonUtils.toJsonString(groupBriefInfos),
@@ -389,8 +366,7 @@ class ClientFactoryTest {
.bootstrapServers("bootstrapServers")
.recordSpeedLimit("recordSpeedLimit")
.primaryKey("primaryKey")
- .build()
- );
+ .build());
List<InlongGroupBriefInfo> groupBriefInfos = Lists.newArrayList(
InlongGroupBriefInfo.builder()
.id(1)
@@ -398,16 +374,12 @@ class ClientFactoryTest {
.name("name")
.inCharges("admin")
.streamSources(streamSources)
- .build()
- );
+ .build());
stubFor(
post(urlMatching("/inlong/manager/api/group/list.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(Response.success(new PageResult<>(groupBriefInfos)))
- )
- )
- );
+ okJson(JsonUtils.toJsonString(Response.success(new PageResult<>(groupBriefInfos))))));
PageResult<InlongGroupBriefInfo> pageInfo = groupClient.listGroups("keyword", 1, 1, 10);
Assertions.assertEquals(JsonUtils.toJsonString(groupBriefInfos),
@@ -420,10 +392,7 @@ class ClientFactoryTest {
post(urlMatching("/inlong/manager/api/group/list.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.fail("Inlong group does not exist/no operation authority"))
- )
- )
- );
+ Response.fail("Inlong group does not exist/no operation authority")))));
PageResult<InlongGroupBriefInfo> pageInfo = groupClient.listGroups("keyword", 1, 1, 10);
Assertions.assertNull(pageInfo);
@@ -434,9 +403,7 @@ class ClientFactoryTest {
stubFor(
post(urlMatching("/inlong/manager/api/group/save.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(Response.success("1111")))
- )
- );
+ okJson(JsonUtils.toJsonString(Response.success("1111")))));
String groupId = groupClient.createGroup(new InlongPulsarRequest());
Assertions.assertEquals("1111", groupId);
@@ -447,9 +414,7 @@ class ClientFactoryTest {
stubFor(
post(urlMatching("/inlong/manager/api/group/update.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(Response.success("1111")))
- )
- );
+ okJson(JsonUtils.toJsonString(Response.success("1111")))));
Pair<String, String> updateGroup = groupClient.updateGroup(new InlongPulsarRequest());
Assertions.assertEquals("1111", updateGroup.getKey());
@@ -467,9 +432,7 @@ class ClientFactoryTest {
get(urlMatching("/inlong/manager/api/group/countByStatus.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(expected))
- ))
- );
+ Response.success(expected)))));
InlongGroupCountResponse actual = groupClient.countGroupByUser();
Assertions.assertEquals(expected.getRejectCount(), actual.getRejectCount());
Assertions.assertEquals(expected.getTotalCount(), actual.getTotalCount());
@@ -491,9 +454,7 @@ class ClientFactoryTest {
get(urlMatching("/inlong/manager/api/group/getTopic/1.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(expected))
- ))
- );
+ Response.success(expected)))));
InlongPulsarTopicInfo actual = (InlongPulsarTopicInfo) groupClient.getTopic("1");
Assertions.assertEquals(expected.getInlongGroupId(), actual.getInlongGroupId());
@@ -507,9 +468,7 @@ class ClientFactoryTest {
stubFor(
post(urlMatching("/inlong/manager/api/stream/save.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(Response.success(11)))
- )
- );
+ okJson(JsonUtils.toJsonString(Response.success(11)))));
Integer groupId = streamClient.createStreamInfo(new InlongStreamInfo());
Assertions.assertEquals(11, groupId);
@@ -520,9 +479,7 @@ class ClientFactoryTest {
stubFor(
get(urlMatching("/inlong/manager/api/stream/exist/123/11.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(Response.success(true)))
- )
- );
+ okJson(JsonUtils.toJsonString(Response.success(true)))));
InlongStreamInfo streamInfo = new InlongStreamInfo();
streamInfo.setInlongGroupId("123");
@@ -551,16 +508,12 @@ class ClientFactoryTest {
.inlongGroupId("123")
.inlongGroupId("11")
.isMetaField(1)
- .build()
- )
- );
+ .build()));
stubFor(
get(urlMatching("/inlong/manager/api/stream/get.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(Response.success(streamInfo)))
- )
- );
+ okJson(JsonUtils.toJsonString(Response.success(streamInfo)))));
InlongStreamInfo streamInfoResult = streamClient.getStreamInfo("123", "11");
Assertions.assertNotNull(streamInfoResult);
@@ -572,9 +525,7 @@ class ClientFactoryTest {
get(urlMatching("/inlong/manager/api/stream/get.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.fail("Inlong stream does not exist/no operation permission")))
- )
- );
+ Response.fail("Inlong stream does not exist/no operation permission")))));
InlongStreamInfo inlongStreamInfo = streamClient.getStreamInfo("123", "11");
Assertions.assertNull(inlongStreamInfo);
@@ -597,9 +548,7 @@ class ClientFactoryTest {
.id(2)
.isMetaField(1)
.fieldFormat("yyyy-MM-dd HH:mm:ss")
- .build()
- )
- );
+ .build()));
ArrayList<StreamSource> sourceList = Lists.newArrayList(
AutoPushSource.builder()
@@ -628,8 +577,7 @@ class ClientFactoryTest {
.sourceType(SourceType.KAFKA)
.autoOffsetReset("11")
.bootstrapServers("127.0.0.1")
- .build()
- );
+ .build());
ArrayList<StreamSink> sinkList = Lists.newArrayList(
HiveSink.builder()
@@ -651,8 +599,7 @@ class ClientFactoryTest {
.sinkType(SinkType.KAFKA)
.id(4)
.bootstrapServers("127.0.0.1")
- .build()
- );
+ .build());
streamInfo.setSourceList(sourceList);
streamInfo.setSinkList(sinkList);
@@ -661,10 +608,7 @@ class ClientFactoryTest {
post(urlMatching("/inlong/manager/api/stream/listAll.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(new PageResult<>(Lists.newArrayList(streamInfo))))
- )
- )
- );
+ Response.success(new PageResult<>(Lists.newArrayList(streamInfo)))))));
List<InlongStreamInfo> streamInfos = streamClient.listStreamInfo("11");
Assertions.assertEquals(JsonUtils.toJsonString(streamInfo), JsonUtils.toJsonString(streamInfos.get(0)));
@@ -713,17 +657,13 @@ class ClientFactoryTest {
.id(7)
.sinkType(SinkType.POSTGRESQL)
.primaryKey("test")
- .build()
- );
+ .build());
stubFor(
get(urlMatching("/inlong/manager/api/sink/list.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(new PageResult<>(Lists.newArrayList(sinkList))))
- )
- )
- );
+ Response.success(new PageResult<>(Lists.newArrayList(sinkList)))))));
List<StreamSink> sinks = sinkClient.listSinks("11", "11");
Assertions.assertEquals(JsonUtils.toJsonString(sinkList), JsonUtils.toJsonString(sinks));
@@ -735,10 +675,7 @@ class ClientFactoryTest {
get(urlMatching("/inlong/manager/api/sink/list.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.fail("groupId should not empty"))
- )
- )
- );
+ Response.fail("groupId should not empty")))));
RuntimeException exception = Assertions.assertThrows(IllegalArgumentException.class,
() -> sinkClient.listSinks("", "11"));
@@ -751,10 +688,7 @@ class ClientFactoryTest {
post(urlMatching("/inlong/manager/api/group/reset.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(true))
- )
- )
- );
+ Response.success(true)))));
boolean isReset = groupClient.resetGroup(new InlongGroupResetRequest());
Assertions.assertTrue(isReset);
@@ -766,10 +700,7 @@ class ClientFactoryTest {
post(urlMatching("/inlong/manager/api/cluster/save.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(1))
- )
- )
- );
+ Response.success(1)))));
ClusterRequest request = new PulsarClusterRequest();
request.setName("pulsar");
request.setClusterTags("test_cluster");
@@ -793,10 +724,7 @@ class ClientFactoryTest {
get(urlMatching("/inlong/manager/api/cluster/get/1.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(cluster))
- )
- )
- );
+ Response.success(cluster)))));
ClusterInfo clusterInfo = clusterClient.get(1);
Assertions.assertEquals(1, clusterInfo.getId());
@@ -825,17 +753,14 @@ class ClientFactoryTest {
Lists.newArrayList(StreamField.builder()
.fieldName("id")
.fieldType("int")
- .build())
- )
+ .build()))
.build();
stubFor(
get(urlMatching("/inlong/manager/api/sink/get/1.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(streamSink))
- ))
- );
+ Response.success(streamSink)))));
StreamSink sinkInfo = sinkClient.getSinkInfo(1);
Assertions.assertEquals(1, sinkInfo.getId());
@@ -848,10 +773,7 @@ class ClientFactoryTest {
post(urlMatching("/inlong/manager/api/cluster/tag/save.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(1))
- )
- )
- );
+ Response.success(1)))));
ClusterTagRequest request = new ClusterTagRequest();
request.setClusterTag("test_cluster");
Integer tagId = clusterClient.saveTag(request);
@@ -870,10 +792,7 @@ class ClientFactoryTest {
get(urlMatching("/inlong/manager/api/cluster/tag/get/1.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(tagResponse))
- )
- )
- );
+ Response.success(tagResponse)))));
ClusterTagResponse clusterTagInfo = clusterClient.getTag(1);
Assertions.assertNotNull(clusterTagInfo);
}
@@ -884,10 +803,7 @@ class ClientFactoryTest {
post(urlMatching("/inlong/manager/api/cluster/bindTag.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(true))
- )
- )
- );
+ Response.success(true)))));
BindTagRequest request = new BindTagRequest();
request.setClusterTag("test_cluster_tag");
Boolean isBind = clusterClient.bindTag(request);
@@ -900,10 +816,7 @@ class ClientFactoryTest {
post(urlMatching("/inlong/manager/api/cluster/node/save.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(1))
- )
- )
- );
+ Response.success(1)))));
ClusterNodeRequest request = new ClusterNodeRequest();
request.setType(ClusterType.PULSAR);
Integer nodeId = clusterClient.saveNode(request);
@@ -922,10 +835,7 @@ class ClientFactoryTest {
get(urlMatching("/inlong/manager/api/cluster/node/get/1.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(response))
- )
- )
- );
+ Response.success(response)))));
ClusterNodeResponse clientNode = clusterClient.getNode(1);
Assertions.assertEquals(1, clientNode.getId());
}
@@ -946,9 +856,7 @@ class ClientFactoryTest {
get(urlMatching("/inlong/manager/api/cluster/node/listByGroupId.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(responses))
- ))
- );
+ Response.success(responses)))));
List<ClusterNodeResponse> clusterNode = clusterClient.listNode(
"1", ClusterType.DATAPROXY, ProtocolType.HTTP);
Assertions.assertEquals(1, clusterNode.size());
@@ -974,9 +882,7 @@ class ClientFactoryTest {
get(urlMatching("/inlong/manager/api/source/get/1.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(streamSource))
- ))
- );
+ Response.success(streamSource)))));
StreamSource sourceInfo = sourceClient.get(1);
Assertions.assertEquals(1, sourceInfo.getId());
Assertions.assertTrue(sourceInfo instanceof MySQLBinlogSource);
@@ -988,9 +894,7 @@ class ClientFactoryTest {
post(urlMatching("/inlong/manager/api/node/save.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(1))
- ))
- );
+ Response.success(1)))));
HiveDataNodeRequest request = new HiveDataNodeRequest();
request.setName("test_hive_node");
Integer nodeId = dataNodeClient.save(request);
@@ -1008,9 +912,7 @@ class ClientFactoryTest {
get(urlMatching("/inlong/manager/api/node/get/1.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(dataNodeInfo))
- ))
- );
+ Response.success(dataNodeInfo)))));
DataNodeInfo nodeInfo = dataNodeClient.get(1);
Assertions.assertEquals(1, nodeInfo.getId());
}
@@ -1022,15 +924,12 @@ class ClientFactoryTest {
.id(1)
.name("test_node")
.type(DataNodeType.HIVE)
- .build()
- );
+ .build());
stubFor(
post(urlMatching("/inlong/manager/api/node/list.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(Response.success(new PageResult<>(nodeResponses))))
- )
- );
+ okJson(JsonUtils.toJsonString(Response.success(new PageResult<>(nodeResponses))))));
HiveDataNodeRequest request = new HiveDataNodeRequest();
request.setName("test_hive_node");
@@ -1044,10 +943,7 @@ class ClientFactoryTest {
post(urlMatching("/inlong/manager/api/node/update.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(true))
- )
- )
- );
+ Response.success(true)))));
HiveDataNodeRequest request = new HiveDataNodeRequest();
request.setId(1);
@@ -1062,10 +958,7 @@ class ClientFactoryTest {
delete(urlMatching("/inlong/manager/api/node/delete/1.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(true))
- )
- )
- );
+ Response.success(true)))));
Boolean isUpdate = dataNodeClient.delete(1);
Assertions.assertTrue(isUpdate);
}
@@ -1076,10 +969,7 @@ class ClientFactoryTest {
post(urlMatching("/inlong/manager/api/user/register.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(1))
- )
- )
- );
+ Response.success(1)))));
UserRequest request = new UserRequest();
request.setName("test_user");
request.setPassword("test_pwd");
@@ -1099,10 +989,7 @@ class ClientFactoryTest {
get(urlMatching("/inlong/manager/api/user/get/1.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(userInfo))
- )
- )
- );
+ Response.success(userInfo)))));
UserInfo info = userClient.getById(1);
Assertions.assertEquals(info.getId(), 1);
}
@@ -1113,10 +1000,7 @@ class ClientFactoryTest {
post(urlMatching("/inlong/manager/api/user/update.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(1))
- )
- )
- );
+ Response.success(1)))));
UserRequest request = new UserRequest();
request.setId(1);
request.setName("test_user");
@@ -1133,10 +1017,7 @@ class ClientFactoryTest {
delete(urlMatching("/inlong/manager/api/user/delete.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(true))
- )
- )
- );
+ Response.success(true)))));
Boolean isDelete = userClient.delete(1);
Assertions.assertTrue(isDelete);
}
diff --git a/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/HeartbeatClientTest.java b/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/HeartbeatClientTest.java
index c6c00bfd8..9f3510da8 100644
--- a/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/HeartbeatClientTest.java
+++ b/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/HeartbeatClientTest.java
@@ -56,10 +56,7 @@ public class HeartbeatClientTest extends ClientFactoryTest {
post(urlMatching("/inlong/manager/api/heartbeat/component/get.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(response))
- )
- )
- );
+ Response.success(response)))));
HeartbeatQueryRequest request = new HeartbeatQueryRequest();
request.setComponent(ComponentTypeEnum.Agent.getType());
@@ -80,10 +77,7 @@ public class HeartbeatClientTest extends ClientFactoryTest {
post(urlMatching("/inlong/manager/api/heartbeat/group/get.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(response))
- )
- )
- );
+ Response.success(response)))));
HeartbeatQueryRequest request = new HeartbeatQueryRequest();
request.setComponent(ComponentTypeEnum.Agent.getType());
@@ -107,10 +101,7 @@ public class HeartbeatClientTest extends ClientFactoryTest {
post(urlMatching("/inlong/manager/api/heartbeat/stream/get.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(response))
- )
- )
- );
+ Response.success(response)))));
HeartbeatQueryRequest request = new HeartbeatQueryRequest();
request.setComponent(ComponentTypeEnum.Agent.getType());
@@ -130,23 +121,18 @@ public class HeartbeatClientTest extends ClientFactoryTest {
ComponentHeartbeatResponse.builder()
.component(ComponentTypeEnum.Agent.getType())
.instance("127.0.0.1")
- .build()
- );
+ .build());
stubFor(
post(urlMatching("/inlong/manager/api/heartbeat/component/list.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(new PageResult<>(responses))
- )
- )
- )
- );
+ Response.success(new PageResult<>(responses))))));
HeartbeatPageRequest request = new HeartbeatPageRequest();
request.setComponent(ComponentTypeEnum.Agent.getType());
PageResult<ComponentHeartbeatResponse> pageResult = heartbeatClient.listComponentHeartbeat(request);
- Assertions.assertEquals(JsonUtils.toJsonString(responses),JsonUtils.toJsonString(pageResult.getList()));
+ Assertions.assertEquals(JsonUtils.toJsonString(responses), JsonUtils.toJsonString(pageResult.getList()));
}
@Test
@@ -155,23 +141,18 @@ public class HeartbeatClientTest extends ClientFactoryTest {
GroupHeartbeatResponse.builder()
.component(ComponentTypeEnum.Agent.getType())
.instance("127.0.0.1")
- .build()
- );
+ .build());
stubFor(
post(urlMatching("/inlong/manager/api/heartbeat/group/list.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(new PageResult<>(responses))
- )
- )
- )
- );
+ Response.success(new PageResult<>(responses))))));
HeartbeatPageRequest request = new HeartbeatPageRequest();
request.setComponent(ComponentTypeEnum.Agent.getType());
PageResult<GroupHeartbeatResponse> pageResult = heartbeatClient.listGroupHeartbeat(request);
- Assertions.assertEquals(JsonUtils.toJsonString(responses),JsonUtils.toJsonString(pageResult.getList()));
+ Assertions.assertEquals(JsonUtils.toJsonString(responses), JsonUtils.toJsonString(pageResult.getList()));
}
@Test
@@ -182,23 +163,18 @@ public class HeartbeatClientTest extends ClientFactoryTest {
.inlongGroupId("test_group")
.inlongStreamId("test_stream")
.instance("127.0.0.1")
- .build()
- );
+ .build());
stubFor(
post(urlMatching("/inlong/manager/api/heartbeat/stream/list.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(new PageResult<>(responses))
- )
- )
- )
- );
+ Response.success(new PageResult<>(responses))))));
HeartbeatPageRequest request = new HeartbeatPageRequest();
request.setComponent(ComponentTypeEnum.Agent.getType());
request.setInlongGroupId("test_group");
PageResult<StreamHeartbeatResponse> pageResult = heartbeatClient.listStreamHeartbeat(request);
- Assertions.assertEquals(JsonUtils.toJsonString(responses),JsonUtils.toJsonString(pageResult.getList()));
+ Assertions.assertEquals(JsonUtils.toJsonString(responses), JsonUtils.toJsonString(pageResult.getList()));
}
}
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 359145181..7dec958a7 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
@@ -54,9 +54,7 @@ public class InlongConsumeClientTest extends ClientFactoryTest {
stubFor(
post(urlMatching("/inlong/manager/api/consume/save.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(Response.success(1)))
- )
- );
+ okJson(JsonUtils.toJsonString(Response.success(1)))));
InlongConsumeRequest request = new ConsumePulsarRequest();
request.setTopic("test_topic");
@@ -75,9 +73,7 @@ public class InlongConsumeClientTest extends ClientFactoryTest {
stubFor(
get(urlMatching("/inlong/manager/api/consume/get/1.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(Response.success(response)))
- )
- );
+ okJson(JsonUtils.toJsonString(Response.success(response)))));
InlongConsumeInfo consumeInfo = consumeClient.get(1);
Assertions.assertEquals(1, consumeInfo.getId());
@@ -95,9 +91,7 @@ public class InlongConsumeClientTest extends ClientFactoryTest {
stubFor(
get(urlMatching("/inlong/manager/api/consume/countStatus.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(Response.success(response)))
- )
- );
+ okJson(JsonUtils.toJsonString(Response.success(response)))));
InlongConsumeCountInfo consumeCountInfo = consumeClient.countStatusByUser();
Assertions.assertEquals(10, consumeCountInfo.getTotalCount());
@@ -111,15 +105,12 @@ public class InlongConsumeClientTest extends ClientFactoryTest {
.mqType(MQType.PULSAR)
.inlongGroupId("test_group_id")
.consumerGroup("test_consume_group")
- .build()
- );
+ .build());
stubFor(
get(urlMatching("/inlong/manager/api/consume/list.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(Response.success(new PageResult<>(responses))))
- )
- );
+ okJson(JsonUtils.toJsonString(Response.success(new PageResult<>(responses))))));
PageResult<InlongConsumeBriefInfo> briefInfoPageResult = consumeClient.list(new InlongConsumePageRequest());
Assertions.assertEquals(JsonUtils.toJsonString(responses),
@@ -131,9 +122,7 @@ public class InlongConsumeClientTest extends ClientFactoryTest {
stubFor(
post(urlMatching("/inlong/manager/api/consume/update.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(Response.success(1)))
- )
- );
+ okJson(JsonUtils.toJsonString(Response.success(1)))));
InlongConsumeRequest request = new ConsumePulsarRequest();
request.setId(1);
@@ -147,9 +136,7 @@ public class InlongConsumeClientTest extends ClientFactoryTest {
stubFor(
delete(urlMatching("/inlong/manager/api/consume/delete/1.*"))
.willReturn(
- okJson(JsonUtils.toJsonString(Response.success(true)))
- )
- );
+ okJson(JsonUtils.toJsonString(Response.success(true)))));
InlongConsumeRequest request = new ConsumePulsarRequest();
request.setId(1);
diff --git a/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/NoAuthClientTest.java b/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/NoAuthClientTest.java
index eb2332ab3..d3d419c8b 100644
--- a/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/NoAuthClientTest.java
+++ b/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/NoAuthClientTest.java
@@ -43,10 +43,7 @@ public class NoAuthClientTest extends ClientFactoryTest {
post(urlMatching("/inlong/manager/api/anno/register.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(1))
- )
- )
- );
+ Response.success(1)))));
UserRequest request = UserRequest.builder()
.name("username")
diff --git a/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/WorkflowApproverClientTest.java b/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/WorkflowApproverClientTest.java
index d32e22649..d6e50d02d 100644
--- a/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/WorkflowApproverClientTest.java
+++ b/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/WorkflowApproverClientTest.java
@@ -49,10 +49,7 @@ class WorkflowApproverClientTest extends ClientFactoryTest {
post(urlMatching("/inlong/manager/api/workflow/approver/save.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(11))
- )
- )
- );
+ Response.success(11)))));
ApproverRequest approverRequest = ApproverRequest.builder()
.processName("test")
.approvers("user1,user2")
@@ -82,11 +79,7 @@ class WorkflowApproverClientTest extends ClientFactoryTest {
.taskName("task2")
.approvers("user1,user2")
.id(2)
- .build()
- ))))
- )
- )
- );
+ .build())))))));
ApproverPageRequest request = ApproverPageRequest.builder()
.processName("process1")
diff --git a/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/WorkflowClientTest.java b/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/WorkflowClientTest.java
index 98fe7b40a..7b5c8305f 100644
--- a/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/WorkflowClientTest.java
+++ b/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/WorkflowClientTest.java
@@ -57,10 +57,7 @@ public class WorkflowClientTest extends ClientFactoryTest {
post(urlMatching("/inlong/manager/api/workflow/start.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(workflowResult))
- )
- )
- );
+ Response.success(workflowResult)))));
WorkflowOperationRequest request = new WorkflowOperationRequest();
request.setName(ProcessName.APPLY_GROUP_PROCESS);
request.setApplicant("test_user");
@@ -79,17 +76,13 @@ public class WorkflowClientTest extends ClientFactoryTest {
ProcessResponse.builder()
.id(1)
.name("test_process")
- .build()
- );
+ .build());
stubFor(
get(urlMatching("/inlong/manager/api/workflow/listProcess.*"))
.willReturn(
okJson(JsonUtils.toJsonString(
- Response.success(new PageResult<>(responses)))
- )
- )
- );
+ Response.success(new PageResult<>(responses))))));
ProcessRequest request = new ProcessRequest();
request.setId(1);
diff --git a/inlong-manager/manager-common/pom.xml b/inlong-manager/manager-common/pom.xml
index a2c31443c..bc197b57a 100644
--- a/inlong-manager/manager-common/pom.xml
+++ b/inlong-manager/manager-common/pom.xml
@@ -15,10 +15,8 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.inlong</groupId>
@@ -94,8 +92,8 @@
<scope>compile</scope>
<exclusions>
<exclusion>
- <artifactId>slf4j-api</artifactId>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/auth/Authentication.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/auth/Authentication.java
index ae428048f..3580b5f26 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/auth/Authentication.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/auth/Authentication.java
@@ -30,6 +30,7 @@ public interface Authentication {
void configure(Map<String, String> properties);
enum AuthType {
+
UNAME_PASSWD,
TOKEN,
SECRET,
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/consts/SourceType.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/consts/SourceType.java
index 93ab42009..4d6d3a4c1 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/consts/SourceType.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/consts/SourceType.java
@@ -42,6 +42,7 @@ public class SourceType {
public static final String REDIS = "REDIS";
public static final Map<String, TaskTypeEnum> SOURCE_TASK_MAP = new HashMap<String, TaskTypeEnum>() {
+
{
put(AUTO_PUSH, null);
put(TUBEMQ, TaskTypeEnum.TUBEMQ);
@@ -55,7 +56,7 @@ public class SourceType {
put(ORACLE, TaskTypeEnum.ORACLE);
put(SQLSERVER, TaskTypeEnum.SQLSERVER);
put(MONGODB, TaskTypeEnum.MONGODB);
- put(REDIS,TaskTypeEnum.REDIS);
+ put(REDIS, TaskTypeEnum.REDIS);
}
};
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/conversion/HoursToMinute.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/conversion/HoursToMinute.java
index 8d6db8358..1e06895ed 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/conversion/HoursToMinute.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/conversion/HoursToMinute.java
@@ -30,4 +30,3 @@ public class HoursToMinute implements ConversionStrategy {
return value * 60;
}
}
-
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/ApplicationEnv.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/ApplicationEnv.java
index ff561eb51..88e768ea3 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/ApplicationEnv.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/ApplicationEnv.java
@@ -28,6 +28,7 @@ import java.util.function.Function;
* ApplicationEnv info
*/
public enum ApplicationEnv {
+
/**
* Development env
*/
@@ -46,8 +47,7 @@ public enum ApplicationEnv {
private static final Map<String, ApplicationEnv> NAME_MAP = InlongCollectionUtils.transformToImmutableMap(
Lists.newArrayList(ApplicationEnv.values()),
ApplicationEnv::name,
- Function.identity()
- );
+ Function.identity());
/**
* Get application environment by name.
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/ClusterType.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/ClusterType.java
index c9fa9db82..2c057641b 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/ClusterType.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/ClusterType.java
@@ -35,6 +35,7 @@ public class ClusterType {
public static final String ELASTICSEARCH = "ELASTICSEARCH";
private static final Set<String> TYPE_SET = new HashSet<String>() {
+
{
add(ClusterType.AGENT);
add(ClusterType.TUBEMQ);
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/SimpleGroupStatus.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/SimpleGroupStatus.java
index 30dbbacc3..88437f3d6 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/SimpleGroupStatus.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/SimpleGroupStatus.java
@@ -117,4 +117,3 @@ public enum SimpleGroupStatus {
}
}
-
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/util/InlongCollectionUtils.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/util/InlongCollectionUtils.java
index c363af4e4..79d434ab8 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/util/InlongCollectionUtils.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/util/InlongCollectionUtils.java
@@ -40,8 +40,8 @@ public class InlongCollectionUtils {
* @return {@link ImmutableMap}
*/
public static <K, V, T> Map<K, V> transformToImmutableMap(Collection<T> originCollection,
- Function<T, K> keyTransformFunction,
- Function<T, V> valueTransformFunction) {
+ Function<T, K> keyTransformFunction,
+ Function<T, V> valueTransformFunction) {
if (CollectionUtils.isEmpty(originCollection)) {
return ImmutableMap.of();
}
@@ -49,9 +49,8 @@ public class InlongCollectionUtils {
Preconditions.checkNotNull(valueTransformFunction, "ValueTransformFunction cannot be null");
ImmutableMap.Builder<K, V> builder = ImmutableMap.builder();
- originCollection.forEach(originObject ->
- builder.put(keyTransformFunction.apply(originObject), valueTransformFunction.apply(originObject))
- );
+ originCollection.forEach(originObject -> builder.put(keyTransformFunction.apply(originObject),
+ valueTransformFunction.apply(originObject)));
return builder.build();
}
}
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/validation/InEnumIntValidator.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/validation/InEnumIntValidator.java
index 0f5b61646..68d969453 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/validation/InEnumIntValidator.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/validation/InEnumIntValidator.java
@@ -52,12 +52,10 @@ public class InEnumIntValidator implements ConstraintValidator<InEnumInt, Intege
context.disableDefaultConstraintViolation();
// Add the error message again
context.buildConstraintViolationWithTemplate(
- context.getDefaultConstraintMessageTemplate()
- .replace("{value}", Joiner.on(",").join(values))
- )
+ context.getDefaultConstraintMessageTemplate()
+ .replace("{value}", Joiner.on(",").join(values)))
.addConstraintViolation();
return false;
}
}
-
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/validation/InEnumStringValidator.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/validation/InEnumStringValidator.java
index d238ca29c..b491d4821 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/validation/InEnumStringValidator.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/validation/InEnumStringValidator.java
@@ -52,11 +52,9 @@ public class InEnumStringValidator implements ConstraintValidator<InEnumString,
context.disableDefaultConstraintViolation();
context.buildConstraintViolationWithTemplate(
context.getDefaultConstraintMessageTemplate()
- .replace("{value}", Joiner.on(",").join(values))
- )
+ .replace("{value}", Joiner.on(",").join(values)))
.addConstraintViolation();
return false;
}
}
-
diff --git a/inlong-manager/manager-dao/pom.xml b/inlong-manager/manager-dao/pom.xml
index 36866219d..6205ea852 100644
--- a/inlong-manager/manager-dao/pom.xml
+++ b/inlong-manager/manager-dao/pom.xml
@@ -15,10 +15,8 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.inlong</groupId>
@@ -56,12 +54,12 @@
<artifactId>druid-spring-boot-starter</artifactId>
<exclusions>
<exclusion>
- <artifactId>spring-boot</artifactId>
<groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot</artifactId>
</exclusion>
<exclusion>
- <artifactId>spring-boot-autoconfigure</artifactId>
<groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-autoconfigure</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -74,12 +72,12 @@
<artifactId>mybatis-spring-boot-starter</artifactId>
<exclusions>
<exclusion>
- <artifactId>spring-boot-autoconfigure</artifactId>
<groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-autoconfigure</artifactId>
</exclusion>
<exclusion>
- <artifactId>spring-boot-starter</artifactId>
<groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -104,6 +102,12 @@
<groupId>org.mybatis.generator</groupId>
<artifactId>mybatis-generator-maven-plugin</artifactId>
<version>1.4.0</version>
+ <configuration>
+ <!-- Output detailed information -->
+ <verbose>true</verbose>
+ <!-- Overwrite file -->
+ <overwrite>true</overwrite>
+ </configuration>
<dependencies>
<dependency>
<groupId>org.postgresql</groupId>
@@ -111,12 +115,6 @@
<version>${postgresql.version}</version>
</dependency>
</dependencies>
- <configuration>
- <!-- Output detailed information -->
- <verbose>true</verbose>
- <!-- Overwrite file -->
- <overwrite>true</overwrite>
- </configuration>
</plugin>
</plugins>
</build>
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/config/JDBCSourceConfig.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/config/JDBCSourceConfig.java
index be60a9139..1b99b5bcc 100644
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/config/JDBCSourceConfig.java
+++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/config/JDBCSourceConfig.java
@@ -35,9 +35,7 @@ import java.util.Objects;
* Main data source config
*/
@Configuration
-@MapperScan(
- basePackages = "org.apache.inlong.manager.dao.mapper",
- sqlSessionTemplateRef = "sqlSessionTemplate")
+@MapperScan(basePackages = "org.apache.inlong.manager.dao.mapper", sqlSessionTemplateRef = "sqlSessionTemplate")
public class JDBCSourceConfig {
@Bean(name = "dataSource")
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/SortSourceConfigEntity.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/SortSourceConfigEntity.java
index 31a4fa09e..a7b821875 100644
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/SortSourceConfigEntity.java
+++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/SortSourceConfigEntity.java
@@ -28,6 +28,7 @@ import java.io.Serializable;
@Data
@Builder
public class SortSourceConfigEntity implements Serializable {
+
private Integer id;
private String clusterName;
private String taskName;
diff --git a/inlong-manager/manager-docker/pom.xml b/inlong-manager/manager-docker/pom.xml
index 4a5856f72..e9330005d 100644
--- a/inlong-manager/manager-docker/pom.xml
+++ b/inlong-manager/manager-docker/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -18,15 +19,15 @@
under the License.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-manager</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>manager-docker</artifactId>
- <modelVersion>4.0.0</modelVersion>
<name>Apache InLong - Manager Docker</name>
<dependencies>
@@ -72,6 +73,14 @@
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<version>${dockerfile.maven.version}</version>
+ <configuration>
+ <repository>${docker.organization}/manager</repository>
+ <pullNewerImage>false</pullNewerImage>
+ <tag>${project.version}</tag>
+ <buildArgs>
+ <VERSION>${project.version}</VERSION>
+ </buildArgs>
+ </configuration>
<executions>
<execution>
<id>default</id>
@@ -91,14 +100,6 @@
</configuration>
</execution>
</executions>
- <configuration>
- <repository>${docker.organization}/manager</repository>
- <pullNewerImage>false</pullNewerImage>
- <tag>${project.version}</tag>
- <buildArgs>
- <VERSION>${project.version}</VERSION>
- </buildArgs>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/inlong-manager/manager-plugins/pom.xml b/inlong-manager/manager-plugins/pom.xml
index 46061f26f..81dd388c8 100644
--- a/inlong-manager/manager-plugins/pom.xml
+++ b/inlong-manager/manager-plugins/pom.xml
@@ -15,10 +15,8 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -107,10 +105,10 @@
<executions>
<execution>
<id>copy-resources</id>
- <phase>prepare-package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
+ <phase>prepare-package</phase>
<configuration>
<outputDirectory>target/plugins</outputDirectory>
<resources>
@@ -125,23 +123,23 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <finalName>plugins</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
<executions>
<execution>
<id>plugins</id>
- <phase>package</phase>
<goals>
<goal>single</goal>
</goals>
+ <phase>package</phase>
</execution>
</executions>
- <configuration>
- <finalName>plugins</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>src/main/assembly/assembly.xml</descriptor>
- </descriptors>
- </configuration>
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/flink/FlinkOperation.java b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/flink/FlinkOperation.java
index 2232606ae..9809652a4 100644
--- a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/flink/FlinkOperation.java
+++ b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/flink/FlinkOperation.java
@@ -94,7 +94,8 @@ public class FlinkOperation {
private String getConnectorJarPattern(String dataSourceType) {
ConnectorJarType connectorJarType = ConnectorJarType.getInstance(dataSourceType);
return connectorJarType == null
- ? ALL_CONNECTOR_JAR_PATTERN : String.format(CONNECTOR_JAR_PATTERN, connectorJarType.getConnectorType());
+ ? ALL_CONNECTOR_JAR_PATTERN
+ : String.format(CONNECTOR_JAR_PATTERN, connectorJarType.getConnectorType());
}
@@ -266,8 +267,8 @@ public class FlinkOperation {
String connectorDir = getConnectorDir(startPath);
Set<String> connectorPaths = nodeTypes.stream().filter(
s -> s.endsWith(InlongConstants.LOAD) || s.endsWith(InlongConstants.EXTRACT)).map(
- s -> FlinkUtils.listFiles(connectorDir, getConnectorJarPattern(s), -1)
- ).flatMap(Collection::stream).collect(Collectors.toSet());
+ s -> FlinkUtils.listFiles(connectorDir, getConnectorJarPattern(s), -1))
+ .flatMap(Collection::stream).collect(Collectors.toSet());
if (CollectionUtils.isEmpty(connectorPaths)) {
String message = String.format("no sort connectors found in %s", connectorDir);
diff --git a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/flink/dto/JarRunRequest.java b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/flink/dto/JarRunRequest.java
index 93721a908..f8f27c243 100644
--- a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/flink/dto/JarRunRequest.java
+++ b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/flink/dto/JarRunRequest.java
@@ -41,5 +41,4 @@ public class JarRunRequest {
private String savepointPath;
-
}
diff --git a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/flink/enums/Constants.java b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/flink/enums/Constants.java
index b652644b9..41a3ae913 100644
--- a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/flink/enums/Constants.java
+++ b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/flink/enums/Constants.java
@@ -22,7 +22,7 @@ package org.apache.inlong.manager.plugin.flink.enums;
*/
public class Constants {
- //properties
+ // properties
public static final String ADDRESS = "flink.rest.address";
public static final String PORT = "flink.rest.port";
@@ -37,7 +37,7 @@ public class Constants {
public static final String METRICS_AUDIT_PROXY_HOSTS = "metrics.audit.proxy.hosts";
- //dataflow
+ // dataflow
public static final String SOURCE_INFO = "source_info";
public static final String SINK_INFO = "sink_info";
@@ -50,7 +50,7 @@ public class Constants {
public static final String RESOURCE_ID = "resource_id";
- //REST API URL
+ // REST API URL
public static final String JOB_URL = "/jobs";
public static final String SUSPEND_URL = "/stop";
diff --git a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/listener/StartupSortListener.java b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/listener/StartupSortListener.java
index 1132e4078..00eb784d2 100644
--- a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/listener/StartupSortListener.java
+++ b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/listener/StartupSortListener.java
@@ -98,8 +98,8 @@ public class StartupSortListener implements SortOperateListener {
Map<String, String> kvConf = extList.stream().filter(v -> StringUtils.isNotEmpty(v.getKeyName())
&& StringUtils.isNotEmpty(v.getKeyValue())).collect(Collectors.toMap(
- InlongGroupExtInfo::getKeyName,
- InlongGroupExtInfo::getKeyValue));
+ InlongGroupExtInfo::getKeyName,
+ InlongGroupExtInfo::getKeyValue));
String sortExt = kvConf.get(InlongConstants.SORT_PROPERTIES);
if (StringUtils.isNotEmpty(sortExt)) {
Map<String, String> result = JsonUtils.OBJECT_MAPPER.convertValue(
diff --git a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/poller/SortStatusPoller.java b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/poller/SortStatusPoller.java
index 386979ecc..fcf806403 100644
--- a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/poller/SortStatusPoller.java
+++ b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/poller/SortStatusPoller.java
@@ -100,8 +100,7 @@ public class SortStatusPoller implements SortPoller {
String sortUrl = kvConf.get(InlongConstants.SORT_URL);
FlinkService flinkService = new FlinkService(sortUrl);
statusInfo.setSortStatus(
- JOB_SORT_STATUS_MAP.getOrDefault(flinkService.getJobStatus(jobId), SortStatus.UNKNOWN)
- );
+ JOB_SORT_STATUS_MAP.getOrDefault(flinkService.getJobStatus(jobId), SortStatus.UNKNOWN));
statusInfos.add(statusInfo);
} catch (Exception e) {
log.error("polling sort status failed for groupId=" + groupId, e);
diff --git a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/util/FlinkConfiguration.java b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/util/FlinkConfiguration.java
index 95761d4fe..c6022cb68 100644
--- a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/util/FlinkConfiguration.java
+++ b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/util/FlinkConfiguration.java
@@ -107,4 +107,3 @@ public class FlinkConfiguration {
}
}
-
diff --git a/inlong-manager/manager-pojo/pom.xml b/inlong-manager/manager-pojo/pom.xml
index 59c71ce8d..1d60e2200 100644
--- a/inlong-manager/manager-pojo/pom.xml
+++ b/inlong-manager/manager-pojo/pom.xml
@@ -15,10 +15,8 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.inlong</groupId>
diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/ClusterTagResponse.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/ClusterTagResponse.java
index 7d9fd7293..a553fb7ba 100644
--- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/ClusterTagResponse.java
+++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/ClusterTagResponse.java
@@ -71,4 +71,3 @@ public class ClusterTagResponse {
private Integer version;
}
-
diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/pulsar/PulsarClusterDTO.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/pulsar/PulsarClusterDTO.java
index b807b7635..d1c93a629 100644
--- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/pulsar/PulsarClusterDTO.java
+++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/pulsar/PulsarClusterDTO.java
@@ -39,8 +39,7 @@ import javax.validation.constraints.NotNull;
@ApiModel("Pulsar cluster info")
public class PulsarClusterDTO {
- @ApiModelProperty(value = "Pulsar admin URL, such as: http://127.0.0.1:8080",
- notes = "Pulsar service URL is the 'url' field of the cluster")
+ @ApiModelProperty(value = "Pulsar admin URL, such as: http://127.0.0.1:8080", notes = "Pulsar service URL is the 'url' field of the cluster")
private String adminUrl;
@ApiModelProperty(value = "Pulsar tenant, default is 'public'")
diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/pulsar/PulsarClusterInfo.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/pulsar/PulsarClusterInfo.java
index 2c4af1440..58049ab66 100644
--- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/pulsar/PulsarClusterInfo.java
+++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/pulsar/PulsarClusterInfo.java
@@ -40,8 +40,7 @@ import org.apache.inlong.manager.pojo.cluster.ClusterInfo;
@ApiModel("Inlong cluster info for Pulsar")
public class PulsarClusterInfo extends ClusterInfo {
- @ApiModelProperty(value = "Pulsar admin URL, such as: http://127.0.0.1:8080",
- notes = "Pulsar service URL is the 'url' field of the cluster")
+ @ApiModelProperty(value = "Pulsar admin URL, such as: http://127.0.0.1:8080", notes = "Pulsar service URL is the 'url' field of the cluster")
private String adminUrl;
@ApiModelProperty(value = "Pulsar tenant, default is 'public'")
diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/pulsar/PulsarClusterRequest.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/pulsar/PulsarClusterRequest.java
index d574efde4..c3d913620 100644
--- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/pulsar/PulsarClusterRequest.java
+++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/pulsar/PulsarClusterRequest.java
@@ -36,8 +36,7 @@ import org.apache.inlong.manager.pojo.cluster.ClusterRequest;
@ApiModel("Inlong cluster request for Pulsar")
public class PulsarClusterRequest extends ClusterRequest {
- @ApiModelProperty(value = "Pulsar admin URL, such as: http://127.0.0.1:8080",
- notes = "Pulsar service URL is the 'url' field of the cluster")
+ @ApiModelProperty(value = "Pulsar admin URL, such as: http://127.0.0.1:8080", notes = "Pulsar service URL is the 'url' field of the cluster")
private String adminUrl;
@ApiModelProperty(value = "Pulsar tenant, default is 'public'")
diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/tubemq/TubeClusterDTO.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/tubemq/TubeClusterDTO.java
index dda32da10..811f850df 100644
--- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/tubemq/TubeClusterDTO.java
+++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/tubemq/TubeClusterDTO.java
@@ -42,8 +42,7 @@ import javax.validation.constraints.NotNull;
public class TubeClusterDTO {
@NotBlank(message = "masterWebUrl cannot be blank")
- @ApiModelProperty(value = "Master Web URL http://120.0.0.1:8080",
- notes = "TubeMQ master RPC URL is the 'url' field of the cluster")
+ @ApiModelProperty(value = "Master Web URL http://120.0.0.1:8080", notes = "TubeMQ master RPC URL is the 'url' field of the cluster")
private String masterWebUrl;
/**
diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/tubemq/TubeClusterInfo.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/tubemq/TubeClusterInfo.java
index 6644dbaa2..b3124681c 100644
--- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/tubemq/TubeClusterInfo.java
+++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/tubemq/TubeClusterInfo.java
@@ -37,8 +37,7 @@ import org.apache.inlong.manager.pojo.cluster.ClusterInfo;
@ApiModel("Inlong cluster info for TubeMQ")
public class TubeClusterInfo extends ClusterInfo {
- @ApiModelProperty(value = "Master Web URL http://120.0.0.1:8080",
- notes = "TubeMQ master RPC URL is the 'url' field of the cluster")
+ @ApiModelProperty(value = "Master Web URL http://120.0.0.1:8080", notes = "TubeMQ master RPC URL is the 'url' field of the cluster")
private String masterWebUrl;
public TubeClusterInfo() {
diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/tubemq/TubeClusterRequest.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/tubemq/TubeClusterRequest.java
index 5c6a6212d..5524a6364 100644
--- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/tubemq/TubeClusterRequest.java
+++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/tubemq/TubeClusterRequest.java
@@ -36,8 +36,7 @@ import org.apache.inlong.manager.pojo.cluster.ClusterRequest;
@ApiModel("Inlong cluster request for TubeMQ")
public class TubeClusterRequest extends ClusterRequest {
- @ApiModelProperty(value = "Master Web URL http://120.0.0.1:8080",
- notes = "TubeMQ master RPC URL is the 'url' field of the cluster")
+ @ApiModelProperty(value = "Master Web URL http://120.0.0.1:8080", notes = "TubeMQ master RPC URL is the 'url' field of the cluster")
private String masterWebUrl;
public TubeClusterRequest() {
diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupApproveRequest.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupApproveRequest.java
index 43dcc4bf9..905647f96 100644
--- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupApproveRequest.java
+++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupApproveRequest.java
@@ -80,8 +80,7 @@ public class InlongGroupApproveRequest {
@ApiModelProperty(value = "Data report type, default is 0.\n"
+ " 0: report to DataProxy and respond when the DataProxy received data.\n"
+ " 1: report to DataProxy and respond after DataProxy sends data.\n"
- + " 2: report to MQ and respond when the MQ received data.",
- notes = "Current constraint is that all InLong Agents under one InlongGroup use the same type")
+ + " 2: report to MQ and respond when the MQ received data.", notes = "Current constraint is that all InLong Agents under one InlongGroup use the same type")
private Integer dataReportType = 0;
}
diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupInfo.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupInfo.java
index b255a9fd7..3a31e82c8 100644
--- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupInfo.java
+++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupInfo.java
@@ -62,8 +62,7 @@ public abstract class InlongGroupInfo extends BaseInlongGroup {
@ApiModelProperty(value = "MQ type, high throughput: TUBEMQ, high consistency: PULSAR")
private String mqType;
- @ApiModelProperty(value = "MQ resource",
- notes = "in inlong group, TubeMQ corresponds to Topic, Pulsar corresponds to Namespace")
+ @ApiModelProperty(value = "MQ resource", notes = "in inlong group, TubeMQ corresponds to Topic, Pulsar corresponds to Namespace")
private String mqResource;
@ApiModelProperty(value = "Whether to enable zookeeper? 0: disable, 1: enable")
@@ -78,8 +77,7 @@ public abstract class InlongGroupInfo extends BaseInlongGroup {
@ApiModelProperty(value = "Data report type, default is 0.\n"
+ " 0: report to DataProxy and respond when the DataProxy received data.\n"
+ " 1: report to DataProxy and respond after DataProxy sends data.\n"
- + " 2: report to MQ and respond when the MQ received data.",
- notes = "Current constraint is that all InLong Agents under one InlongGroup use the same type")
+ + " 2: report to MQ and respond when the MQ received data.", notes = "Current constraint is that all InLong Agents under one InlongGroup use the same type")
private Integer dataReportType = 0;
@ApiModelProperty(value = "Inlong cluster tag, which links to inlong_cluster table")
diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupRequest.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupRequest.java
index d4df45763..dfa95d31a 100644
--- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupRequest.java
... 46379 lines suppressed ...