From cd406992939916dbcbf5ce97637a7033a4496276 Mon Sep 17 00:00:00 2001 From: Logic Date: Wed, 25 Feb 2026 09:49:52 +0800 Subject: [PATCH] refactor: Split hertzbeat-common into core and spring modules (#4035) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: zqr10159 <30048352+zqr10159@users.noreply.github.com> Co-authored-by: Tomsun28 --- .github/workflows/backend-build-test.yml | 4 +- hertzbeat-ai/pom.xml | 2 +- hertzbeat-base/pom.xml | 2 +- .../hertzbeat-collector-common/pom.xml | 2 +- hertzbeat-collector/pom.xml | 2 +- .../pom.xml | 87 ++++------ .../apache/arrow/vector/table/ArrowTable.java | 0 .../common/cache/CommonCacheService.java | 0 .../common/constants/AiConstants.java | 0 .../common/constants/AiTypeEnum.java | 0 .../constants/CollectCodeConstants.java | 0 .../common/constants/CommonConstants.java | 0 .../common/constants/ConfigConstants.java | 0 .../common/constants/DataQueueConstants.java | 0 .../common/constants/ExportFileConstants.java | 0 .../constants/GeneralConfigTypeEnum.java | 0 .../constants/HertzBeatKeywordsEnum.java | 0 .../constants/ImExportTaskConstant.java | 0 .../constants/ImportTaskStatusEnum.java | 0 .../common/constants/JexlKeywordsEnum.java | 0 .../constants/ManagerEventTypeEnum.java | 0 .../common/constants/MetricDataConstants.java | 0 .../common/constants/NetworkConstants.java | 0 .../common/constants/NotifyLevelEnum.java | 0 .../common/constants/PluginType.java | 0 .../common/constants/SignConstants.java | 0 .../common/constants/SmsConstants.java | 0 .../hertzbeat/common/constants/ThemeEnum.java | 0 .../common/entity/arrow/ArrowCell.java | 0 .../entity/arrow/DefaultMetadataReader.java | 0 .../common/entity/arrow/MetadataReader.java | 0 .../common/entity/arrow/RowWrapper.java | 0 .../common/entity/dto/AlertReport.java | 0 .../common/entity/dto/CollectorInfo.java | 0 .../hertzbeat/common/entity/dto/Field.java | 0 .../common/entity/dto/ImportTaskMessage.java | 2 +- .../common/entity/dto/MailServerConfig.java | 0 .../common/entity/dto/ManagerMessage.java | 0 .../hertzbeat/common/entity/dto/Message.java | 0 .../common/entity/dto/MetricsData.java | 0 .../common/entity/dto/MetricsHistoryData.java | 0 .../entity/dto/ModelProviderConfig.java | 0 .../common/entity/dto/PromVectorOrMatrix.java | 0 .../common/entity/dto/ServerInfo.java | 0 .../hertzbeat/common/entity/dto/Value.java | 0 .../hertzbeat/common/entity/dto/ValueRow.java | 0 .../entity/dto/query/DatasourceQuery.java | 0 .../entity/dto/query/DatasourceQueryData.java | 0 .../entity/dto/sms/AlibabaSmsProperties.java | 0 .../entity/dto/sms/AwsSmsProperties.java | 0 .../entity/dto/sms/SmslocalSmsProperties.java | 0 .../entity/dto/sms/TencentSmsProperties.java | 0 .../entity/dto/sms/TwilioSmsProperties.java | 0 .../entity/dto/sms/UniSmsProperties.java | 0 .../common/entity/job/Configmap.java | 0 .../common/entity/job/SshTunnel.java | 0 .../job/protocol/CommonRequestProtocol.java | 0 .../entity/job/protocol/ConsulSdProtocol.java | 0 .../entity/job/protocol/DnsProtocol.java | 0 .../entity/job/protocol/DnsSdProtocol.java | 0 .../entity/job/protocol/EurekaSdProtocol.java | 0 .../entity/job/protocol/FtpProtocol.java | 0 .../entity/job/protocol/HttpProtocol.java | 0 .../entity/job/protocol/HttpSdProtocol.java | 0 .../entity/job/protocol/IcmpProtocol.java | 0 .../entity/job/protocol/ImapProtocol.java | 0 .../entity/job/protocol/IpmiProtocol.java | 0 .../entity/job/protocol/JdbcProtocol.java | 0 .../entity/job/protocol/JmxProtocol.java | 0 .../entity/job/protocol/KafkaProtocol.java | 0 .../job/protocol/MemcachedProtocol.java | 0 .../entity/job/protocol/ModbusProtocol.java | 0 .../entity/job/protocol/MongodbProtocol.java | 0 .../entity/job/protocol/MqttProtocol.java | 0 .../entity/job/protocol/NacosSdProtocol.java | 0 .../job/protocol/NebulaGraphProtocol.java | 0 .../entity/job/protocol/NginxProtocol.java | 0 .../entity/job/protocol/NgqlProtocol.java | 0 .../entity/job/protocol/NtpProtocol.java | 0 .../entity/job/protocol/PlcProtocol.java | 0 .../entity/job/protocol/Pop3Protocol.java | 0 .../job/protocol/PrometheusProtocol.java | 0 .../common/entity/job/protocol/Protocol.java | 0 .../entity/job/protocol/PushProtocol.java | 0 .../entity/job/protocol/RedfishProtocol.java | 0 .../entity/job/protocol/RedisProtocol.java | 0 .../entity/job/protocol/RegistryProtocol.java | 0 .../entity/job/protocol/RocketmqProtocol.java | 0 .../entity/job/protocol/S7Protocol.java | 0 .../entity/job/protocol/ScriptProtocol.java | 0 .../entity/job/protocol/SmtpProtocol.java | 0 .../entity/job/protocol/SnmpProtocol.java | 0 .../entity/job/protocol/SshProtocol.java | 0 .../entity/job/protocol/TelnetProtocol.java | 0 .../entity/job/protocol/UdpProtocol.java | 0 .../job/protocol/WebsocketProtocol.java | 0 .../job/protocol/ZookeeperSdProtocol.java | 0 .../hertzbeat/common/entity/log/LogEntry.java | 0 .../common/entity/message/ClusterMsg.java | 0 .../common/entity/message/CollectRep.java | 2 +- .../common/entity/plugin/PluginContext.java | 0 .../common/entity/sd/ConnectionConfig.java | 0 .../sd/EurekaDiscoveryResponseEntity.java | 0 .../sd/ServiceDiscoveryResponseEntity.java | 0 .../common/queue/CommonDataQueue.java | 0 .../serialize/KafkaLogEntryDeserializer.java | 0 .../serialize/KafkaLogEntrySerializer.java | 0 .../KafkaMetricsDataDeserializer.java | 0 .../serialize/KafkaMetricsDataSerializer.java | 0 .../common/serialize/RedisLogEntryCodec.java | 0 .../serialize/RedisMetricsDataCodec.java | 0 .../common/timer/HashedWheelTimer.java | 0 .../hertzbeat/common/timer/Timeout.java | 0 .../apache/hertzbeat/common/timer/Timer.java | 0 .../hertzbeat/common/timer/TimerTask.java | 0 .../apache/hertzbeat/common/util/AesUtil.java | 0 .../hertzbeat/common/util/ArrowUtil.java | 0 .../hertzbeat/common/util/BackoffUtils.java | 0 .../hertzbeat/common/util/Base64Util.java | 0 .../hertzbeat/common/util/CommonUtil.java | 0 .../common/util/ExponentialBackoff.java | 0 .../common/util/HertzBeatKeywordsUtil.java | 0 .../common/util/IntervalExpressionUtil.java | 0 .../hertzbeat/common/util/IpDomainUtil.java | 152 ++++++++++++++++++ .../common/util/JexlCheckerUtil.java | 0 .../common/util/JexlCommonFunction.java | 0 .../common/util/JexlExpressionRunner.java | 0 .../hertzbeat/common/util/JsonUtil.java | 7 +- .../apache/hertzbeat/common/util/LogUtil.java | 0 .../hertzbeat/common/util/LruHashMap.java | 0 .../hertzbeat/common/util/MapCapUtil.java | 0 .../hertzbeat/common/util/NetworkUtil.java | 0 .../apache/hertzbeat/common/util/Pair.java | 0 .../hertzbeat/common/util/ProtoJsonUtil.java | 0 .../common/util/SnowFlakeIdGenerator.java | 0 .../common/util/SnowFlakeIdWorker.java | 0 .../hertzbeat/common/util/StrBuffer.java | 0 .../apache/hertzbeat/common/util/StrUtil.java | 0 .../hertzbeat/common/util/TimePeriodUtil.java | 0 .../hertzbeat/common/util/TimeZoneUtil.java | 0 .../common/util/export/ExcelExportUtils.java | 8 +- .../common/util/export/YamlExportUtils.java | 0 .../src/main/message/cluster_msg.proto | 2 +- .../arrow/vector/table/ArrowTableTest.java | 0 .../common/entity/message/CollectRepTest.java | 0 .../entity/plugin/PluginContextTest.java | 0 .../KafkaLogEntryDeserializerTest.java | 0 .../KafkaLogEntrySerializerTest.java | 0 .../KafkaMetricsDataDeserializerTest.java | 0 .../KafkaMetricsDataSerializerTest.java | 0 .../serialize/RedisLogEntryCodecTest.java | 0 .../hertzbeat/common/util/AesUtilTest.java | 0 .../hertzbeat/common/util/ArrowUtilTest.java | 0 .../common/util/BackoffUtilsTest.java | 0 .../hertzbeat/common/util/Base64UtilTest.java | 0 .../util/ChineseCharacterCheckTest.java | 0 .../hertzbeat/common/util/CommonUtilTest.java | 0 .../common/util/ExponentialBackoffTest.java | 0 .../util/HertzBeatKeywordsUtilTest.java | 0 .../util/IntervalExpressionUtilTest.java | 0 .../common/util/IpDomainUtilTest.java | 0 .../common/util/JexlExpressionRunnerTest.java | 0 .../hertzbeat/common/util/JexlTest.java | 0 .../hertzbeat/common/util/JsonUtilTest.java | 0 .../hertzbeat/common/util/LogUtilTest.java | 0 .../hertzbeat/common/util/LruHashMapTest.java | 0 .../hertzbeat/common/util/MapCapUtilTest.java | 0 .../common/util/NetworkUtilTest.java | 0 .../hertzbeat/common/util/PairTest.java | 0 .../common/util/ProtoJsonUtilTest.java | 0 .../common/util/SnowFlakeIdGeneratorTest.java | 0 .../hertzbeat/common/util/StrBufferTest.java | 0 .../hertzbeat/common/util/StrUtilTest.java | 0 .../common/util/TimePeriodUtilTest.java | 0 .../common/util/TimeZoneUtilTest.java | 0 .../common/util/entity/PersonTest.java | 0 .../src/test/proto/person.proto | 0 hertzbeat-common-spring/pom.xml | 88 ++++++++++ .../hertzbeat/common/cache/CacheFactory.java | 0 .../cache/CaffeineCacheServiceImpl.java | 0 .../common/config/BaseKafkaProperties.java | 0 .../hertzbeat/common/config/CommonConfig.java | 0 .../common/config/CommonProperties.java | 0 .../common/config/EclipseLinkCustomizer.java | 0 .../config/EclipseLinkJpaConfiguration.java | 0 .../common/entity/ai/ChatConversation.java | 0 .../common/entity/ai/ChatMessage.java | 0 .../common/entity/alerter/AlertDefine.java | 0 .../alerter/AlertDefineMonitorBind.java | 0 .../entity/alerter/AlertGroupConverge.java | 0 .../common/entity/alerter/AlertInhibit.java | 0 .../common/entity/alerter/AlertSilence.java | 0 .../common/entity/alerter/GroupAlert.java | 0 .../alerter/JsonMapAttributeConverter.java | 0 .../common/entity/alerter/NoticeReceiver.java | 0 .../common/entity/alerter/NoticeRule.java | 0 .../common/entity/alerter/NoticeTemplate.java | 0 .../common/entity/alerter/SingleAlert.java | 0 .../common/entity/dto/CollectorSummary.java | 0 .../common/entity/dto/PluginUpload.java | 0 .../common/entity/dto/sms/SmsConfig.java | 0 .../entity/grafana/GrafanaDashboard.java | 0 .../common/entity/job/Configmap.java | 54 +++++++ .../hertzbeat/common/entity/job/Job.java | 0 .../hertzbeat/common/entity/job/Metrics.java | 0 .../common/entity/job/SshTunnel.java | 80 +++++++++ .../common/entity/manager/Bulletin.java | 0 .../common/entity/manager/Collector.java | 0 .../entity/manager/CollectorMonitorBind.java | 0 .../common/entity/manager/Define.java | 0 .../common/entity/manager/GeneralConfig.java | 0 .../JsonByteListAttributeConverter.java | 0 .../JsonLongListAttributeConverter.java | 0 .../JsonMapListAttributeConverter.java | 0 .../JsonOptionListAttributeConverter.java | 0 .../JsonStringListAttributeConverter.java | 0 .../common/entity/manager/Label.java | 0 .../entity/manager/MetricsFavorite.java | 0 .../common/entity/manager/Monitor.java | 0 .../common/entity/manager/MonitorBind.java | 0 .../common/entity/manager/Param.java | 0 .../common/entity/manager/ParamDefine.java | 0 .../common/entity/manager/PluginItem.java | 0 .../common/entity/manager/PluginMetadata.java | 0 .../entity/manager/StatusPageComponent.java | 0 .../entity/manager/StatusPageHistory.java | 0 .../entity/manager/StatusPageIncident.java | 0 .../StatusPageIncidentComponentBind.java | 0 .../manager/StatusPageIncidentContent.java | 0 .../common/entity/manager/StatusPageOrg.java | 0 .../ZonedDateTimeAttributeConverter.java | 0 .../common/entity/plugin/PluginConfig.java | 0 .../common/entity/push/PushMetrics.java | 0 .../common/entity/push/PushMetricsDto.java | 0 .../common/entity/warehouse/History.java | 0 .../queue/impl/InMemoryCommonDataQueue.java | 0 .../queue/impl/KafkaCommonDataQueue.java | 0 .../queue/impl/RedisCommonDataQueue.java | 0 .../common/support/CommonThreadPool.java | 0 .../support/ResourceBundleUtf8Control.java | 0 .../common/support/SpringContextHolder.java | 0 .../event/AiProviderConfigChangeEvent.java | 0 .../support/event/MonitorDeletedEvent.java | 0 .../support/event/SmsConfigChangeEvent.java | 0 .../event/SystemConfigChangeEvent.java | 0 .../exception/AlertExpressionException.java | 0 .../CommonDataQueueUnknownException.java | 0 .../support/exception/CommonException.java | 0 .../exception/ExpressionVisitorException.java | 0 .../support/exception/IgnoreException.java | 0 .../exception/SendMessageException.java | 0 .../support/valid/EmailParamValidator.java | 0 .../common/support/valid/EmailValid.java | 0 .../support/valid/HostParamValidator.java | 0 .../common/support/valid/HostValid.java | 0 .../support/valid/PhoneNumParamValidator.java | 0 .../common/support/valid/PhoneNumValid.java | 0 .../support/valid/SqlSecurityException.java | 0 .../support/valid/SqlSecurityValidator.java | 0 .../hertzbeat/common/util/FileUtil.java | 0 .../hertzbeat/common/util/IpDomainUtil.java | 0 .../common/util/ResourceBundleUtil.java | 0 .../hertzbeat/common/util/ResponseUtil.java | 0 .../apache/hertzbeat/common/util/XmlUtil.java | 0 ...ot.autoconfigure.AutoConfiguration.imports | 0 .../common/cache/CacheFactoryTest.java | 0 .../common/cache/CaffeineCacheTest.java | 0 .../entity/manager/MetricsFavoriteTest.java | 0 .../impl/InMemoryCommonDataQueueTest.java | 0 .../queue/impl/KafkaCommonDataQueueTest.java | 0 .../queue/impl/RedisCommonDataQueueTest.java | 0 .../common/support/CommonThreadPoolTest.java | 0 .../ResourceBundleUtf8ControlTest.java | 0 .../support/SpringContextHolderTest.java | 0 .../vaild/EmailParamValidatorTest.java | 0 .../support/vaild/HostParamValidatorTest.java | 0 .../vaild/PhoneNumParamValidatorTest.java | 0 .../valid/SqlSecurityValidatorTest.java | 0 .../hertzbeat/common/util/FileUtilTest.java | 0 .../common/util/ResourceBundleUtilTest.java | 0 .../common/util/ResponseUtilTest.java | 0 .../src/test/resources/msg.properties | 0 .../src/test/resources/msg_en.properties | 0 .../hertzbeat-collector-basic-e2e/pom.xml | 8 +- .../hertzbeat-collector-kafka-e2e/pom.xml | 4 +- hertzbeat-e2e/hertzbeat-log-e2e/pom.xml | 12 +- hertzbeat-e2e/pom.xml | 4 +- hertzbeat-manager/pom.xml | 4 +- hertzbeat-otel/pom.xml | 2 +- hertzbeat-plugin/pom.xml | 2 +- hertzbeat-remoting/pom.xml | 2 +- hertzbeat-startup/pom.xml | 2 +- hertzbeat-warehouse/pom.xml | 2 +- pom.xml | 20 ++- 294 files changed, 461 insertions(+), 95 deletions(-) rename {hertzbeat-common => hertzbeat-common-core}/pom.xml (81%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/arrow/vector/table/ArrowTable.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/cache/CommonCacheService.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/constants/AiConstants.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/constants/AiTypeEnum.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/constants/CollectCodeConstants.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/constants/CommonConstants.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/constants/ConfigConstants.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/constants/DataQueueConstants.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/constants/ExportFileConstants.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/constants/GeneralConfigTypeEnum.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/constants/HertzBeatKeywordsEnum.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/constants/ImExportTaskConstant.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/constants/ImportTaskStatusEnum.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/constants/JexlKeywordsEnum.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/constants/ManagerEventTypeEnum.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/constants/MetricDataConstants.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/constants/NetworkConstants.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/constants/NotifyLevelEnum.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/constants/PluginType.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/constants/SignConstants.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/constants/SmsConstants.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/constants/ThemeEnum.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/arrow/ArrowCell.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/arrow/DefaultMetadataReader.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/arrow/MetadataReader.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/arrow/RowWrapper.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/dto/AlertReport.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/dto/CollectorInfo.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/dto/Field.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/dto/ImportTaskMessage.java (98%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/dto/MailServerConfig.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/dto/ManagerMessage.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/dto/Message.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsData.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsHistoryData.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/dto/ModelProviderConfig.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/dto/PromVectorOrMatrix.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/dto/ServerInfo.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/dto/Value.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/dto/ValueRow.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/dto/query/DatasourceQuery.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/dto/query/DatasourceQueryData.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/AlibabaSmsProperties.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/AwsSmsProperties.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/SmslocalSmsProperties.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/TencentSmsProperties.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/TwilioSmsProperties.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/UniSmsProperties.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/Configmap.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/SshTunnel.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/CommonRequestProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ConsulSdProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/DnsProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/DnsSdProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/EurekaSdProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/FtpProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/HttpProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/HttpSdProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/IcmpProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ImapProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/IpmiProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/JdbcProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/JmxProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/KafkaProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MemcachedProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ModbusProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MongodbProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MqttProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NacosSdProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NebulaGraphProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NginxProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NgqlProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NtpProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PlcProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/Pop3Protocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PrometheusProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/Protocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PushProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RedfishProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RedisProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RegistryProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RocketmqProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/S7Protocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ScriptProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SmtpProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SnmpProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SshProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/TelnetProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/UdpProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/WebsocketProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ZookeeperSdProtocol.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/log/LogEntry.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/message/ClusterMsg.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/message/CollectRep.java (99%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/plugin/PluginContext.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/sd/ConnectionConfig.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/sd/EurekaDiscoveryResponseEntity.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/entity/sd/ServiceDiscoveryResponseEntity.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/queue/CommonDataQueue.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/serialize/KafkaLogEntryDeserializer.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/serialize/KafkaLogEntrySerializer.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataDeserializer.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataSerializer.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/serialize/RedisLogEntryCodec.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/serialize/RedisMetricsDataCodec.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/timer/HashedWheelTimer.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/timer/Timeout.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/timer/Timer.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/timer/TimerTask.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/util/AesUtil.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/util/ArrowUtil.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/util/BackoffUtils.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/util/Base64Util.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/util/CommonUtil.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/util/ExponentialBackoff.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/util/HertzBeatKeywordsUtil.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/util/IntervalExpressionUtil.java (100%) create mode 100644 hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/IpDomainUtil.java rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/util/JexlCheckerUtil.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/util/JexlCommonFunction.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/util/JexlExpressionRunner.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/util/JsonUtil.java (96%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/util/LogUtil.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/util/LruHashMap.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/util/MapCapUtil.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/util/NetworkUtil.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/util/Pair.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/util/ProtoJsonUtil.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdGenerator.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdWorker.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/util/StrBuffer.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/util/StrUtil.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/util/TimePeriodUtil.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/util/TimeZoneUtil.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/util/export/ExcelExportUtils.java (95%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/java/org/apache/hertzbeat/common/util/export/YamlExportUtils.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/main/message/cluster_msg.proto (98%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/arrow/vector/table/ArrowTableTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/entity/message/CollectRepTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/entity/plugin/PluginContextTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/serialize/KafkaLogEntryDeserializerTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/serialize/KafkaLogEntrySerializerTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataDeserializerTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataSerializerTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/serialize/RedisLogEntryCodecTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/util/AesUtilTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/util/ArrowUtilTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/util/BackoffUtilsTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/util/Base64UtilTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/util/ChineseCharacterCheckTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/util/CommonUtilTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/util/ExponentialBackoffTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/util/HertzBeatKeywordsUtilTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/util/IntervalExpressionUtilTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/util/IpDomainUtilTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/util/JexlExpressionRunnerTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/util/JexlTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/util/JsonUtilTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/util/LogUtilTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/util/LruHashMapTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/util/MapCapUtilTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/util/NetworkUtilTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/util/PairTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/util/ProtoJsonUtilTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/util/SnowFlakeIdGeneratorTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/util/StrBufferTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/util/StrUtilTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/util/TimePeriodUtilTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/util/TimeZoneUtilTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/java/org/apache/hertzbeat/common/util/entity/PersonTest.java (100%) rename {hertzbeat-common => hertzbeat-common-core}/src/test/proto/person.proto (100%) create mode 100644 hertzbeat-common-spring/pom.xml rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/cache/CacheFactory.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/cache/CaffeineCacheServiceImpl.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/config/BaseKafkaProperties.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/config/CommonConfig.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/config/CommonProperties.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkCustomizer.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkJpaConfiguration.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/ai/ChatConversation.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/ai/ChatMessage.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefine.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefineMonitorBind.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertGroupConverge.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertInhibit.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertSilence.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/alerter/GroupAlert.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/alerter/JsonMapAttributeConverter.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/alerter/NoticeReceiver.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/alerter/NoticeRule.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/alerter/NoticeTemplate.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/alerter/SingleAlert.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/dto/CollectorSummary.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/dto/PluginUpload.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/SmsConfig.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/grafana/GrafanaDashboard.java (100%) create mode 100644 hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/job/Configmap.java rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/job/Job.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/job/Metrics.java (100%) create mode 100644 hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/job/SshTunnel.java rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/manager/Bulletin.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/manager/Collector.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/manager/CollectorMonitorBind.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/manager/Define.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/manager/GeneralConfig.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonByteListAttributeConverter.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonLongListAttributeConverter.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonMapListAttributeConverter.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonOptionListAttributeConverter.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonStringListAttributeConverter.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/manager/Label.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/manager/MetricsFavorite.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/manager/Monitor.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/manager/MonitorBind.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/manager/Param.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/manager/ParamDefine.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/manager/PluginItem.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/manager/PluginMetadata.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageComponent.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageHistory.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncident.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentComponentBind.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentContent.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageOrg.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/manager/ZonedDateTimeAttributeConverter.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/plugin/PluginConfig.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetrics.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetricsDto.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/entity/warehouse/History.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/queue/impl/InMemoryCommonDataQueue.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/queue/impl/KafkaCommonDataQueue.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/queue/impl/RedisCommonDataQueue.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/support/CommonThreadPool.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8Control.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/support/SpringContextHolder.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/support/event/AiProviderConfigChangeEvent.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/support/event/MonitorDeletedEvent.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/support/event/SmsConfigChangeEvent.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/support/event/SystemConfigChangeEvent.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/support/exception/AlertExpressionException.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/support/exception/CommonDataQueueUnknownException.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/support/exception/CommonException.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/support/exception/ExpressionVisitorException.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/support/exception/IgnoreException.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/support/exception/SendMessageException.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/support/valid/EmailParamValidator.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/support/valid/EmailValid.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/support/valid/HostParamValidator.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/support/valid/HostValid.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumParamValidator.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumValid.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/support/valid/SqlSecurityException.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/support/valid/SqlSecurityValidator.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/util/FileUtil.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/util/IpDomainUtil.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/util/ResourceBundleUtil.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/util/ResponseUtil.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/java/org/apache/hertzbeat/common/util/XmlUtil.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/test/java/org/apache/hertzbeat/common/cache/CacheFactoryTest.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/test/java/org/apache/hertzbeat/common/cache/CaffeineCacheTest.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/test/java/org/apache/hertzbeat/common/entity/manager/MetricsFavoriteTest.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/test/java/org/apache/hertzbeat/common/queue/impl/InMemoryCommonDataQueueTest.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/test/java/org/apache/hertzbeat/common/queue/impl/KafkaCommonDataQueueTest.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/test/java/org/apache/hertzbeat/common/queue/impl/RedisCommonDataQueueTest.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/test/java/org/apache/hertzbeat/common/support/CommonThreadPoolTest.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/test/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8ControlTest.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/test/java/org/apache/hertzbeat/common/support/SpringContextHolderTest.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/test/java/org/apache/hertzbeat/common/support/vaild/EmailParamValidatorTest.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/test/java/org/apache/hertzbeat/common/support/vaild/HostParamValidatorTest.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/test/java/org/apache/hertzbeat/common/support/vaild/PhoneNumParamValidatorTest.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/test/java/org/apache/hertzbeat/common/support/valid/SqlSecurityValidatorTest.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/test/java/org/apache/hertzbeat/common/util/FileUtilTest.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/test/java/org/apache/hertzbeat/common/util/ResourceBundleUtilTest.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/test/java/org/apache/hertzbeat/common/util/ResponseUtilTest.java (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/test/resources/msg.properties (100%) rename {hertzbeat-common => hertzbeat-common-spring}/src/test/resources/msg_en.properties (100%) diff --git a/.github/workflows/backend-build-test.yml b/.github/workflows/backend-build-test.yml index daf5678c92..34917e8e50 100644 --- a/.github/workflows/backend-build-test.yml +++ b/.github/workflows/backend-build-test.yml @@ -66,11 +66,11 @@ jobs: run: | sudo curl -L https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose sudo chmod u+x /usr/local/bin/docker-compose - + cd e2e sudo docker-compose version sudo docker-compose up --exit-code-from testing --remove-orphans - + # upload application logs - name: Upload logs & API test reports uses: actions/upload-artifact@v4 diff --git a/hertzbeat-ai/pom.xml b/hertzbeat-ai/pom.xml index d026a98b3b..9a3e5249f9 100644 --- a/hertzbeat-ai/pom.xml +++ b/hertzbeat-ai/pom.xml @@ -59,7 +59,7 @@ org.apache.hertzbeat - hertzbeat-common + hertzbeat-common-spring diff --git a/hertzbeat-base/pom.xml b/hertzbeat-base/pom.xml index 094c2e4c74..0b8a384e43 100644 --- a/hertzbeat-base/pom.xml +++ b/hertzbeat-base/pom.xml @@ -35,7 +35,7 @@ org.apache.hertzbeat - hertzbeat-common + hertzbeat-common-spring commons-logging diff --git a/hertzbeat-collector/hertzbeat-collector-common/pom.xml b/hertzbeat-collector/hertzbeat-collector-common/pom.xml index 177adf6deb..c66fe8910f 100644 --- a/hertzbeat-collector/hertzbeat-collector-common/pom.xml +++ b/hertzbeat-collector/hertzbeat-collector-common/pom.xml @@ -49,7 +49,7 @@ org.apache.hertzbeat - hertzbeat-common + hertzbeat-common-core diff --git a/hertzbeat-collector/pom.xml b/hertzbeat-collector/pom.xml index a85b368439..2e24513ee2 100644 --- a/hertzbeat-collector/pom.xml +++ b/hertzbeat-collector/pom.xml @@ -81,7 +81,7 @@ org.apache.hertzbeat - hertzbeat-common + hertzbeat-common-core diff --git a/hertzbeat-common/pom.xml b/hertzbeat-common-core/pom.xml similarity index 81% rename from hertzbeat-common/pom.xml rename to hertzbeat-common-core/pom.xml index 379245e6ae..0121c11097 100644 --- a/hertzbeat-common/pom.xml +++ b/hertzbeat-common-core/pom.xml @@ -26,62 +26,10 @@ 4.0.0 - hertzbeat-common + hertzbeat-common-core ${project.artifactId} - - - org.springframework.boot - spring-boot-starter-web - provided - - - org.springframework.boot - spring-boot-configuration-processor - true - - - org.springframework.boot - spring-boot-autoconfigure - - - - org.eclipse.persistence - org.eclipse.persistence.jpa - ${eclipse-jpa.version} - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.hibernate.orm - hibernate-core - - - - - - org.springframework.boot - spring-boot-starter-validation - - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - - - - org.springdoc - springdoc-openapi-starter-webmvc-ui - provided - com.google.guava @@ -187,6 +135,39 @@ com.github.jsqlparser jsqlparser + + + com.fasterxml.jackson.core + jackson-databind + provided + + + com.fasterxml.jackson.core + jackson-annotations + provided + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + provided + + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + provided + + + + jakarta.validation + jakarta.validation-api + provided + + + + jakarta.annotation + jakarta.annotation-api + diff --git a/hertzbeat-common/src/main/java/org/apache/arrow/vector/table/ArrowTable.java b/hertzbeat-common-core/src/main/java/org/apache/arrow/vector/table/ArrowTable.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/arrow/vector/table/ArrowTable.java rename to hertzbeat-common-core/src/main/java/org/apache/arrow/vector/table/ArrowTable.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/cache/CommonCacheService.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/cache/CommonCacheService.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/cache/CommonCacheService.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/cache/CommonCacheService.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/AiConstants.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/AiConstants.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/AiConstants.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/AiConstants.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/AiTypeEnum.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/AiTypeEnum.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/AiTypeEnum.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/AiTypeEnum.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/CollectCodeConstants.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/CollectCodeConstants.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/CollectCodeConstants.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/CollectCodeConstants.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/CommonConstants.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/CommonConstants.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/CommonConstants.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/CommonConstants.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/ConfigConstants.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/ConfigConstants.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/ConfigConstants.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/ConfigConstants.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/DataQueueConstants.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/DataQueueConstants.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/DataQueueConstants.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/DataQueueConstants.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/ExportFileConstants.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/ExportFileConstants.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/ExportFileConstants.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/ExportFileConstants.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/GeneralConfigTypeEnum.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/GeneralConfigTypeEnum.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/GeneralConfigTypeEnum.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/GeneralConfigTypeEnum.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/HertzBeatKeywordsEnum.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/HertzBeatKeywordsEnum.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/HertzBeatKeywordsEnum.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/HertzBeatKeywordsEnum.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/ImExportTaskConstant.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/ImExportTaskConstant.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/ImExportTaskConstant.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/ImExportTaskConstant.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/ImportTaskStatusEnum.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/ImportTaskStatusEnum.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/ImportTaskStatusEnum.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/ImportTaskStatusEnum.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/JexlKeywordsEnum.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/JexlKeywordsEnum.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/JexlKeywordsEnum.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/JexlKeywordsEnum.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/ManagerEventTypeEnum.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/ManagerEventTypeEnum.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/ManagerEventTypeEnum.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/ManagerEventTypeEnum.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/MetricDataConstants.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/MetricDataConstants.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/MetricDataConstants.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/MetricDataConstants.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/NetworkConstants.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/NetworkConstants.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/NetworkConstants.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/NetworkConstants.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/NotifyLevelEnum.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/NotifyLevelEnum.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/NotifyLevelEnum.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/NotifyLevelEnum.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/PluginType.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/PluginType.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/PluginType.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/PluginType.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/SignConstants.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/SignConstants.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/SignConstants.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/SignConstants.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/SmsConstants.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/SmsConstants.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/SmsConstants.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/SmsConstants.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/ThemeEnum.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/ThemeEnum.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/ThemeEnum.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/ThemeEnum.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/arrow/ArrowCell.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/arrow/ArrowCell.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/arrow/ArrowCell.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/arrow/ArrowCell.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/arrow/DefaultMetadataReader.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/arrow/DefaultMetadataReader.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/arrow/DefaultMetadataReader.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/arrow/DefaultMetadataReader.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/arrow/MetadataReader.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/arrow/MetadataReader.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/arrow/MetadataReader.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/arrow/MetadataReader.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/arrow/RowWrapper.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/arrow/RowWrapper.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/arrow/RowWrapper.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/arrow/RowWrapper.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/AlertReport.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/AlertReport.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/AlertReport.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/AlertReport.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/CollectorInfo.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/CollectorInfo.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/CollectorInfo.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/CollectorInfo.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/Field.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/Field.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/Field.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/Field.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/ImportTaskMessage.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/ImportTaskMessage.java similarity index 98% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/ImportTaskMessage.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/ImportTaskMessage.java index b9df1e1c63..85e71b3df8 100644 --- a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/ImportTaskMessage.java +++ b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/ImportTaskMessage.java @@ -17,13 +17,13 @@ package org.apache.hertzbeat.common.entity.dto; +import jakarta.annotation.Nullable; import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.hertzbeat.common.constants.ImportTaskStatusEnum; import org.apache.hertzbeat.common.constants.ManagerEventTypeEnum; import org.apache.hertzbeat.common.constants.NotifyLevelEnum; -import org.springframework.lang.Nullable; /** * Import task message diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/MailServerConfig.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/MailServerConfig.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/MailServerConfig.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/MailServerConfig.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/ManagerMessage.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/ManagerMessage.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/ManagerMessage.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/ManagerMessage.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/Message.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/Message.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/Message.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/Message.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsData.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsData.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsData.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsData.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsHistoryData.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsHistoryData.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsHistoryData.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsHistoryData.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/ModelProviderConfig.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/ModelProviderConfig.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/ModelProviderConfig.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/ModelProviderConfig.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/PromVectorOrMatrix.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/PromVectorOrMatrix.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/PromVectorOrMatrix.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/PromVectorOrMatrix.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/ServerInfo.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/ServerInfo.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/ServerInfo.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/ServerInfo.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/Value.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/Value.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/Value.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/Value.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/ValueRow.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/ValueRow.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/ValueRow.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/ValueRow.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/query/DatasourceQuery.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/query/DatasourceQuery.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/query/DatasourceQuery.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/query/DatasourceQuery.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/query/DatasourceQueryData.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/query/DatasourceQueryData.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/query/DatasourceQueryData.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/query/DatasourceQueryData.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/AlibabaSmsProperties.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/AlibabaSmsProperties.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/AlibabaSmsProperties.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/AlibabaSmsProperties.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/AwsSmsProperties.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/AwsSmsProperties.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/AwsSmsProperties.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/AwsSmsProperties.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/SmslocalSmsProperties.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/SmslocalSmsProperties.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/SmslocalSmsProperties.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/SmslocalSmsProperties.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/TencentSmsProperties.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/TencentSmsProperties.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/TencentSmsProperties.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/TencentSmsProperties.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/TwilioSmsProperties.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/TwilioSmsProperties.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/TwilioSmsProperties.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/TwilioSmsProperties.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/UniSmsProperties.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/UniSmsProperties.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/UniSmsProperties.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/UniSmsProperties.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/Configmap.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/Configmap.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/Configmap.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/Configmap.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/SshTunnel.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/SshTunnel.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/SshTunnel.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/SshTunnel.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/CommonRequestProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/CommonRequestProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/CommonRequestProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/CommonRequestProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ConsulSdProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ConsulSdProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ConsulSdProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ConsulSdProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/DnsProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/DnsProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/DnsProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/DnsProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/DnsSdProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/DnsSdProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/DnsSdProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/DnsSdProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/EurekaSdProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/EurekaSdProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/EurekaSdProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/EurekaSdProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/FtpProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/FtpProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/FtpProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/FtpProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/HttpProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/HttpProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/HttpProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/HttpProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/HttpSdProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/HttpSdProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/HttpSdProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/HttpSdProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/IcmpProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/IcmpProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/IcmpProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/IcmpProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ImapProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ImapProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ImapProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ImapProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/IpmiProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/IpmiProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/IpmiProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/IpmiProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/JdbcProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/JdbcProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/JdbcProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/JdbcProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/JmxProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/JmxProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/JmxProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/JmxProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/KafkaProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/KafkaProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/KafkaProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/KafkaProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MemcachedProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MemcachedProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MemcachedProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MemcachedProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ModbusProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ModbusProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ModbusProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ModbusProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MongodbProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MongodbProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MongodbProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MongodbProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MqttProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MqttProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MqttProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MqttProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NacosSdProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NacosSdProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NacosSdProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NacosSdProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NebulaGraphProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NebulaGraphProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NebulaGraphProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NebulaGraphProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NginxProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NginxProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NginxProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NginxProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NgqlProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NgqlProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NgqlProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NgqlProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NtpProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NtpProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NtpProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NtpProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PlcProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PlcProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PlcProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PlcProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/Pop3Protocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/Pop3Protocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/Pop3Protocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/Pop3Protocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PrometheusProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PrometheusProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PrometheusProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PrometheusProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/Protocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/Protocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/Protocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/Protocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PushProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PushProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PushProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PushProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RedfishProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RedfishProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RedfishProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RedfishProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RedisProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RedisProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RedisProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RedisProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RegistryProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RegistryProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RegistryProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RegistryProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RocketmqProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RocketmqProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RocketmqProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RocketmqProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/S7Protocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/S7Protocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/S7Protocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/S7Protocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ScriptProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ScriptProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ScriptProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ScriptProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SmtpProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SmtpProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SmtpProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SmtpProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SnmpProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SnmpProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SnmpProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SnmpProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SshProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SshProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SshProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SshProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/TelnetProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/TelnetProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/TelnetProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/TelnetProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/UdpProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/UdpProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/UdpProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/UdpProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/WebsocketProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/WebsocketProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/WebsocketProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/WebsocketProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ZookeeperSdProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ZookeeperSdProtocol.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ZookeeperSdProtocol.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ZookeeperSdProtocol.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/log/LogEntry.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/log/LogEntry.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/log/LogEntry.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/log/LogEntry.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/message/ClusterMsg.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/message/ClusterMsg.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/message/ClusterMsg.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/message/ClusterMsg.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/message/CollectRep.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/message/CollectRep.java similarity index 99% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/message/CollectRep.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/message/CollectRep.java index d327879bef..03d2821c5d 100644 --- a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/message/CollectRep.java +++ b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/message/CollectRep.java @@ -486,7 +486,7 @@ public final class CollectRep { } public long getTime() { - return Integer.parseInt(metadata.getOrDefault(MetricDataConstants.TIME, "0")); + return Long.parseLong(metadata.getOrDefault(MetricDataConstants.TIME, "0")); } public Code getCode() { diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/plugin/PluginContext.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/plugin/PluginContext.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/plugin/PluginContext.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/plugin/PluginContext.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/sd/ConnectionConfig.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/sd/ConnectionConfig.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/sd/ConnectionConfig.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/sd/ConnectionConfig.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/sd/EurekaDiscoveryResponseEntity.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/sd/EurekaDiscoveryResponseEntity.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/sd/EurekaDiscoveryResponseEntity.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/sd/EurekaDiscoveryResponseEntity.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/sd/ServiceDiscoveryResponseEntity.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/sd/ServiceDiscoveryResponseEntity.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/sd/ServiceDiscoveryResponseEntity.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/sd/ServiceDiscoveryResponseEntity.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/queue/CommonDataQueue.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/queue/CommonDataQueue.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/queue/CommonDataQueue.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/queue/CommonDataQueue.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/serialize/KafkaLogEntryDeserializer.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/KafkaLogEntryDeserializer.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/serialize/KafkaLogEntryDeserializer.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/KafkaLogEntryDeserializer.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/serialize/KafkaLogEntrySerializer.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/KafkaLogEntrySerializer.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/serialize/KafkaLogEntrySerializer.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/KafkaLogEntrySerializer.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataDeserializer.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataDeserializer.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataDeserializer.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataDeserializer.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataSerializer.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataSerializer.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataSerializer.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataSerializer.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/serialize/RedisLogEntryCodec.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/RedisLogEntryCodec.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/serialize/RedisLogEntryCodec.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/RedisLogEntryCodec.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/serialize/RedisMetricsDataCodec.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/RedisMetricsDataCodec.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/serialize/RedisMetricsDataCodec.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/RedisMetricsDataCodec.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/timer/HashedWheelTimer.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/timer/HashedWheelTimer.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/timer/HashedWheelTimer.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/timer/HashedWheelTimer.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/timer/Timeout.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/timer/Timeout.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/timer/Timeout.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/timer/Timeout.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/timer/Timer.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/timer/Timer.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/timer/Timer.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/timer/Timer.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/timer/TimerTask.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/timer/TimerTask.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/timer/TimerTask.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/timer/TimerTask.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/AesUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/AesUtil.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/AesUtil.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/AesUtil.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/ArrowUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/ArrowUtil.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/ArrowUtil.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/ArrowUtil.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/BackoffUtils.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/BackoffUtils.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/BackoffUtils.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/BackoffUtils.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/Base64Util.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/Base64Util.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/Base64Util.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/Base64Util.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/CommonUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/CommonUtil.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/CommonUtil.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/CommonUtil.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/ExponentialBackoff.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/ExponentialBackoff.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/ExponentialBackoff.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/ExponentialBackoff.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/HertzBeatKeywordsUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/HertzBeatKeywordsUtil.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/HertzBeatKeywordsUtil.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/HertzBeatKeywordsUtil.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/IntervalExpressionUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/IntervalExpressionUtil.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/IntervalExpressionUtil.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/IntervalExpressionUtil.java diff --git a/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/IpDomainUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/IpDomainUtil.java new file mode 100644 index 0000000000..3c72baa41a --- /dev/null +++ b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/IpDomainUtil.java @@ -0,0 +1,152 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hertzbeat.common.util; + +import java.net.Inet4Address; +import java.net.InetAddress; +import java.net.NetworkInterface; +import java.net.UnknownHostException; +import java.util.Enumeration; +import java.util.regex.Pattern; +import lombok.extern.slf4j.Slf4j; +import org.apache.hertzbeat.common.constants.NetworkConstants; +import org.apache.hertzbeat.common.constants.SignConstants; +import org.apache.http.conn.util.InetAddressUtils; + +/** + * ipv4 ipv6 domain util. + */ +@Slf4j +public final class IpDomainUtil { + + private static final Pattern DOMAIN_PATTERN = + Pattern.compile("^[-\\w]+(\\.[-\\w]+)*$"); + + private static final String LOCALHOST = "localhost"; + + /** + * HTTP header schema. + */ + private static final Pattern DOMAIN_SCHEMA = Pattern.compile("^([hH][tT]{2}[pP]://|[hH][tT]{2}[pP][sS]://){1}[^\\s]*"); + + private IpDomainUtil() { + } + + /** + * whether it is ip or domain. + * @param ipDomain ip domain string + * @return true-yes false-no + */ + public static boolean validateIpDomain(String ipDomain) { + if (ipDomain == null || ipDomain.trim().isEmpty()) { + return false; + } + ipDomain = ipDomain.trim(); + if (LOCALHOST.equalsIgnoreCase(ipDomain)) { + return true; + } + if (InetAddressUtils.isIPv4Address(ipDomain)) { + return true; + } + if (InetAddressUtils.isIPv6Address(ipDomain)) { + return true; + } + return DOMAIN_PATTERN.matcher(ipDomain).matches(); + } + + /** + * if domain or ip has http / https schema. + * @param domainIp host + * @return true or false + */ + public static boolean isHasSchema(String domainIp) { + if (domainIp == null || domainIp.trim().isEmpty()) { + return false; + } + return DOMAIN_SCHEMA.matcher(domainIp).matches(); + } + + /** + * if instance has the port with mark + * @param instance instance ip:port + * @return true if has + */ + public static boolean isHasPortWithMark(String instance) { + if (instance == null || instance.trim().isEmpty()) { + return false; + } + String[] parts = instance.split(SignConstants.DOUBLE_MARK); + if (parts.length >= 2) { + String port = parts[parts.length - 1]; + return CommonUtil.isNumeric(port); + } + return false; + } + + /** + * get localhost IP. + * @return ip + */ + public static String getLocalhostIp() { + try { + Enumeration allNetInterfaces = NetworkInterface.getNetworkInterfaces(); + InetAddress ip; + while (allNetInterfaces.hasMoreElements()) { + NetworkInterface netInterface = allNetInterfaces.nextElement(); + if (!netInterface.isLoopback() && !netInterface.isVirtual() && netInterface.isUp()) { + Enumeration addresses = netInterface.getInetAddresses(); + while (addresses.hasMoreElements()) { + ip = addresses.nextElement(); + if (ip instanceof Inet4Address) { + return ip.getHostAddress(); + } + } + } + } + } catch (Exception e) { + log.warn(e.getMessage()); + } + return null; + } + + /** + * check IP address type. + * @param ipDomain ip domain + * @return IP address type + */ + public static String checkIpAddressType(String ipDomain){ + if (ipDomain != null && !ipDomain.trim().isEmpty() && InetAddressUtils.isIPv6Address(ipDomain)) { + return NetworkConstants.IPV6; + } + return NetworkConstants.IPV4; + } + + /** + * get current local host name. + * @return hostname + */ + public static String getCurrentHostName() { + try { + InetAddress inetAddress = InetAddress.getLocalHost(); + return inetAddress.getHostName(); + } catch (UnknownHostException e) { + return null; + } + } + +} diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/JexlCheckerUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/JexlCheckerUtil.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/JexlCheckerUtil.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/JexlCheckerUtil.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/JexlCommonFunction.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/JexlCommonFunction.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/JexlCommonFunction.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/JexlCommonFunction.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/JexlExpressionRunner.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/JexlExpressionRunner.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/JexlExpressionRunner.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/JexlExpressionRunner.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/JsonUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/JsonUtil.java similarity index 96% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/JsonUtil.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/JsonUtil.java index b7a46e3a03..45854bef2e 100644 --- a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/JsonUtil.java +++ b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/JsonUtil.java @@ -28,7 +28,6 @@ import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import javax.annotation.concurrent.ThreadSafe; import lombok.extern.slf4j.Slf4j; -import org.springframework.util.StringUtils; /** * json util @@ -63,7 +62,7 @@ public final class JsonUtil { } public static T fromJson(String jsonStr, Class clazz) { - if (!StringUtils.hasText(jsonStr)) { + if (jsonStr == null || jsonStr.trim().isEmpty()) { return null; } try { @@ -75,7 +74,7 @@ public final class JsonUtil { } public static T fromJson(String jsonStr, TypeReference type) { - if (!StringUtils.hasText(jsonStr)) { + if (jsonStr == null || jsonStr.trim().isEmpty()) { return null; } try { @@ -87,7 +86,7 @@ public final class JsonUtil { } public static JsonNode fromJson(String jsonStr) { - if (!StringUtils.hasText(jsonStr)) { + if (jsonStr == null || jsonStr.trim().isEmpty()) { return null; } try { diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/LogUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/LogUtil.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/LogUtil.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/LogUtil.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/LruHashMap.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/LruHashMap.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/LruHashMap.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/LruHashMap.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/MapCapUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/MapCapUtil.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/MapCapUtil.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/MapCapUtil.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/NetworkUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/NetworkUtil.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/NetworkUtil.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/NetworkUtil.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/Pair.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/Pair.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/Pair.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/Pair.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/ProtoJsonUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/ProtoJsonUtil.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/ProtoJsonUtil.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/ProtoJsonUtil.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdGenerator.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdGenerator.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdGenerator.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdGenerator.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdWorker.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdWorker.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdWorker.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdWorker.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/StrBuffer.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/StrBuffer.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/StrBuffer.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/StrBuffer.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/StrUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/StrUtil.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/StrUtil.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/StrUtil.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/TimePeriodUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/TimePeriodUtil.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/TimePeriodUtil.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/TimePeriodUtil.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/TimeZoneUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/TimeZoneUtil.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/TimeZoneUtil.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/TimeZoneUtil.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/export/ExcelExportUtils.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/export/ExcelExportUtils.java similarity index 95% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/export/ExcelExportUtils.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/export/ExcelExportUtils.java index ce0dc27632..f26a71209e 100644 --- a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/export/ExcelExportUtils.java +++ b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/export/ExcelExportUtils.java @@ -15,6 +15,7 @@ package org.apache.hertzbeat.common.util.export; +import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; import org.apache.poi.ss.usermodel.Cell; @@ -24,7 +25,6 @@ import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; -import org.springframework.util.ReflectionUtils; /** * Excel export utils @@ -64,11 +64,11 @@ public final class ExcelExportUtils { headerCellStyle.setAlignment(HorizontalAlignment.CENTER); List headers = new ArrayList<>(); - ReflectionUtils.doWithFields(clazz, field -> { - + Field[] fields = clazz.getDeclaredFields(); + for (Field field : fields) { field.setAccessible(true); headers.add(field.getName()); - }); + } // set header Row headerRow = sheet.createRow(0); diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/export/YamlExportUtils.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/export/YamlExportUtils.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/export/YamlExportUtils.java rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/export/YamlExportUtils.java diff --git a/hertzbeat-common/src/main/message/cluster_msg.proto b/hertzbeat-common-core/src/main/message/cluster_msg.proto similarity index 98% rename from hertzbeat-common/src/main/message/cluster_msg.proto rename to hertzbeat-common-core/src/main/message/cluster_msg.proto index e1321e1a41..bcc1335fc3 100644 --- a/hertzbeat-common/src/main/message/cluster_msg.proto +++ b/hertzbeat-common-core/src/main/message/cluster_msg.proto @@ -40,7 +40,7 @@ enum MessageType GO_OFFLINE = 2; // collector go close to master GO_CLOSE = 3; - // issue cyclic collect task + // issue cyclic collect task ISSUE_CYCLIC_TASK = 4; // delete cyclic collect task DELETE_CYCLIC_TASK = 5; diff --git a/hertzbeat-common/src/test/java/org/apache/arrow/vector/table/ArrowTableTest.java b/hertzbeat-common-core/src/test/java/org/apache/arrow/vector/table/ArrowTableTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/arrow/vector/table/ArrowTableTest.java rename to hertzbeat-common-core/src/test/java/org/apache/arrow/vector/table/ArrowTableTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/entity/message/CollectRepTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/entity/message/CollectRepTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/entity/message/CollectRepTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/entity/message/CollectRepTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/entity/plugin/PluginContextTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/entity/plugin/PluginContextTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/entity/plugin/PluginContextTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/entity/plugin/PluginContextTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/serialize/KafkaLogEntryDeserializerTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/serialize/KafkaLogEntryDeserializerTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/serialize/KafkaLogEntryDeserializerTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/serialize/KafkaLogEntryDeserializerTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/serialize/KafkaLogEntrySerializerTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/serialize/KafkaLogEntrySerializerTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/serialize/KafkaLogEntrySerializerTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/serialize/KafkaLogEntrySerializerTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataDeserializerTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataDeserializerTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataDeserializerTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataDeserializerTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataSerializerTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataSerializerTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataSerializerTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataSerializerTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/serialize/RedisLogEntryCodecTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/serialize/RedisLogEntryCodecTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/serialize/RedisLogEntryCodecTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/serialize/RedisLogEntryCodecTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/AesUtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/AesUtilTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/AesUtilTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/AesUtilTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/ArrowUtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/ArrowUtilTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/ArrowUtilTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/ArrowUtilTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/BackoffUtilsTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/BackoffUtilsTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/BackoffUtilsTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/BackoffUtilsTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/Base64UtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/Base64UtilTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/Base64UtilTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/Base64UtilTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/ChineseCharacterCheckTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/ChineseCharacterCheckTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/ChineseCharacterCheckTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/ChineseCharacterCheckTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/CommonUtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/CommonUtilTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/CommonUtilTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/CommonUtilTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/ExponentialBackoffTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/ExponentialBackoffTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/ExponentialBackoffTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/ExponentialBackoffTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/HertzBeatKeywordsUtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/HertzBeatKeywordsUtilTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/HertzBeatKeywordsUtilTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/HertzBeatKeywordsUtilTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/IntervalExpressionUtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/IntervalExpressionUtilTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/IntervalExpressionUtilTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/IntervalExpressionUtilTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/IpDomainUtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/IpDomainUtilTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/IpDomainUtilTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/IpDomainUtilTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/JexlExpressionRunnerTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/JexlExpressionRunnerTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/JexlExpressionRunnerTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/JexlExpressionRunnerTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/JexlTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/JexlTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/JexlTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/JexlTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/JsonUtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/JsonUtilTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/JsonUtilTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/JsonUtilTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/LogUtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/LogUtilTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/LogUtilTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/LogUtilTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/LruHashMapTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/LruHashMapTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/LruHashMapTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/LruHashMapTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/MapCapUtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/MapCapUtilTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/MapCapUtilTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/MapCapUtilTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/NetworkUtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/NetworkUtilTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/NetworkUtilTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/NetworkUtilTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/PairTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/PairTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/PairTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/PairTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/ProtoJsonUtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/ProtoJsonUtilTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/ProtoJsonUtilTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/ProtoJsonUtilTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/SnowFlakeIdGeneratorTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/SnowFlakeIdGeneratorTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/SnowFlakeIdGeneratorTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/SnowFlakeIdGeneratorTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/StrBufferTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/StrBufferTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/StrBufferTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/StrBufferTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/StrUtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/StrUtilTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/StrUtilTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/StrUtilTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/TimePeriodUtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/TimePeriodUtilTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/TimePeriodUtilTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/TimePeriodUtilTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/TimeZoneUtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/TimeZoneUtilTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/TimeZoneUtilTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/TimeZoneUtilTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/entity/PersonTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/entity/PersonTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/entity/PersonTest.java rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/entity/PersonTest.java diff --git a/hertzbeat-common/src/test/proto/person.proto b/hertzbeat-common-core/src/test/proto/person.proto similarity index 100% rename from hertzbeat-common/src/test/proto/person.proto rename to hertzbeat-common-core/src/test/proto/person.proto diff --git a/hertzbeat-common-spring/pom.xml b/hertzbeat-common-spring/pom.xml new file mode 100644 index 0000000000..9e6d2f9bf4 --- /dev/null +++ b/hertzbeat-common-spring/pom.xml @@ -0,0 +1,88 @@ + + + + + hertzbeat + org.apache.hertzbeat + 2.0-SNAPSHOT + + + 4.0.0 + + hertzbeat-common-spring + ${project.artifactId} + + + + + org.apache.hertzbeat + hertzbeat-common-core + + + + + org.springframework.boot + spring-boot-starter-web + provided + + + org.springframework.boot + spring-boot-configuration-processor + true + + + org.springframework.boot + spring-boot-autoconfigure + + + + org.eclipse.persistence + org.eclipse.persistence.jpa + ${eclipse-jpa.version} + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.hibernate.orm + hibernate-core + + + + + + org.springframework.boot + spring-boot-starter-validation + + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + provided + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + + + + diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/cache/CacheFactory.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/cache/CacheFactory.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/cache/CacheFactory.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/cache/CacheFactory.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/cache/CaffeineCacheServiceImpl.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/cache/CaffeineCacheServiceImpl.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/cache/CaffeineCacheServiceImpl.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/cache/CaffeineCacheServiceImpl.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/config/BaseKafkaProperties.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/config/BaseKafkaProperties.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/config/BaseKafkaProperties.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/config/BaseKafkaProperties.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/config/CommonConfig.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/config/CommonConfig.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/config/CommonConfig.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/config/CommonConfig.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/config/CommonProperties.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/config/CommonProperties.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/config/CommonProperties.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/config/CommonProperties.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkCustomizer.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkCustomizer.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkCustomizer.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkCustomizer.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkJpaConfiguration.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkJpaConfiguration.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkJpaConfiguration.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkJpaConfiguration.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/ai/ChatConversation.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/ai/ChatConversation.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/ai/ChatConversation.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/ai/ChatConversation.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/ai/ChatMessage.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/ai/ChatMessage.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/ai/ChatMessage.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/ai/ChatMessage.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefine.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefine.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefine.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefine.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefineMonitorBind.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefineMonitorBind.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefineMonitorBind.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefineMonitorBind.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertGroupConverge.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertGroupConverge.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertGroupConverge.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertGroupConverge.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertInhibit.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertInhibit.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertInhibit.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertInhibit.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertSilence.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertSilence.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertSilence.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertSilence.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/GroupAlert.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/GroupAlert.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/GroupAlert.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/GroupAlert.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/JsonMapAttributeConverter.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/JsonMapAttributeConverter.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/JsonMapAttributeConverter.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/JsonMapAttributeConverter.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/NoticeReceiver.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/NoticeReceiver.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/NoticeReceiver.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/NoticeReceiver.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/NoticeRule.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/NoticeRule.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/NoticeRule.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/NoticeRule.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/NoticeTemplate.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/NoticeTemplate.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/NoticeTemplate.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/NoticeTemplate.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/SingleAlert.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/SingleAlert.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/SingleAlert.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/SingleAlert.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/CollectorSummary.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/dto/CollectorSummary.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/CollectorSummary.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/dto/CollectorSummary.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/PluginUpload.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/dto/PluginUpload.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/PluginUpload.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/dto/PluginUpload.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/SmsConfig.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/SmsConfig.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/SmsConfig.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/SmsConfig.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/grafana/GrafanaDashboard.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/grafana/GrafanaDashboard.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/grafana/GrafanaDashboard.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/grafana/GrafanaDashboard.java diff --git a/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/job/Configmap.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/job/Configmap.java new file mode 100644 index 0000000000..f93093157d --- /dev/null +++ b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/job/Configmap.java @@ -0,0 +1,54 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hertzbeat.common.entity.job; + +import java.io.Serializable; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * Monitoring configuration parameter properties and values + * During the process, you need to replace the content with the identifier ^_^key^_^ + * in the protocol configuration parameter with the real value in the configuration parameter + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class Configmap implements Serializable { + + /** + * Parameter key, replace the content with the identifier ^^_key_^^ in the protocol + * configuration parameter with the real value in the configuration parameter + */ + private String key; + + /** + * parameter value + */ + private Object value; + + /** + * Parameter type + * 0: number 1: string 2: encrypted string 3: json string mapped by map + * number,string,secret + */ + private byte type = 1; +} diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/Job.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/job/Job.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/Job.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/job/Job.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/Metrics.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/job/Metrics.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/Metrics.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/job/Metrics.java diff --git a/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/job/SshTunnel.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/job/SshTunnel.java new file mode 100644 index 0000000000..154669560f --- /dev/null +++ b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/job/SshTunnel.java @@ -0,0 +1,80 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hertzbeat.common.entity.job; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.apache.hertzbeat.common.entity.job.protocol.CommonRequestProtocol; +import org.apache.hertzbeat.common.entity.job.protocol.Protocol; + +/** + * ssh tunnel + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class SshTunnel implements CommonRequestProtocol, Protocol { + + /** + * enable ssh tunnel + */ + private String enable = "false"; + + /** + * IP ADDRESS OR DOMAIN NAME OF THE PEER HOST + */ + private String host; + + /** + * Peer host port + */ + private String port = "22"; + + /** + * TIME OUT PERIOD + */ + private String timeout = "6000"; + + /** + * UserName + */ + private String username; + + /** + * Password (optional) + */ + private String password; + + /** + * Private key (optional) + */ + private String privateKey; + + /** + * private key passphrase (optional) + */ + private String privateKeyPassphrase; + + /** + * share connection session + */ + private String shareConnection = "true"; +} diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/Bulletin.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/Bulletin.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/Bulletin.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/Bulletin.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/Collector.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/Collector.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/Collector.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/Collector.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/CollectorMonitorBind.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/CollectorMonitorBind.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/CollectorMonitorBind.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/CollectorMonitorBind.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/Define.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/Define.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/Define.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/Define.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/GeneralConfig.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/GeneralConfig.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/GeneralConfig.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/GeneralConfig.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonByteListAttributeConverter.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonByteListAttributeConverter.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonByteListAttributeConverter.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonByteListAttributeConverter.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonLongListAttributeConverter.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonLongListAttributeConverter.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonLongListAttributeConverter.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonLongListAttributeConverter.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonMapListAttributeConverter.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonMapListAttributeConverter.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonMapListAttributeConverter.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonMapListAttributeConverter.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonOptionListAttributeConverter.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonOptionListAttributeConverter.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonOptionListAttributeConverter.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonOptionListAttributeConverter.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonStringListAttributeConverter.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonStringListAttributeConverter.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonStringListAttributeConverter.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonStringListAttributeConverter.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/Label.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/Label.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/Label.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/Label.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/MetricsFavorite.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/MetricsFavorite.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/MetricsFavorite.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/MetricsFavorite.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/Monitor.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/Monitor.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/Monitor.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/Monitor.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/MonitorBind.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/MonitorBind.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/MonitorBind.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/MonitorBind.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/Param.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/Param.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/Param.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/Param.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/ParamDefine.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/ParamDefine.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/ParamDefine.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/ParamDefine.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/PluginItem.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/PluginItem.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/PluginItem.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/PluginItem.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/PluginMetadata.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/PluginMetadata.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/PluginMetadata.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/PluginMetadata.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageComponent.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageComponent.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageComponent.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageComponent.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageHistory.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageHistory.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageHistory.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageHistory.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncident.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncident.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncident.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncident.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentComponentBind.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentComponentBind.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentComponentBind.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentComponentBind.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentContent.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentContent.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentContent.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentContent.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageOrg.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageOrg.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageOrg.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageOrg.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/ZonedDateTimeAttributeConverter.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/ZonedDateTimeAttributeConverter.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/ZonedDateTimeAttributeConverter.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/ZonedDateTimeAttributeConverter.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/plugin/PluginConfig.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/plugin/PluginConfig.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/plugin/PluginConfig.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/plugin/PluginConfig.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetrics.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetrics.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetrics.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetrics.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetricsDto.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetricsDto.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetricsDto.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetricsDto.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/warehouse/History.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/warehouse/History.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/warehouse/History.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/warehouse/History.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/queue/impl/InMemoryCommonDataQueue.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/queue/impl/InMemoryCommonDataQueue.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/queue/impl/InMemoryCommonDataQueue.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/queue/impl/InMemoryCommonDataQueue.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/queue/impl/KafkaCommonDataQueue.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/queue/impl/KafkaCommonDataQueue.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/queue/impl/KafkaCommonDataQueue.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/queue/impl/KafkaCommonDataQueue.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/queue/impl/RedisCommonDataQueue.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/queue/impl/RedisCommonDataQueue.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/queue/impl/RedisCommonDataQueue.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/queue/impl/RedisCommonDataQueue.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/CommonThreadPool.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/CommonThreadPool.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/CommonThreadPool.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/CommonThreadPool.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8Control.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8Control.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8Control.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8Control.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/SpringContextHolder.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/SpringContextHolder.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/SpringContextHolder.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/SpringContextHolder.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/event/AiProviderConfigChangeEvent.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/event/AiProviderConfigChangeEvent.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/event/AiProviderConfigChangeEvent.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/event/AiProviderConfigChangeEvent.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/event/MonitorDeletedEvent.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/event/MonitorDeletedEvent.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/event/MonitorDeletedEvent.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/event/MonitorDeletedEvent.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/event/SmsConfigChangeEvent.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/event/SmsConfigChangeEvent.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/event/SmsConfigChangeEvent.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/event/SmsConfigChangeEvent.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/event/SystemConfigChangeEvent.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/event/SystemConfigChangeEvent.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/event/SystemConfigChangeEvent.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/event/SystemConfigChangeEvent.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/exception/AlertExpressionException.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/exception/AlertExpressionException.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/exception/AlertExpressionException.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/exception/AlertExpressionException.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/exception/CommonDataQueueUnknownException.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/exception/CommonDataQueueUnknownException.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/exception/CommonDataQueueUnknownException.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/exception/CommonDataQueueUnknownException.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/exception/CommonException.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/exception/CommonException.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/exception/CommonException.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/exception/CommonException.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/exception/ExpressionVisitorException.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/exception/ExpressionVisitorException.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/exception/ExpressionVisitorException.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/exception/ExpressionVisitorException.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/exception/IgnoreException.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/exception/IgnoreException.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/exception/IgnoreException.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/exception/IgnoreException.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/exception/SendMessageException.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/exception/SendMessageException.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/exception/SendMessageException.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/exception/SendMessageException.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/EmailParamValidator.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/EmailParamValidator.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/EmailParamValidator.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/EmailParamValidator.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/EmailValid.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/EmailValid.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/EmailValid.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/EmailValid.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/HostParamValidator.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/HostParamValidator.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/HostParamValidator.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/HostParamValidator.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/HostValid.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/HostValid.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/HostValid.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/HostValid.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumParamValidator.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumParamValidator.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumParamValidator.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumParamValidator.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumValid.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumValid.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumValid.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumValid.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/SqlSecurityException.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/SqlSecurityException.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/SqlSecurityException.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/SqlSecurityException.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/SqlSecurityValidator.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/SqlSecurityValidator.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/SqlSecurityValidator.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/SqlSecurityValidator.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/FileUtil.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/util/FileUtil.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/FileUtil.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/util/FileUtil.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/IpDomainUtil.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/util/IpDomainUtil.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/IpDomainUtil.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/util/IpDomainUtil.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/ResourceBundleUtil.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/util/ResourceBundleUtil.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/ResourceBundleUtil.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/util/ResourceBundleUtil.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/ResponseUtil.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/util/ResponseUtil.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/ResponseUtil.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/util/ResponseUtil.java diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/XmlUtil.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/util/XmlUtil.java similarity index 100% rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/XmlUtil.java rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/util/XmlUtil.java diff --git a/hertzbeat-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/hertzbeat-common-spring/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from hertzbeat-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to hertzbeat-common-spring/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/cache/CacheFactoryTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/cache/CacheFactoryTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/cache/CacheFactoryTest.java rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/cache/CacheFactoryTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/cache/CaffeineCacheTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/cache/CaffeineCacheTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/cache/CaffeineCacheTest.java rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/cache/CaffeineCacheTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/entity/manager/MetricsFavoriteTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/entity/manager/MetricsFavoriteTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/entity/manager/MetricsFavoriteTest.java rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/entity/manager/MetricsFavoriteTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/queue/impl/InMemoryCommonDataQueueTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/queue/impl/InMemoryCommonDataQueueTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/queue/impl/InMemoryCommonDataQueueTest.java rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/queue/impl/InMemoryCommonDataQueueTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/queue/impl/KafkaCommonDataQueueTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/queue/impl/KafkaCommonDataQueueTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/queue/impl/KafkaCommonDataQueueTest.java rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/queue/impl/KafkaCommonDataQueueTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/queue/impl/RedisCommonDataQueueTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/queue/impl/RedisCommonDataQueueTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/queue/impl/RedisCommonDataQueueTest.java rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/queue/impl/RedisCommonDataQueueTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/support/CommonThreadPoolTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/support/CommonThreadPoolTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/support/CommonThreadPoolTest.java rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/support/CommonThreadPoolTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8ControlTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8ControlTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8ControlTest.java rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8ControlTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/support/SpringContextHolderTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/support/SpringContextHolderTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/support/SpringContextHolderTest.java rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/support/SpringContextHolderTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/support/vaild/EmailParamValidatorTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/support/vaild/EmailParamValidatorTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/support/vaild/EmailParamValidatorTest.java rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/support/vaild/EmailParamValidatorTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/support/vaild/HostParamValidatorTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/support/vaild/HostParamValidatorTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/support/vaild/HostParamValidatorTest.java rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/support/vaild/HostParamValidatorTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/support/vaild/PhoneNumParamValidatorTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/support/vaild/PhoneNumParamValidatorTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/support/vaild/PhoneNumParamValidatorTest.java rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/support/vaild/PhoneNumParamValidatorTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/support/valid/SqlSecurityValidatorTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/support/valid/SqlSecurityValidatorTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/support/valid/SqlSecurityValidatorTest.java rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/support/valid/SqlSecurityValidatorTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/FileUtilTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/util/FileUtilTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/FileUtilTest.java rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/util/FileUtilTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/ResourceBundleUtilTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/util/ResourceBundleUtilTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/ResourceBundleUtilTest.java rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/util/ResourceBundleUtilTest.java diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/ResponseUtilTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/util/ResponseUtilTest.java similarity index 100% rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/ResponseUtilTest.java rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/util/ResponseUtilTest.java diff --git a/hertzbeat-common/src/test/resources/msg.properties b/hertzbeat-common-spring/src/test/resources/msg.properties similarity index 100% rename from hertzbeat-common/src/test/resources/msg.properties rename to hertzbeat-common-spring/src/test/resources/msg.properties diff --git a/hertzbeat-common/src/test/resources/msg_en.properties b/hertzbeat-common-spring/src/test/resources/msg_en.properties similarity index 100% rename from hertzbeat-common/src/test/resources/msg_en.properties rename to hertzbeat-common-spring/src/test/resources/msg_en.properties diff --git a/hertzbeat-e2e/hertzbeat-collector-basic-e2e/pom.xml b/hertzbeat-e2e/hertzbeat-collector-basic-e2e/pom.xml index 5b6cfff6b4..af0d937df1 100644 --- a/hertzbeat-e2e/hertzbeat-collector-basic-e2e/pom.xml +++ b/hertzbeat-e2e/hertzbeat-collector-basic-e2e/pom.xml @@ -58,24 +58,24 @@ org.testcontainers - junit-jupiter + testcontainers-junit-jupiter test org.testcontainers - jdbc + testcontainers-jdbc test org.testcontainers - mysql + testcontainers-mysql test org.testcontainers - postgresql + testcontainers-postgresql test diff --git a/hertzbeat-e2e/hertzbeat-collector-kafka-e2e/pom.xml b/hertzbeat-e2e/hertzbeat-collector-kafka-e2e/pom.xml index 765c4ad22b..d56825f6de 100644 --- a/hertzbeat-e2e/hertzbeat-collector-kafka-e2e/pom.xml +++ b/hertzbeat-e2e/hertzbeat-collector-kafka-e2e/pom.xml @@ -36,7 +36,7 @@ org.testcontainers - kafka + testcontainers-kafka ${testcontainers.version} test @@ -58,4 +58,4 @@ test - \ No newline at end of file + diff --git a/hertzbeat-e2e/hertzbeat-log-e2e/pom.xml b/hertzbeat-e2e/hertzbeat-log-e2e/pom.xml index 4908029857..ea5b1fa1a4 100644 --- a/hertzbeat-e2e/hertzbeat-log-e2e/pom.xml +++ b/hertzbeat-e2e/hertzbeat-log-e2e/pom.xml @@ -70,35 +70,35 @@ ${hertzbeat.version} test - + org.testcontainers - junit-jupiter + testcontainers-junit-jupiter test - + org.springframework.boot spring-boot-starter-test test - + org.junit.jupiter junit-jupiter test - + org.assertj assertj-core test - + org.awaitility diff --git a/hertzbeat-e2e/pom.xml b/hertzbeat-e2e/pom.xml index 8b60b55dca..dbcbad9c5d 100644 --- a/hertzbeat-e2e/pom.xml +++ b/hertzbeat-e2e/pom.xml @@ -39,7 +39,7 @@ 17 17 UTF-8 - 1.20.2 + 2.0.3 4.13.2 4.2.0 @@ -87,5 +87,5 @@ - + diff --git a/hertzbeat-manager/pom.xml b/hertzbeat-manager/pom.xml index 5f3671242c..1bdae24887 100644 --- a/hertzbeat-manager/pom.xml +++ b/hertzbeat-manager/pom.xml @@ -29,10 +29,10 @@ - + org.apache.hertzbeat - hertzbeat-common + hertzbeat-common-spring commons-logging diff --git a/hertzbeat-otel/pom.xml b/hertzbeat-otel/pom.xml index 0a03179e66..1078534b84 100644 --- a/hertzbeat-otel/pom.xml +++ b/hertzbeat-otel/pom.xml @@ -39,7 +39,7 @@ org.apache.hertzbeat - hertzbeat-common + hertzbeat-common-spring diff --git a/hertzbeat-plugin/pom.xml b/hertzbeat-plugin/pom.xml index 6cbc0bddc5..49da586dd0 100644 --- a/hertzbeat-plugin/pom.xml +++ b/hertzbeat-plugin/pom.xml @@ -34,7 +34,7 @@ org.apache.hertzbeat - hertzbeat-common + hertzbeat-common-spring provided diff --git a/hertzbeat-remoting/pom.xml b/hertzbeat-remoting/pom.xml index 4ecbc81586..1fddaf8853 100644 --- a/hertzbeat-remoting/pom.xml +++ b/hertzbeat-remoting/pom.xml @@ -35,7 +35,7 @@ org.apache.hertzbeat - hertzbeat-common + hertzbeat-common-spring diff --git a/hertzbeat-startup/pom.xml b/hertzbeat-startup/pom.xml index f45a196a6b..dfdf691686 100644 --- a/hertzbeat-startup/pom.xml +++ b/hertzbeat-startup/pom.xml @@ -60,7 +60,7 @@ org.apache.hertzbeat - hertzbeat-common + hertzbeat-common-spring diff --git a/hertzbeat-warehouse/pom.xml b/hertzbeat-warehouse/pom.xml index 169d014d74..b2d5e2ac53 100644 --- a/hertzbeat-warehouse/pom.xml +++ b/hertzbeat-warehouse/pom.xml @@ -32,7 +32,7 @@ org.apache.hertzbeat - hertzbeat-common + hertzbeat-common-spring provided diff --git a/pom.xml b/pom.xml index 08ad1b0a1b..bc1567a994 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,8 @@ hertzbeat-startup hertzbeat-manager hertzbeat-alerter - hertzbeat-common + hertzbeat-common-core + hertzbeat-common-spring hertzbeat-collector hertzbeat-warehouse hertzbeat-remoting @@ -133,7 +134,7 @@ 3.7.1 4.1.117.Final 8.4.0 - 10.2.0.jre8 + 12.10.2.jre11 21.5.0.0 4.6.1 0.4.6 @@ -187,10 +188,16 @@ - + org.apache.hertzbeat - hertzbeat-common + hertzbeat-common-core + ${hertzbeat.version} + + + + org.apache.hertzbeat + hertzbeat-common-spring ${hertzbeat.version} @@ -602,6 +609,11 @@ org.jacoco jacoco-maven-plugin ${jacoco-maven-plugin.version} + + + net/sf/jsqlparser/parser/** + + prepare-agent