From 6f942bc601262b0c395754907b790a048fe901e1 Mon Sep 17 00:00:00 2001 From: crossoverJie Date: Sun, 21 Apr 2024 16:44:23 +0800 Subject: [PATCH] [feature] Improve the import checkstyle (#1802) --- .../hertzbeat/alert/AlerterWorkerPool.java | 5 +- .../alert/calculate/CalculateAlarm.java | 29 ++++++++---- .../controller/AlertConvergeController.java | 16 ++++--- .../controller/AlertConvergesController.java | 20 ++++---- .../controller/AlertDefineController.java | 21 ++++----- .../controller/AlertDefinesController.java | 29 ++++++------ .../controller/AlertReportController.java | 14 +++--- .../controller/AlertSilenceController.java | 17 ++++--- .../controller/AlertSilencesController.java | 20 ++++---- .../alert/controller/AlertsController.java | 30 ++++++------ .../hertzbeat/alert/dao/AlertConvergeDao.java | 3 +- .../apache/hertzbeat/alert/dao/AlertDao.java | 5 +- .../alert/dao/AlertDefineBindDao.java | 5 +- .../hertzbeat/alert/dao/AlertDefineDao.java | 5 +- .../hertzbeat/alert/dao/AlertMonitorDao.java | 3 +- .../hertzbeat/alert/dao/AlertSilenceDao.java | 3 +- .../hertzbeat/alert/dto/AlertSummary.java | 3 +- .../alert/dto/CloudAlertReportAbstract.java | 3 +- .../alert/dto/GeneralCloudAlertReport.java | 5 +- .../alert/dto/TenCloudAlertReport.java | 5 +- .../CloudServiceAlarmInformationEnum.java | 3 +- .../alert/reduce/AlarmCommonReduce.java | 7 ++- .../alert/reduce/AlarmConvergeReduce.java | 11 ++--- .../alert/reduce/AlarmSilenceReduce.java | 11 ++--- .../alert/service/AlertConvergeService.java | 3 +- .../alert/service/AlertDefineService.java | 9 ++-- .../hertzbeat/alert/service/AlertService.java | 5 +- .../alert/service/AlertSilenceService.java | 3 +- .../impl/AlertConvergeServiceImpl.java | 3 +- ...lertDefineAbstractImExportServiceImpl.java | 13 +++--- .../AlertDefineExcelImExportServiceImpl.java | 21 ++++++--- .../AlertDefineJsonImExportServiceImpl.java | 7 ++- .../service/impl/AlertDefineServiceImpl.java | 20 ++++---- .../AlertDefineYamlImExportServiceImpl.java | 9 ++-- .../alert/service/impl/AlertServiceImpl.java | 25 +++++----- .../service/impl/AlertSilenceServiceImpl.java | 5 +- .../alert/util/AlertTemplateUtil.java | 3 +- .../apache/hertzbeat/alert/util/DateUtil.java | 3 +- .../apache/hertzbeat/collector/Collector.java | 3 +- .../collect/common/cache/CacheIdentifier.java | 2 +- .../common/cache/ConnectionCommonCache.java | 10 ++-- .../collect/common/cache/JdbcConnect.java | 3 +- .../collect/common/cache/JmxConnect.java | 3 +- .../collect/common/http/CommonHttpClient.java | 23 +++++----- .../collect/database/JdbcCommonCollect.java | 23 +++++----- .../collector/collect/dns/DnsCollectImpl.java | 17 ++++--- .../collector/collect/ftp/FtpCollectImpl.java | 15 +++--- .../collect/http/HttpCollectImpl.java | 46 ++++++++++--------- .../http/SslCertificateCollectImpl.java | 30 ++++++------ .../promethus/AbstractPrometheusParse.java | 3 +- .../http/promethus/PrometheusLastParser.java | 9 ++-- .../promethus/PrometheusMatrixParser.java | 9 ++-- .../promethus/PrometheusVectorParser.java | 9 ++-- .../promethus/exporter/ExporterParser.java | 9 ++-- .../http/promethus/exporter/MetricFamily.java | 5 +- .../collector/collect/httpsd/HttpsdImpl.java | 7 ++- .../constant/DiscoveryClientInstance.java | 3 +- .../httpsd/discovery/DiscoveryClient.java | 3 +- .../discovery/DiscoveryClientManagement.java | 5 +- .../discovery/impl/ConsulDiscoveryClient.java | 7 ++- .../discovery/impl/NacosDiscoveryClient.java | 7 ++- .../collect/icmp/IcmpCollectImpl.java | 13 +++--- .../collector/collect/jmx/JmxCollectImpl.java | 43 +++++++++++------ .../memcached/MemcachedCollectImpl.java | 19 ++++---- .../mongodb/MongodbSingleCollectImpl.java | 16 +++---- .../collect/mq/RocketmqCollectData.java | 3 +- .../collect/mq/RocketmqSingleCollectImpl.java | 43 +++++++++-------- .../nebulagraph/NebulaGraphCollectImpl.java | 35 +++++++------- .../collect/nginx/NginxCollectImpl.java | 40 ++++++++-------- .../collector/collect/ntp/NtpCollectImpl.java | 23 +++++----- .../collect/pop3/Pop3CollectImpl.java | 18 ++++---- .../prometheus/PrometheusAutoCollectImpl.java | 44 +++++++++--------- .../prometheus/parser/MetricFamily.java | 3 +- .../collect/prometheus/parser/TextParser.java | 7 ++- .../collect/push/PushCollectImpl.java | 31 ++++++------- .../collect/redis/RedisCommonCollectImpl.java | 36 +++++++++------ .../collect/smtp/SmtpCollectImpl.java | 17 ++++--- .../collect/snmp/SnmpCollectImpl.java | 45 ++++++++++++------ .../collector/collect/ssh/SshCollectImpl.java | 45 +++++++++--------- .../strategy/CollectStrategyFactory.java | 5 +- .../collect/telnet/TelnetCollectImpl.java | 23 ++++++---- .../collector/collect/udp/UdpCollectImpl.java | 12 +++-- .../websocket/WebsocketCollectImpl.java | 21 ++++----- .../dispatch/CollectDataDispatch.java | 3 +- .../collector/dispatch/CommonDispatcher.java | 17 +++++-- .../collector/dispatch/MetricsCollect.java | 16 ++++--- .../dispatch/MetricsCollectorQueue.java | 5 +- .../collector/dispatch/WorkerPool.java | 7 ++- .../dispatch/entrance/CollectServer.java | 21 +++++---- .../entrance/internal/CollectJobService.java | 13 +++--- .../CollectResponseEventListener.java | 3 +- .../processor/DeleteCyclicTaskProcessor.java | 3 +- .../dispatch/timer/HashedWheelTimer.java | 7 ++- .../dispatch/timer/TimerDispatch.java | 5 +- .../dispatch/timer/TimerDispatcher.java | 11 ++--- .../dispatch/timer/WheelTimerTask.java | 9 ++-- .../dispatch/unit/impl/DataSizeConvert.java | 5 +- .../dispatch/unit/impl/TimeLengthConvert.java | 5 +- .../hertzbeat/collector/util/CollectUtil.java | 20 +++++--- .../collector/util/JsonPathParser.java | 11 +++-- .../collector/util/PrivateKeyUtils.java | 5 +- .../redis/RedisClusterCollectImplTest.java | 5 +- .../cache/CaffeineCacheServiceImpl.java | 2 +- .../common/config/AviatorConfiguration.java | 6 +-- .../common/entity/alerter/Alert.java | 26 +++++++---- .../common/entity/alerter/AlertConverge.java | 22 +++++---- .../common/entity/alerter/AlertDefine.java | 24 ++++++---- .../alerter/AlertDefineMonitorBind.java | 23 +++++++--- .../common/entity/alerter/AlertSilence.java | 21 ++++++--- .../alerter/JsonMapAttributeConverter.java | 3 +- .../common/entity/dto/AlertReport.java | 5 +- .../common/entity/dto/CollectorInfo.java | 2 +- .../common/entity/dto/MetricsData.java | 2 +- .../common/entity/dto/MetricsHistoryData.java | 4 +- .../common/entity/dto/PromVectorOrMatrix.java | 10 ++-- .../hertzbeat/common/entity/dto/ValueRow.java | 4 +- .../hertzbeat/common/entity/job/Job.java | 13 ++++-- .../hertzbeat/common/entity/job/Metrics.java | 36 +++++++++++---- .../entity/job/protocol/HttpProtocol.java | 5 +- .../entity/job/protocol/NginxProtocol.java | 2 +- .../job/protocol/PrometheusProtocol.java | 3 +- .../entity/job/protocol/PushProtocol.java | 3 +- .../entity/job/protocol/SnmpProtocol.java | 3 +- .../common/entity/manager/Collector.java | 19 ++++---- .../entity/manager/CollectorMonitorBind.java | 19 ++++---- .../common/entity/manager/GeneralConfig.java | 17 +++---- .../JsonByteListAttributeConverter.java | 3 +- .../JsonLongListAttributeConverter.java | 2 +- .../JsonOptionListAttributeConverter.java | 3 +- .../JsonStringListAttributeConverter.java | 3 +- .../manager/JsonTagAttributeConverter.java | 3 +- .../JsonTagListAttributeConverter.java | 3 +- .../common/entity/manager/Monitor.java | 28 +++++++---- .../common/entity/manager/NoticeReceiver.java | 20 ++++---- .../common/entity/manager/NoticeRule.java | 22 +++++---- .../common/entity/manager/NoticeTemplate.java | 23 ++++++---- .../common/entity/manager/Param.java | 22 +++++---- .../common/entity/manager/ParamDefine.java | 23 ++++++---- .../entity/manager/StatusPageComponent.java | 13 ++++-- .../entity/manager/StatusPageHistory.java | 13 ++++-- .../entity/manager/StatusPageIncident.java | 24 +++++++--- .../StatusPageIncidentComponentBind.java | 13 ++++-- .../manager/StatusPageIncidentContent.java | 13 ++++-- .../common/entity/manager/StatusPageOrg.java | 13 ++++-- .../hertzbeat/common/entity/manager/Tag.java | 23 ++++++---- .../common/entity/manager/TagItem.java | 3 +- .../common/entity/manager/TagMonitorBind.java | 16 +++++-- .../common/entity/push/PushMetrics.java | 9 +++- .../common/entity/push/PushMetricsDto.java | 7 ++- .../common/entity/warehouse/History.java | 14 ++++-- .../queue/impl/InMemoryCommonDataQueue.java | 11 ++--- .../queue/impl/KafkaCommonDataQueue.java | 13 +++--- .../common/serialize/AlertDeserializer.java | 5 +- .../common/serialize/AlertSerializer.java | 7 ++- .../KafkaMetricsDataDeserializer.java | 5 +- .../serialize/KafkaMetricsDataSerializer.java | 5 +- .../common/service/AliYunSmsClient.java | 9 ++-- .../common/service/TencentSmsClient.java | 4 +- .../common/support/CommonThreadPool.java | 7 ++- .../support/ResourceBundleUtf8Control.java | 3 +- .../support/valid/EmailParamValidator.java | 3 +- .../common/support/valid/EmailValid.java | 7 ++- .../support/valid/HostParamValidator.java | 3 +- .../common/support/valid/HostValid.java | 7 ++- .../support/valid/PhoneNumParamValidator.java | 3 +- .../common/support/valid/PhoneNumValid.java | 7 ++- .../apache/hertzbeat/common/util/AesUtil.java | 10 ++-- .../hertzbeat/common/util/CommonUtil.java | 6 +-- .../hertzbeat/common/util/IpDomainUtil.java | 7 ++- .../hertzbeat/common/util/JsonUtil.java | 2 +- .../common/util/ResourceBundleUtil.java | 5 +- .../common/util/SnowFlakeIdGenerator.java | 3 +- .../common/util/SnowFlakeIdWorker.java | 2 +- .../common/util/prometheus/Metric.java | 2 +- .../community/code-style-and-quality-guide.md | 15 ++++++ .../community/code-style-and-quality-guide.md | 15 ++++++ .../org/apache/hertzbeat/manager/Manager.java | 3 +- .../component/alerter/DispatcherAlarm.java | 7 ++- .../impl/AbstractAlertNotifyHandlerImpl.java | 19 ++++---- .../impl/AliYunAlertNotifyHandlerImpl.java | 3 +- .../alerter/impl/DbAlertStoreHandlerImpl.java | 5 +- .../DingTalkRobotAlertNotifyHandlerImpl.java | 6 ++- .../DiscordBotAlertNotifyHandlerImpl.java | 3 +- .../impl/EmailAlertNotifyHandlerImpl.java | 11 ++--- .../impl/FlyBookAlertNotifyHandlerImpl.java | 11 +++-- .../impl/GotifyAlertNotifyHandlerImpl.java | 6 ++- .../HuaweiCloudSmnAlertNotifyHandlerImpl.java | 7 ++- .../ServerChanAlertNotifyHandlerImpl.java | 6 ++- .../impl/SlackAlertNotifyHandlerImpl.java | 3 +- .../impl/SmsAlertNotifyHandlerImpl.java | 3 +- .../TelegramBotAlertNotifyHandlerImpl.java | 6 ++- .../impl/WeChatAlertNotifyHandlerImpl.java | 12 ++--- .../impl/WeWorkAppAlertNotifyHandlerImpl.java | 9 ++-- .../WeWorkRobotAlertNotifyHandlerImpl.java | 12 ++++- .../impl/WebHookAlertNotifyHandlerImpl.java | 5 +- .../component/status/CalculateStatus.java | 37 +++++++++------ .../config/AngularErrorViewResolver.java | 10 ++-- .../config/CommonCommandLineRunner.java | 9 ++-- .../config/HeaderRequestInterceptor.java | 3 +- .../manager/config/JpaAuditorConfig.java | 3 +- .../manager/config/RestTemplateConfig.java | 5 +- .../config/SecurityCorsConfiguration.java | 3 +- .../manager/controller/AccountController.java | 23 ++++++---- .../manager/controller/AppController.java | 22 +++++---- .../controller/CollectorController.java | 24 ++++++---- .../controller/GeneralConfigController.java | 21 +++++---- .../manager/controller/I18nController.java | 8 ++-- .../manager/controller/MetricsController.java | 12 ++--- .../manager/controller/MonitorController.java | 19 +++++--- .../controller/MonitorsController.java | 28 ++++++----- .../controller/NoticeConfigController.java | 24 ++++++---- .../controller/StatusPageController.java | 17 ++++--- .../StatusPagePublicController.java | 11 +++-- .../manager/controller/SummaryController.java | 8 ++-- .../manager/controller/TagController.java | 27 +++++++---- .../hertzbeat/manager/dao/CollectorDao.java | 3 +- .../manager/dao/CollectorMonitorBindDao.java | 7 ++- .../hertzbeat/manager/dao/MonitorDao.java | 9 ++-- .../hertzbeat/manager/dao/NoticeRuleDao.java | 3 +- .../hertzbeat/manager/dao/ParamDao.java | 5 +- .../hertzbeat/manager/dao/ParamDefineDao.java | 3 +- .../manager/dao/StatusPageComponentDao.java | 3 +- .../manager/dao/StatusPageHistoryDao.java | 3 +- .../apache/hertzbeat/manager/dao/TagDao.java | 7 ++- .../manager/dao/TagMonitorBindDao.java | 3 +- .../HertzbeatRuntimeHintsRegistrar.java | 5 +- .../manager/pojo/dto/ComponentStatus.java | 3 +- .../hertzbeat/manager/pojo/dto/Dashboard.java | 3 +- .../manager/pojo/dto/EmailNoticeSender.java | 7 ++- .../hertzbeat/manager/pojo/dto/FileDTO.java | 3 +- .../hertzbeat/manager/pojo/dto/Hierarchy.java | 6 +-- .../hertzbeat/manager/pojo/dto/LoginDto.java | 6 +-- .../manager/pojo/dto/MonitorDefineDto.java | 6 +-- .../manager/pojo/dto/MonitorDto.java | 12 ++--- .../dto/ObjectStoreConfigChangeEvent.java | 3 +- .../manager/pojo/dto/ParamDefineDto.java | 5 +- .../manager/pojo/dto/TemplateConfig.java | 3 +- .../manager/scheduler/AssignJobs.java | 5 +- .../scheduler/CollectJobScheduling.java | 3 +- .../scheduler/CollectorAndJobScheduler.java | 25 +++++----- .../manager/scheduler/ConsistentHash.java | 14 ++++-- .../manager/scheduler/SchedulerInit.java | 13 ++++-- .../manager/scheduler/netty/ManageServer.java | 11 ++--- .../CollectOneTimeDataResponseProcessor.java | 5 +- .../hertzbeat/manager/service/AppService.java | 7 ++- .../service/AvailableAlertDefineInit.java | 7 ++- .../manager/service/CollectorService.java | 3 +- .../manager/service/MailService.java | 3 +- .../manager/service/MonitorService.java | 9 ++-- .../manager/service/NoticeConfigService.java | 5 +- .../manager/service/ObjectStoreService.java | 5 +- .../manager/service/StatusPageService.java | 3 +- .../hertzbeat/manager/service/TagService.java | 7 ++- .../impl/AbstractImExportServiceImpl.java | 24 +++++----- .../manager/service/impl/AppServiceImpl.java | 29 +++++++----- .../service/impl/CollectorServiceImpl.java | 5 +- .../impl/ExcelImExportServiceImpl.java | 25 +++++++--- .../service/impl/JsonImExportServiceImpl.java | 7 ++- .../impl/MailGeneralConfigServiceImpl.java | 3 +- .../manager/service/impl/MailServiceImpl.java | 21 ++++----- .../service/impl/MonitorServiceImpl.java | 38 +++++++++------ .../service/impl/NoticeConfigServiceImpl.java | 20 ++++---- .../impl/ObjectStoreConfigServiceImpl.java | 5 +- .../impl/ObsObjectStoreServiceImpl.java | 9 ++-- .../service/impl/StatusPageServiceImpl.java | 15 +++--- .../impl/SystemGeneralConfigServiceImpl.java | 9 ++-- .../manager/service/impl/TagServiceImpl.java | 13 +++--- .../impl/TemplateConfigServiceImpl.java | 5 +- .../service/impl/YamlImExportServiceImpl.java | 9 ++-- .../support/GlobalExceptionHandler.java | 13 +++--- .../push/controller/PushController.java | 10 ++-- .../controller/PushGatewayController.java | 5 +- .../push/service/PushGatewayService.java | 3 +- .../hertzbeat/push/service/PushService.java | 2 +- .../service/impl/PushGatewayServiceImpl.java | 7 ++- .../push/service/impl/PushServiceImpl.java | 9 +++- .../hertzbeat/remoting/RemotingClient.java | 6 +-- .../hertzbeat/remoting/RemotingServer.java | 9 ++-- .../remoting/netty/NettyRemotingAbstract.java | 7 ++- .../remoting/netty/NettyRemotingClient.java | 3 +- .../remoting/netty/NettyRemotingServer.java | 5 +- .../remoting/netty/ResponseFuture.java | 3 +- script/checkstyle/checkstyle.xml | 42 +++++++++++++++++ .../warehouse/WarehouseWorkerPool.java | 5 +- .../warehouse/config/WarehouseProperties.java | 5 +- .../controller/MetricsDataController.java | 24 +++++----- .../warehouse/service/WarehouseService.java | 3 +- .../service/WarehouseServiceImpl.java | 5 +- .../store/AbstractHistoryDataStorage.java | 7 ++- .../store/AbstractRealTimeDataStorage.java | 5 +- .../warehouse/store/DataStorageDispatch.java | 5 +- .../store/HistoryGrepTimeDbDataStorage.java | 42 +++++++++++------ .../store/HistoryInfluxdbDataStorage.java | 27 +++++++---- .../store/HistoryIotDbDataStorage.java | 15 +++--- .../store/HistoryJpaDatabaseDataStorage.java | 27 ++++++----- .../store/HistoryTdEngineDataStorage.java | 25 +++++----- .../HistoryVictoriaMetricsDataStorage.java | 30 +++++++----- .../store/MetricsDataRedisCodec.java | 5 +- .../store/RealTimeMemoryDataStorage.java | 11 ++--- .../store/RealTimeRedisDataStorage.java | 15 +++--- 300 files changed, 1876 insertions(+), 1547 deletions(-) diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/AlerterWorkerPool.java b/alerter/src/main/java/org/apache/hertzbeat/alert/AlerterWorkerPool.java index 384c6a65d33..a8ebf4a1f40 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/AlerterWorkerPool.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/AlerterWorkerPool.java @@ -18,14 +18,13 @@ package org.apache.hertzbeat.alert; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.SynchronousQueue; import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; /** * alarm module thread pool diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/calculate/CalculateAlarm.java b/alerter/src/main/java/org/apache/hertzbeat/alert/calculate/CalculateAlarm.java index b2e0f429176..960f88974e1 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/calculate/CalculateAlarm.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/calculate/CalculateAlarm.java @@ -17,17 +17,34 @@ package org.apache.hertzbeat.alert.calculate; +import static org.apache.hertzbeat.common.constants.CommonConstants.ALERT_STATUS_CODE_NOT_REACH; +import static org.apache.hertzbeat.common.constants.CommonConstants.ALERT_STATUS_CODE_PENDING; +import static org.apache.hertzbeat.common.constants.CommonConstants.ALERT_STATUS_CODE_SOLVED; +import static org.apache.hertzbeat.common.constants.CommonConstants.TAG_CODE; +import static org.apache.hertzbeat.common.constants.CommonConstants.TAG_METRIC; +import static org.apache.hertzbeat.common.constants.CommonConstants.TAG_METRICS; +import static org.apache.hertzbeat.common.constants.CommonConstants.TAG_MONITOR_APP; +import static org.apache.hertzbeat.common.constants.CommonConstants.TAG_MONITOR_ID; +import static org.apache.hertzbeat.common.constants.CommonConstants.TAG_MONITOR_NAME; import com.googlecode.aviator.AviatorEvaluator; import com.googlecode.aviator.Expression; import com.googlecode.aviator.exception.CompileExpressionErrorException; import com.googlecode.aviator.exception.ExpressionRuntimeException; import com.googlecode.aviator.exception.ExpressionSyntaxErrorException; +import jakarta.persistence.criteria.Predicate; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.ResourceBundle; +import java.util.concurrent.ConcurrentHashMap; +import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.hertzbeat.alert.AlerterWorkerPool; -import org.apache.hertzbeat.alert.service.AlertDefineService; import org.apache.hertzbeat.alert.dao.AlertMonitorDao; import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce; +import org.apache.hertzbeat.alert.service.AlertDefineService; import org.apache.hertzbeat.alert.service.AlertService; import org.apache.hertzbeat.alert.util.AlertTemplateUtil; import org.apache.hertzbeat.common.constants.CommonConstants; @@ -46,12 +63,6 @@ import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; -import jakarta.persistence.criteria.Predicate; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Collectors; - -import static org.apache.hertzbeat.common.constants.CommonConstants.*; /** * Calculate alarms based on the alarm definition rules and collected data @@ -67,7 +78,7 @@ public class CalculateAlarm { * key - monitorId+alertDefineId+tags ｜ The alarm is a common threshold alarm * key - monitorId ｜ Indicates the monitoring status availability reachability alarm */ - private final Map triggeredAlertMap; + private final Map triggeredAlertMap; /** * The not recover alert * key - monitorId + alertDefineId + tags @@ -100,7 +111,7 @@ public CalculateAlarm(AlerterWorkerPool workerPool, CommonDataQueue dataQueue, tags.put(TAG_MONITOR_NAME, monitor.getName()); tags.put(TAG_MONITOR_APP, monitor.getApp()); this.notRecoveredAlertMap.put(monitor.getId() + CommonConstants.AVAILABILITY, - Alert.builder().tags(tags).target(AVAILABILITY).status(ALERT_STATUS_CODE_PENDING).build()); + Alert.builder().tags(tags).target(CommonConstants.AVAILABILITY).status(ALERT_STATUS_CODE_PENDING).build()); } } startCalculate(); diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertConvergeController.java b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertConvergeController.java index 106ac72e6b8..df38ea5a95c 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertConvergeController.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertConvergeController.java @@ -17,20 +17,24 @@ package org.apache.hertzbeat.alert.controller; +import static org.apache.hertzbeat.common.constants.CommonConstants.MONITOR_NOT_EXIST_CODE; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import org.apache.hertzbeat.alert.service.AlertConvergeService; import org.apache.hertzbeat.common.entity.alerter.AlertConverge; import org.apache.hertzbeat.common.entity.dto.Message; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import jakarta.validation.Valid; - -import static org.apache.hertzbeat.common.constants.CommonConstants.MONITOR_NOT_EXIST_CODE; -import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * Alarm Converge management API diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertConvergesController.java b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertConvergesController.java index 4b38a38183d..3d6fb584e72 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertConvergesController.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertConvergesController.java @@ -17,9 +17,15 @@ package org.apache.hertzbeat.alert.controller; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Predicate; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; import org.apache.hertzbeat.alert.service.AlertConvergeService; import org.apache.hertzbeat.common.entity.alerter.AlertConverge; import org.apache.hertzbeat.common.entity.dto.Message; @@ -30,15 +36,11 @@ import org.springframework.data.jpa.domain.Specification; import org.springframework.http.ResponseEntity; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.*; - -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.Predicate; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; - -import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; /** * Converge the batch API for alarms diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertDefineController.java b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertDefineController.java index 66e26b2fd67..33f4292bacb 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertDefineController.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertDefineController.java @@ -17,13 +17,18 @@ package org.apache.hertzbeat.alert.controller; -import org.apache.hertzbeat.common.entity.alerter.AlertDefine; -import org.apache.hertzbeat.common.entity.alerter.AlertDefineMonitorBind; -import org.apache.hertzbeat.alert.service.AlertDefineService; -import org.apache.hertzbeat.common.entity.dto.Message; +import static org.apache.hertzbeat.common.constants.CommonConstants.MONITOR_NOT_EXIST_CODE; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import java.util.List; +import java.util.stream.Collectors; +import org.apache.hertzbeat.alert.service.AlertDefineService; +import org.apache.hertzbeat.common.entity.alerter.AlertDefine; +import org.apache.hertzbeat.common.entity.alerter.AlertDefineMonitorBind; +import org.apache.hertzbeat.common.entity.dto.Message; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.DeleteMapping; @@ -35,14 +40,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import jakarta.validation.Valid; - -import java.util.List; -import java.util.stream.Collectors; - -import static org.apache.hertzbeat.common.constants.CommonConstants.MONITOR_NOT_EXIST_CODE; -import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; - /** * Alarm definition management API */ diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertDefinesController.java b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertDefinesController.java index 259309f0210..2150f06800f 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertDefinesController.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertDefinesController.java @@ -17,12 +17,19 @@ package org.apache.hertzbeat.alert.controller; -import org.apache.hertzbeat.common.entity.alerter.AlertDefine; -import org.apache.hertzbeat.alert.service.AlertDefineService; -import org.apache.hertzbeat.common.entity.dto.Message; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Predicate; +import jakarta.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import org.apache.hertzbeat.alert.service.AlertDefineService; +import org.apache.hertzbeat.common.entity.alerter.AlertDefine; +import org.apache.hertzbeat.common.entity.dto.Message; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -30,18 +37,14 @@ import org.springframework.data.jpa.domain.Specification; import org.springframework.http.ResponseEntity; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.Predicate; -import jakarta.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; - -import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; - /** * Define the batch API for alarms */ diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertReportController.java b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertReportController.java index af1e8486f61..89b67fd1899 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertReportController.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertReportController.java @@ -17,8 +17,11 @@ package org.apache.hertzbeat.alert.controller; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import java.util.Date; +import java.util.Optional; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.alert.dto.CloudAlertReportAbstract; import org.apache.hertzbeat.alert.dto.GeneralCloudAlertReport; @@ -29,12 +32,11 @@ import org.apache.hertzbeat.common.util.JsonUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.Date; -import java.util.Optional; - -import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * Extern Alarm Manage API diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertSilenceController.java b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertSilenceController.java index bd0b9d1b578..56e9af3f022 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertSilenceController.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertSilenceController.java @@ -17,21 +17,24 @@ package org.apache.hertzbeat.alert.controller; +import static org.apache.hertzbeat.common.constants.CommonConstants.MONITOR_NOT_EXIST_CODE; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import org.apache.hertzbeat.alert.service.AlertSilenceService; import org.apache.hertzbeat.common.entity.alerter.AlertSilence; import org.apache.hertzbeat.common.entity.dto.Message; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import jakarta.validation.Valid; - - -import static org.apache.hertzbeat.common.constants.CommonConstants.MONITOR_NOT_EXIST_CODE; -import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * Alarm Silence management API diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertSilencesController.java b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertSilencesController.java index c112cc55ead..c5db7e4c3ac 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertSilencesController.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertSilencesController.java @@ -17,9 +17,15 @@ package org.apache.hertzbeat.alert.controller; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Predicate; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; import org.apache.hertzbeat.alert.service.AlertSilenceService; import org.apache.hertzbeat.common.entity.alerter.AlertSilence; import org.apache.hertzbeat.common.entity.dto.Message; @@ -30,15 +36,11 @@ import org.springframework.data.jpa.domain.Specification; import org.springframework.http.ResponseEntity; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.*; - -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.Predicate; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; - -import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; /** * Silence the batch API for alarms diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertsController.java b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertsController.java index 7d488e53fd0..65aac1e0419 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertsController.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertsController.java @@ -17,28 +17,32 @@ package org.apache.hertzbeat.alert.controller; -import org.apache.hertzbeat.alert.dto.AlertSummary; -import org.apache.hertzbeat.common.entity.alerter.Alert; -import org.apache.hertzbeat.alert.service.AlertService; -import org.apache.hertzbeat.common.entity.dto.Message; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Predicate; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import org.apache.hertzbeat.alert.dto.AlertSummary; +import org.apache.hertzbeat.alert.service.AlertService; +import org.apache.hertzbeat.common.entity.alerter.Alert; +import org.apache.hertzbeat.common.entity.dto.Message; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.Predicate; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; - -import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; /** * Alarm Management API diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertConvergeDao.java b/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertConvergeDao.java index 6b17f3110f7..b638f0d3416 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertConvergeDao.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertConvergeDao.java @@ -17,13 +17,12 @@ package org.apache.hertzbeat.alert.dao; +import java.util.Set; import org.apache.hertzbeat.common.entity.alerter.AlertConverge; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Modifying; -import java.util.Set; - /** * AlertConverge Dao */ diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertDao.java b/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertDao.java index 8dda5941fc5..80603d64c03 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertDao.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertDao.java @@ -17,6 +17,8 @@ package org.apache.hertzbeat.alert.dao; +import java.util.List; +import java.util.Set; import org.apache.hertzbeat.alert.dto.AlertPriorityNum; import org.apache.hertzbeat.common.entity.alerter.Alert; import org.springframework.data.jpa.repository.JpaRepository; @@ -25,9 +27,6 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import java.util.List; -import java.util.Set; - /** * Alert Database Operations */ diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertDefineBindDao.java b/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertDefineBindDao.java index a6f8dad57dc..76bb187c8c3 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertDefineBindDao.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertDefineBindDao.java @@ -17,13 +17,12 @@ package org.apache.hertzbeat.alert.dao; +import java.util.List; +import java.util.Set; import org.apache.hertzbeat.common.entity.alerter.AlertDefineMonitorBind; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import java.util.List; -import java.util.Set; - /** * AlertDefineBind database operations */ diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertDefineDao.java b/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertDefineDao.java index 15fe8c2c5e8..4e453f364fe 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertDefineDao.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertDefineDao.java @@ -17,15 +17,14 @@ package org.apache.hertzbeat.alert.dao; +import java.util.List; +import java.util.Set; import org.apache.hertzbeat.common.entity.alerter.AlertDefine; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import java.util.List; -import java.util.Set; - /** * AlertDefine Dao */ diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertMonitorDao.java b/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertMonitorDao.java index bf6e72949b2..8fd7614736e 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertMonitorDao.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertMonitorDao.java @@ -17,6 +17,7 @@ package org.apache.hertzbeat.alert.dao; +import java.util.List; import org.apache.hertzbeat.common.entity.manager.Monitor; import org.apache.hertzbeat.common.entity.manager.Tag; import org.springframework.data.jpa.repository.JpaRepository; @@ -24,8 +25,6 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import java.util.List; - /** * Alert Monitor Dao */ diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertSilenceDao.java b/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertSilenceDao.java index 3e168dbf79b..4a409b801ac 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertSilenceDao.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertSilenceDao.java @@ -17,13 +17,12 @@ package org.apache.hertzbeat.alert.dao; +import java.util.Set; import org.apache.hertzbeat.common.entity.alerter.AlertSilence; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Modifying; -import java.util.Set; - /** * AlertSilence Dao */ diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/dto/AlertSummary.java b/alerter/src/main/java/org/apache/hertzbeat/alert/dto/AlertSummary.java index 30c051877d5..f75a680e913 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/dto/AlertSummary.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/dto/AlertSummary.java @@ -17,13 +17,12 @@ package org.apache.hertzbeat.alert.dto; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; - /** * Alarm Statistics Information diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/dto/CloudAlertReportAbstract.java b/alerter/src/main/java/org/apache/hertzbeat/alert/dto/CloudAlertReportAbstract.java index f3fba3e6133..eeecd5acb42 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/dto/CloudAlertReportAbstract.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/dto/CloudAlertReportAbstract.java @@ -18,9 +18,8 @@ package org.apache.hertzbeat.alert.dto; import com.fasterxml.jackson.annotation.JsonIgnore; -import org.apache.hertzbeat.common.entity.dto.AlertReport; - import java.util.Map; +import org.apache.hertzbeat.common.entity.dto.AlertReport; /** * Abstract parent of cloud service alarm information diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/dto/GeneralCloudAlertReport.java b/alerter/src/main/java/org/apache/hertzbeat/alert/dto/GeneralCloudAlertReport.java index 9178884b706..cc81d886126 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/dto/GeneralCloudAlertReport.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/dto/GeneralCloudAlertReport.java @@ -17,7 +17,10 @@ package org.apache.hertzbeat.alert.dto; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.apache.hertzbeat.alert.util.DateUtil; import org.apache.hertzbeat.common.entity.dto.AlertReport; diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/dto/TenCloudAlertReport.java b/alerter/src/main/java/org/apache/hertzbeat/alert/dto/TenCloudAlertReport.java index cc8e71df1db..93f81ba36cc 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/dto/TenCloudAlertReport.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/dto/TenCloudAlertReport.java @@ -19,6 +19,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; +import java.io.Serializable; +import java.util.Map; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -26,9 +28,6 @@ import lombok.NoArgsConstructor; import org.apache.hertzbeat.alert.util.DateUtil; -import java.io.Serializable; -import java.util.Map; - /** * * Tencent cloud alarm entity class diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/enums/CloudServiceAlarmInformationEnum.java b/alerter/src/main/java/org/apache/hertzbeat/alert/enums/CloudServiceAlarmInformationEnum.java index bb0e6d0169e..ebaeb0ae324 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/enums/CloudServiceAlarmInformationEnum.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/enums/CloudServiceAlarmInformationEnum.java @@ -17,13 +17,12 @@ package org.apache.hertzbeat.alert.enums; +import java.util.Arrays; import lombok.AllArgsConstructor; import lombok.Getter; import org.apache.hertzbeat.alert.dto.CloudAlertReportAbstract; import org.apache.hertzbeat.alert.dto.TenCloudAlertReport; -import java.util.Arrays; - /** * Cloud server alarm enum */ diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/reduce/AlarmCommonReduce.java b/alerter/src/main/java/org/apache/hertzbeat/alert/reduce/AlarmCommonReduce.java index 2da97519983..302e7c827f3 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/reduce/AlarmCommonReduce.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/reduce/AlarmCommonReduce.java @@ -17,6 +17,9 @@ package org.apache.hertzbeat.alert.reduce; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.alert.dao.AlertMonitorDao; @@ -26,10 +29,6 @@ import org.apache.hertzbeat.common.queue.CommonDataQueue; import org.springframework.stereotype.Service; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /** * reduce alarm and send alert data */ diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/reduce/AlarmConvergeReduce.java b/alerter/src/main/java/org/apache/hertzbeat/alert/reduce/AlarmConvergeReduce.java index 6fd387f6f83..b2c13509458 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/reduce/AlarmConvergeReduce.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/reduce/AlarmConvergeReduce.java @@ -17,6 +17,11 @@ package org.apache.hertzbeat.alert.reduce; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; import org.apache.hertzbeat.alert.dao.AlertConvergeDao; import org.apache.hertzbeat.common.cache.CacheFactory; import org.apache.hertzbeat.common.cache.CommonCacheService; @@ -26,12 +31,6 @@ import org.apache.hertzbeat.common.entity.manager.TagItem; import org.springframework.stereotype.Service; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; - /** * alarm converge */ diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/reduce/AlarmSilenceReduce.java b/alerter/src/main/java/org/apache/hertzbeat/alert/reduce/AlarmSilenceReduce.java index ab82daae892..6f9e146287e 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/reduce/AlarmSilenceReduce.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/reduce/AlarmSilenceReduce.java @@ -17,6 +17,11 @@ package org.apache.hertzbeat.alert.reduce; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.util.List; +import java.util.Map; +import java.util.Optional; import lombok.RequiredArgsConstructor; import org.apache.hertzbeat.alert.dao.AlertSilenceDao; import org.apache.hertzbeat.common.cache.CacheFactory; @@ -27,12 +32,6 @@ import org.apache.hertzbeat.common.entity.manager.TagItem; import org.springframework.stereotype.Service; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.util.List; -import java.util.Map; -import java.util.Optional; - /** * silence alarm */ diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertConvergeService.java b/alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertConvergeService.java index 3e24c151d29..b41fdc5efb8 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertConvergeService.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertConvergeService.java @@ -17,13 +17,12 @@ package org.apache.hertzbeat.alert.service; +import java.util.Set; import org.apache.hertzbeat.common.entity.alerter.AlertConverge; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.jpa.domain.Specification; -import java.util.Set; - /** * management interface service for alert converge */ diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertDefineService.java b/alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertDefineService.java index 9e0efe58f14..74319167a81 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertDefineService.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertDefineService.java @@ -17,6 +17,10 @@ package org.apache.hertzbeat.alert.service; +import jakarta.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; +import java.util.Set; import org.apache.hertzbeat.common.entity.alerter.AlertDefine; import org.apache.hertzbeat.common.entity.alerter.AlertDefineMonitorBind; import org.springframework.data.domain.Page; @@ -24,11 +28,6 @@ import org.springframework.data.jpa.domain.Specification; import org.springframework.web.multipart.MultipartFile; -import jakarta.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * Alarm define manager service */ diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertService.java b/alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertService.java index 3db37ef8d48..2bc6b182e64 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertService.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertService.java @@ -17,6 +17,8 @@ package org.apache.hertzbeat.alert.service; +import java.util.HashSet; +import java.util.List; import org.apache.hertzbeat.alert.dto.AlertSummary; import org.apache.hertzbeat.common.entity.alerter.Alert; import org.apache.hertzbeat.common.entity.dto.AlertReport; @@ -24,9 +26,6 @@ import org.springframework.data.domain.PageRequest; import org.springframework.data.jpa.domain.Specification; -import java.util.HashSet; -import java.util.List; - /** * Alarm information management interface */ diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertSilenceService.java b/alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertSilenceService.java index 1703edb8480..3e7e114e4f1 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertSilenceService.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertSilenceService.java @@ -17,13 +17,12 @@ package org.apache.hertzbeat.alert.service; +import java.util.Set; import org.apache.hertzbeat.common.entity.alerter.AlertSilence; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.jpa.domain.Specification; -import java.util.Set; - /** * management interface service for alert silence */ diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertConvergeServiceImpl.java b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertConvergeServiceImpl.java index c02f56710aa..a4d05b47e56 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertConvergeServiceImpl.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertConvergeServiceImpl.java @@ -17,6 +17,7 @@ package org.apache.hertzbeat.alert.service.impl; +import java.util.Set; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.alert.dao.AlertConvergeDao; import org.apache.hertzbeat.alert.service.AlertConvergeService; @@ -31,8 +32,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Set; - /** * implement for alert converge service */ diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineAbstractImExportServiceImpl.java b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineAbstractImExportServiceImpl.java index ed98272db07..3dc25e09aab 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineAbstractImExportServiceImpl.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineAbstractImExportServiceImpl.java @@ -22,6 +22,12 @@ import cn.afterturn.easypoi.excel.annotation.ExcelTarget; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; +import jakarta.annotation.Resource; +import java.io.InputStream; +import java.io.OutputStream; +import java.time.LocalDate; +import java.util.List; +import java.util.stream.Collectors; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.alert.service.AlertDefineImExportService; @@ -32,13 +38,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.util.CollectionUtils; -import jakarta.annotation.Resource; -import java.io.InputStream; -import java.io.OutputStream; -import java.time.LocalDate; -import java.util.List; -import java.util.stream.Collectors; - /** * Configuration Import Export */ diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineExcelImExportServiceImpl.java b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineExcelImExportServiceImpl.java index dcebc80b3d0..46e5db4e9a4 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineExcelImExportServiceImpl.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineExcelImExportServiceImpl.java @@ -18,18 +18,27 @@ package org.apache.hertzbeat.alert.service.impl; import com.fasterxml.jackson.core.type.TypeReference; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.usermodel.*; import org.apache.hertzbeat.common.entity.manager.TagItem; import org.apache.hertzbeat.common.util.JsonUtil; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.CellType; +import org.apache.poi.ss.usermodel.Font; +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.apache.poi.ss.usermodel.WorkbookFactory; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.*; - /** * Configure the import and export EXCEL format diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineJsonImExportServiceImpl.java b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineJsonImExportServiceImpl.java index 4b0a23bf374..37f4ba51ea4 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineJsonImExportServiceImpl.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineJsonImExportServiceImpl.java @@ -20,14 +20,13 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.List; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; /** diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineServiceImpl.java b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineServiceImpl.java index 5869350ba73..b66ef9841a3 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineServiceImpl.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineServiceImpl.java @@ -18,13 +18,23 @@ package org.apache.hertzbeat.alert.service.impl; import com.googlecode.aviator.AviatorEvaluator; +import jakarta.servlet.http.HttpServletResponse; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; +import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.alert.dao.AlertDefineBindDao; +import org.apache.hertzbeat.alert.dao.AlertDefineDao; import org.apache.hertzbeat.alert.service.AlertDefineImExportService; import org.apache.hertzbeat.alert.service.AlertDefineService; -import org.apache.hertzbeat.alert.dao.AlertDefineDao; import org.apache.hertzbeat.common.entity.alerter.AlertDefine; import org.apache.hertzbeat.common.entity.alerter.AlertDefineMonitorBind; -import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -35,12 +45,6 @@ import org.springframework.util.StringUtils; import org.springframework.web.multipart.MultipartFile; -import jakarta.servlet.http.HttpServletResponse; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.util.*; -import java.util.stream.Collectors; - /** * Alarm definition management interface implementation */ diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineYamlImExportServiceImpl.java b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineYamlImExportServiceImpl.java index 2d162d67053..bdd88cb3efb 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineYamlImExportServiceImpl.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineYamlImExportServiceImpl.java @@ -18,16 +18,15 @@ package org.apache.hertzbeat.alert.service.impl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.yaml.snakeyaml.DumperOptions; -import org.yaml.snakeyaml.Yaml; - import java.io.InputStream; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.nio.charset.StandardCharsets; import java.util.List; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.yaml.snakeyaml.DumperOptions; +import org.yaml.snakeyaml.Yaml; /** diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertServiceImpl.java b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertServiceImpl.java index ec6ebb56d1f..567952cad59 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertServiceImpl.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertServiceImpl.java @@ -17,15 +17,23 @@ package org.apache.hertzbeat.alert.service.impl; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.alert.dao.AlertDao; -import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce; import org.apache.hertzbeat.alert.dto.AlertPriorityNum; import org.apache.hertzbeat.alert.dto.AlertSummary; -import org.apache.hertzbeat.common.entity.alerter.Alert; +import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce; import org.apache.hertzbeat.alert.service.AlertService; -import org.apache.hertzbeat.common.entity.dto.AlertReport; import org.apache.hertzbeat.common.constants.CommonConstants; -import lombok.extern.slf4j.Slf4j; +import org.apache.hertzbeat.common.entity.alerter.Alert; +import org.apache.hertzbeat.common.entity.dto.AlertReport; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -33,15 +41,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.time.Instant; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.util.HashSet; -import java.util.List; -import java.util.Map; - /** * Realization of Alarm Information Service */ diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertSilenceServiceImpl.java b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertSilenceServiceImpl.java index 2f495eea0d0..a8a347af5b4 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertSilenceServiceImpl.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertSilenceServiceImpl.java @@ -17,6 +17,8 @@ package org.apache.hertzbeat.alert.service.impl; +import java.util.Arrays; +import java.util.Set; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.alert.dao.AlertSilenceDao; import org.apache.hertzbeat.alert.service.AlertSilenceService; @@ -31,9 +33,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Arrays; -import java.util.Set; - /** * management interface service implement for alert silence */ diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/util/AlertTemplateUtil.java b/alerter/src/main/java/org/apache/hertzbeat/alert/util/AlertTemplateUtil.java index 3f8aea5cc5d..69be45bcf1c 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/util/AlertTemplateUtil.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/util/AlertTemplateUtil.java @@ -17,11 +17,10 @@ package org.apache.hertzbeat.alert.util; -import lombok.extern.slf4j.Slf4j; - import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; +import lombok.extern.slf4j.Slf4j; /** * Alarm template keyword matching replacement engine tool diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/util/DateUtil.java b/alerter/src/main/java/org/apache/hertzbeat/alert/util/DateUtil.java index 5d2801f3eb2..c9c81583d93 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/util/DateUtil.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/util/DateUtil.java @@ -17,10 +17,9 @@ package org.apache.hertzbeat.alert.util; -import lombok.extern.slf4j.Slf4j; - import java.text.ParseException; import java.text.SimpleDateFormat; +import lombok.extern.slf4j.Slf4j; /** * date time common util diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/Collector.java b/collector/src/main/java/org/apache/hertzbeat/collector/Collector.java index 4d5f2ae6de1..3e41f228010 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/Collector.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/Collector.java @@ -17,10 +17,9 @@ package org.apache.hertzbeat.collector; +import jakarta.annotation.PostConstruct; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; - -import jakarta.annotation.PostConstruct; import org.springframework.boot.context.properties.ConfigurationPropertiesScan; import org.springframework.context.annotation.ComponentScan; diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/CacheIdentifier.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/CacheIdentifier.java index 733f7e058ee..686dc8c0864 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/CacheIdentifier.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/CacheIdentifier.java @@ -17,10 +17,10 @@ package org.apache.hertzbeat.collector.collect.common.cache; +import java.util.Objects; import lombok.Builder; import lombok.Data; -import java.util.Objects; /** * resource identifier in cache diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/ConnectionCommonCache.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/ConnectionCommonCache.java index ac96988bdeb..0ae50816695 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/ConnectionCommonCache.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/ConnectionCommonCache.java @@ -20,11 +20,15 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap; -import lombok.extern.slf4j.Slf4j; - import java.util.Map; import java.util.Optional; -import java.util.concurrent.*; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ScheduledThreadPoolExecutor; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import lombok.extern.slf4j.Slf4j; /** * lru common resource cache for client-server connection diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/JdbcConnect.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/JdbcConnect.java index 4825ad218fa..c110b343794 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/JdbcConnect.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/JdbcConnect.java @@ -17,9 +17,8 @@ package org.apache.hertzbeat.collector.collect.common.cache; -import lombok.extern.slf4j.Slf4j; - import java.sql.Connection; +import lombok.extern.slf4j.Slf4j; /** * jdbc common connection diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/JmxConnect.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/JmxConnect.java index 97a4f256690..36db79722be 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/JmxConnect.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/JmxConnect.java @@ -17,9 +17,8 @@ package org.apache.hertzbeat.collector.collect.common.cache; -import lombok.extern.slf4j.Slf4j; - import javax.management.remote.JMXConnector; +import lombok.extern.slf4j.Slf4j; /** * jmx connect object diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/http/CommonHttpClient.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/http/CommonHttpClient.java index f37ebbfcf79..5212e71f6d8 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/http/CommonHttpClient.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/http/CommonHttpClient.java @@ -18,6 +18,17 @@ package org.apache.hertzbeat.collector.collect.common.http; import com.google.common.util.concurrent.ThreadFactoryBuilder; +import java.security.cert.CertificateException; +import java.security.cert.CertificateExpiredException; +import java.security.cert.X509Certificate; +import java.util.Date; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.TimeUnit; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; import lombok.extern.slf4j.Slf4j; import org.apache.http.client.config.RequestConfig; import org.apache.http.config.Registry; @@ -31,18 +42,6 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.apache.http.ssl.SSLContexts; -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; -import java.security.cert.CertificateException; -import java.security.cert.CertificateExpiredException; -import java.security.cert.X509Certificate; -import java.util.Date; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.TimeUnit; - /** * common http client */ diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/database/JdbcCommonCollect.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/database/JdbcCommonCollect.java index 5d0e011dfaf..b251af8535e 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/database/JdbcCommonCollect.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/database/JdbcCommonCollect.java @@ -17,6 +17,16 @@ package org.apache.hertzbeat.collector.collect.database; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.HashMap; +import java.util.List; +import java.util.Objects; +import java.util.Optional; +import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.collector.collect.AbstractCollect; import org.apache.hertzbeat.collector.collect.common.cache.CacheIdentifier; import org.apache.hertzbeat.collector.collect.common.cache.ConnectionCommonCache; @@ -24,27 +34,16 @@ import org.apache.hertzbeat.collector.dispatch.DispatchConstants; import org.apache.hertzbeat.collector.util.CollectUtil; import org.apache.hertzbeat.common.constants.CollectorConstants; +import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.entity.job.Metrics; import org.apache.hertzbeat.common.entity.job.protocol.JdbcProtocol; import org.apache.hertzbeat.common.entity.message.CollectRep; -import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.util.CommonUtil; -import lombok.extern.slf4j.Slf4j; import org.postgresql.util.PSQLException; import org.springframework.core.io.FileSystemResource; import org.springframework.jdbc.datasource.init.ScriptUtils; import org.springframework.util.StringUtils; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.HashMap; -import java.util.List; -import java.util.Objects; -import java.util.Optional; - /** * common query for database query */ diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/dns/DnsCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/dns/DnsCollectImpl.java index 1655571cb4d..c0d41d347ed 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/dns/DnsCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/dns/DnsCollectImpl.java @@ -19,14 +19,21 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import java.io.IOException; +import java.time.Duration; +import java.time.temporal.ChronoUnit; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.apache.hertzbeat.collector.dispatch.DispatchConstants; import org.apache.hertzbeat.collector.collect.AbstractCollect; +import org.apache.hertzbeat.collector.dispatch.DispatchConstants; import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.entity.job.Metrics; import org.apache.hertzbeat.common.entity.job.protocol.DnsProtocol; @@ -45,14 +52,6 @@ import org.xbill.DNS.SimpleResolver; import org.xbill.DNS.Type; -import java.io.IOException; -import java.time.Duration; -import java.time.temporal.ChronoUnit; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Objects; - /** * dns protocol collection implementation */ diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/ftp/FtpCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/ftp/FtpCollectImpl.java index be3246eb1f6..c4f3afe8646 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/ftp/FtpCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/ftp/FtpCollectImpl.java @@ -17,22 +17,21 @@ package org.apache.hertzbeat.collector.collect.ftp; -import org.apache.hertzbeat.collector.dispatch.DispatchConstants; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.net.ftp.FTPClient; import org.apache.hertzbeat.collector.collect.AbstractCollect; +import org.apache.hertzbeat.collector.dispatch.DispatchConstants; +import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.entity.job.Metrics; import org.apache.hertzbeat.common.entity.job.protocol.FtpProtocol; import org.apache.hertzbeat.common.entity.message.CollectRep; -import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.util.CommonUtil; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.net.ftp.FTPClient; import org.springframework.util.Assert; import org.springframework.util.StringUtils; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; - /** * ftp protocol collection implementation */ diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/HttpCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/HttpCollectImpl.java index c7783f7a1e1..1f45861e6aa 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/HttpCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/HttpCollectImpl.java @@ -17,28 +17,47 @@ package org.apache.hertzbeat.collector.collect.http; +import static org.apache.hertzbeat.common.constants.SignConstants.RIGHT_DASH; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InterruptedIOException; +import java.net.ConnectException; +import java.net.UnknownHostException; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import javax.net.ssl.SSLException; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.net.util.Base64; +import org.apache.hertzbeat.collector.collect.AbstractCollect; import org.apache.hertzbeat.collector.collect.common.http.CommonHttpClient; import org.apache.hertzbeat.collector.collect.http.promethus.AbstractPrometheusParse; import org.apache.hertzbeat.collector.collect.http.promethus.PrometheusParseCreater; import org.apache.hertzbeat.collector.collect.http.promethus.exporter.ExporterParser; import org.apache.hertzbeat.collector.collect.http.promethus.exporter.MetricFamily; import org.apache.hertzbeat.collector.dispatch.DispatchConstants; -import org.apache.hertzbeat.collector.collect.AbstractCollect; import org.apache.hertzbeat.collector.util.CollectUtil; -import org.apache.hertzbeat.common.constants.CollectorConstants; import org.apache.hertzbeat.collector.util.JsonPathParser; +import org.apache.hertzbeat.common.constants.CollectorConstants; +import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.entity.job.Metrics; import org.apache.hertzbeat.common.entity.job.protocol.HttpProtocol; import org.apache.hertzbeat.common.entity.message.CollectRep; -import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.util.CommonUtil; import org.apache.hertzbeat.common.util.IpDomainUtil; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.net.util.Base64; import org.apache.http.HttpHeaders; import org.apache.http.HttpHost; import org.apache.http.HttpStatus; @@ -67,23 +86,6 @@ import org.w3c.dom.NodeList; -import javax.net.ssl.SSLException; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InterruptedIOException; -import java.net.ConnectException; -import java.net.UnknownHostException; -import java.nio.charset.StandardCharsets; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import static org.apache.hertzbeat.common.constants.SignConstants.RIGHT_DASH; - - /** * http https collect */ diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/SslCertificateCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/SslCertificateCollectImpl.java index 7f9a17f388f..4e3340d21b0 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/SslCertificateCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/SslCertificateCollectImpl.java @@ -17,20 +17,7 @@ package org.apache.hertzbeat.collector.collect.http; -import org.apache.hertzbeat.collector.dispatch.DispatchConstants; -import org.apache.hertzbeat.collector.collect.AbstractCollect; -import org.apache.hertzbeat.common.constants.CollectorConstants; -import org.apache.hertzbeat.common.entity.job.Metrics; -import org.apache.hertzbeat.common.entity.job.protocol.HttpProtocol; -import org.apache.hertzbeat.common.entity.message.CollectRep; -import org.apache.hertzbeat.common.constants.CommonConstants; -import org.apache.hertzbeat.common.util.CommonUtil; -import org.apache.hertzbeat.common.util.IpDomainUtil; -import lombok.extern.slf4j.Slf4j; - -import javax.net.ssl.HttpsURLConnection; -import javax.net.ssl.SSLException; -import javax.net.ssl.SSLPeerUnverifiedException; +import static org.apache.hertzbeat.common.constants.SignConstants.RIGHT_DASH; import java.io.IOException; import java.io.InterruptedIOException; import java.net.ConnectException; @@ -39,8 +26,19 @@ import java.security.cert.Certificate; import java.security.cert.X509Certificate; import java.util.Date; - -import static org.apache.hertzbeat.common.constants.SignConstants.RIGHT_DASH; +import javax.net.ssl.HttpsURLConnection; +import javax.net.ssl.SSLException; +import javax.net.ssl.SSLPeerUnverifiedException; +import lombok.extern.slf4j.Slf4j; +import org.apache.hertzbeat.collector.collect.AbstractCollect; +import org.apache.hertzbeat.collector.dispatch.DispatchConstants; +import org.apache.hertzbeat.common.constants.CollectorConstants; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.job.Metrics; +import org.apache.hertzbeat.common.entity.job.protocol.HttpProtocol; +import org.apache.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.util.CommonUtil; +import org.apache.hertzbeat.common.util.IpDomainUtil; /** diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/AbstractPrometheusParse.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/AbstractPrometheusParse.java index 36f994d2e62..d2417aff538 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/AbstractPrometheusParse.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/AbstractPrometheusParse.java @@ -17,11 +17,10 @@ package org.apache.hertzbeat.collector.collect.http.promethus; +import java.util.List; import org.apache.hertzbeat.common.entity.job.protocol.HttpProtocol; import org.apache.hertzbeat.common.entity.message.CollectRep; -import java.util.List; - /** * prometheus parse abstract class * todo: string类型 和 scalar类型 响应格式解析 diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/PrometheusLastParser.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/PrometheusLastParser.java index 17a0617d555..fa60b33789a 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/PrometheusLastParser.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/PrometheusLastParser.java @@ -17,13 +17,12 @@ package org.apache.hertzbeat.collector.collect.http.promethus; -import org.apache.hertzbeat.common.entity.job.protocol.HttpProtocol; -import org.apache.hertzbeat.common.entity.message.CollectRep; -import org.apache.hertzbeat.common.constants.CommonConstants; +import java.util.List; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; - -import java.util.List; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.job.protocol.HttpProtocol; +import org.apache.hertzbeat.common.entity.message.CollectRep; /** * Prometheus Last Parser diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/PrometheusMatrixParser.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/PrometheusMatrixParser.java index b0e395ba9e9..eace41a5d80 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/PrometheusMatrixParser.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/PrometheusMatrixParser.java @@ -18,17 +18,16 @@ package org.apache.hertzbeat.collector.collect.http.promethus; import com.google.gson.JsonElement; +import java.math.BigDecimal; +import java.util.List; +import lombok.NoArgsConstructor; import org.apache.hertzbeat.collector.dispatch.DispatchConstants; import org.apache.hertzbeat.collector.util.CollectUtil; +import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.entity.dto.PromVectorOrMatrix; import org.apache.hertzbeat.common.entity.job.protocol.HttpProtocol; import org.apache.hertzbeat.common.entity.message.CollectRep; -import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.util.JsonUtil; -import lombok.NoArgsConstructor; - -import java.math.BigDecimal; -import java.util.List; /** * Processing prometheus returns a response format of type "matrix" diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/PrometheusVectorParser.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/PrometheusVectorParser.java index b50ee953a1d..28b85683cf7 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/PrometheusVectorParser.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/PrometheusVectorParser.java @@ -18,17 +18,16 @@ package org.apache.hertzbeat.collector.collect.http.promethus; import com.google.gson.JsonElement; +import java.math.BigDecimal; +import java.util.List; +import lombok.NoArgsConstructor; import org.apache.hertzbeat.collector.dispatch.DispatchConstants; import org.apache.hertzbeat.collector.util.CollectUtil; +import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.entity.dto.PromVectorOrMatrix; import org.apache.hertzbeat.common.entity.job.protocol.HttpProtocol; import org.apache.hertzbeat.common.entity.message.CollectRep; -import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.util.JsonUtil; -import lombok.NoArgsConstructor; - -import java.math.BigDecimal; -import java.util.List; /** * Processing prometheus returns a response format of type "vector" diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/exporter/ExporterParser.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/exporter/ExporterParser.java index 359d8a2144a..1f35caa2d76 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/exporter/ExporterParser.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/exporter/ExporterParser.java @@ -17,11 +17,6 @@ package org.apache.hertzbeat.collector.collect.http.promethus.exporter; -import org.apache.hertzbeat.collector.collect.http.promethus.ParseException; -import org.apache.hertzbeat.common.util.StrBuffer; -import lombok.extern.slf4j.Slf4j; -import org.springframework.util.StringUtils; - import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; @@ -29,6 +24,10 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; +import lombok.extern.slf4j.Slf4j; +import org.apache.hertzbeat.collector.collect.http.promethus.ParseException; +import org.apache.hertzbeat.common.util.StrBuffer; +import org.springframework.util.StringUtils; /** * Resolves the data passed by prometheus's exporter interface http:xxx/metrics diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/exporter/MetricFamily.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/exporter/MetricFamily.java index 7dbbfdc2d94..e1b90ad358a 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/exporter/MetricFamily.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/exporter/MetricFamily.java @@ -17,11 +17,10 @@ package org.apache.hertzbeat.collector.collect.http.promethus.exporter; -import lombok.Data; -import lombok.ToString; - import java.util.ArrayList; import java.util.List; +import lombok.Data; +import lombok.ToString; /** * diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/HttpsdImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/HttpsdImpl.java index 19af8630804..ac90051eb45 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/HttpsdImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/HttpsdImpl.java @@ -20,13 +20,15 @@ package org.apache.hertzbeat.collector.collect.httpsd; import com.ecwid.consul.transport.TransportException; +import java.lang.reflect.Field; +import java.util.Objects; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.hertzbeat.collector.collect.AbstractCollect; import org.apache.hertzbeat.collector.collect.httpsd.discovery.DiscoveryClient; import org.apache.hertzbeat.collector.collect.httpsd.discovery.DiscoveryClientManagement; import org.apache.hertzbeat.collector.collect.httpsd.discovery.ServerInfo; import org.apache.hertzbeat.collector.dispatch.DispatchConstants; -import org.apache.hertzbeat.collector.collect.AbstractCollect; import org.apache.hertzbeat.common.constants.CollectorConstants; import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.entity.job.Metrics; @@ -34,9 +36,6 @@ import org.apache.hertzbeat.common.entity.message.CollectRep; import org.apache.hertzbeat.common.util.CommonUtil; -import java.lang.reflect.Field; -import java.util.Objects; - /** * http_sd protocol collection implementation */ diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/constant/DiscoveryClientInstance.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/constant/DiscoveryClientInstance.java index 060b013246b..513020eae0b 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/constant/DiscoveryClientInstance.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/constant/DiscoveryClientInstance.java @@ -19,9 +19,8 @@ package org.apache.hertzbeat.collector.collect.httpsd.constant; -import org.apache.commons.lang3.StringUtils; - import java.util.Arrays; +import org.apache.commons.lang3.StringUtils; /** * Discovery Client Instance Name For Httpsd monitor diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/DiscoveryClient.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/DiscoveryClient.java index 1cec6c700df..fa9ad4f86e4 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/DiscoveryClient.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/DiscoveryClient.java @@ -19,9 +19,8 @@ package org.apache.hertzbeat.collector.collect.httpsd.discovery; -import org.apache.hertzbeat.common.entity.job.protocol.HttpsdProtocol; - import java.util.List; +import org.apache.hertzbeat.common.entity.job.protocol.HttpsdProtocol; /** * DiscoveryClient interface diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/DiscoveryClientManagement.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/DiscoveryClientManagement.java index 2235e72eb7e..bad53031795 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/DiscoveryClientManagement.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/DiscoveryClientManagement.java @@ -19,13 +19,12 @@ package org.apache.hertzbeat.collector.collect.httpsd.discovery; +import java.util.Objects; +import org.apache.hertzbeat.collector.collect.httpsd.constant.DiscoveryClientInstance; import org.apache.hertzbeat.collector.collect.httpsd.discovery.impl.ConsulDiscoveryClient; import org.apache.hertzbeat.collector.collect.httpsd.discovery.impl.NacosDiscoveryClient; -import org.apache.hertzbeat.collector.collect.httpsd.constant.DiscoveryClientInstance; import org.apache.hertzbeat.common.entity.job.protocol.HttpsdProtocol; -import java.util.Objects; - /** * Discovery Client Management */ diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/impl/ConsulDiscoveryClient.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/impl/ConsulDiscoveryClient.java index e8892303b2a..7799792b157 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/impl/ConsulDiscoveryClient.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/impl/ConsulDiscoveryClient.java @@ -24,6 +24,9 @@ import com.ecwid.consul.v1.agent.model.Self; import com.ecwid.consul.v1.agent.model.Service; import com.google.common.collect.Lists; +import java.util.Collection; +import java.util.List; +import java.util.Map; import org.apache.commons.lang3.StringUtils; import org.apache.hertzbeat.collector.collect.httpsd.discovery.ConnectConfig; import org.apache.hertzbeat.collector.collect.httpsd.discovery.DiscoveryClient; @@ -31,10 +34,6 @@ import org.apache.hertzbeat.collector.collect.httpsd.discovery.ServiceInstance; import org.apache.hertzbeat.common.entity.job.protocol.HttpsdProtocol; -import java.util.Collection; -import java.util.List; -import java.util.Map; - /** * DiscoveryClient impl of Consul * diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/impl/NacosDiscoveryClient.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/impl/NacosDiscoveryClient.java index 15e453ca67a..cb80da17985 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/impl/NacosDiscoveryClient.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/impl/NacosDiscoveryClient.java @@ -23,16 +23,15 @@ import com.alibaba.nacos.api.naming.NamingFactory; import com.alibaba.nacos.api.naming.NamingService; import com.google.common.collect.Lists; +import java.util.Collections; +import java.util.List; +import java.util.Objects; import org.apache.hertzbeat.collector.collect.httpsd.discovery.ConnectConfig; import org.apache.hertzbeat.collector.collect.httpsd.discovery.DiscoveryClient; import org.apache.hertzbeat.collector.collect.httpsd.discovery.ServerInfo; import org.apache.hertzbeat.collector.collect.httpsd.discovery.ServiceInstance; import org.apache.hertzbeat.common.entity.job.protocol.HttpsdProtocol; -import java.util.Collections; -import java.util.List; -import java.util.Objects; - /** * DiscoveryClient impl of Nacos * diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/icmp/IcmpCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/icmp/IcmpCollectImpl.java index 9373f8fda13..624e184ce2f 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/icmp/IcmpCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/icmp/IcmpCollectImpl.java @@ -17,19 +17,18 @@ package org.apache.hertzbeat.collector.collect.icmp; -import org.apache.hertzbeat.collector.dispatch.DispatchConstants; +import java.io.IOException; +import java.net.InetAddress; +import java.net.UnknownHostException; +import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.collector.collect.AbstractCollect; +import org.apache.hertzbeat.collector.dispatch.DispatchConstants; import org.apache.hertzbeat.common.constants.CollectorConstants; +import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.entity.job.Metrics; import org.apache.hertzbeat.common.entity.job.protocol.IcmpProtocol; import org.apache.hertzbeat.common.entity.message.CollectRep; -import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.util.CommonUtil; -import lombok.extern.slf4j.Slf4j; - -import java.io.IOException; -import java.net.InetAddress; -import java.net.UnknownHostException; /** * icmp ping collect diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/jmx/JmxCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/jmx/JmxCollectImpl.java index 900fbeb6676..4d542a7e2bd 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/jmx/JmxCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/jmx/JmxCollectImpl.java @@ -17,31 +17,44 @@ package org.apache.hertzbeat.collector.collect.jmx; +import java.io.IOException; +import java.util.Arrays; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; +import javax.management.Attribute; +import javax.management.AttributeList; +import javax.management.MBeanAttributeInfo; +import javax.management.MBeanFeatureInfo; +import javax.management.MBeanInfo; +import javax.management.MBeanServerConnection; +import javax.management.ObjectInstance; +import javax.management.ObjectName; +import javax.management.openmbean.CompositeData; +import javax.management.openmbean.CompositeType; +import javax.management.remote.JMXConnector; +import javax.management.remote.JMXConnectorFactory; +import javax.management.remote.JMXServiceURL; +import javax.management.remote.rmi.RMIConnectorServer; +import javax.naming.Context; +import javax.rmi.ssl.SslRMIClientSocketFactory; +import lombok.extern.slf4j.Slf4j; +import org.apache.hertzbeat.collector.collect.AbstractCollect; import org.apache.hertzbeat.collector.collect.common.cache.CacheIdentifier; import org.apache.hertzbeat.collector.collect.common.cache.ConnectionCommonCache; import org.apache.hertzbeat.collector.collect.common.cache.JmxConnect; import org.apache.hertzbeat.collector.dispatch.DispatchConstants; -import org.apache.hertzbeat.collector.collect.AbstractCollect; +import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.entity.job.Metrics; import org.apache.hertzbeat.common.entity.job.protocol.JmxProtocol; import org.apache.hertzbeat.common.entity.message.CollectRep; -import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.util.CommonUtil; -import lombok.extern.slf4j.Slf4j; import org.springframework.util.StringUtils; -import javax.management.*; -import javax.management.openmbean.CompositeData; -import javax.management.openmbean.CompositeType; -import javax.management.remote.*; -import javax.management.remote.rmi.RMIConnectorServer; -import javax.naming.Context; -import javax.rmi.ssl.SslRMIClientSocketFactory; -import java.io.IOException; -import java.util.*; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - /** * jmx protocol acquisition implementation */ diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/memcached/MemcachedCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/memcached/MemcachedCollectImpl.java index 40feca2ba96..a09d1007360 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/memcached/MemcachedCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/memcached/MemcachedCollectImpl.java @@ -17,16 +17,6 @@ package org.apache.hertzbeat.collector.collect.memcached; -import lombok.extern.slf4j.Slf4j; -import org.apache.hertzbeat.collector.dispatch.DispatchConstants; -import org.apache.hertzbeat.collector.collect.AbstractCollect; -import org.apache.hertzbeat.common.constants.CollectorConstants; -import org.apache.hertzbeat.common.constants.CommonConstants; -import org.apache.hertzbeat.common.entity.job.Metrics; -import org.apache.hertzbeat.common.entity.job.protocol.MemcachedProtocol; -import org.apache.hertzbeat.common.entity.message.CollectRep; -import org.apache.hertzbeat.common.util.CommonUtil; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -40,6 +30,15 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import lombok.extern.slf4j.Slf4j; +import org.apache.hertzbeat.collector.collect.AbstractCollect; +import org.apache.hertzbeat.collector.dispatch.DispatchConstants; +import org.apache.hertzbeat.common.constants.CollectorConstants; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.job.Metrics; +import org.apache.hertzbeat.common.entity.job.protocol.MemcachedProtocol; +import org.apache.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.util.CommonUtil; /** * memcached collect diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/mongodb/MongodbSingleCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/mongodb/MongodbSingleCollectImpl.java index 069455d8c65..e3c6dc97eca 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/mongodb/MongodbSingleCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/mongodb/MongodbSingleCollectImpl.java @@ -17,6 +17,7 @@ package org.apache.hertzbeat.collector.collect.mongodb; +import static java.util.concurrent.TimeUnit.MILLISECONDS; import com.mongodb.ConnectionString; import com.mongodb.MongoClientSettings; import com.mongodb.MongoServerUnavailableException; @@ -25,27 +26,24 @@ import com.mongodb.client.MongoClient; import com.mongodb.client.MongoClients; import com.mongodb.client.MongoDatabase; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; +import java.util.Optional; import lombok.extern.slf4j.Slf4j; -import org.apache.hertzbeat.collector.dispatch.DispatchConstants; -import org.bson.Document; import org.apache.hertzbeat.collector.collect.AbstractCollect; import org.apache.hertzbeat.collector.collect.common.cache.CacheIdentifier; import org.apache.hertzbeat.collector.collect.common.cache.ConnectionCommonCache; import org.apache.hertzbeat.collector.collect.common.cache.MongodbConnect; +import org.apache.hertzbeat.collector.dispatch.DispatchConstants; import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.entity.job.Metrics; import org.apache.hertzbeat.common.entity.job.protocol.MongodbProtocol; import org.apache.hertzbeat.common.entity.message.CollectRep; import org.apache.hertzbeat.common.util.CommonUtil; +import org.bson.Document; import org.springframework.util.Assert; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.util.Arrays; -import java.util.Optional; - -import static java.util.concurrent.TimeUnit.MILLISECONDS; - /** * Mongodb single collect * see also https://www.mongodb.com/languages/java, diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/mq/RocketmqCollectData.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/mq/RocketmqCollectData.java index 5625a14960f..bf272bff702 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/mq/RocketmqCollectData.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/mq/RocketmqCollectData.java @@ -17,10 +17,9 @@ package org.apache.hertzbeat.collector.collect.mq; -import lombok.Data; - import java.util.List; import java.util.Map; +import lombok.Data; /** * rocketmq collect data diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/mq/RocketmqSingleCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/mq/RocketmqSingleCollectImpl.java index c67f2c6c6d4..f39c24bebad 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/mq/RocketmqSingleCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/mq/RocketmqSingleCollectImpl.java @@ -20,10 +20,31 @@ import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; import com.google.common.util.concurrent.ThreadFactoryBuilder; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.hertzbeat.collector.collect.AbstractCollect; import org.apache.hertzbeat.collector.dispatch.DispatchConstants; +import org.apache.hertzbeat.collector.util.JsonPathParser; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.job.Metrics; +import org.apache.hertzbeat.common.entity.job.protocol.RocketmqProtocol; +import org.apache.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.util.CommonUtil; import org.apache.rocketmq.acl.common.AclClientRPCHook; import org.apache.rocketmq.acl.common.SessionCredentials; import org.apache.rocketmq.common.MixAll; @@ -37,31 +58,9 @@ import org.apache.rocketmq.common.utils.ThreadUtils; import org.apache.rocketmq.remoting.RPCHook; import org.apache.rocketmq.tools.admin.DefaultMQAdminExt; -import org.apache.hertzbeat.collector.collect.AbstractCollect; -import org.apache.hertzbeat.collector.util.JsonPathParser; -import org.apache.hertzbeat.common.constants.CommonConstants; -import org.apache.hertzbeat.common.entity.job.Metrics; -import org.apache.hertzbeat.common.entity.job.protocol.RocketmqProtocol; -import org.apache.hertzbeat.common.entity.message.CollectRep; -import org.apache.hertzbeat.common.util.CommonUtil; import org.springframework.beans.factory.DisposableBean; import org.springframework.util.Assert; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - /** * rocketmq collect */ diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/nebulagraph/NebulaGraphCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/nebulagraph/NebulaGraphCollectImpl.java index c378716f2ad..dfc7e18ec9c 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/nebulagraph/NebulaGraphCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/nebulagraph/NebulaGraphCollectImpl.java @@ -17,16 +17,15 @@ package org.apache.hertzbeat.collector.collect.nebulagraph; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Objects; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import lombok.extern.slf4j.Slf4j; -import org.apache.http.HttpHeaders; -import org.apache.http.HttpHost; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.client.methods.RequestBuilder; -import org.apache.http.client.protocol.HttpClientContext; -import org.apache.http.protocol.HttpContext; -import org.apache.http.util.EntityUtils; import org.apache.hertzbeat.collector.collect.AbstractCollect; import org.apache.hertzbeat.collector.collect.common.http.CommonHttpClient; import org.apache.hertzbeat.collector.dispatch.DispatchConstants; @@ -38,15 +37,15 @@ import org.apache.hertzbeat.common.entity.message.CollectRep; import org.apache.hertzbeat.common.util.CommonUtil; import org.apache.hertzbeat.common.util.IpDomainUtil; - -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Objects; -import java.util.regex.Matcher; -import java.util.regex.Pattern; +import org.apache.http.HttpHeaders; +import org.apache.http.HttpHost; +import org.apache.http.client.config.RequestConfig; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpUriRequest; +import org.apache.http.client.methods.RequestBuilder; +import org.apache.http.client.protocol.HttpClientContext; +import org.apache.http.protocol.HttpContext; +import org.apache.http.util.EntityUtils; /** diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/nginx/NginxCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/nginx/NginxCollectImpl.java index 9f975ac02e8..41c258562e2 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/nginx/NginxCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/nginx/NginxCollectImpl.java @@ -17,14 +17,33 @@ package org.apache.hertzbeat.collector.collect.nginx; +import static org.apache.hertzbeat.common.constants.SignConstants.RIGHT_DASH; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.hertzbeat.collector.collect.AbstractCollect; import org.apache.hertzbeat.collector.collect.common.http.CommonHttpClient; import org.apache.hertzbeat.collector.dispatch.DispatchConstants; +import org.apache.hertzbeat.collector.util.CollectUtil; +import org.apache.hertzbeat.common.constants.CollectorConstants; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.job.Metrics; +import org.apache.hertzbeat.common.entity.job.protocol.NginxProtocol; +import org.apache.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.util.CommonUtil; +import org.apache.hertzbeat.common.util.IpDomainUtil; import org.apache.http.HttpHeaders; import org.apache.http.HttpHost; import org.apache.http.client.config.RequestConfig; @@ -34,27 +53,6 @@ import org.apache.http.client.protocol.HttpClientContext; import org.apache.http.protocol.HttpContext; import org.apache.http.util.EntityUtils; -import org.apache.hertzbeat.collector.collect.AbstractCollect; -import org.apache.hertzbeat.collector.util.CollectUtil; -import org.apache.hertzbeat.common.constants.CollectorConstants; -import org.apache.hertzbeat.common.constants.CommonConstants; -import org.apache.hertzbeat.common.entity.job.Metrics; -import org.apache.hertzbeat.common.entity.job.protocol.NginxProtocol; -import org.apache.hertzbeat.common.entity.message.CollectRep; -import org.apache.hertzbeat.common.util.CommonUtil; -import org.apache.hertzbeat.common.util.IpDomainUtil; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import static org.apache.hertzbeat.common.constants.SignConstants.RIGHT_DASH; /** * nginx collect diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/ntp/NtpCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/ntp/NtpCollectImpl.java index 9f7737a7382..53ec794d888 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/ntp/NtpCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/ntp/NtpCollectImpl.java @@ -17,13 +17,23 @@ package org.apache.hertzbeat.collector.collect.ntp; +import java.io.IOException; +import java.net.InetAddress; +import java.net.SocketException; +import java.net.UnknownHostException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; import lombok.extern.slf4j.Slf4j; import org.apache.commons.net.ntp.NTPUDPClient; import org.apache.commons.net.ntp.NtpV3Packet; import org.apache.commons.net.ntp.TimeInfo; import org.apache.commons.net.ntp.TimeStamp; -import org.apache.hertzbeat.collector.dispatch.DispatchConstants; import org.apache.hertzbeat.collector.collect.AbstractCollect; +import org.apache.hertzbeat.collector.dispatch.DispatchConstants; import org.apache.hertzbeat.collector.util.CollectUtil; import org.apache.hertzbeat.common.constants.CollectorConstants; import org.apache.hertzbeat.common.constants.CommonConstants; @@ -32,17 +42,6 @@ import org.apache.hertzbeat.common.entity.message.CollectRep; import org.apache.hertzbeat.common.util.CommonUtil; -import java.io.IOException; -import java.net.InetAddress; -import java.net.SocketException; -import java.net.UnknownHostException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; - /** * ntp collect */ diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/pop3/Pop3CollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/pop3/Pop3CollectImpl.java index 4c6533d2d0e..8e41c085016 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/pop3/Pop3CollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/pop3/Pop3CollectImpl.java @@ -17,26 +17,24 @@ package org.apache.hertzbeat.collector.collect.pop3; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.net.pop3.POP3Client; import org.apache.commons.net.pop3.POP3MessageInfo; -import org.apache.hertzbeat.collector.dispatch.DispatchConstants; +import org.apache.commons.net.pop3.POP3SClient; import org.apache.hertzbeat.collector.collect.AbstractCollect; +import org.apache.hertzbeat.collector.dispatch.DispatchConstants; import org.apache.hertzbeat.common.constants.CollectorConstants; import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.entity.job.Metrics; import org.apache.hertzbeat.common.entity.job.protocol.Pop3Protocol; import org.apache.hertzbeat.common.entity.message.CollectRep; - -import org.apache.commons.net.pop3.POP3SClient; -import org.apache.commons.net.pop3.POP3Client; import org.apache.hertzbeat.common.util.CommonUtil; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /** * pop3 collect diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/PrometheusAutoCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/PrometheusAutoCollectImpl.java index e964ccffc0c..1631f27b590 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/PrometheusAutoCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/PrometheusAutoCollectImpl.java @@ -17,11 +17,34 @@ package org.apache.hertzbeat.collector.collect.prometheus; +import static org.apache.hertzbeat.common.constants.SignConstants.RIGHT_DASH; +import java.io.IOException; +import java.io.InterruptedIOException; +import java.net.ConnectException; +import java.net.UnknownHostException; +import java.nio.charset.StandardCharsets; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import javax.net.ssl.SSLException; import lombok.extern.slf4j.Slf4j; import org.apache.commons.net.util.Base64; +import org.apache.hertzbeat.collector.collect.common.http.CommonHttpClient; import org.apache.hertzbeat.collector.collect.prometheus.parser.MetricFamily; import org.apache.hertzbeat.collector.collect.prometheus.parser.TextParser; import org.apache.hertzbeat.collector.dispatch.DispatchConstants; +import org.apache.hertzbeat.collector.util.CollectUtil; +import org.apache.hertzbeat.common.constants.CollectorConstants; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.job.Metrics; +import org.apache.hertzbeat.common.entity.job.protocol.PrometheusProtocol; +import org.apache.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.util.CommonUtil; +import org.apache.hertzbeat.common.util.IpDomainUtil; import org.apache.http.HttpHeaders; import org.apache.http.HttpHost; import org.apache.http.HttpStatus; @@ -41,29 +64,8 @@ import org.apache.http.impl.client.BasicCredentialsProvider; import org.apache.http.protocol.HttpContext; import org.apache.http.util.EntityUtils; -import org.apache.hertzbeat.collector.collect.common.http.CommonHttpClient; -import org.apache.hertzbeat.collector.util.CollectUtil; -import org.apache.hertzbeat.common.constants.CollectorConstants; -import org.apache.hertzbeat.common.constants.CommonConstants; -import org.apache.hertzbeat.common.entity.job.Metrics; -import org.apache.hertzbeat.common.entity.job.protocol.PrometheusProtocol; -import org.apache.hertzbeat.common.entity.message.CollectRep; -import org.apache.hertzbeat.common.util.CommonUtil; -import org.apache.hertzbeat.common.util.IpDomainUtil; import org.springframework.util.StringUtils; -import javax.net.ssl.SSLException; -import java.io.IOException; -import java.io.InterruptedIOException; -import java.net.ConnectException; -import java.net.UnknownHostException; -import java.nio.charset.StandardCharsets; -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import static org.apache.hertzbeat.common.constants.SignConstants.RIGHT_DASH; - /** * prometheus auto collect diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/parser/MetricFamily.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/parser/MetricFamily.java index e838ea71eb1..7a547fe3fb9 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/parser/MetricFamily.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/parser/MetricFamily.java @@ -17,11 +17,10 @@ package org.apache.hertzbeat.collector.collect.prometheus.parser; +import java.util.List; import lombok.Data; import lombok.ToString; -import java.util.List; - /** * metric family */ diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/parser/TextParser.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/parser/TextParser.java index 23b91063d9e..be637a32777 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/parser/TextParser.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/parser/TextParser.java @@ -17,16 +17,15 @@ package org.apache.hertzbeat.collector.collect.prometheus.parser; -import lombok.extern.slf4j.Slf4j; -import org.apache.hertzbeat.collector.collect.http.promethus.ParseException; -import org.apache.hertzbeat.common.util.StrBuffer; - import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import lombok.extern.slf4j.Slf4j; +import org.apache.hertzbeat.collector.collect.http.promethus.ParseException; +import org.apache.hertzbeat.common.util.StrBuffer; /** * Resolves the data passed by prometheus's exporter interface http:xxx/metrics diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/push/PushCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/push/PushCollectImpl.java index 4730ab69b96..3afab4112cb 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/push/PushCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/push/PushCollectImpl.java @@ -18,19 +18,15 @@ package org.apache.hertzbeat.collector.collect.push; import com.fasterxml.jackson.core.type.TypeReference; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import lombok.extern.slf4j.Slf4j; +import org.apache.hertzbeat.collector.collect.AbstractCollect; import org.apache.hertzbeat.collector.collect.common.http.CommonHttpClient; import org.apache.hertzbeat.collector.dispatch.DispatchConstants; -import org.apache.http.HttpHeaders; -import org.apache.http.HttpHost; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.client.methods.RequestBuilder; -import org.apache.http.client.protocol.HttpClientContext; -import org.apache.http.protocol.HttpContext; -import org.apache.http.util.EntityUtils; -import org.apache.hertzbeat.collector.collect.AbstractCollect; import org.apache.hertzbeat.collector.util.CollectUtil; import org.apache.hertzbeat.common.constants.CollectorConstants; import org.apache.hertzbeat.common.entity.dto.Message; @@ -41,12 +37,15 @@ import org.apache.hertzbeat.common.util.CommonUtil; import org.apache.hertzbeat.common.util.IpDomainUtil; import org.apache.hertzbeat.common.util.JsonUtil; - -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; +import org.apache.http.HttpHeaders; +import org.apache.http.HttpHost; +import org.apache.http.client.config.RequestConfig; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpUriRequest; +import org.apache.http.client.methods.RequestBuilder; +import org.apache.http.client.protocol.HttpClientContext; +import org.apache.http.protocol.HttpContext; +import org.apache.http.util.EntityUtils; /** * push style collect diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/redis/RedisCommonCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/redis/RedisCommonCollectImpl.java index 08e78445d92..69d70309712 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/redis/RedisCommonCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/redis/RedisCommonCollectImpl.java @@ -17,19 +17,6 @@ package org.apache.hertzbeat.collector.collect.redis; -import org.apache.hertzbeat.collector.collect.common.cache.CacheIdentifier; -import org.apache.hertzbeat.collector.collect.common.cache.ConnectionCommonCache; -import org.apache.hertzbeat.collector.collect.common.cache.RedisConnect; -import org.apache.hertzbeat.collector.dispatch.DispatchConstants; -import org.apache.hertzbeat.collector.collect.AbstractCollect; -import org.apache.hertzbeat.collector.util.CollectUtil; -import org.apache.hertzbeat.common.entity.job.Metrics; -import org.apache.hertzbeat.common.entity.job.protocol.RedisProtocol; -import org.apache.hertzbeat.common.entity.message.CollectRep; -import org.apache.hertzbeat.common.constants.CommonConstants; -import org.apache.hertzbeat.common.util.CommonUtil; -import org.apache.hertzbeat.common.util.MapCapUtil; -import org.apache.hertzbeat.common.constants.SignConstants; import io.lettuce.core.RedisClient; import io.lettuce.core.RedisConnectionException; import io.lettuce.core.RedisURI; @@ -41,12 +28,31 @@ import io.lettuce.core.cluster.models.partitions.RedisClusterNode; import io.lettuce.core.resource.ClientResources; import io.lettuce.core.resource.DefaultClientResources; +import java.time.Duration; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; import lombok.extern.slf4j.Slf4j; +import org.apache.hertzbeat.collector.collect.AbstractCollect; +import org.apache.hertzbeat.collector.collect.common.cache.CacheIdentifier; +import org.apache.hertzbeat.collector.collect.common.cache.ConnectionCommonCache; +import org.apache.hertzbeat.collector.collect.common.cache.RedisConnect; +import org.apache.hertzbeat.collector.dispatch.DispatchConstants; +import org.apache.hertzbeat.collector.util.CollectUtil; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.constants.SignConstants; +import org.apache.hertzbeat.common.entity.job.Metrics; +import org.apache.hertzbeat.common.entity.job.protocol.RedisProtocol; +import org.apache.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.util.CommonUtil; +import org.apache.hertzbeat.common.util.MapCapUtil; import org.springframework.util.Assert; import org.springframework.util.StringUtils; -import java.time.Duration; -import java.util.*; /** * Redis single cluster collector diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/smtp/SmtpCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/smtp/SmtpCollectImpl.java index 1a8056fb4af..1f278665648 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/smtp/SmtpCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/smtp/SmtpCollectImpl.java @@ -17,10 +17,17 @@ package org.apache.hertzbeat.collector.collect.smtp; +import java.io.IOException; +import java.net.SocketException; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; import lombok.extern.slf4j.Slf4j; import org.apache.commons.net.smtp.SMTP; -import org.apache.hertzbeat.collector.dispatch.DispatchConstants; import org.apache.hertzbeat.collector.collect.AbstractCollect; +import org.apache.hertzbeat.collector.dispatch.DispatchConstants; import org.apache.hertzbeat.collector.util.CollectUtil; import org.apache.hertzbeat.common.constants.CollectorConstants; import org.apache.hertzbeat.common.constants.CommonConstants; @@ -29,14 +36,6 @@ import org.apache.hertzbeat.common.entity.message.CollectRep; import org.apache.hertzbeat.common.util.CommonUtil; -import java.io.IOException; -import java.net.SocketException; -import java.nio.charset.StandardCharsets; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; - /** * smtp collect */ diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/snmp/SnmpCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/snmp/SnmpCollectImpl.java index 7ab73d31f9b..c9324b06a23 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/snmp/SnmpCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/snmp/SnmpCollectImpl.java @@ -17,35 +17,50 @@ package org.apache.hertzbeat.collector.collect.snmp; -import org.apache.hertzbeat.collector.dispatch.DispatchConstants; +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ExecutionException; +import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.collector.collect.AbstractCollect; +import org.apache.hertzbeat.collector.dispatch.DispatchConstants; import org.apache.hertzbeat.collector.util.CollectUtil; import org.apache.hertzbeat.common.constants.CollectorConstants; +import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.entity.job.Metrics; import org.apache.hertzbeat.common.entity.job.protocol.SnmpProtocol; import org.apache.hertzbeat.common.entity.message.CollectRep; -import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.util.CommonUtil; -import lombok.extern.slf4j.Slf4j; import org.snmp4j.PDU; import org.snmp4j.Snmp; -import org.snmp4j.mp.MPv3; -import org.snmp4j.mp.SnmpConstants; -import org.snmp4j.security.*; -import org.snmp4j.smi.*; -import org.snmp4j.util.*; -import org.springframework.util.Assert; -import org.snmp4j.*; +import org.snmp4j.Target; import org.snmp4j.fluent.SnmpBuilder; import org.snmp4j.fluent.SnmpCompletableFuture; import org.snmp4j.fluent.TargetBuilder; +import org.snmp4j.mp.MPv3; +import org.snmp4j.mp.SnmpConstants; +import org.snmp4j.security.AuthMD5; +import org.snmp4j.security.PrivDES; +import org.snmp4j.security.SecurityModel; +import org.snmp4j.security.SecurityModels; +import org.snmp4j.security.SecurityProtocols; +import org.snmp4j.security.USM; +import org.snmp4j.security.UsmUser; +import org.snmp4j.smi.Address; +import org.snmp4j.smi.GenericAddress; +import org.snmp4j.smi.OID; +import org.snmp4j.smi.OctetString; +import org.snmp4j.smi.TimeTicks; +import org.snmp4j.smi.Variable; +import org.snmp4j.smi.VariableBinding; +import org.snmp4j.util.DefaultPDUFactory; +import org.snmp4j.util.TableEvent; +import org.snmp4j.util.TableUtils; +import org.springframework.util.Assert; import org.springframework.util.StringUtils; -import java.io.IOException; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ExecutionException; - /** * Snmp protocol collection implementation */ diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/ssh/SshCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/ssh/SshCollectImpl.java index 146c0ac7269..ecfb8114925 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/ssh/SshCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/ssh/SshCollectImpl.java @@ -17,47 +17,46 @@ package org.apache.hertzbeat.collector.collect.ssh; +import java.io.ByteArrayOutputStream; +import java.io.FileInputStream; +import java.io.IOException; +import java.net.ConnectException; +import java.net.SocketTimeoutException; +import java.security.GeneralSecurityException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; +import lombok.extern.slf4j.Slf4j; +import org.apache.hertzbeat.collector.collect.AbstractCollect; import org.apache.hertzbeat.collector.collect.common.cache.CacheIdentifier; import org.apache.hertzbeat.collector.collect.common.cache.ConnectionCommonCache; import org.apache.hertzbeat.collector.collect.common.cache.SshConnect; import org.apache.hertzbeat.collector.collect.common.ssh.CommonSshClient; import org.apache.hertzbeat.collector.dispatch.DispatchConstants; -import org.apache.sshd.common.SshException; -import org.apache.sshd.common.channel.exception.SshChannelOpenException; -import org.apache.sshd.common.util.io.output.NoCloseOutputStream; -import org.apache.sshd.common.util.security.SecurityUtils; -import org.apache.hertzbeat.collector.collect.AbstractCollect; import org.apache.hertzbeat.collector.util.CollectUtil; import org.apache.hertzbeat.collector.util.PrivateKeyUtils; import org.apache.hertzbeat.common.constants.CollectorConstants; +import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.entity.job.Metrics; import org.apache.hertzbeat.common.entity.job.protocol.SshProtocol; import org.apache.hertzbeat.common.entity.message.CollectRep; -import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.util.CommonUtil; -import lombok.extern.slf4j.Slf4j; import org.apache.sshd.client.SshClient; import org.apache.sshd.client.channel.ClientChannel; import org.apache.sshd.client.channel.ClientChannelEvent; import org.apache.sshd.client.session.ClientSession; +import org.apache.sshd.common.SshException; +import org.apache.sshd.common.channel.exception.SshChannelOpenException; +import org.apache.sshd.common.util.io.output.NoCloseOutputStream; +import org.apache.sshd.common.util.security.SecurityUtils; import org.springframework.util.StringUtils; -import java.io.ByteArrayOutputStream; -import java.io.FileInputStream; -import java.io.IOException; -import java.net.ConnectException; -import java.net.SocketTimeoutException; -import java.security.GeneralSecurityException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - /** * Ssh protocol collection implementation */ diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/strategy/CollectStrategyFactory.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/strategy/CollectStrategyFactory.java index ef678d97f21..9512300c6ea 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/strategy/CollectStrategyFactory.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/strategy/CollectStrategyFactory.java @@ -17,15 +17,14 @@ package org.apache.hertzbeat.collector.collect.strategy; +import java.util.ServiceLoader; +import java.util.concurrent.ConcurrentHashMap; import org.apache.hertzbeat.collector.collect.AbstractCollect; import org.springframework.boot.CommandLineRunner; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; -import java.util.ServiceLoader; -import java.util.concurrent.ConcurrentHashMap; - /** * Specific metrics collection factory */ diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/telnet/TelnetCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/telnet/TelnetCollectImpl.java index d5804bc1cf0..c53fdc8c540 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/telnet/TelnetCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/telnet/TelnetCollectImpl.java @@ -17,23 +17,26 @@ package org.apache.hertzbeat.collector.collect.telnet; -import org.apache.hertzbeat.collector.dispatch.DispatchConstants; +import java.io.IOException; +import java.io.OutputStream; +import java.net.ConnectException; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.net.telnet.TelnetClient; import org.apache.hertzbeat.collector.collect.AbstractCollect; +import org.apache.hertzbeat.collector.dispatch.DispatchConstants; import org.apache.hertzbeat.collector.util.CollectUtil; import org.apache.hertzbeat.common.constants.CollectorConstants; +import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.entity.job.Metrics; import org.apache.hertzbeat.common.entity.job.protocol.TelnetProtocol; import org.apache.hertzbeat.common.entity.message.CollectRep; -import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.util.CommonUtil; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.net.telnet.TelnetClient; - -import java.io.IOException; -import java.io.OutputStream; -import java.net.ConnectException; -import java.util.*; -import java.util.stream.Collectors; /** * telnet collect diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/udp/UdpCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/udp/UdpCollectImpl.java index d38e31fc759..0d733b5fc9b 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/udp/UdpCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/udp/UdpCollectImpl.java @@ -17,9 +17,16 @@ package org.apache.hertzbeat.collector.collect.udp; +import java.net.DatagramPacket; +import java.net.DatagramSocket; +import java.net.InetSocketAddress; +import java.net.PortUnreachableException; +import java.net.SocketAddress; +import java.net.SocketTimeoutException; +import java.nio.charset.StandardCharsets; import lombok.extern.slf4j.Slf4j; -import org.apache.hertzbeat.collector.dispatch.DispatchConstants; import org.apache.hertzbeat.collector.collect.AbstractCollect; +import org.apache.hertzbeat.collector.dispatch.DispatchConstants; import org.apache.hertzbeat.collector.util.CollectUtil; import org.apache.hertzbeat.common.constants.CollectorConstants; import org.apache.hertzbeat.common.constants.CommonConstants; @@ -28,9 +35,6 @@ import org.apache.hertzbeat.common.entity.message.CollectRep; import org.apache.hertzbeat.common.util.CommonUtil; -import java.net.*; -import java.nio.charset.StandardCharsets; - /** * udp collect */ diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/websocket/WebsocketCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/websocket/WebsocketCollectImpl.java index 7bcff5cb8ea..5bdbd35ade4 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/websocket/WebsocketCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/websocket/WebsocketCollectImpl.java @@ -17,17 +17,6 @@ package org.apache.hertzbeat.collector.collect.websocket; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.apache.hertzbeat.collector.dispatch.DispatchConstants; -import org.apache.hertzbeat.collector.collect.AbstractCollect; -import org.apache.hertzbeat.common.constants.CollectorConstants; -import org.apache.hertzbeat.common.constants.CommonConstants; -import org.apache.hertzbeat.common.entity.job.Metrics; -import org.apache.hertzbeat.common.entity.job.protocol.WebsocketProtocol; -import org.apache.hertzbeat.common.entity.message.CollectRep; -import org.apache.hertzbeat.common.util.CommonUtil; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -45,6 +34,16 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.apache.hertzbeat.collector.collect.AbstractCollect; +import org.apache.hertzbeat.collector.dispatch.DispatchConstants; +import org.apache.hertzbeat.common.constants.CollectorConstants; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.job.Metrics; +import org.apache.hertzbeat.common.entity.job.protocol.WebsocketProtocol; +import org.apache.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.util.CommonUtil; /** * Websocket Collect diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/CollectDataDispatch.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/CollectDataDispatch.java index 1bb4573ae88..a133086d47a 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/CollectDataDispatch.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/CollectDataDispatch.java @@ -18,12 +18,11 @@ package org.apache.hertzbeat.collector.dispatch; +import java.util.List; import org.apache.hertzbeat.collector.dispatch.timer.Timeout; import org.apache.hertzbeat.common.entity.job.Metrics; import org.apache.hertzbeat.common.entity.message.CollectRep; -import java.util.List; - /** * Collection data scheduler interface */ diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/CommonDispatcher.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/CommonDispatcher.java index 254a7c5bc7a..831bd082fc3 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/CommonDispatcher.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/CommonDispatcher.java @@ -20,6 +20,18 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.google.gson.Gson; import com.google.gson.JsonElement; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.ScheduledThreadPoolExecutor; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; import lombok.AllArgsConstructor; import lombok.Data; import lombok.extern.slf4j.Slf4j; @@ -36,11 +48,6 @@ import org.apache.hertzbeat.common.queue.CommonDataQueue; import org.springframework.stereotype.Component; -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicReference; - /** * Collection task and response data scheduler */ diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/MetricsCollect.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/MetricsCollect.java index be9c08f4a20..cffc97ce13f 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/MetricsCollect.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/MetricsCollect.java @@ -19,14 +19,21 @@ import com.googlecode.aviator.AviatorEvaluator; import com.googlecode.aviator.Expression; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import org.apache.hertzbeat.collector.dispatch.timer.Timeout; -import org.apache.hertzbeat.collector.dispatch.timer.WheelTimerTask; -import org.apache.hertzbeat.collector.dispatch.unit.UnitConvert; import org.apache.hertzbeat.collector.collect.AbstractCollect; import org.apache.hertzbeat.collector.collect.prometheus.PrometheusAutoCollectImpl; import org.apache.hertzbeat.collector.collect.strategy.CollectStrategyFactory; +import org.apache.hertzbeat.collector.dispatch.timer.Timeout; +import org.apache.hertzbeat.collector.dispatch.timer.WheelTimerTask; +import org.apache.hertzbeat.collector.dispatch.unit.UnitConvert; import org.apache.hertzbeat.collector.util.CollectUtil; import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.entity.job.Job; @@ -35,9 +42,6 @@ import org.apache.hertzbeat.common.util.CommonUtil; import org.apache.hertzbeat.common.util.Pair; -import java.util.*; -import java.util.stream.Collectors; - /** * metrics collection */ diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/MetricsCollectorQueue.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/MetricsCollectorQueue.java index 6829e44c2aa..c927a71faa6 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/MetricsCollectorQueue.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/MetricsCollectorQueue.java @@ -17,11 +17,10 @@ package org.apache.hertzbeat.collector.dispatch; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - import java.util.concurrent.PriorityBlockingQueue; import java.util.concurrent.TimeUnit; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; /** * queue of jobs to run diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/WorkerPool.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/WorkerPool.java index 2f8aaac7686..68c50f08775 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/WorkerPool.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/WorkerPool.java @@ -18,15 +18,14 @@ package org.apache.hertzbeat.collector.dispatch; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.stereotype.Component; - import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.SynchronousQueue; import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.DisposableBean; +import org.springframework.stereotype.Component; /** * Collection task worker thread pool diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/CollectServer.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/CollectServer.java index d63b57112bd..687540d75ff 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/CollectServer.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/CollectServer.java @@ -17,14 +17,22 @@ package org.apache.hertzbeat.collector.dispatch.entrance; - import com.google.common.util.concurrent.ThreadFactoryBuilder; import io.netty.channel.Channel; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; -import org.apache.hertzbeat.collector.dispatch.entrance.internal.CollectJobService; -import org.apache.hertzbeat.collector.dispatch.entrance.processor.*; import org.apache.hertzbeat.collector.dispatch.DispatchProperties; -import org.apache.hertzbeat.collector.dispatch.entrance.processor.*; +import org.apache.hertzbeat.collector.dispatch.entrance.internal.CollectJobService; +import org.apache.hertzbeat.collector.dispatch.entrance.processor.CollectCyclicDataProcessor; +import org.apache.hertzbeat.collector.dispatch.entrance.processor.CollectOneTimeDataProcessor; +import org.apache.hertzbeat.collector.dispatch.entrance.processor.DeleteCyclicTaskProcessor; +import org.apache.hertzbeat.collector.dispatch.entrance.processor.GoCloseProcessor; +import org.apache.hertzbeat.collector.dispatch.entrance.processor.GoOfflineProcessor; +import org.apache.hertzbeat.collector.dispatch.entrance.processor.GoOnlineProcessor; +import org.apache.hertzbeat.collector.dispatch.entrance.processor.HeartbeatProcessor; import org.apache.hertzbeat.collector.dispatch.timer.TimerDispatch; import org.apache.hertzbeat.common.entity.dto.CollectorInfo; import org.apache.hertzbeat.common.entity.message.ClusterMsg; @@ -41,11 +49,6 @@ import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.TimeUnit; - /** * collect server */ diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/internal/CollectJobService.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/internal/CollectJobService.java index 44e3515d254..9bb203be923 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/internal/CollectJobService.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/internal/CollectJobService.java @@ -17,6 +17,12 @@ package org.apache.hertzbeat.collector.dispatch.entrance.internal; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.collector.dispatch.DispatchProperties; import org.apache.hertzbeat.collector.dispatch.WorkerPool; import org.apache.hertzbeat.collector.dispatch.entrance.CollectServer; @@ -27,17 +33,10 @@ import org.apache.hertzbeat.common.entity.message.CollectRep; import org.apache.hertzbeat.common.util.IpDomainUtil; import org.apache.hertzbeat.common.util.JsonUtil; -import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.util.ProtoJsonUtil; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - /** * Collection job management provides api interface * 采集job管理提供api接口 diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/internal/CollectResponseEventListener.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/internal/CollectResponseEventListener.java index 8f63be23ce2..06765743d92 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/internal/CollectResponseEventListener.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/internal/CollectResponseEventListener.java @@ -17,10 +17,9 @@ package org.apache.hertzbeat.collector.dispatch.entrance.internal; -import org.apache.hertzbeat.common.entity.message.CollectRep; - import java.util.EventListener; import java.util.List; +import org.apache.hertzbeat.common.entity.message.CollectRep; /** * One-time collection task response result listener diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/DeleteCyclicTaskProcessor.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/DeleteCyclicTaskProcessor.java index a1ba8e0c2ef..ea227f107a0 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/DeleteCyclicTaskProcessor.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/DeleteCyclicTaskProcessor.java @@ -19,14 +19,13 @@ import com.fasterxml.jackson.core.type.TypeReference; import io.netty.channel.ChannelHandlerContext; +import java.util.List; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.collector.dispatch.entrance.CollectServer; import org.apache.hertzbeat.common.entity.message.ClusterMsg; import org.apache.hertzbeat.common.util.JsonUtil; import org.apache.hertzbeat.remoting.netty.NettyRemotingProcessor; -import java.util.List; - /** * handle delete cyclic task message */ diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/HashedWheelTimer.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/HashedWheelTimer.java index 72b6a30e2ed..c9f60941804 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/HashedWheelTimer.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/HashedWheelTimer.java @@ -18,10 +18,6 @@ package org.apache.hertzbeat.collector.dispatch.timer; -import org.apache.hertzbeat.common.util.NetworkUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.Collections; import java.util.HashSet; import java.util.Queue; @@ -36,6 +32,9 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.atomic.AtomicLong; +import org.apache.hertzbeat.common.util.NetworkUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A {@link Timer} optimized for approximated I/O timeout scheduling. diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/TimerDispatch.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/TimerDispatch.java index a7449439c83..ed7b50e7627 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/TimerDispatch.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/TimerDispatch.java @@ -18,13 +18,12 @@ package org.apache.hertzbeat.collector.dispatch.timer; +import java.util.List; +import java.util.concurrent.TimeUnit; import org.apache.hertzbeat.collector.dispatch.entrance.internal.CollectResponseEventListener; import org.apache.hertzbeat.common.entity.job.Job; import org.apache.hertzbeat.common.entity.message.CollectRep; -import java.util.List; -import java.util.concurrent.TimeUnit; - /** * timer dispatch service */ diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/TimerDispatcher.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/TimerDispatcher.java index ce094e581a0..8dc3fd18007 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/TimerDispatcher.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/TimerDispatcher.java @@ -17,6 +17,11 @@ package org.apache.hertzbeat.collector.dispatch.timer; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.collector.dispatch.entrance.internal.CollectResponseEventListener; import org.apache.hertzbeat.common.entity.job.Job; @@ -24,12 +29,6 @@ import org.springframework.beans.factory.DisposableBean; import org.springframework.stereotype.Component; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; - /** * job timer dispatcher */ diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/WheelTimerTask.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/WheelTimerTask.java index a12fd42539a..2918166b839 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/WheelTimerTask.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/WheelTimerTask.java @@ -19,6 +19,10 @@ import com.google.gson.Gson; import com.google.gson.JsonElement; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.collector.dispatch.DispatchConstants; import org.apache.hertzbeat.collector.dispatch.MetricsTaskDispatch; @@ -30,11 +34,6 @@ import org.apache.hertzbeat.common.support.SpringContextHolder; import org.apache.hertzbeat.common.util.AesUtil; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - /** * Timer Task implementation */ diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/unit/impl/DataSizeConvert.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/unit/impl/DataSizeConvert.java index 1f01f735ee6..b7871fce35c 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/unit/impl/DataSizeConvert.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/unit/impl/DataSizeConvert.java @@ -17,13 +17,12 @@ package org.apache.hertzbeat.collector.dispatch.unit.impl; +import java.math.BigDecimal; +import java.math.RoundingMode; import org.apache.hertzbeat.collector.dispatch.unit.DataUnit; import org.apache.hertzbeat.collector.dispatch.unit.UnitConvert; import org.springframework.stereotype.Component; -import java.math.BigDecimal; -import java.math.RoundingMode; - /** * the convert of data size * 数据空间大小转换 diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/unit/impl/TimeLengthConvert.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/unit/impl/TimeLengthConvert.java index a13ff9feb05..788ed71764b 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/unit/impl/TimeLengthConvert.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/unit/impl/TimeLengthConvert.java @@ -17,13 +17,12 @@ package org.apache.hertzbeat.collector.dispatch.unit.impl; +import java.math.BigDecimal; +import java.math.RoundingMode; import org.apache.hertzbeat.collector.dispatch.unit.TimeLengthUnit; import org.apache.hertzbeat.collector.dispatch.unit.UnitConvert; import org.springframework.stereotype.Component; -import java.math.BigDecimal; -import java.math.RoundingMode; - /** * the convert of time length * 时间长短转换 diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/util/CollectUtil.java b/collector/src/main/java/org/apache/hertzbeat/collector/util/CollectUtil.java index c80e606e363..1eb8087c692 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/util/CollectUtil.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/util/CollectUtil.java @@ -18,20 +18,26 @@ package org.apache.hertzbeat.collector.util; import com.fasterxml.jackson.core.type.TypeReference; -import com.google.gson.*; +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonNull; +import com.google.gson.JsonObject; +import com.google.gson.JsonPrimitive; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; - import org.apache.commons.lang3.StringUtils; import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.entity.job.Configmap; import org.apache.hertzbeat.common.entity.job.Metrics; import org.apache.hertzbeat.common.util.JsonUtil; -import java.util.*; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Collectors; - /** * util for collector */ diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/util/JsonPathParser.java b/collector/src/main/java/org/apache/hertzbeat/collector/util/JsonPathParser.java index 9b1424a4784..f6c861431ef 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/util/JsonPathParser.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/util/JsonPathParser.java @@ -17,12 +17,15 @@ package org.apache.hertzbeat.collector.util; -import com.jayway.jsonpath.*; +import com.jayway.jsonpath.Configuration; +import com.jayway.jsonpath.JsonPath; +import com.jayway.jsonpath.Option; +import com.jayway.jsonpath.ParseContext; +import com.jayway.jsonpath.TypeRef; import com.jayway.jsonpath.spi.cache.CacheProvider; import com.jayway.jsonpath.spi.cache.LRUCache; - -import java.util.*; - +import java.util.Collections; +import java.util.List; import org.apache.commons.lang3.StringUtils; /** diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/util/PrivateKeyUtils.java b/collector/src/main/java/org/apache/hertzbeat/collector/util/PrivateKeyUtils.java index 641eab297cc..65090a32da1 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/util/PrivateKeyUtils.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/util/PrivateKeyUtils.java @@ -17,13 +17,12 @@ package org.apache.hertzbeat.collector.util; -import lombok.experimental.UtilityClass; -import lombok.extern.slf4j.Slf4j; - import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; import java.util.Objects; +import lombok.experimental.UtilityClass; +import lombok.extern.slf4j.Slf4j; /** * private key util diff --git a/collector/src/test/java/org/apache/hertzbeat/collector/collect/redis/RedisClusterCollectImplTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/collect/redis/RedisClusterCollectImplTest.java index 801acc8591b..29b9628e25f 100644 --- a/collector/src/test/java/org/apache/hertzbeat/collector/collect/redis/RedisClusterCollectImplTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/collect/redis/RedisClusterCollectImplTest.java @@ -17,6 +17,8 @@ package org.apache.hertzbeat.collector.collect.redis; +import java.util.ArrayList; +import java.util.List; import org.apache.hertzbeat.common.entity.job.Metrics; import org.apache.hertzbeat.common.entity.job.protocol.RedisProtocol; import org.apache.hertzbeat.common.entity.message.CollectRep; @@ -27,9 +29,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import java.util.ArrayList; -import java.util.List; - /** * Test case for {@link RedisCommonCollectImpl} * diff --git a/common/src/main/java/org/apache/hertzbeat/common/cache/CaffeineCacheServiceImpl.java b/common/src/main/java/org/apache/hertzbeat/common/cache/CaffeineCacheServiceImpl.java index 71ae72f1a2b..db2ead18d18 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/cache/CaffeineCacheServiceImpl.java +++ b/common/src/main/java/org/apache/hertzbeat/common/cache/CaffeineCacheServiceImpl.java @@ -19,9 +19,9 @@ import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; - import java.time.Duration; + /** * caffeine cache impl */ diff --git a/common/src/main/java/org/apache/hertzbeat/common/config/AviatorConfiguration.java b/common/src/main/java/org/apache/hertzbeat/common/config/AviatorConfiguration.java index c0815a6fa5d..c690ef0f0f5 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/config/AviatorConfiguration.java +++ b/common/src/main/java/org/apache/hertzbeat/common/config/AviatorConfiguration.java @@ -28,14 +28,14 @@ import com.googlecode.aviator.runtime.type.AviatorObject; import com.googlecode.aviator.runtime.type.AviatorString; import com.googlecode.aviator.runtime.type.AviatorType; +import java.util.Map; +import java.util.Objects; +import java.util.regex.Pattern; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import java.util.Map; -import java.util.Objects; -import java.util.regex.Pattern; /** * aviator config diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/Alert.java b/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/Alert.java index daf389f2ee5..45d095a2215 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/Alert.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/Alert.java @@ -17,12 +17,27 @@ package org.apache.hertzbeat.common.entity.alerter; -import org.apache.hertzbeat.common.util.JsonUtil; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import java.time.LocalDateTime; +import java.util.Map; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.apache.hertzbeat.common.util.JsonUtil; import org.hibernate.annotations.GenericGenerator; import org.hibernate.validator.constraints.Length; import org.springframework.data.annotation.CreatedBy; @@ -31,15 +46,6 @@ import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import jakarta.persistence.*; -import jakarta.validation.constraints.Max; -import jakarta.validation.constraints.Min; - -import java.time.LocalDateTime; -import java.util.Map; - -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; /** * Alarm record entity diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertConverge.java b/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertConverge.java index 5c8df413966..d91be3611c7 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertConverge.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertConverge.java @@ -17,7 +17,21 @@ package org.apache.hertzbeat.common.entity.alerter; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import java.time.LocalDateTime; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -32,14 +46,6 @@ import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import jakarta.persistence.*; -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.NotNull; -import java.time.LocalDateTime; -import java.util.List; - -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; /** * Alert Converge strategy entity diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefine.java b/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefine.java index 41417272f66..5d74acdf938 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefine.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefine.java @@ -17,8 +17,23 @@ package org.apache.hertzbeat.common.entity.alerter; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; import com.google.common.base.Objects; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import java.time.LocalDateTime; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -32,16 +47,7 @@ import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import jakarta.persistence.*; -import jakarta.validation.constraints.Max; -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.NotNull; -import java.time.LocalDateTime; -import java.util.List; - -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; /** diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefineMonitorBind.java b/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefineMonitorBind.java index 912b7558839..fd9649ddb44 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefineMonitorBind.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefineMonitorBind.java @@ -17,23 +17,34 @@ package org.apache.hertzbeat.common.entity.alerter; -import org.apache.hertzbeat.common.entity.manager.Monitor; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.Column; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.apache.hertzbeat.common.entity.manager.Monitor; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import jakarta.persistence.*; -import java.time.LocalDateTime; - -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; /** diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertSilence.java b/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertSilence.java index 2e6e7409bfb..ac5b29b83c3 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertSilence.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertSilence.java @@ -17,7 +17,21 @@ package org.apache.hertzbeat.common.entity.alerter; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import java.time.LocalDateTime; +import java.time.ZonedDateTime; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -32,14 +46,7 @@ import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import jakarta.persistence.*; -import jakarta.validation.constraints.NotNull; -import java.time.LocalDateTime; -import java.time.ZonedDateTime; -import java.util.List; -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; /** * Alert Silence strategy entity diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/JsonMapAttributeConverter.java b/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/JsonMapAttributeConverter.java index 834d151017e..68f44427679 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/JsonMapAttributeConverter.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/JsonMapAttributeConverter.java @@ -17,11 +17,10 @@ package org.apache.hertzbeat.common.entity.alerter; -import org.apache.hertzbeat.common.util.JsonUtil; import com.fasterxml.jackson.core.type.TypeReference; - import jakarta.persistence.AttributeConverter; import java.util.Map; +import org.apache.hertzbeat.common.util.JsonUtil; /** * json map converter diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/dto/AlertReport.java b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/AlertReport.java index bef2f1296db..dee7b25c14c 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/dto/AlertReport.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/AlertReport.java @@ -17,15 +17,14 @@ package org.apache.hertzbeat.common.entity.dto; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; import io.swagger.v3.oas.annotations.media.Schema; +import java.util.Map; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.Map; - -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; /** diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/dto/CollectorInfo.java b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/CollectorInfo.java index d23531bfa2b..b92893c26e5 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/dto/CollectorInfo.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/CollectorInfo.java @@ -18,13 +18,13 @@ package org.apache.hertzbeat.common.entity.dto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import org.apache.hertzbeat.common.constants.CommonConstants; -import jakarta.validation.constraints.NotNull; /** * collector info diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsData.java b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsData.java index 4f63ec9f211..f2d70e2bf7c 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsData.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsData.java @@ -18,12 +18,12 @@ package org.apache.hertzbeat.common.entity.dto; import io.swagger.v3.oas.annotations.media.Schema; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.List; /** * Monitoring Metrics Data diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsHistoryData.java b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsHistoryData.java index 5cbb8ae3228..16687e459c3 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsHistoryData.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsHistoryData.java @@ -18,13 +18,13 @@ package org.apache.hertzbeat.common.entity.dto; import io.swagger.v3.oas.annotations.media.Schema; +import java.util.List; +import java.util.Map; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.List; -import java.util.Map; /** * Metric History Range Query Data diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/dto/PromVectorOrMatrix.java b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/PromVectorOrMatrix.java index 483dc82dbd1..87d05367bd4 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/dto/PromVectorOrMatrix.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/PromVectorOrMatrix.java @@ -24,11 +24,15 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.google.gson.JsonObject; -import lombok.*; -import lombok.experimental.Accessors; - import java.io.IOException; import java.util.List; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import lombok.experimental.Accessors; + /** * prometheus vector or matrix entity diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/dto/ValueRow.java b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/ValueRow.java index 0d2c3007f39..e7d855e284b 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/dto/ValueRow.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/ValueRow.java @@ -18,13 +18,13 @@ package org.apache.hertzbeat.common.entity.dto; import io.swagger.v3.oas.annotations.media.Schema; +import java.util.List; +import java.util.Map; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.List; -import java.util.Map; /** * Monitoring Metrics DataRow diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/job/Job.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/Job.java index c1da761bf41..2becfa052c6 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/job/Job.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/Job.java @@ -19,6 +19,16 @@ import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -28,9 +38,6 @@ import org.apache.hertzbeat.common.entity.message.CollectRep; import org.apache.hertzbeat.common.util.JsonUtil; -import java.util.*; -import java.util.stream.Collectors; - /** * Collect task details */ diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/job/Metrics.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/Metrics.java index 530d1d5d054..6bb96574ee5 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/job/Metrics.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/Metrics.java @@ -18,20 +18,40 @@ package org.apache.hertzbeat.common.entity.job; import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.hertzbeat.common.entity.job.protocol.*; +import org.apache.hertzbeat.common.entity.job.protocol.DnsProtocol; +import org.apache.hertzbeat.common.entity.job.protocol.FtpProtocol; +import org.apache.hertzbeat.common.entity.job.protocol.HttpProtocol; +import org.apache.hertzbeat.common.entity.job.protocol.HttpsdProtocol; +import org.apache.hertzbeat.common.entity.job.protocol.IcmpProtocol; +import org.apache.hertzbeat.common.entity.job.protocol.JdbcProtocol; +import org.apache.hertzbeat.common.entity.job.protocol.JmxProtocol; +import org.apache.hertzbeat.common.entity.job.protocol.MemcachedProtocol; +import org.apache.hertzbeat.common.entity.job.protocol.MongodbProtocol; +import org.apache.hertzbeat.common.entity.job.protocol.NebulaGraphProtocol; +import org.apache.hertzbeat.common.entity.job.protocol.NginxProtocol; +import org.apache.hertzbeat.common.entity.job.protocol.NtpProtocol; +import org.apache.hertzbeat.common.entity.job.protocol.Pop3Protocol; +import org.apache.hertzbeat.common.entity.job.protocol.PrometheusProtocol; +import org.apache.hertzbeat.common.entity.job.protocol.PushProtocol; +import org.apache.hertzbeat.common.entity.job.protocol.RedisProtocol; +import org.apache.hertzbeat.common.entity.job.protocol.RocketmqProtocol; +import org.apache.hertzbeat.common.entity.job.protocol.SmtpProtocol; +import org.apache.hertzbeat.common.entity.job.protocol.SnmpProtocol; +import org.apache.hertzbeat.common.entity.job.protocol.SshProtocol; +import org.apache.hertzbeat.common.entity.job.protocol.TelnetProtocol; +import org.apache.hertzbeat.common.entity.job.protocol.UdpProtocol; +import org.apache.hertzbeat.common.entity.job.protocol.WebsocketProtocol; import org.apache.hertzbeat.common.entity.message.CollectRep; -import org.apache.hertzbeat.common.entity.job.protocol.*; - -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicReference; /** * Details of the monitoring metrics collected diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/HttpProtocol.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/HttpProtocol.java index 96c5cbc21a5..1ca3047fb84 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/HttpProtocol.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/HttpProtocol.java @@ -17,14 +17,13 @@ package org.apache.hertzbeat.common.entity.job.protocol; +import java.util.List; +import java.util.Map; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.List; -import java.util.Map; - /** * http protocol configuration */ diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NginxProtocol.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NginxProtocol.java index 96f83412351..732caa93840 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NginxProtocol.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NginxProtocol.java @@ -17,11 +17,11 @@ package org.apache.hertzbeat.common.entity.job.protocol; -import org.apache.commons.lang3.StringUtils; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.apache.commons.lang3.StringUtils; /** * nginx protocol diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PrometheusProtocol.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PrometheusProtocol.java index 9357bea0f2d..e613fac8cf9 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PrometheusProtocol.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PrometheusProtocol.java @@ -17,13 +17,12 @@ package org.apache.hertzbeat.common.entity.job.protocol; +import java.util.Map; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.Map; - /** * Prometheus Protocol configuration */ diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PushProtocol.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PushProtocol.java index 156ff335ea3..46a64936998 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PushProtocol.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PushProtocol.java @@ -17,14 +17,13 @@ package org.apache.hertzbeat.common.entity.job.protocol; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import org.apache.hertzbeat.common.entity.dto.Field; -import java.util.List; - /** * push protocol definition */ diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SnmpProtocol.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SnmpProtocol.java index 15b348e1db5..0bdf20bdb82 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SnmpProtocol.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SnmpProtocol.java @@ -17,13 +17,12 @@ package org.apache.hertzbeat.common.entity.job.protocol; +import java.util.Map; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.Map; - /** * snmp Protocol configuration */ diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/Collector.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/Collector.java index 3e0cd89ff77..9fa86bc10c7 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/Collector.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/Collector.java @@ -18,16 +18,6 @@ package org.apache.hertzbeat.common.entity.manager; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.springframework.data.annotation.CreatedBy; -import org.springframework.data.annotation.CreatedDate; -import org.springframework.data.annotation.LastModifiedBy; -import org.springframework.data.annotation.LastModifiedDate; -import org.springframework.data.jpa.domain.support.AuditingEntityListener; - import jakarta.persistence.Entity; import jakarta.persistence.EntityListeners; import jakarta.persistence.GeneratedValue; @@ -38,6 +28,15 @@ import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; import java.time.LocalDateTime; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.data.annotation.CreatedBy; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedBy; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; /** * collector entity diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/CollectorMonitorBind.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/CollectorMonitorBind.java index e182911aa86..f961adb5d66 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/CollectorMonitorBind.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/CollectorMonitorBind.java @@ -18,16 +18,6 @@ package org.apache.hertzbeat.common.entity.manager; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.springframework.data.annotation.CreatedBy; -import org.springframework.data.annotation.CreatedDate; -import org.springframework.data.annotation.LastModifiedBy; -import org.springframework.data.annotation.LastModifiedDate; -import org.springframework.data.jpa.domain.support.AuditingEntityListener; - import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EntityListeners; @@ -37,6 +27,15 @@ import jakarta.persistence.Index; import jakarta.persistence.Table; import java.time.LocalDateTime; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.data.annotation.CreatedBy; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedBy; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; /** * collector entity diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/GeneralConfig.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/GeneralConfig.java index 29850ab2245..4f65da6806b 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/GeneralConfig.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/GeneralConfig.java @@ -17,7 +17,16 @@ package org.apache.hertzbeat.common.entity.manager; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -28,14 +37,6 @@ import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import jakarta.persistence.*; -import jakarta.validation.constraints.NotNull; - -import java.time.LocalDateTime; - -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; - /** * Common Config Entity */ diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonByteListAttributeConverter.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonByteListAttributeConverter.java index ab13cbbd9cf..535dc9c6866 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonByteListAttributeConverter.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonByteListAttributeConverter.java @@ -18,10 +18,9 @@ package org.apache.hertzbeat.common.entity.manager; import com.fasterxml.jackson.core.type.TypeReference; -import org.apache.hertzbeat.common.util.JsonUtil; - import jakarta.persistence.AttributeConverter; import java.util.List; +import org.apache.hertzbeat.common.util.JsonUtil; /** * json str to list Byte converter diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonLongListAttributeConverter.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonLongListAttributeConverter.java index 6921ae1af2a..6e894eb03c6 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonLongListAttributeConverter.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonLongListAttributeConverter.java @@ -19,9 +19,9 @@ import com.fasterxml.jackson.core.type.TypeReference; import jakarta.persistence.AttributeConverter; +import java.util.List; import org.apache.commons.lang3.StringUtils; import org.apache.hertzbeat.common.util.JsonUtil; -import java.util.List; /** diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonOptionListAttributeConverter.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonOptionListAttributeConverter.java index bb1b656264b..cd143bfbe67 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonOptionListAttributeConverter.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonOptionListAttributeConverter.java @@ -18,10 +18,9 @@ package org.apache.hertzbeat.common.entity.manager; import com.fasterxml.jackson.core.type.TypeReference; -import org.apache.hertzbeat.common.util.JsonUtil; - import jakarta.persistence.AttributeConverter; import java.util.List; +import org.apache.hertzbeat.common.util.JsonUtil; /** * json str to list paramDefine.Option diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonStringListAttributeConverter.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonStringListAttributeConverter.java index 2f49891f940..a3d0da39dd1 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonStringListAttributeConverter.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonStringListAttributeConverter.java @@ -19,9 +19,8 @@ import com.fasterxml.jackson.core.type.TypeReference; import jakarta.persistence.AttributeConverter; -import org.apache.hertzbeat.common.util.JsonUtil; - import java.util.List; +import org.apache.hertzbeat.common.util.JsonUtil; /** diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonTagAttributeConverter.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonTagAttributeConverter.java index a254a95a50c..8a8374444a3 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonTagAttributeConverter.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonTagAttributeConverter.java @@ -18,9 +18,8 @@ package org.apache.hertzbeat.common.entity.manager; import com.fasterxml.jackson.core.type.TypeReference; -import org.apache.hertzbeat.common.util.JsonUtil; - import jakarta.persistence.AttributeConverter; +import org.apache.hertzbeat.common.util.JsonUtil; /** * json str to tag item diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonTagListAttributeConverter.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonTagListAttributeConverter.java index 791a701dfa5..6c3fd06574e 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonTagListAttributeConverter.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonTagListAttributeConverter.java @@ -18,12 +18,11 @@ package org.apache.hertzbeat.common.entity.manager; import com.fasterxml.jackson.core.type.TypeReference; -import org.apache.hertzbeat.common.util.JsonUtil; - import jakarta.persistence.AttributeConverter; import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import org.apache.hertzbeat.common.util.JsonUtil; /** * json str to tag list diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/Monitor.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/Monitor.java index d40d17495a7..35070f5b9d1 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/Monitor.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/Monitor.java @@ -17,26 +17,36 @@ package org.apache.hertzbeat.common.entity.manager; -import org.apache.hertzbeat.common.support.valid.HostValid; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import java.time.LocalDateTime; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.apache.hertzbeat.common.support.valid.HostValid; import org.hibernate.validator.constraints.Length; import org.springframework.data.annotation.CreatedBy; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedBy; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import jakarta.persistence.*; -import jakarta.validation.constraints.Max; -import jakarta.validation.constraints.Min; -import java.time.LocalDateTime; -import java.util.List; - -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; /** * Monitor Entity diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/NoticeReceiver.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/NoticeReceiver.java index 5cb2513cfdc..1c0d5880753 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/NoticeReceiver.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/NoticeReceiver.java @@ -17,7 +17,19 @@ package org.apache.hertzbeat.common.entity.manager; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -29,14 +41,6 @@ import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import jakarta.persistence.*; -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.NotNull; -import java.time.LocalDateTime; - -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; - /** * Message notification recipient entity diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/NoticeRule.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/NoticeRule.java index d5b35d1741a..1ebf51df97c 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/NoticeRule.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/NoticeRule.java @@ -17,7 +17,21 @@ package org.apache.hertzbeat.common.entity.manager; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import java.time.LocalDateTime; +import java.time.ZonedDateTime; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -28,14 +42,6 @@ import org.springframework.data.annotation.LastModifiedBy; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import jakarta.persistence.*; -import jakarta.validation.constraints.NotNull; -import java.time.LocalDateTime; -import java.time.ZonedDateTime; -import java.util.List; - -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; /** * Notification strategy entity diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/NoticeTemplate.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/NoticeTemplate.java index 1b3fcb2b3d5..ce8a25f5cc9 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/NoticeTemplate.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/NoticeTemplate.java @@ -17,7 +17,21 @@ package org.apache.hertzbeat.common.entity.manager; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -29,15 +43,6 @@ import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import jakarta.persistence.*; -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import java.time.LocalDateTime; - -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; - /** * Notification template entity * 通知模版 diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/Param.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/Param.java index 1b4e46cc02c..402f9876f69 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/Param.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/Param.java @@ -17,7 +17,21 @@ package org.apache.hertzbeat.common.entity.manager; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -27,14 +41,6 @@ import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import jakarta.persistence.*; -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.NotNull; -import java.time.LocalDateTime; - -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; - /** * Monitor parameter values diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/ParamDefine.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/ParamDefine.java index 8a37728859f..38f549f44fa 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/ParamDefine.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/ParamDefine.java @@ -17,26 +17,31 @@ package org.apache.hertzbeat.common.entity.manager; -import org.apache.hertzbeat.common.entity.alerter.JsonMapAttributeConverter; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import java.time.LocalDateTime; +import java.util.List; +import java.util.Map; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.apache.hertzbeat.common.entity.alerter.JsonMapAttributeConverter; import org.springframework.data.annotation.CreatedBy; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedBy; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import jakarta.persistence.*; -import java.time.LocalDateTime; -import java.util.List; -import java.util.Map; - -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; - /** * Monitoring parameter definitions */ diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageComponent.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageComponent.java index ca616fce998..5fe82560c54 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageComponent.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageComponent.java @@ -18,6 +18,15 @@ package org.apache.hertzbeat.common.entity.manager; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotBlank; +import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -28,10 +37,6 @@ import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import jakarta.persistence.*; -import jakarta.validation.constraints.NotBlank; -import java.time.LocalDateTime; - /** * status page component entity */ diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageHistory.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageHistory.java index 87b428bf10f..64eaca93d4a 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageHistory.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageHistory.java @@ -18,6 +18,14 @@ package org.apache.hertzbeat.common.entity.manager; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -28,11 +36,6 @@ import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import jakarta.persistence.*; - - -import java.time.LocalDateTime; - /** * status page history entity */ diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncident.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncident.java index 19eb75453a7..2df6d6dc7db 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncident.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncident.java @@ -18,6 +18,24 @@ package org.apache.hertzbeat.common.entity.manager; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotBlank; +import java.time.LocalDateTime; +import java.util.List; +import java.util.Set; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -28,12 +46,6 @@ import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import jakarta.persistence.*; -import jakarta.validation.constraints.NotBlank; -import java.time.LocalDateTime; -import java.util.List; -import java.util.Set; - /** * status page incident entity */ diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentComponentBind.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentComponentBind.java index d1b859a24d0..f1f18074a78 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentComponentBind.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentComponentBind.java @@ -18,6 +18,15 @@ package org.apache.hertzbeat.common.entity.manager; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Table; +import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -26,10 +35,6 @@ import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import jakarta.persistence.*; - -import java.time.LocalDateTime; - /** * status page incident component bind entity */ diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentContent.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentContent.java index 36a36c12712..0d74dd6e705 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentContent.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentContent.java @@ -18,6 +18,15 @@ package org.apache.hertzbeat.common.entity.manager; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotBlank; +import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -28,10 +37,6 @@ import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import jakarta.persistence.*; -import jakarta.validation.constraints.NotBlank; -import java.time.LocalDateTime; - /** * status page incident entity content. */ diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageOrg.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageOrg.java index 8f8b09e7d5e..567feb23f17 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageOrg.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageOrg.java @@ -18,6 +18,14 @@ package org.apache.hertzbeat.common.entity.manager; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotBlank; +import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -28,11 +36,6 @@ import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import jakarta.persistence.*; -import jakarta.validation.constraints.NotBlank; - -import java.time.LocalDateTime; - /** * status page org entity */ diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/Tag.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/Tag.java index 19c5fee5dc8..408ab2365a0 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/Tag.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/Tag.java @@ -17,7 +17,21 @@ package org.apache.hertzbeat.common.entity.manager; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import java.time.LocalDateTime; +import java.util.Objects; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -27,15 +41,6 @@ import org.springframework.data.annotation.LastModifiedBy; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import jakarta.persistence.*; -import jakarta.validation.constraints.Max; -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.NotNull; -import java.time.LocalDateTime; -import java.util.Objects; - -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; /** * Tag Entity diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/TagItem.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/TagItem.java index 627595fbc77..dbd9c8a4abe 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/TagItem.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/TagItem.java @@ -18,12 +18,11 @@ package org.apache.hertzbeat.common.entity.manager; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.validation.constraints.NotBlank; - /** * tag item */ diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/TagMonitorBind.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/TagMonitorBind.java index f2cc1a7a2ce..cf8d2d6bde7 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/manager/TagMonitorBind.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/TagMonitorBind.java @@ -17,7 +17,18 @@ package org.apache.hertzbeat.common.entity.manager; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Table; +import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -25,11 +36,6 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import jakarta.persistence.*; -import java.time.LocalDateTime; - -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; /** * Tag Bind Monitor diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetrics.java b/common/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetrics.java index 24fe09bafa7..1f72f83dc8f 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetrics.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetrics.java @@ -17,14 +17,19 @@ package org.apache.hertzbeat.common.entity.push; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import jakarta.persistence.*; - /** * push metrics entity */ diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetricsDto.java b/common/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetricsDto.java index 4856cf0b802..342004062f9 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetricsDto.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetricsDto.java @@ -17,15 +17,14 @@ package org.apache.hertzbeat.common.entity.push; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - /** * push metrics dto */ diff --git a/common/src/main/java/org/apache/hertzbeat/common/entity/warehouse/History.java b/common/src/main/java/org/apache/hertzbeat/common/entity/warehouse/History.java index 5bbb0b5c886..28a41e9ba7d 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/entity/warehouse/History.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/warehouse/History.java @@ -17,18 +17,22 @@ package org.apache.hertzbeat.common.entity.warehouse; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import org.hibernate.annotations.GenericGenerator; -import jakarta.persistence.*; - -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; - /** * metrics history data entity */ diff --git a/common/src/main/java/org/apache/hertzbeat/common/queue/impl/InMemoryCommonDataQueue.java b/common/src/main/java/org/apache/hertzbeat/common/queue/impl/InMemoryCommonDataQueue.java index 44868a0cfe5..42a9fe8fd49 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/queue/impl/InMemoryCommonDataQueue.java +++ b/common/src/main/java/org/apache/hertzbeat/common/queue/impl/InMemoryCommonDataQueue.java @@ -17,20 +17,19 @@ package org.apache.hertzbeat.common.queue.impl; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.TimeUnit; +import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.entity.alerter.Alert; import org.apache.hertzbeat.common.entity.message.CollectRep; import org.apache.hertzbeat.common.queue.CommonDataQueue; -import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.DisposableBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.TimeUnit; - /** * common data queue implement memory */ diff --git a/common/src/main/java/org/apache/hertzbeat/common/queue/impl/KafkaCommonDataQueue.java b/common/src/main/java/org/apache/hertzbeat/common/queue/impl/KafkaCommonDataQueue.java index 8eba3f3380d..edcdca253b3 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/queue/impl/KafkaCommonDataQueue.java +++ b/common/src/main/java/org/apache/hertzbeat/common/queue/impl/KafkaCommonDataQueue.java @@ -17,10 +17,17 @@ package org.apache.hertzbeat.common.queue.impl; +import java.time.Duration; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.locks.ReentrantLock; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.config.CommonProperties; import org.apache.hertzbeat.common.entity.alerter.Alert; import org.apache.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.queue.CommonDataQueue; import org.apache.hertzbeat.common.serialize.AlertDeserializer; import org.apache.hertzbeat.common.serialize.AlertSerializer; import org.apache.hertzbeat.common.serialize.KafkaMetricsDataDeserializer; @@ -34,16 +41,10 @@ import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.serialization.LongDeserializer; import org.apache.kafka.common.serialization.LongSerializer; -import org.apache.hertzbeat.common.queue.CommonDataQueue; import org.springframework.beans.factory.DisposableBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Configuration; -import java.time.Duration; -import java.util.*; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.locks.ReentrantLock; - /** * common data queue implement kafka diff --git a/common/src/main/java/org/apache/hertzbeat/common/serialize/AlertDeserializer.java b/common/src/main/java/org/apache/hertzbeat/common/serialize/AlertDeserializer.java index 1c0551c2774..502d805b521 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/serialize/AlertDeserializer.java +++ b/common/src/main/java/org/apache/hertzbeat/common/serialize/AlertDeserializer.java @@ -17,12 +17,11 @@ package org.apache.hertzbeat.common.serialize; +import java.util.Map; import org.apache.hertzbeat.common.entity.alerter.Alert; +import org.apache.hertzbeat.common.util.JsonUtil; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.serialization.Deserializer; -import org.apache.hertzbeat.common.util.JsonUtil; - -import java.util.Map; /** * kafka alert deserializer diff --git a/common/src/main/java/org/apache/hertzbeat/common/serialize/AlertSerializer.java b/common/src/main/java/org/apache/hertzbeat/common/serialize/AlertSerializer.java index 5aa42bf7e16..b1c8b9301cf 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/serialize/AlertSerializer.java +++ b/common/src/main/java/org/apache/hertzbeat/common/serialize/AlertSerializer.java @@ -18,12 +18,11 @@ package org.apache.hertzbeat.common.serialize; -import org.apache.kafka.common.header.Headers; -import org.apache.kafka.common.serialization.Serializer; +import java.util.Map; import org.apache.hertzbeat.common.entity.alerter.Alert; import org.apache.hertzbeat.common.util.JsonUtil; - -import java.util.Map; +import org.apache.kafka.common.header.Headers; +import org.apache.kafka.common.serialization.Serializer; /** * kafka alert entity serializer diff --git a/common/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataDeserializer.java b/common/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataDeserializer.java index aaa69615952..c1f80270503 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataDeserializer.java +++ b/common/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataDeserializer.java @@ -18,11 +18,10 @@ package org.apache.hertzbeat.common.serialize; import com.google.protobuf.InvalidProtocolBufferException; +import java.util.Map; +import org.apache.hertzbeat.common.entity.message.CollectRep; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.serialization.Deserializer; -import org.apache.hertzbeat.common.entity.message.CollectRep; - -import java.util.Map; /** * kafka metrics data deserializer diff --git a/common/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataSerializer.java b/common/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataSerializer.java index 526c17f91b5..c2d56e51353 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataSerializer.java +++ b/common/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataSerializer.java @@ -18,11 +18,10 @@ package org.apache.hertzbeat.common.serialize; +import java.util.Map; +import org.apache.hertzbeat.common.entity.message.CollectRep; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.serialization.Serializer; -import org.apache.hertzbeat.common.entity.message.CollectRep; - -import java.util.Map; /** diff --git a/common/src/main/java/org/apache/hertzbeat/common/service/AliYunSmsClient.java b/common/src/main/java/org/apache/hertzbeat/common/service/AliYunSmsClient.java index 161dcec32be..127d057f2b0 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/service/AliYunSmsClient.java +++ b/common/src/main/java/org/apache/hertzbeat/common/service/AliYunSmsClient.java @@ -21,6 +21,10 @@ import com.tencentcloudapi.common.Credential; import com.tencentcloudapi.sms.v20210111.SmsClient; import com.tencentcloudapi.sms.v20210111.models.SendSmsRequest; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.HashMap; +import java.util.Map; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.config.CommonProperties; import org.apache.hertzbeat.common.support.exception.SendMessageException; @@ -28,11 +32,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.HashMap; -import java.util.Map; - /** * sms service client for aliyun cloud */ diff --git a/common/src/main/java/org/apache/hertzbeat/common/service/TencentSmsClient.java b/common/src/main/java/org/apache/hertzbeat/common/service/TencentSmsClient.java index 5f95f1266c4..a740548f154 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/service/TencentSmsClient.java +++ b/common/src/main/java/org/apache/hertzbeat/common/service/TencentSmsClient.java @@ -22,9 +22,9 @@ import com.tencentcloudapi.sms.v20210111.models.SendSmsRequest; import com.tencentcloudapi.sms.v20210111.models.SendSmsResponse; import com.tencentcloudapi.sms.v20210111.models.SendStatus; -import org.apache.hertzbeat.common.support.exception.SendMessageException; -import org.apache.hertzbeat.common.config.CommonProperties; import lombok.extern.slf4j.Slf4j; +import org.apache.hertzbeat.common.config.CommonProperties; +import org.apache.hertzbeat.common.support.exception.SendMessageException; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; diff --git a/common/src/main/java/org/apache/hertzbeat/common/support/CommonThreadPool.java b/common/src/main/java/org/apache/hertzbeat/common/support/CommonThreadPool.java index 2c04c3e70df..159d048b353 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/support/CommonThreadPool.java +++ b/common/src/main/java/org/apache/hertzbeat/common/support/CommonThreadPool.java @@ -18,15 +18,14 @@ package org.apache.hertzbeat.common.support; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.stereotype.Component; - import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.SynchronousQueue; import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.DisposableBean; +import org.springframework.stereotype.Component; /** * common task worker thread pool diff --git a/common/src/main/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8Control.java b/common/src/main/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8Control.java index 8ab13a8ec48..eeb34effe13 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8Control.java +++ b/common/src/main/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8Control.java @@ -17,8 +17,6 @@ package org.apache.hertzbeat.common.support; -import lombok.extern.slf4j.Slf4j; - import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -31,6 +29,7 @@ import java.util.Locale; import java.util.PropertyResourceBundle; import java.util.ResourceBundle; +import lombok.extern.slf4j.Slf4j; /** * i18n resource bundle control diff --git a/common/src/main/java/org/apache/hertzbeat/common/support/valid/EmailParamValidator.java b/common/src/main/java/org/apache/hertzbeat/common/support/valid/EmailParamValidator.java index 4787b72d4c8..50d74ebf6bb 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/support/valid/EmailParamValidator.java +++ b/common/src/main/java/org/apache/hertzbeat/common/support/valid/EmailParamValidator.java @@ -17,10 +17,9 @@ package org.apache.hertzbeat.common.support.valid; -import org.apache.hertzbeat.common.util.CommonUtil; - import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; +import org.apache.hertzbeat.common.util.CommonUtil; /** * email validator diff --git a/common/src/main/java/org/apache/hertzbeat/common/support/valid/EmailValid.java b/common/src/main/java/org/apache/hertzbeat/common/support/valid/EmailValid.java index e7954352b51..36dd6b5c3d9 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/support/valid/EmailValid.java +++ b/common/src/main/java/org/apache/hertzbeat/common/support/valid/EmailValid.java @@ -17,16 +17,15 @@ package org.apache.hertzbeat.common.support.valid; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; import jakarta.validation.Constraint; import jakarta.validation.Payload; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - /** * EmailValid */ diff --git a/common/src/main/java/org/apache/hertzbeat/common/support/valid/HostParamValidator.java b/common/src/main/java/org/apache/hertzbeat/common/support/valid/HostParamValidator.java index 26ad4c02aa3..c0e7deab344 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/support/valid/HostParamValidator.java +++ b/common/src/main/java/org/apache/hertzbeat/common/support/valid/HostParamValidator.java @@ -17,10 +17,9 @@ package org.apache.hertzbeat.common.support.valid; -import org.apache.hertzbeat.common.util.IpDomainUtil; - import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; +import org.apache.hertzbeat.common.util.IpDomainUtil; /** * Host Param Validator diff --git a/common/src/main/java/org/apache/hertzbeat/common/support/valid/HostValid.java b/common/src/main/java/org/apache/hertzbeat/common/support/valid/HostValid.java index 2db92492284..14065f6d8e4 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/support/valid/HostValid.java +++ b/common/src/main/java/org/apache/hertzbeat/common/support/valid/HostValid.java @@ -17,16 +17,15 @@ package org.apache.hertzbeat.common.support.valid; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; import jakarta.validation.Constraint; import jakarta.validation.Payload; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - /** * Host Param Validator */ diff --git a/common/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumParamValidator.java b/common/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumParamValidator.java index 1f8a8ca1e7f..c8a27bfbb35 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumParamValidator.java +++ b/common/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumParamValidator.java @@ -17,10 +17,9 @@ package org.apache.hertzbeat.common.support.valid; -import org.apache.hertzbeat.common.util.CommonUtil; - import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; +import org.apache.hertzbeat.common.util.CommonUtil; /** * PhoneNum Param Validator diff --git a/common/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumValid.java b/common/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumValid.java index 686ed491f0a..3a1625201b1 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumValid.java +++ b/common/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumValid.java @@ -17,16 +17,15 @@ package org.apache.hertzbeat.common.support.valid; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; import jakarta.validation.Constraint; import jakarta.validation.Payload; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - /** * PhoneNum Param Validator */ diff --git a/common/src/main/java/org/apache/hertzbeat/common/util/AesUtil.java b/common/src/main/java/org/apache/hertzbeat/common/util/AesUtil.java index e23f3b6740d..914b62d6be9 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/util/AesUtil.java +++ b/common/src/main/java/org/apache/hertzbeat/common/util/AesUtil.java @@ -17,16 +17,16 @@ package org.apache.hertzbeat.common.util; -import lombok.extern.slf4j.Slf4j; - +import java.nio.charset.StandardCharsets; +import java.security.NoSuchAlgorithmException; +import java.util.Base64; import javax.crypto.BadPaddingException; import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; -import java.nio.charset.StandardCharsets; -import java.security.NoSuchAlgorithmException; -import java.util.Base64; +import lombok.extern.slf4j.Slf4j; + /** * AES Decode Encode Util diff --git a/common/src/main/java/org/apache/hertzbeat/common/util/CommonUtil.java b/common/src/main/java/org/apache/hertzbeat/common/util/CommonUtil.java index 6683d1a6d93..428917307f2 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/util/CommonUtil.java +++ b/common/src/main/java/org/apache/hertzbeat/common/util/CommonUtil.java @@ -17,9 +17,6 @@ package org.apache.hertzbeat.common.util; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; - import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalTime; @@ -27,6 +24,9 @@ import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; + /** * common util diff --git a/common/src/main/java/org/apache/hertzbeat/common/util/IpDomainUtil.java b/common/src/main/java/org/apache/hertzbeat/common/util/IpDomainUtil.java index b143888a2bb..3510702940b 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/util/IpDomainUtil.java +++ b/common/src/main/java/org/apache/hertzbeat/common/util/IpDomainUtil.java @@ -17,16 +17,15 @@ package org.apache.hertzbeat.common.util; -import lombok.extern.slf4j.Slf4j; -import org.apache.hertzbeat.common.constants.CollectorConstants; -import org.apache.http.conn.util.InetAddressUtils; - 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.CollectorConstants; +import org.apache.http.conn.util.InetAddressUtils; /** * ipv4 ipv6 domain util diff --git a/common/src/main/java/org/apache/hertzbeat/common/util/JsonUtil.java b/common/src/main/java/org/apache/hertzbeat/common/util/JsonUtil.java index ddfa00af14b..f5617ddc6c4 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/util/JsonUtil.java +++ b/common/src/main/java/org/apache/hertzbeat/common/util/JsonUtil.java @@ -24,11 +24,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; 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; -import javax.annotation.concurrent.ThreadSafe; /** * json util diff --git a/common/src/main/java/org/apache/hertzbeat/common/util/ResourceBundleUtil.java b/common/src/main/java/org/apache/hertzbeat/common/util/ResourceBundleUtil.java index 070a0670f4f..46e527ec7ba 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/util/ResourceBundleUtil.java +++ b/common/src/main/java/org/apache/hertzbeat/common/util/ResourceBundleUtil.java @@ -17,12 +17,11 @@ package org.apache.hertzbeat.common.util; -import org.apache.hertzbeat.common.support.ResourceBundleUtf8Control; -import lombok.extern.slf4j.Slf4j; - import java.util.Locale; import java.util.MissingResourceException; import java.util.ResourceBundle; +import lombok.extern.slf4j.Slf4j; +import org.apache.hertzbeat.common.support.ResourceBundleUtf8Control; /** * i18n ResourceBundle util diff --git a/common/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdGenerator.java b/common/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdGenerator.java index f9b591a005f..c599cd30f7f 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdGenerator.java +++ b/common/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdGenerator.java @@ -17,12 +17,11 @@ package org.apache.hertzbeat.common.util; +import java.io.Serializable; import org.hibernate.HibernateException; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.id.IdentifierGenerator; -import java.io.Serializable; - /** * Snowflake Algorithm Generator Tool */ diff --git a/common/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdWorker.java b/common/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdWorker.java index 55fcf7ca0be..58d8154572c 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdWorker.java +++ b/common/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdWorker.java @@ -17,9 +17,9 @@ package org.apache.hertzbeat.common.util; +import java.util.Random; import lombok.extern.slf4j.Slf4j; -import java.util.Random; /** * SnowFlakeId Instance diff --git a/common/src/main/java/org/apache/hertzbeat/common/util/prometheus/Metric.java b/common/src/main/java/org/apache/hertzbeat/common/util/prometheus/Metric.java index b78f2cc0cce..8a839a37a4e 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/util/prometheus/Metric.java +++ b/common/src/main/java/org/apache/hertzbeat/common/util/prometheus/Metric.java @@ -19,12 +19,12 @@ package org.apache.hertzbeat.common.util.prometheus; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.List; /** * prometheus metric line entity diff --git a/home/docs/community/code-style-and-quality-guide.md b/home/docs/community/code-style-and-quality-guide.md index 865f0271a94..755a98f3fd7 100644 --- a/home/docs/community/code-style-and-quality-guide.md +++ b/home/docs/community/code-style-and-quality-guide.md @@ -43,6 +43,21 @@ sidebar_position: 3 ## 2 Code Checkstyle +### 2.1 Configure Checkstyle + +1. Install the Checkstyle-IDEA plugin. +2. Open Checkstyle Settings. Click **Settings** → **Tools** → **Checkstyle**. +3. Set **Checkstyle version** to **10.14.2**. +4. Set **Scan scope** to **Only Java sources (including tests)**. +5. Click **+** button in the **Configuration** section to open a dialog to choose the checkstyle config file. + 1. Enter a **Description**. For example, hertzbeat. + 2. Select **Use a local checkstyle file**. + 3. Set **File** to **script/checkstyle/checkstyle.xml**. + 4. Select **Store relative to project location**. + 5. Click **Next** → **Next** → **Finish**. +6. Activate the configuration you just added by toggling the corresponding box. +7. Click **OK**. + - Backend code specification Maven plugin: `checkstyle` Just run `mvn checkstyle:checkstyle`. diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/code-style-and-quality-guide.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/code-style-and-quality-guide.md index 3d8baa70391..a9a6f54d474 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/code-style-and-quality-guide.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/code-style-and-quality-guide.md @@ -43,6 +43,21 @@ sidebar_position: 3 ## 2 代码检查样式 +### 2.1 配置 Checkstyle + +1. 安装 Checkstyle-IDEA 插件. +2. 打开 Checkstyle 设置. 点击 **Settings** → **Tools** → **Checkstyle**。 +3. 设置 **Checkstyle version** 的版本为： **10.14.2**。 +4. 设置 **Scan scope** 为 **Only Java sources (including tests)**。 +5. 点击 **+** 按钮在 **Configuration** 部分打开一个对话框选择 checkstyle 配置文件。 + 1. 输入描述名称，比如：hertzbeat。 + 2. 选择 **Use a local checkstyle file**。 + 3. 设置 **File** 路径为： **script/checkstyle/checkstyle.xml**。 + 4. 选择 **Store relative to project location**。 + 5. 点击 **Next** → **Next** → **Finish**。 +6. 激活刚才的 **Checkstyle** 配置。 +7. 点击 **OK**。 + - 后端代码规范 Maven 插件：`checkstyle` 后端运行 `mvn checkstyle:checkstyle` diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/Manager.java b/manager/src/main/java/org/apache/hertzbeat/manager/Manager.java index 4284f06b547..e9aac8c0c08 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/Manager.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/Manager.java @@ -17,6 +17,7 @@ package org.apache.hertzbeat.manager; +import javax.annotation.PostConstruct; import org.apache.hertzbeat.manager.nativex.HertzbeatRuntimeHintsRegistrar; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -27,8 +28,6 @@ import org.springframework.data.jpa.repository.config.EnableJpaAuditing; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -import javax.annotation.PostConstruct; - /** * start up class. */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/DispatcherAlarm.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/DispatcherAlarm.java index 801d5192033..d26229dea70 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/DispatcherAlarm.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/DispatcherAlarm.java @@ -18,6 +18,8 @@ package org.apache.hertzbeat.manager.component.alerter; import com.google.common.collect.Maps; +import java.util.List; +import java.util.Map; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.alert.AlerterWorkerPool; import org.apache.hertzbeat.common.entity.alerter.Alert; @@ -25,15 +27,12 @@ import org.apache.hertzbeat.common.entity.manager.NoticeRule; import org.apache.hertzbeat.common.entity.manager.NoticeTemplate; import org.apache.hertzbeat.common.queue.CommonDataQueue; +import org.apache.hertzbeat.manager.service.NoticeConfigService; import org.apache.hertzbeat.manager.support.exception.AlertNoticeException; import org.apache.hertzbeat.manager.support.exception.IgnoreException; -import org.apache.hertzbeat.manager.service.NoticeConfigService; import org.springframework.beans.factory.InitializingBean; import org.springframework.stereotype.Component; -import java.util.List; -import java.util.Map; - /** * Alarm information storage and distribution * 告警信息入库分发 diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/AbstractAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/AbstractAlertNotifyHandlerImpl.java index 4599c190262..b463df219ef 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/AbstractAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/AbstractAlertNotifyHandlerImpl.java @@ -20,6 +20,15 @@ import freemarker.cache.StringTemplateLoader; import freemarker.template.Configuration; import freemarker.template.TemplateException; +import java.io.IOException; +import java.time.Instant; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; +import java.util.ResourceBundle; +import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.alert.AlerterProperties; import org.apache.hertzbeat.common.constants.CommonConstants; @@ -33,16 +42,6 @@ import org.springframework.ui.freemarker.FreeMarkerTemplateUtils; import org.springframework.web.client.RestTemplate; -import javax.annotation.Resource; -import java.io.IOException; -import java.time.Instant; -import java.time.ZoneId; -import java.time.format.DateTimeFormatter; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; -import java.util.ResourceBundle; - /** */ @Slf4j diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/AliYunAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/AliYunAlertNotifyHandlerImpl.java index af4a82ce678..8dea9c31306 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/AliYunAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/AliYunAlertNotifyHandlerImpl.java @@ -17,6 +17,7 @@ package org.apache.hertzbeat.manager.component.alerter.impl; +import java.util.ResourceBundle; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.constants.CommonConstants; @@ -29,8 +30,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; -import java.util.ResourceBundle; - /** * Send alarm information through Alibaba Cloud SMS */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImpl.java index 091c025b96a..3bbff2afe8f 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImpl.java @@ -17,19 +17,18 @@ package org.apache.hertzbeat.manager.component.alerter.impl; +import java.util.Map; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.alert.service.AlertService; import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.entity.alerter.Alert; import org.apache.hertzbeat.common.entity.manager.Monitor; -import org.apache.hertzbeat.manager.service.MonitorService; import org.apache.hertzbeat.manager.component.alerter.AlertStoreHandler; +import org.apache.hertzbeat.manager.service.MonitorService; import org.apache.hertzbeat.manager.support.exception.IgnoreException; import org.springframework.stereotype.Component; -import java.util.Map; - /** * 报警持久化 - 落地到数据库 * Alarm data persistence - landing in the database diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImpl.java index 7e49e6d4641..843a22a91a9 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImpl.java @@ -24,7 +24,11 @@ import org.apache.hertzbeat.common.entity.manager.NoticeReceiver; import org.apache.hertzbeat.common.entity.manager.NoticeTemplate; import org.apache.hertzbeat.manager.support.exception.AlertNoticeException; -import org.springframework.http.*; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; /** diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImpl.java index f0d5d3dd707..7962a422e3f 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImpl.java @@ -18,6 +18,7 @@ package org.apache.hertzbeat.manager.component.alerter.impl; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import java.util.List; import lombok.Builder; import lombok.Data; import lombok.RequiredArgsConstructor; @@ -32,8 +33,6 @@ import org.springframework.http.MediaType; import org.springframework.stereotype.Component; -import java.util.List; - /** * Send alarm information through Discord robot */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/EmailAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/EmailAlertNotifyHandlerImpl.java index 8d6ebe9e9eb..60b7047a2d5 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/EmailAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/EmailAlertNotifyHandlerImpl.java @@ -18,6 +18,10 @@ package org.apache.hertzbeat.manager.component.alerter.impl; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.mail.internet.MimeMessage; +import java.util.Date; +import java.util.Properties; +import java.util.ResourceBundle; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.entity.alerter.Alert; @@ -26,10 +30,10 @@ import org.apache.hertzbeat.common.entity.manager.NoticeTemplate; import org.apache.hertzbeat.common.support.event.SystemConfigChangeEvent; import org.apache.hertzbeat.common.util.ResourceBundleUtil; +import org.apache.hertzbeat.manager.component.alerter.AlertNotifyHandler; import org.apache.hertzbeat.manager.dao.GeneralConfigDao; import org.apache.hertzbeat.manager.pojo.dto.EmailNoticeSender; import org.apache.hertzbeat.manager.service.MailService; -import org.apache.hertzbeat.manager.component.alerter.AlertNotifyHandler; import org.apache.hertzbeat.manager.support.exception.AlertNoticeException; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.event.EventListener; @@ -38,11 +42,6 @@ import org.springframework.mail.javamail.MimeMessageHelper; import org.springframework.stereotype.Component; -import jakarta.mail.internet.MimeMessage; -import java.util.Date; -import java.util.Properties; -import java.util.ResourceBundle; - /** * Send alarm information through email */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImpl.java index 50582453d7b..8f13ffc2448 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImpl.java @@ -18,6 +18,8 @@ package org.apache.hertzbeat.manager.component.alerter.impl; import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.ArrayList; +import java.util.List; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -25,12 +27,13 @@ import org.apache.hertzbeat.common.entity.manager.NoticeReceiver; import org.apache.hertzbeat.common.entity.manager.NoticeTemplate; import org.apache.hertzbeat.manager.support.exception.AlertNoticeException; -import org.springframework.http.*; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; -import java.util.ArrayList; -import java.util.List; - /** * Send alert information through FeiShu * 通过飞书发送告警信息 diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/GotifyAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/GotifyAlertNotifyHandlerImpl.java index baf049391a3..88f116271bd 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/GotifyAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/GotifyAlertNotifyHandlerImpl.java @@ -25,7 +25,11 @@ import org.apache.hertzbeat.common.entity.manager.NoticeReceiver; import org.apache.hertzbeat.common.entity.manager.NoticeTemplate; import org.apache.hertzbeat.manager.support.exception.AlertNoticeException; -import org.springframework.http.*; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; /** diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/HuaweiCloudSmnAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/HuaweiCloudSmnAlertNotifyHandlerImpl.java index 9d9b50cae6b..f1662586514 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/HuaweiCloudSmnAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/HuaweiCloudSmnAlertNotifyHandlerImpl.java @@ -22,6 +22,9 @@ import com.huaweicloud.sdk.smn.v2.model.PublishMessageRequest; import com.huaweicloud.sdk.smn.v2.model.PublishMessageRequestBody; import com.huaweicloud.sdk.smn.v2.region.SmnRegion; +import java.util.Map; +import java.util.ResourceBundle; +import java.util.concurrent.ConcurrentHashMap; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.entity.alerter.Alert; @@ -31,10 +34,6 @@ import org.apache.hertzbeat.manager.support.exception.AlertNoticeException; import org.springframework.stereotype.Component; -import java.util.Map; -import java.util.ResourceBundle; -import java.util.concurrent.ConcurrentHashMap; - /** * Send alarm information through Huawei CloudSmn */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/ServerChanAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/ServerChanAlertNotifyHandlerImpl.java index 85b8ba86fd1..53e5d9b5315 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/ServerChanAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/ServerChanAlertNotifyHandlerImpl.java @@ -24,7 +24,11 @@ import org.apache.hertzbeat.common.entity.manager.NoticeReceiver; import org.apache.hertzbeat.common.entity.manager.NoticeTemplate; import org.apache.hertzbeat.manager.support.exception.AlertNoticeException; -import org.springframework.http.*; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; /** diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/SlackAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/SlackAlertNotifyHandlerImpl.java index babd89d921e..0f49eb9c4e9 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/SlackAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/SlackAlertNotifyHandlerImpl.java @@ -17,6 +17,7 @@ package org.apache.hertzbeat.manager.component.alerter.impl; +import java.util.Objects; import lombok.Builder; import lombok.Data; import lombok.RequiredArgsConstructor; @@ -32,8 +33,6 @@ import org.springframework.stereotype.Component; import org.springframework.web.client.RestTemplate; -import java.util.Objects; - /** * Send alarm information by Slack Webhook * 通过Slack Webhook发送告警信息 diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/SmsAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/SmsAlertNotifyHandlerImpl.java index e7cb069b272..73cd74cf37d 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/SmsAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/SmsAlertNotifyHandlerImpl.java @@ -17,6 +17,7 @@ package org.apache.hertzbeat.manager.component.alerter.impl; +import java.util.ResourceBundle; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.constants.CommonConstants; @@ -29,8 +30,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; -import java.util.ResourceBundle; - /** * Send alarm information through Sms */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImpl.java index ffe0bce0993..906748ae6fd 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImpl.java @@ -27,7 +27,11 @@ import org.apache.hertzbeat.common.entity.manager.NoticeReceiver; import org.apache.hertzbeat.common.entity.manager.NoticeTemplate; import org.apache.hertzbeat.manager.support.exception.AlertNoticeException; -import org.springframework.http.*; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; /** diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WeChatAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WeChatAlertNotifyHandlerImpl.java index a7dd7247ed3..1c97fee1c12 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WeChatAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WeChatAlertNotifyHandlerImpl.java @@ -17,17 +17,17 @@ package org.apache.hertzbeat.manager.component.alerter.impl; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import java.net.URI; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; import org.apache.hertzbeat.common.entity.alerter.Alert; import org.apache.hertzbeat.common.entity.manager.NoticeReceiver; import org.apache.hertzbeat.common.entity.manager.NoticeTemplate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.net.http.HttpClient; -import java.net.http.HttpRequest; -import java.net.http.HttpResponse; -import java.net.URI; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; /** * Send alarm information through WeChat diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WeWorkAppAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WeWorkAppAlertNotifyHandlerImpl.java index ceee4e4f70e..887e291f0c4 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WeWorkAppAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WeWorkAppAlertNotifyHandlerImpl.java @@ -18,7 +18,12 @@ package org.apache.hertzbeat.manager.component.alerter.impl; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.*; +import java.util.Objects; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.entity.alerter.Alert; import org.apache.hertzbeat.common.entity.manager.NoticeReceiver; @@ -31,8 +36,6 @@ import org.springframework.stereotype.Component; import org.springframework.web.client.RestTemplate; -import java.util.Objects; - /** * WeChat app alert notify impl */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImpl.java index 5e5256ade4e..0a08c87c6d4 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImpl.java @@ -17,13 +17,21 @@ package org.apache.hertzbeat.manager.component.alerter.impl; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.entity.alerter.Alert; import org.apache.hertzbeat.common.entity.manager.NoticeReceiver; import org.apache.hertzbeat.common.entity.manager.NoticeTemplate; import org.apache.hertzbeat.manager.support.exception.AlertNoticeException; -import org.springframework.http.*; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; /** diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WebHookAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WebHookAlertNotifyHandlerImpl.java index cacbbefda14..b4db3b0773c 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WebHookAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WebHookAlertNotifyHandlerImpl.java @@ -17,6 +17,8 @@ package org.apache.hertzbeat.manager.component.alerter.impl; +import java.util.Iterator; +import java.util.Map; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.hertzbeat.common.entity.alerter.Alert; @@ -30,9 +32,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; -import java.util.Iterator; -import java.util.Map; - /** * Send alarm information through WebHookAlter */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/component/status/CalculateStatus.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/status/CalculateStatus.java index 5a5625a152d..357793f757b 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/component/status/CalculateStatus.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/status/CalculateStatus.java @@ -18,30 +18,41 @@ package org.apache.hertzbeat.manager.component.status; import com.google.common.util.concurrent.ThreadFactoryBuilder; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.ListJoin; +import jakarta.persistence.criteria.Predicate; +import java.time.Duration; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.ZoneOffset; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; -import org.apache.hertzbeat.common.entity.manager.*; import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.manager.Monitor; +import org.apache.hertzbeat.common.entity.manager.StatusPageComponent; +import org.apache.hertzbeat.common.entity.manager.StatusPageHistory; +import org.apache.hertzbeat.common.entity.manager.StatusPageOrg; +import org.apache.hertzbeat.common.entity.manager.Tag; +import org.apache.hertzbeat.common.entity.manager.TagItem; import org.apache.hertzbeat.manager.config.StatusProperties; import org.apache.hertzbeat.manager.dao.MonitorDao; import org.apache.hertzbeat.manager.dao.StatusPageComponentDao; import org.apache.hertzbeat.manager.dao.StatusPageHistoryDao; import org.apache.hertzbeat.manager.dao.StatusPageOrgDao; -import org.apache.hertzbeat.common.entity.manager.*; -import org.apache.hertzbeat.manager.dao.*; import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; -import jakarta.persistence.criteria.JoinType; -import jakarta.persistence.criteria.ListJoin; -import jakarta.persistence.criteria.Predicate; -import java.time.*; -import java.util.*; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.TimeUnit; - /** * calculate component status for status page */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/config/AngularErrorViewResolver.java b/manager/src/main/java/org/apache/hertzbeat/manager/config/AngularErrorViewResolver.java index 223167b57ea..d6a9670e42e 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/config/AngularErrorViewResolver.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/config/AngularErrorViewResolver.java @@ -17,6 +17,11 @@ package org.apache.hertzbeat.manager.config; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import java.util.Collections; +import java.util.EnumMap; +import java.util.Map; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.template.TemplateAvailabilityProvider; import org.springframework.boot.autoconfigure.template.TemplateAvailabilityProviders; @@ -32,11 +37,6 @@ import org.springframework.util.FileCopyUtils; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.View; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import java.util.Collections; -import java.util.EnumMap; -import java.util.Map; /** * Solve the front-end routing problem of angular static website resources with DefaultErrorViewResolver and route the 404 website request to the angular front-end diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/config/CommonCommandLineRunner.java b/manager/src/main/java/org/apache/hertzbeat/manager/config/CommonCommandLineRunner.java index 9b87e222458..c483cab68f4 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/config/CommonCommandLineRunner.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/config/CommonCommandLineRunner.java @@ -18,12 +18,15 @@ package org.apache.hertzbeat.manager.config; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.annotation.Resource; +import java.util.Locale; +import java.util.TimeZone; import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.entity.manager.GeneralConfig; +import org.apache.hertzbeat.manager.dao.GeneralConfigDao; import org.apache.hertzbeat.manager.pojo.dto.SystemConfig; import org.apache.hertzbeat.manager.pojo.dto.TemplateConfig; import org.apache.hertzbeat.manager.service.AppService; -import org.apache.hertzbeat.manager.dao.GeneralConfigDao; import org.apache.hertzbeat.manager.service.impl.SystemGeneralConfigServiceImpl; import org.apache.hertzbeat.manager.service.impl.TemplateConfigServiceImpl; import org.springframework.boot.CommandLineRunner; @@ -31,10 +34,6 @@ import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; -import jakarta.annotation.Resource; -import java.util.Locale; -import java.util.TimeZone; - /** * Common CommandLineRunner class */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/config/HeaderRequestInterceptor.java b/manager/src/main/java/org/apache/hertzbeat/manager/config/HeaderRequestInterceptor.java index a29b63bfe46..e9f0dfb6a37 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/config/HeaderRequestInterceptor.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/config/HeaderRequestInterceptor.java @@ -17,6 +17,7 @@ package org.apache.hertzbeat.manager.config; +import java.io.IOException; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpRequest; import org.springframework.http.MediaType; @@ -24,8 +25,6 @@ import org.springframework.http.client.ClientHttpRequestInterceptor; import org.springframework.http.client.ClientHttpResponse; -import java.io.IOException; - /** * Rest Template interceptor adds request header information * restTemplate拦截器添加请求头信息 diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/config/JpaAuditorConfig.java b/manager/src/main/java/org/apache/hertzbeat/manager/config/JpaAuditorConfig.java index de851475fc8..c8b7df5f080 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/config/JpaAuditorConfig.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/config/JpaAuditorConfig.java @@ -19,11 +19,10 @@ import com.usthe.sureness.subject.SubjectSum; import com.usthe.sureness.util.SurenessContextHolder; +import java.util.Optional; import org.springframework.context.annotation.Configuration; import org.springframework.data.domain.AuditorAware; -import java.util.Optional; - /** * generate auditor for jpa auditing */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/config/RestTemplateConfig.java b/manager/src/main/java/org/apache/hertzbeat/manager/config/RestTemplateConfig.java index a0865b4494c..38ec83e29b7 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/config/RestTemplateConfig.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/config/RestTemplateConfig.java @@ -17,6 +17,8 @@ package org.apache.hertzbeat.manager.config; +import java.util.Collections; +import java.util.concurrent.TimeUnit; import okhttp3.OkHttpClient; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -24,9 +26,6 @@ import org.springframework.http.client.OkHttp3ClientHttpRequestFactory; import org.springframework.web.client.RestTemplate; -import java.util.Collections; -import java.util.concurrent.TimeUnit; - /** * restTemplate config * todo 连接池 diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/config/SecurityCorsConfiguration.java b/manager/src/main/java/org/apache/hertzbeat/manager/config/SecurityCorsConfiguration.java index b93d24ebdee..69065eee42a 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/config/SecurityCorsConfiguration.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/config/SecurityCorsConfiguration.java @@ -17,6 +17,7 @@ package org.apache.hertzbeat.manager.config; +import java.util.Collections; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -24,8 +25,6 @@ import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import org.springframework.web.filter.CorsFilter; -import java.util.Collections; - /** * SecurityCorsConfiguration class */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/controller/AccountController.java b/manager/src/main/java/org/apache/hertzbeat/manager/controller/AccountController.java index c7017794b19..ed5f68e8648 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/controller/AccountController.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/controller/AccountController.java @@ -17,6 +17,8 @@ package org.apache.hertzbeat.manager.controller; +import static org.apache.hertzbeat.common.constants.CommonConstants.MONITOR_LOGIN_FAILED_CODE; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; import com.usthe.sureness.provider.SurenessAccount; import com.usthe.sureness.provider.SurenessAccountProvider; import com.usthe.sureness.provider.ducument.DocumentAccountProvider; @@ -26,22 +28,23 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.entity.dto.Message; import org.apache.hertzbeat.common.util.JsonUtil; import org.apache.hertzbeat.manager.pojo.dto.LoginDto; import org.apache.hertzbeat.manager.pojo.dto.RefreshTokenResponse; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotNull; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static org.apache.hertzbeat.common.constants.CommonConstants.MONITOR_LOGIN_FAILED_CODE; -import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * Authentication registration TOKEN management API diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/controller/AppController.java b/manager/src/main/java/org/apache/hertzbeat/manager/controller/AppController.java index 6956b798210..4d865e1c9a4 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/controller/AppController.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/controller/AppController.java @@ -17,9 +17,14 @@ package org.apache.hertzbeat.manager.controller; +import static org.apache.hertzbeat.common.constants.CommonConstants.FAIL_CODE; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import java.util.List; +import java.util.Locale; import org.apache.hertzbeat.common.entity.dto.Message; import org.apache.hertzbeat.common.entity.job.Job; import org.apache.hertzbeat.common.entity.manager.ParamDefine; @@ -28,14 +33,15 @@ import org.apache.hertzbeat.manager.service.AppService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import jakarta.validation.Valid; -import java.util.List; -import java.util.Locale; - -import static org.apache.hertzbeat.common.constants.CommonConstants.FAIL_CODE; -import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; /** * Monitoring Type Management API diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/controller/CollectorController.java b/manager/src/main/java/org/apache/hertzbeat/manager/controller/CollectorController.java index c626d23c2b3..9e03870c823 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/controller/CollectorController.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/controller/CollectorController.java @@ -17,30 +17,34 @@ package org.apache.hertzbeat.manager.controller; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.persistence.criteria.Predicate; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.entity.dto.CollectorSummary; import org.apache.hertzbeat.common.entity.dto.Message; import org.apache.hertzbeat.common.entity.manager.Collector; import org.apache.hertzbeat.common.util.IpDomainUtil; -import org.apache.hertzbeat.manager.service.CollectorService; import org.apache.hertzbeat.manager.scheduler.netty.ManageServer; +import org.apache.hertzbeat.manager.service.CollectorService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.jpa.domain.Specification; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import jakarta.persistence.criteria.Predicate; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; /** * collector API diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/controller/GeneralConfigController.java b/manager/src/main/java/org/apache/hertzbeat/manager/controller/GeneralConfigController.java index 7b3bf6e213a..012c7a1c060 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/controller/GeneralConfigController.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/controller/GeneralConfigController.java @@ -17,24 +17,27 @@ package org.apache.hertzbeat.manager.controller; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.constraints.NotNull; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.entity.dto.Message; import org.apache.hertzbeat.manager.pojo.dto.TemplateConfig; import org.apache.hertzbeat.manager.service.GeneralConfigService; import org.apache.hertzbeat.manager.service.impl.TemplateConfigServiceImpl; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import jakarta.validation.constraints.NotNull; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * Alert sender Configuration API diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/controller/I18nController.java b/manager/src/main/java/org/apache/hertzbeat/manager/controller/I18nController.java index 41bf6e40567..e127070e0a4 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/controller/I18nController.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/controller/I18nController.java @@ -17,19 +17,19 @@ package org.apache.hertzbeat.manager.controller; -import org.apache.hertzbeat.common.entity.dto.Message; -import org.apache.hertzbeat.manager.service.AppService; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import java.util.Map; +import org.apache.hertzbeat.common.entity.dto.Message; +import org.apache.hertzbeat.manager.service.AppService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Map; -import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; /** * Internationalization I 18 N diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/controller/MetricsController.java b/manager/src/main/java/org/apache/hertzbeat/manager/controller/MetricsController.java index d4e7e7dfc12..5d69b2480df 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/controller/MetricsController.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/controller/MetricsController.java @@ -17,22 +17,20 @@ package org.apache.hertzbeat.manager.controller; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import java.util.HashMap; +import java.util.Map; import org.apache.hertzbeat.common.entity.dto.Message; import org.apache.hertzbeat.common.queue.CommonDataQueue; import org.apache.hertzbeat.common.queue.impl.InMemoryCommonDataQueue; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.HashMap; -import java.util.Map; - -import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; - /** * hertzbeat metrics exporter */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/controller/MonitorController.java b/manager/src/main/java/org/apache/hertzbeat/manager/controller/MonitorController.java index 3846511b605..366e13dbfc7 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/controller/MonitorController.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/controller/MonitorController.java @@ -17,22 +17,27 @@ package org.apache.hertzbeat.manager.controller; +import static org.apache.hertzbeat.common.constants.CommonConstants.MONITOR_NOT_EXIST_CODE; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import java.util.List; import org.apache.hertzbeat.common.entity.dto.Message; import org.apache.hertzbeat.common.entity.manager.Monitor; import org.apache.hertzbeat.manager.pojo.dto.MonitorDto; import org.apache.hertzbeat.manager.service.MonitorService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import jakarta.validation.Valid; -import java.util.List; - -import static org.apache.hertzbeat.common.constants.CommonConstants.MONITOR_NOT_EXIST_CODE; -import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * Monitoring management API diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/controller/MonitorsController.java b/manager/src/main/java/org/apache/hertzbeat/manager/controller/MonitorsController.java index 8a2aeb07a90..ba2f280f092 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/controller/MonitorsController.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/controller/MonitorsController.java @@ -17,9 +17,18 @@ package org.apache.hertzbeat.manager.controller; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.ListJoin; +import jakarta.persistence.criteria.Predicate; +import jakarta.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; import org.apache.hertzbeat.common.entity.dto.Message; import org.apache.hertzbeat.common.entity.manager.Monitor; import org.apache.hertzbeat.manager.service.MonitorService; @@ -30,20 +39,15 @@ import org.springframework.data.jpa.domain.Specification; import org.springframework.http.ResponseEntity; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.JoinType; -import jakarta.persistence.criteria.ListJoin; -import jakarta.persistence.criteria.Predicate; -import jakarta.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; - -import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; - /** * Monitor and manage batch API * 监控管理批量API diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/controller/NoticeConfigController.java b/manager/src/main/java/org/apache/hertzbeat/manager/controller/NoticeConfigController.java index 2e6fa3dab8f..42af74c6016 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/controller/NoticeConfigController.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/controller/NoticeConfigController.java @@ -17,9 +17,15 @@ package org.apache.hertzbeat.manager.controller; +import static org.apache.hertzbeat.common.constants.CommonConstants.FAIL_CODE; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.persistence.criteria.Predicate; +import java.util.List; +import java.util.Optional; +import javax.validation.Valid; import org.apache.hertzbeat.common.entity.dto.Message; import org.apache.hertzbeat.common.entity.manager.NoticeReceiver; import org.apache.hertzbeat.common.entity.manager.NoticeRule; @@ -28,15 +34,15 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.jpa.domain.Specification; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import jakarta.persistence.criteria.Predicate; -import javax.validation.Valid; -import java.util.List; -import java.util.Optional; - -import static org.apache.hertzbeat.common.constants.CommonConstants.FAIL_CODE; -import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; /** diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/controller/StatusPageController.java b/manager/src/main/java/org/apache/hertzbeat/manager/controller/StatusPageController.java index 06d9f75b2f4..dec87bf2a7c 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/controller/StatusPageController.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/controller/StatusPageController.java @@ -17,8 +17,11 @@ package org.apache.hertzbeat.manager.controller; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import java.util.List; +import javax.validation.Valid; import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.entity.dto.Message; import org.apache.hertzbeat.common.entity.manager.StatusPageComponent; @@ -27,12 +30,14 @@ import org.apache.hertzbeat.manager.service.StatusPageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import javax.validation.Valid; -import java.util.List; - -import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * status page endpoint controller diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/controller/StatusPagePublicController.java b/manager/src/main/java/org/apache/hertzbeat/manager/controller/StatusPagePublicController.java index a5cbb7277c3..98b69857048 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/controller/StatusPagePublicController.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/controller/StatusPagePublicController.java @@ -17,8 +17,10 @@ package org.apache.hertzbeat.manager.controller; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import java.util.List; import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.entity.dto.Message; import org.apache.hertzbeat.common.entity.manager.StatusPageIncident; @@ -27,11 +29,10 @@ import org.apache.hertzbeat.manager.service.StatusPageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * status page public endpoint controller diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/controller/SummaryController.java b/manager/src/main/java/org/apache/hertzbeat/manager/controller/SummaryController.java index 2053328aa40..830a6ddb4ea 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/controller/SummaryController.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/controller/SummaryController.java @@ -17,19 +17,19 @@ package org.apache.hertzbeat.manager.controller; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import java.util.List; import org.apache.hertzbeat.common.entity.dto.Message; import org.apache.hertzbeat.manager.pojo.dto.AppCount; import org.apache.hertzbeat.manager.pojo.dto.Dashboard; import org.apache.hertzbeat.manager.service.MonitorService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; -import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; /** * System Summary Statistics API diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/controller/TagController.java b/manager/src/main/java/org/apache/hertzbeat/manager/controller/TagController.java index 5fff0836de8..c524c767522 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/controller/TagController.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/controller/TagController.java @@ -17,24 +17,31 @@ package org.apache.hertzbeat.manager.controller; -import org.apache.hertzbeat.common.entity.dto.Message; -import org.apache.hertzbeat.common.entity.manager.Tag; -import org.apache.hertzbeat.manager.service.TagService; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.jpa.domain.Specification; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; import jakarta.persistence.criteria.Predicate; import jakarta.validation.Valid; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; -import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import org.apache.hertzbeat.common.entity.dto.Message; +import org.apache.hertzbeat.common.entity.manager.Tag; +import org.apache.hertzbeat.manager.service.TagService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.jpa.domain.Specification; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; /** * Tags management API diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/dao/CollectorDao.java b/manager/src/main/java/org/apache/hertzbeat/manager/dao/CollectorDao.java index a9902f6376d..972985d834f 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/dao/CollectorDao.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/dao/CollectorDao.java @@ -17,13 +17,12 @@ package org.apache.hertzbeat.manager.dao; +import java.util.Optional; import org.apache.hertzbeat.common.entity.manager.Collector; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Modifying; -import java.util.Optional; - /** * Collector repository diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/dao/CollectorMonitorBindDao.java b/manager/src/main/java/org/apache/hertzbeat/manager/dao/CollectorMonitorBindDao.java index a6b428c1090..8358d394ddb 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/dao/CollectorMonitorBindDao.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/dao/CollectorMonitorBindDao.java @@ -17,15 +17,14 @@ package org.apache.hertzbeat.manager.dao; +import java.util.List; +import java.util.Optional; +import java.util.Set; import org.apache.hertzbeat.common.entity.manager.CollectorMonitorBind; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Modifying; -import java.util.List; -import java.util.Optional; -import java.util.Set; - /** * CollectorMonitorBind repository diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/dao/MonitorDao.java b/manager/src/main/java/org/apache/hertzbeat/manager/dao/MonitorDao.java index 550d17bc2d7..5e5d2fabbb0 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/dao/MonitorDao.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/dao/MonitorDao.java @@ -17,18 +17,17 @@ package org.apache.hertzbeat.manager.dao; -import org.apache.hertzbeat.manager.pojo.dto.AppCount; +import java.util.List; +import java.util.Optional; +import java.util.Set; import org.apache.hertzbeat.common.entity.manager.Monitor; +import org.apache.hertzbeat.manager.pojo.dto.AppCount; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import java.util.List; -import java.util.Optional; -import java.util.Set; - /** * AuthResources 数据库操作 */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/dao/NoticeRuleDao.java b/manager/src/main/java/org/apache/hertzbeat/manager/dao/NoticeRuleDao.java index e65d42e898c..ec8b5c05cdb 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/dao/NoticeRuleDao.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/dao/NoticeRuleDao.java @@ -17,12 +17,11 @@ package org.apache.hertzbeat.manager.dao; +import java.util.List; import org.apache.hertzbeat.common.entity.manager.NoticeRule; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import java.util.List; - /** * NoticeRule数据库操作 * NoticeRule database operations diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/dao/ParamDao.java b/manager/src/main/java/org/apache/hertzbeat/manager/dao/ParamDao.java index 94a1ff59e2a..feb9dba6b50 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/dao/ParamDao.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/dao/ParamDao.java @@ -17,11 +17,10 @@ package org.apache.hertzbeat.manager.dao; -import org.apache.hertzbeat.common.entity.manager.Param; -import org.springframework.data.jpa.repository.JpaRepository; - import java.util.List; import java.util.Set; +import org.apache.hertzbeat.common.entity.manager.Param; +import org.springframework.data.jpa.repository.JpaRepository; /** * ParamDao 数据库操作 diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/dao/ParamDefineDao.java b/manager/src/main/java/org/apache/hertzbeat/manager/dao/ParamDefineDao.java index 938ec922c11..a993a9fc279 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/dao/ParamDefineDao.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/dao/ParamDefineDao.java @@ -17,11 +17,10 @@ package org.apache.hertzbeat.manager.dao; +import java.util.List; import org.apache.hertzbeat.common.entity.manager.ParamDefine; import org.springframework.data.jpa.repository.JpaRepository; -import java.util.List; - /** * Param Define Database Operations * ParamDefine数据库操作 diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/dao/StatusPageComponentDao.java b/manager/src/main/java/org/apache/hertzbeat/manager/dao/StatusPageComponentDao.java index 56d1504c884..74d6428dd7c 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/dao/StatusPageComponentDao.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/dao/StatusPageComponentDao.java @@ -17,12 +17,11 @@ package org.apache.hertzbeat.manager.dao; +import java.util.List; import org.apache.hertzbeat.common.entity.manager.StatusPageComponent; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import java.util.List; - /** * StatusPageComponent DAO interface. */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/dao/StatusPageHistoryDao.java b/manager/src/main/java/org/apache/hertzbeat/manager/dao/StatusPageHistoryDao.java index 4654f589127..beda8d32ba1 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/dao/StatusPageHistoryDao.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/dao/StatusPageHistoryDao.java @@ -17,12 +17,11 @@ package org.apache.hertzbeat.manager.dao; +import java.util.List; import org.apache.hertzbeat.common.entity.manager.StatusPageHistory; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import java.util.List; - /** * StatusPageOrg DAO interface. */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/dao/TagDao.java b/manager/src/main/java/org/apache/hertzbeat/manager/dao/TagDao.java index e5e51326bf7..075a92a0f70 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/dao/TagDao.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/dao/TagDao.java @@ -17,13 +17,12 @@ package org.apache.hertzbeat.manager.dao; -import org.apache.hertzbeat.common.entity.manager.Tag; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - import java.util.List; import java.util.Optional; import java.util.Set; +import org.apache.hertzbeat.common.entity.manager.Tag; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; /** * tag repository diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/dao/TagMonitorBindDao.java b/manager/src/main/java/org/apache/hertzbeat/manager/dao/TagMonitorBindDao.java index 95738ab4ba8..8d7c7701d95 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/dao/TagMonitorBindDao.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/dao/TagMonitorBindDao.java @@ -17,12 +17,11 @@ package org.apache.hertzbeat.manager.dao; +import java.util.Set; import org.apache.hertzbeat.common.entity.manager.TagMonitorBind; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import java.util.Set; - /** * TagMonitorBindDao repository */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/nativex/HertzbeatRuntimeHintsRegistrar.java b/manager/src/main/java/org/apache/hertzbeat/manager/nativex/HertzbeatRuntimeHintsRegistrar.java index c2cfbd47f45..8217fe7d7b1 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/nativex/HertzbeatRuntimeHintsRegistrar.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/nativex/HertzbeatRuntimeHintsRegistrar.java @@ -19,6 +19,8 @@ package org.apache.hertzbeat.manager.nativex; +import java.lang.reflect.Constructor; +import java.util.Set; import org.apache.sshd.common.channel.ChannelListener; import org.apache.sshd.common.forward.PortForwardingEventListener; import org.apache.sshd.common.io.nio2.Nio2ServiceFactory; @@ -33,9 +35,6 @@ import org.springframework.aot.hint.TypeReference; import org.springframework.util.ClassUtils; -import java.lang.reflect.Constructor; -import java.util.Set; - /** */ public class HertzbeatRuntimeHintsRegistrar implements RuntimeHintsRegistrar { diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/ComponentStatus.java b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/ComponentStatus.java index 42a11cc2551..b2682876c00 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/ComponentStatus.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/ComponentStatus.java @@ -18,14 +18,13 @@ package org.apache.hertzbeat.manager.pojo.dto; import io.swagger.v3.oas.annotations.media.Schema; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import org.apache.hertzbeat.common.entity.manager.StatusPageComponent; import org.apache.hertzbeat.common.entity.manager.StatusPageHistory; -import java.util.List; - /** * status page's component status dto */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/Dashboard.java b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/Dashboard.java index 834e63cbd16..8829bdd2f0c 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/Dashboard.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/Dashboard.java @@ -18,12 +18,11 @@ package org.apache.hertzbeat.manager.pojo.dto; import io.swagger.v3.oas.annotations.media.Schema; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.List; - /** * 大屏仪表盘统计信息 * Large screen dashboard statistics diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/EmailNoticeSender.java b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/EmailNoticeSender.java index 5de1ccb10b1..6162846c850 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/EmailNoticeSender.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/EmailNoticeSender.java @@ -17,12 +17,15 @@ package org.apache.hertzbeat.manager.pojo.dto; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.validation.constraints.*; - /** * 邮件账号配置dto diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/FileDTO.java b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/FileDTO.java index 042ff3fd167..38024c9b1ec 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/FileDTO.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/FileDTO.java @@ -17,13 +17,12 @@ package org.apache.hertzbeat.manager.pojo.dto; +import java.io.InputStream; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.io.InputStream; - /** * 文件存储 * File storage diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/Hierarchy.java b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/Hierarchy.java index 1d2e9c82e1a..0441d0d4300 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/Hierarchy.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/Hierarchy.java @@ -17,15 +17,13 @@ package org.apache.hertzbeat.manager.pojo.dto; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; import io.swagger.v3.oas.annotations.media.Schema; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.List; - -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; - /** * Hierarchical structure * eg: Monitoring Type metrics Information Hierarchy Relationship diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/LoginDto.java b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/LoginDto.java index a285bff017e..1929203d67b 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/LoginDto.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/LoginDto.java @@ -17,7 +17,9 @@ package org.apache.hertzbeat.manager.pojo.dto; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -25,10 +27,6 @@ import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Range; -import jakarta.validation.constraints.NotBlank; - -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; - /** * Login registered account information transfer body username phone email * 登录注册账户信息传输体 username phone email diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/MonitorDefineDto.java b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/MonitorDefineDto.java index 3ba9a82a60c..0e52240089b 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/MonitorDefineDto.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/MonitorDefineDto.java @@ -17,16 +17,14 @@ package org.apache.hertzbeat.manager.pojo.dto; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.validation.constraints.NotBlank; - -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; - /** * monitor define */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/MonitorDto.java b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/MonitorDto.java index 5320d7b446e..49c875de601 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/MonitorDto.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/MonitorDto.java @@ -17,17 +17,15 @@ package org.apache.hertzbeat.manager.pojo.dto; -import org.apache.hertzbeat.common.entity.manager.Monitor; -import org.apache.hertzbeat.common.entity.manager.Param; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; +import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import java.util.List; - -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; -import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; +import lombok.Data; +import org.apache.hertzbeat.common.entity.manager.Monitor; +import org.apache.hertzbeat.common.entity.manager.Param; /** * Monitoring Information External Interaction Entities diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/ObjectStoreConfigChangeEvent.java b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/ObjectStoreConfigChangeEvent.java index 8820ae0012c..f30adee1017 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/ObjectStoreConfigChangeEvent.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/ObjectStoreConfigChangeEvent.java @@ -17,11 +17,10 @@ package org.apache.hertzbeat.manager.pojo.dto; +import java.util.UUID; import lombok.Getter; import org.springframework.context.ApplicationEvent; -import java.util.UUID; - /** */ @Getter diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/ParamDefineDto.java b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/ParamDefineDto.java index 0572e6eb24e..70e166e23c7 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/ParamDefineDto.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/ParamDefineDto.java @@ -17,12 +17,11 @@ package org.apache.hertzbeat.manager.pojo.dto; -import org.apache.hertzbeat.common.entity.manager.ParamDefine; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; - -import java.util.List; +import org.apache.hertzbeat.common.entity.manager.ParamDefine; /** * 参数定义传输实体 diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/TemplateConfig.java b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/TemplateConfig.java index 8b07f1285af..c117bf97ef3 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/TemplateConfig.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/TemplateConfig.java @@ -17,13 +17,12 @@ package org.apache.hertzbeat.manager.pojo.dto; +import java.util.Map; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.Map; - /** * App Template Config */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/AssignJobs.java b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/AssignJobs.java index 583787b4384..3a21f51bae6 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/AssignJobs.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/AssignJobs.java @@ -17,11 +17,10 @@ package org.apache.hertzbeat.manager.scheduler; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; - import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; /** * 分配的采集任务列表 diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectJobScheduling.java b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectJobScheduling.java index d620bb65f1e..7727e82d1bc 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectJobScheduling.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectJobScheduling.java @@ -17,11 +17,10 @@ package org.apache.hertzbeat.manager.scheduler; +import java.util.List; import org.apache.hertzbeat.common.entity.job.Job; import org.apache.hertzbeat.common.entity.message.CollectRep; -import java.util.List; - /** * Collection job management provides api interface * 调度采集job管理api接口 diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectorAndJobScheduler.java b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectorAndJobScheduler.java index 154732af96c..f133c3dd43a 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectorAndJobScheduler.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectorAndJobScheduler.java @@ -17,6 +17,17 @@ package org.apache.hertzbeat.manager.scheduler; +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.collector.dispatch.entrance.internal.CollectJobService; import org.apache.hertzbeat.collector.dispatch.entrance.internal.CollectResponseEventListener; @@ -37,25 +48,13 @@ import org.apache.hertzbeat.manager.dao.CollectorMonitorBindDao; import org.apache.hertzbeat.manager.dao.MonitorDao; import org.apache.hertzbeat.manager.dao.ParamDao; -import org.apache.hertzbeat.manager.service.AppService; import org.apache.hertzbeat.manager.scheduler.netty.ManageServer; +import org.apache.hertzbeat.manager.service.AppService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; -import java.util.Collections; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - /** * collector service */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/ConsistentHash.java b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/ConsistentHash.java index 5370cb6b294..5525b0500df 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/ConsistentHash.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/ConsistentHash.java @@ -17,15 +17,21 @@ package org.apache.hertzbeat.manager.scheduler; +import java.util.Collections; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.stream.Collectors; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.constants.CommonConstants; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Collectors; - /** * 一致性hash实现的采集器与任务映射调度 * Collector and task mapping scheduling implemented by consistent hashing diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/SchedulerInit.java b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/SchedulerInit.java index d00d6e000d0..538f15cd474 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/SchedulerInit.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/SchedulerInit.java @@ -17,27 +17,30 @@ package org.apache.hertzbeat.manager.scheduler; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; -import org.apache.hertzbeat.common.entity.manager.*; import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.entity.dto.CollectorInfo; import org.apache.hertzbeat.common.entity.job.Configmap; import org.apache.hertzbeat.common.entity.job.Job; +import org.apache.hertzbeat.common.entity.manager.Collector; +import org.apache.hertzbeat.common.entity.manager.CollectorMonitorBind; +import org.apache.hertzbeat.common.entity.manager.Monitor; +import org.apache.hertzbeat.common.entity.manager.Param; +import org.apache.hertzbeat.common.entity.manager.ParamDefine; import org.apache.hertzbeat.manager.dao.CollectorDao; import org.apache.hertzbeat.manager.dao.CollectorMonitorBindDao; import org.apache.hertzbeat.manager.dao.MonitorDao; import org.apache.hertzbeat.manager.dao.ParamDao; import org.apache.hertzbeat.manager.service.AppService; -import org.apache.hertzbeat.common.entity.manager.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; import org.springframework.util.StringUtils; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; /** * scheduler init diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/ManageServer.java b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/ManageServer.java index 9b6f9414daf..80194a03b5f 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/ManageServer.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/ManageServer.java @@ -18,6 +18,11 @@ package org.apache.hertzbeat.manager.scheduler.netty; import io.netty.channel.Channel; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.entity.message.ClusterMsg; import org.apache.hertzbeat.common.support.CommonThreadPool; @@ -38,12 +43,6 @@ import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; - /** * manage server */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/process/CollectOneTimeDataResponseProcessor.java b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/process/CollectOneTimeDataResponseProcessor.java index c6388d86b56..eb00b7366ce 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/process/CollectOneTimeDataResponseProcessor.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/process/CollectOneTimeDataResponseProcessor.java @@ -19,6 +19,8 @@ import com.fasterxml.jackson.core.type.TypeReference; import io.netty.channel.ChannelHandlerContext; +import java.util.ArrayList; +import java.util.List; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.entity.message.ClusterMsg; import org.apache.hertzbeat.common.entity.message.CollectRep; @@ -27,9 +29,6 @@ import org.apache.hertzbeat.manager.scheduler.netty.ManageServer; import org.apache.hertzbeat.remoting.netty.NettyRemotingProcessor; -import java.util.ArrayList; -import java.util.List; - /** * handle one-time collect data response message */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/AppService.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/AppService.java index 74bc705b640..ec976345468 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/service/AppService.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/AppService.java @@ -17,15 +17,14 @@ package org.apache.hertzbeat.manager.service; +import java.util.List; +import java.util.Map; +import java.util.Optional; import org.apache.hertzbeat.common.entity.job.Job; import org.apache.hertzbeat.common.entity.manager.ParamDefine; import org.apache.hertzbeat.manager.pojo.dto.Hierarchy; import org.apache.hertzbeat.manager.pojo.dto.TemplateConfig; -import java.util.List; -import java.util.Map; -import java.util.Optional; - /** * Monitoring Type Management Interface */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/AvailableAlertDefineInit.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/AvailableAlertDefineInit.java index b0de617d44b..94bd0ba3573 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/service/AvailableAlertDefineInit.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/AvailableAlertDefineInit.java @@ -17,19 +17,18 @@ package org.apache.hertzbeat.manager.service; +import java.util.List; +import java.util.Set; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.alert.dao.AlertDefineDao; -import org.apache.hertzbeat.common.entity.alerter.AlertDefine; import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.alerter.AlertDefine; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Set; - /** * available alert define database record init */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/CollectorService.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/CollectorService.java index a7caa727cd8..81d995af829 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/service/CollectorService.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/CollectorService.java @@ -17,14 +17,13 @@ package org.apache.hertzbeat.manager.service; +import java.util.List; import org.apache.hertzbeat.common.entity.dto.CollectorSummary; import org.apache.hertzbeat.common.entity.manager.Collector; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.jpa.domain.Specification; -import java.util.List; - /** * collector service */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/MailService.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/MailService.java index e4d9cf91659..a40852bc299 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/service/MailService.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/MailService.java @@ -18,11 +18,10 @@ package org.apache.hertzbeat.manager.service; import freemarker.template.TemplateException; +import java.io.IOException; import org.apache.hertzbeat.common.entity.alerter.Alert; import org.apache.hertzbeat.common.entity.manager.NoticeTemplate; -import java.io.IOException; - /** * Email delivery service 邮箱发送服务 * @version 1.0 diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/MonitorService.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/MonitorService.java index 99cc3c6bdb3..5aa42c654a4 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/service/MonitorService.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/MonitorService.java @@ -17,6 +17,10 @@ package org.apache.hertzbeat.manager.service; +import jakarta.servlet.http.HttpServletResponse; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import org.apache.hertzbeat.common.entity.job.Job; import org.apache.hertzbeat.common.entity.manager.Monitor; import org.apache.hertzbeat.common.entity.manager.Param; @@ -28,11 +32,6 @@ import org.springframework.data.jpa.domain.Specification; import org.springframework.web.multipart.MultipartFile; -import jakarta.servlet.http.HttpServletResponse; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - /** * 监控管理服务 * Monitoring and management services diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/NoticeConfigService.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/NoticeConfigService.java index d0396a49bba..6108024f9e5 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/service/NoticeConfigService.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/NoticeConfigService.java @@ -17,15 +17,14 @@ package org.apache.hertzbeat.manager.service; +import java.util.List; +import java.util.Optional; import org.apache.hertzbeat.common.entity.alerter.Alert; import org.apache.hertzbeat.common.entity.manager.NoticeReceiver; import org.apache.hertzbeat.common.entity.manager.NoticeRule; import org.apache.hertzbeat.common.entity.manager.NoticeTemplate; import org.springframework.data.jpa.domain.Specification; -import java.util.List; -import java.util.Optional; - /** * Message notification configuration interface * 消息通知配置接口 diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/ObjectStoreService.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/ObjectStoreService.java index 761ac89d7bc..4d9f5ab7a56 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/service/ObjectStoreService.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/ObjectStoreService.java @@ -17,11 +17,10 @@ package org.apache.hertzbeat.manager.service; -import org.apache.hertzbeat.manager.pojo.dto.FileDTO; -import org.apache.hertzbeat.manager.pojo.dto.ObjectStoreDTO; - import java.io.InputStream; import java.util.List; +import org.apache.hertzbeat.manager.pojo.dto.FileDTO; +import org.apache.hertzbeat.manager.pojo.dto.ObjectStoreDTO; /** * 文件存储服务 diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/StatusPageService.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/StatusPageService.java index 96aa22156e4..268baf176c8 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/service/StatusPageService.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/StatusPageService.java @@ -17,13 +17,12 @@ package org.apache.hertzbeat.manager.service; +import java.util.List; import org.apache.hertzbeat.common.entity.manager.StatusPageComponent; import org.apache.hertzbeat.common.entity.manager.StatusPageIncident; import org.apache.hertzbeat.common.entity.manager.StatusPageOrg; import org.apache.hertzbeat.manager.pojo.dto.ComponentStatus; -import java.util.List; - /** * status page service interface. */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/TagService.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/TagService.java index 27d83277928..d64a9712956 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/service/TagService.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/TagService.java @@ -17,16 +17,15 @@ package org.apache.hertzbeat.manager.service; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import org.apache.hertzbeat.common.entity.manager.Monitor; import org.apache.hertzbeat.common.entity.manager.Tag; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.jpa.domain.Specification; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - /** * 标签服务 * tag service diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AbstractImExportServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AbstractImExportServiceImpl.java index d92a7212969..803e7764253 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AbstractImExportServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AbstractImExportServiceImpl.java @@ -15,9 +15,21 @@ package org.apache.hertzbeat.manager.service.impl; -import cn.afterturn.easypoi.excel.annotation.*; +import cn.afterturn.easypoi.excel.annotation.Excel; +import cn.afterturn.easypoi.excel.annotation.ExcelCollection; +import cn.afterturn.easypoi.excel.annotation.ExcelEntity; +import cn.afterturn.easypoi.excel.annotation.ExcelTarget; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; +import jakarta.annotation.Resource; +import java.io.InputStream; +import java.io.OutputStream; +import java.time.LocalDate; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.constants.CommonConstants; @@ -32,16 +44,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.util.CollectionUtils; -import jakarta.annotation.Resource; -import java.io.InputStream; -import java.io.OutputStream; -import java.time.LocalDate; -import java.util.HashSet; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; -import java.util.Collections; - /** * class AbstractImExportServiceImpl */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AppServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AppServiceImpl.java index 1fa88409a58..1858fc8df58 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AppServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AppServiceImpl.java @@ -17,6 +17,24 @@ package org.apache.hertzbeat.manager.service.impl; +import static java.util.Objects.isNull; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.stream.Collectors; +import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; @@ -52,17 +70,6 @@ import org.springframework.util.StringUtils; import org.yaml.snakeyaml.Yaml; -import javax.annotation.Resource; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Collectors; - -import static java.util.Objects.isNull; - /** * Monitoring Type Management Implementation * 监控类型管理实现 diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/CollectorServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/CollectorServiceImpl.java index 53a494d5c53..003c5f99e55 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/CollectorServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/CollectorServiceImpl.java @@ -17,6 +17,8 @@ package org.apache.hertzbeat.manager.service.impl; +import java.util.LinkedList; +import java.util.List; import org.apache.hertzbeat.common.entity.dto.CollectorSummary; import org.apache.hertzbeat.common.entity.manager.Collector; import org.apache.hertzbeat.common.entity.manager.CollectorMonitorBind; @@ -35,9 +37,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.LinkedList; -import java.util.List; - /** * collector service impl */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ExcelImExportServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ExcelImExportServiceImpl.java index 93653fe7a83..51c6e7030d4 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ExcelImExportServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ExcelImExportServiceImpl.java @@ -17,20 +17,31 @@ package org.apache.hertzbeat.manager.service.impl; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.usermodel.BorderStyle; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.CellType; +import org.apache.poi.ss.usermodel.Font; +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.apache.poi.ss.usermodel.WorkbookFactory; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.ss.util.RegionUtil; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.*; -import java.util.stream.Collectors; - /** * Configure the import and export EXCEL format * 配置导入导出 EXCEL格式 diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/JsonImExportServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/JsonImExportServiceImpl.java index ed2d6bbd249..d021ac763db 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/JsonImExportServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/JsonImExportServiceImpl.java @@ -17,14 +17,13 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.List; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; /** * Configure the import and export JSON format diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MailGeneralConfigServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MailGeneralConfigServiceImpl.java index 3b251fc1edb..ef28be81fbd 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MailGeneralConfigServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MailGeneralConfigServiceImpl.java @@ -19,12 +19,11 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; +import java.lang.reflect.Type; import org.apache.hertzbeat.manager.dao.GeneralConfigDao; import org.apache.hertzbeat.manager.pojo.dto.EmailNoticeSender; import org.springframework.stereotype.Service; -import java.lang.reflect.Type; - /** * MailGeneralConfigServiceImpl类是通用邮件配置服务实现类，继承了AbstractGeneralConfigServiceImpl类。 diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MailServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MailServiceImpl.java index 507203799cb..622faedb2a3 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MailServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MailServiceImpl.java @@ -20,28 +20,27 @@ import freemarker.cache.StringTemplateLoader; import freemarker.template.Configuration; import freemarker.template.TemplateException; +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; +import java.util.ResourceBundle; +import javax.annotation.Resource; +import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.alert.AlerterProperties; -import org.apache.hertzbeat.common.entity.alerter.Alert; import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.alerter.Alert; import org.apache.hertzbeat.common.entity.manager.NoticeTemplate; import org.apache.hertzbeat.common.support.event.SystemConfigChangeEvent; import org.apache.hertzbeat.common.util.ResourceBundleUtil; import org.apache.hertzbeat.manager.service.MailService; import org.apache.hertzbeat.manager.service.NoticeConfigService; -import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Service; import org.springframework.ui.freemarker.FreeMarkerTemplateUtils; -import javax.annotation.Resource; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; -import java.util.ResourceBundle; - /** * Mailbox sending service interface implementation class * 邮箱发送服务接口实现类 diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java index ca2aa0f382c..9aeb474d19b 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java @@ -18,6 +18,19 @@ package org.apache.hertzbeat.manager.service.impl; import com.fasterxml.jackson.core.type.TypeReference; +import jakarta.servlet.http.HttpServletResponse; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.time.LocalDateTime; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.alert.dao.AlertDefineBindDao; import org.apache.hertzbeat.collector.dispatch.DispatchConstants; @@ -33,7 +46,16 @@ import org.apache.hertzbeat.common.entity.manager.Tag; import org.apache.hertzbeat.common.entity.message.CollectRep; import org.apache.hertzbeat.common.support.event.MonitorDeletedEvent; -import org.apache.hertzbeat.common.util.*; +import org.apache.hertzbeat.common.util.AesUtil; +import org.apache.hertzbeat.common.util.IntervalExpressionUtil; +import org.apache.hertzbeat.common.util.IpDomainUtil; +import org.apache.hertzbeat.common.util.JsonUtil; +import org.apache.hertzbeat.common.util.SnowFlakeIdGenerator; +import org.apache.hertzbeat.manager.dao.CollectorDao; +import org.apache.hertzbeat.manager.dao.CollectorMonitorBindDao; +import org.apache.hertzbeat.manager.dao.MonitorDao; +import org.apache.hertzbeat.manager.dao.ParamDao; +import org.apache.hertzbeat.manager.dao.TagMonitorBindDao; import org.apache.hertzbeat.manager.pojo.dto.AppCount; import org.apache.hertzbeat.manager.pojo.dto.MonitorDto; import org.apache.hertzbeat.manager.scheduler.CollectJobScheduling; @@ -41,14 +63,9 @@ import org.apache.hertzbeat.manager.service.ImExportService; import org.apache.hertzbeat.manager.service.MonitorService; import org.apache.hertzbeat.manager.service.TagService; +import org.apache.hertzbeat.manager.support.exception.MonitorDatabaseException; import org.apache.hertzbeat.manager.support.exception.MonitorDetectException; import org.apache.hertzbeat.manager.support.exception.MonitorMetricsException; -import org.apache.hertzbeat.manager.dao.CollectorDao; -import org.apache.hertzbeat.manager.dao.CollectorMonitorBindDao; -import org.apache.hertzbeat.manager.dao.MonitorDao; -import org.apache.hertzbeat.manager.dao.ParamDao; -import org.apache.hertzbeat.manager.dao.TagMonitorBindDao; -import org.apache.hertzbeat.manager.support.exception.MonitorDatabaseException; import org.apache.hertzbeat.warehouse.service.WarehouseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; @@ -62,13 +79,6 @@ import org.springframework.util.StringUtils; import org.springframework.web.multipart.MultipartFile; -import jakarta.servlet.http.HttpServletResponse; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.time.LocalDateTime; -import java.util.*; -import java.util.stream.Collectors; - /** * 监控管理服务实现 * Monitoring and management service implementation diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/NoticeConfigServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/NoticeConfigServiceImpl.java index 85aebd36890..85fb1603d72 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/NoticeConfigServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/NoticeConfigServiceImpl.java @@ -17,6 +17,18 @@ package org.apache.hertzbeat.manager.service.impl; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.cache.CacheFactory; import org.apache.hertzbeat.common.cache.CommonCacheService; @@ -41,14 +53,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.util.*; -import java.util.stream.Collectors; - /** * 消息通知配置实现 * Message notification configuration implementation diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ObjectStoreConfigServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ObjectStoreConfigServiceImpl.java index 07fff43c4b1..f4fa45f9757 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ObjectStoreConfigServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ObjectStoreConfigServiceImpl.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.obs.services.ObsClient; +import java.lang.reflect.Type; +import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.manager.dao.GeneralConfigDao; import org.apache.hertzbeat.manager.pojo.dto.ObjectStoreConfigChangeEvent; @@ -33,9 +35,6 @@ import org.springframework.stereotype.Service; import org.springframework.util.Assert; -import javax.annotation.Resource; -import java.lang.reflect.Type; - /** * 文件存储配置服务 * File storage configuration service diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ObsObjectStoreServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ObsObjectStoreServiceImpl.java index f663e787b39..9272d724165 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ObsObjectStoreServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ObsObjectStoreServiceImpl.java @@ -19,17 +19,16 @@ import com.obs.services.ObsClient; import com.obs.services.model.ListObjectsRequest; +import java.io.InputStream; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.constants.SignConstants; import org.apache.hertzbeat.manager.pojo.dto.FileDTO; import org.apache.hertzbeat.manager.pojo.dto.ObjectStoreDTO; import org.apache.hertzbeat.manager.service.ObjectStoreService; -import java.io.InputStream; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - /** * 华为云存储服务 * Huawei cloud storage service diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/StatusPageServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/StatusPageServiceImpl.java index 6247773004f..5e7e0d59e5c 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/StatusPageServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/StatusPageServiceImpl.java @@ -17,6 +17,13 @@ package org.apache.hertzbeat.manager.service.impl; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.ZoneOffset; +import java.util.LinkedList; +import java.util.List; +import java.util.stream.Collectors; import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.entity.manager.StatusPageComponent; import org.apache.hertzbeat.common.entity.manager.StatusPageHistory; @@ -33,14 +40,6 @@ import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; -import java.time.Instant; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.time.ZoneOffset; -import java.util.LinkedList; -import java.util.List; -import java.util.stream.Collectors; - /** * status page service implement. */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/SystemGeneralConfigServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/SystemGeneralConfigServiceImpl.java index 5e1cbcdfd60..29a2e003945 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/SystemGeneralConfigServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/SystemGeneralConfigServiceImpl.java @@ -19,6 +19,10 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.annotation.Resource; +import java.lang.reflect.Type; +import java.util.Locale; +import java.util.TimeZone; import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.support.event.SystemConfigChangeEvent; import org.apache.hertzbeat.manager.dao.GeneralConfigDao; @@ -26,11 +30,6 @@ import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; -import java.lang.reflect.Type; -import java.util.Locale; -import java.util.TimeZone; - /** * system config service impl */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/TagServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/TagServiceImpl.java index 2648b1650eb..7e1f8b7fe04 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/TagServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/TagServiceImpl.java @@ -17,12 +17,17 @@ package org.apache.hertzbeat.manager.service.impl; +import java.util.HashSet; +import java.util.List; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.hertzbeat.common.entity.manager.Monitor; import org.apache.hertzbeat.common.entity.manager.Tag; import org.apache.hertzbeat.manager.dao.TagDao; import org.apache.hertzbeat.manager.service.TagService; -import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -30,12 +35,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.HashSet; -import java.util.List; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; - /** */ @Service diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/TemplateConfigServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/TemplateConfigServiceImpl.java index 9f3624c5ada..938e70bbff7 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/TemplateConfigServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/TemplateConfigServiceImpl.java @@ -19,14 +19,13 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.annotation.Resource; +import java.lang.reflect.Type; import org.apache.hertzbeat.manager.dao.GeneralConfigDao; import org.apache.hertzbeat.manager.pojo.dto.TemplateConfig; import org.apache.hertzbeat.manager.service.AppService; import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; -import java.lang.reflect.Type; - /** * template config service impl */ diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/YamlImExportServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/YamlImExportServiceImpl.java index 661c9e6ec98..ebc76736748 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/YamlImExportServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/YamlImExportServiceImpl.java @@ -17,16 +17,15 @@ package org.apache.hertzbeat.manager.service.impl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.yaml.snakeyaml.DumperOptions; -import org.yaml.snakeyaml.Yaml; - import java.io.InputStream; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.nio.charset.StandardCharsets; import java.util.List; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.yaml.snakeyaml.DumperOptions; +import org.yaml.snakeyaml.Yaml; /** * Configure the import and export Yaml format diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/support/GlobalExceptionHandler.java b/manager/src/main/java/org/apache/hertzbeat/manager/support/GlobalExceptionHandler.java index a0087094e45..2ef2f1c80fe 100644 --- a/manager/src/main/java/org/apache/hertzbeat/manager/support/GlobalExceptionHandler.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/support/GlobalExceptionHandler.java @@ -17,13 +17,19 @@ package org.apache.hertzbeat.manager.support; +import static org.apache.hertzbeat.common.constants.CommonConstants.DETECT_FAILED_CODE; +import static org.apache.hertzbeat.common.constants.CommonConstants.FAIL_CODE; +import static org.apache.hertzbeat.common.constants.CommonConstants.MONITOR_CONFLICT_CODE; +import static org.apache.hertzbeat.common.constants.CommonConstants.PARAM_INVALID_CODE; +import java.util.Objects; +import javax.validation.ConstraintViolationException; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.entity.dto.Message; import org.apache.hertzbeat.common.support.exception.CommonException; import org.apache.hertzbeat.manager.support.exception.AlertNoticeException; +import org.apache.hertzbeat.manager.support.exception.MonitorDatabaseException; import org.apache.hertzbeat.manager.support.exception.MonitorDetectException; import org.apache.hertzbeat.manager.support.exception.MonitorMetricsException; -import org.apache.hertzbeat.manager.support.exception.MonitorDatabaseException; import org.springframework.dao.DataAccessException; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -36,11 +42,6 @@ import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.servlet.resource.NoResourceFoundException; -import javax.validation.ConstraintViolationException; -import java.util.Objects; - -import static org.apache.hertzbeat.common.constants.CommonConstants.*; - /** * controller exception handler */ diff --git a/push/src/main/java/org/apache/hertzbeat/push/controller/PushController.java b/push/src/main/java/org/apache/hertzbeat/push/controller/PushController.java index 3c2ad340c95..e0598b470ca 100644 --- a/push/src/main/java/org/apache/hertzbeat/push/controller/PushController.java +++ b/push/src/main/java/org/apache/hertzbeat/push/controller/PushController.java @@ -17,6 +17,7 @@ package org.apache.hertzbeat.push.controller; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -25,9 +26,12 @@ import org.apache.hertzbeat.push.service.PushService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; /** * push controller diff --git a/push/src/main/java/org/apache/hertzbeat/push/controller/PushGatewayController.java b/push/src/main/java/org/apache/hertzbeat/push/controller/PushGatewayController.java index f67313191f3..f355a4a7397 100644 --- a/push/src/main/java/org/apache/hertzbeat/push/controller/PushGatewayController.java +++ b/push/src/main/java/org/apache/hertzbeat/push/controller/PushGatewayController.java @@ -22,6 +22,8 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; +import java.io.IOException; +import java.io.InputStream; import org.apache.hertzbeat.common.entity.dto.Message; import org.apache.hertzbeat.push.service.PushGatewayService; import org.springframework.beans.factory.annotation.Autowired; @@ -30,9 +32,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.io.IOException; -import java.io.InputStream; - /** * push gateway controller */ diff --git a/push/src/main/java/org/apache/hertzbeat/push/service/PushGatewayService.java b/push/src/main/java/org/apache/hertzbeat/push/service/PushGatewayService.java index d6463950668..daa0cf1a8f8 100644 --- a/push/src/main/java/org/apache/hertzbeat/push/service/PushGatewayService.java +++ b/push/src/main/java/org/apache/hertzbeat/push/service/PushGatewayService.java @@ -19,10 +19,9 @@ package org.apache.hertzbeat.push.service; -import org.springframework.stereotype.Service; - import java.io.IOException; import java.io.InputStream; +import org.springframework.stereotype.Service; /** * push gateway metrics diff --git a/push/src/main/java/org/apache/hertzbeat/push/service/PushService.java b/push/src/main/java/org/apache/hertzbeat/push/service/PushService.java index b1661c2043b..41143e3c36a 100644 --- a/push/src/main/java/org/apache/hertzbeat/push/service/PushService.java +++ b/push/src/main/java/org/apache/hertzbeat/push/service/PushService.java @@ -27,5 +27,5 @@ public interface PushService { void pushMetricsData(PushMetricsDto pushMetricsData); - PushMetricsDto getPushMetricData(final Long monitorId, final Long time); + PushMetricsDto getPushMetricData(Long monitorId, Long time); } diff --git a/push/src/main/java/org/apache/hertzbeat/push/service/impl/PushGatewayServiceImpl.java b/push/src/main/java/org/apache/hertzbeat/push/service/impl/PushGatewayServiceImpl.java index ba2e71f7253..c1cff60defa 100644 --- a/push/src/main/java/org/apache/hertzbeat/push/service/impl/PushGatewayServiceImpl.java +++ b/push/src/main/java/org/apache/hertzbeat/push/service/impl/PushGatewayServiceImpl.java @@ -19,16 +19,15 @@ package org.apache.hertzbeat.push.service.impl; +import java.io.IOException; +import java.io.InputStream; +import java.util.List; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.util.prometheus.Metric; import org.apache.hertzbeat.common.util.prometheus.PrometheusUtil; import org.apache.hertzbeat.push.service.PushGatewayService; import org.springframework.stereotype.Service; -import java.io.IOException; -import java.io.InputStream; -import java.util.List; - /** * push gateway service impl */ diff --git a/push/src/main/java/org/apache/hertzbeat/push/service/impl/PushServiceImpl.java b/push/src/main/java/org/apache/hertzbeat/push/service/impl/PushServiceImpl.java index 5349997b410..f6db48c7c23 100644 --- a/push/src/main/java/org/apache/hertzbeat/push/service/impl/PushServiceImpl.java +++ b/push/src/main/java/org/apache/hertzbeat/push/service/impl/PushServiceImpl.java @@ -19,6 +19,13 @@ import com.fasterxml.jackson.core.type.TypeReference; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Timer; +import java.util.TimerTask; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.entity.manager.Monitor; import org.apache.hertzbeat.common.entity.push.PushMetrics; @@ -30,8 +37,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.*; - /** * push service impl */ diff --git a/remoting/src/main/java/org/apache/hertzbeat/remoting/RemotingClient.java b/remoting/src/main/java/org/apache/hertzbeat/remoting/RemotingClient.java index cba073d68f6..e814a7af507 100644 --- a/remoting/src/main/java/org/apache/hertzbeat/remoting/RemotingClient.java +++ b/remoting/src/main/java/org/apache/hertzbeat/remoting/RemotingClient.java @@ -31,13 +31,13 @@ public interface RemotingClient extends RemotingService { * @param messageType type * @param processor remoting processor */ - void registerProcessor(final ClusterMsg.MessageType messageType, final NettyRemotingProcessor processor); + void registerProcessor(ClusterMsg.MessageType messageType, NettyRemotingProcessor processor); /** * send message to server * @param request request message */ - void sendMsg(final ClusterMsg.Message request); + void sendMsg(ClusterMsg.Message request); /** * send message to server and sync waiting receive server message @@ -45,5 +45,5 @@ public interface RemotingClient extends RemotingService { * @param timeoutMillis timeout millis * @return response message */ - ClusterMsg.Message sendMsgSync(final ClusterMsg.Message request, final int timeoutMillis); + ClusterMsg.Message sendMsgSync(ClusterMsg.Message request, int timeoutMillis); } diff --git a/remoting/src/main/java/org/apache/hertzbeat/remoting/RemotingServer.java b/remoting/src/main/java/org/apache/hertzbeat/remoting/RemotingServer.java index 6da740eb2e3..a8798f7c23a 100644 --- a/remoting/src/main/java/org/apache/hertzbeat/remoting/RemotingServer.java +++ b/remoting/src/main/java/org/apache/hertzbeat/remoting/RemotingServer.java @@ -18,12 +18,11 @@ package org.apache.hertzbeat.remoting; import io.netty.channel.Channel; +import java.util.List; import org.apache.hertzbeat.common.entity.message.ClusterMsg; import org.apache.hertzbeat.remoting.netty.NettyHook; import org.apache.hertzbeat.remoting.netty.NettyRemotingProcessor; -import java.util.List; - /** * remoting server interface */ @@ -35,14 +34,14 @@ public interface RemotingServer extends RemotingService { * @param messageType type * @param processor remoting processor */ - void registerProcessor(final ClusterMsg.MessageType messageType, final NettyRemotingProcessor processor); + void registerProcessor(ClusterMsg.MessageType messageType, NettyRemotingProcessor processor); /** * send message to client * @param channel client channel * @param request request message */ - void sendMsg(final Channel channel, final ClusterMsg.Message request); + void sendMsg(Channel channel, ClusterMsg.Message request); /** * send message to client and receive client message @@ -51,7 +50,7 @@ public interface RemotingServer extends RemotingService { * @param timeoutMillis timeout millis * @return response message */ - ClusterMsg.Message sendMsgSync(final Channel channel, final ClusterMsg.Message request, final int timeoutMillis); + ClusterMsg.Message sendMsgSync(Channel channel, ClusterMsg.Message request, int timeoutMillis); void registerHook(List nettyHookList); } diff --git a/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyRemotingAbstract.java b/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyRemotingAbstract.java index 4aa2d3e1bf3..ba87a58ceaf 100644 --- a/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyRemotingAbstract.java +++ b/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyRemotingAbstract.java @@ -22,16 +22,15 @@ import io.netty.channel.epoll.Epoll; import io.netty.handler.timeout.IdleState; import io.netty.handler.timeout.IdleStateEvent; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.ConcurrentHashMap; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.entity.message.ClusterMsg; import org.apache.hertzbeat.common.util.NetworkUtil; import org.apache.hertzbeat.remoting.RemotingService; import org.apache.hertzbeat.remoting.event.NettyEventListener; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.ConcurrentHashMap; - /** * netty remote abstract * @see NettyRemotingAbstract diff --git a/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyRemotingClient.java b/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyRemotingClient.java index 1fbc1288596..ebb8498aca1 100644 --- a/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyRemotingClient.java +++ b/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyRemotingClient.java @@ -35,14 +35,13 @@ import io.netty.handler.codec.protobuf.ProtobufEncoder; import io.netty.handler.codec.protobuf.ProtobufVarint32FrameDecoder; import io.netty.handler.codec.protobuf.ProtobufVarint32LengthFieldPrepender; +import java.util.concurrent.ThreadFactory; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.entity.message.ClusterMsg; import org.apache.hertzbeat.common.support.CommonThreadPool; import org.apache.hertzbeat.remoting.RemotingClient; import org.apache.hertzbeat.remoting.event.NettyEventListener; -import java.util.concurrent.ThreadFactory; - /** * netty client * @see NettyRemotingClient diff --git a/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyRemotingServer.java b/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyRemotingServer.java index 2ea7a3b1854..fd4b343d86b 100644 --- a/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyRemotingServer.java +++ b/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyRemotingServer.java @@ -41,15 +41,14 @@ import io.netty.handler.logging.LogLevel; import io.netty.handler.logging.LoggingHandler; import io.netty.handler.timeout.IdleStateHandler; +import java.util.List; +import java.util.concurrent.ThreadFactory; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.entity.message.ClusterMsg; import org.apache.hertzbeat.common.support.CommonThreadPool; import org.apache.hertzbeat.remoting.RemotingServer; import org.apache.hertzbeat.remoting.event.NettyEventListener; -import java.util.List; -import java.util.concurrent.ThreadFactory; - /** * netty server * @see NettyRemotingServer diff --git a/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/ResponseFuture.java b/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/ResponseFuture.java index 6a0d47004a5..3a9a38295ee 100644 --- a/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/ResponseFuture.java +++ b/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/ResponseFuture.java @@ -17,10 +17,9 @@ package org.apache.hertzbeat.remoting.netty; -import org.apache.hertzbeat.common.entity.message.ClusterMsg; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import org.apache.hertzbeat.common.entity.message.ClusterMsg; /** * netty response future diff --git a/script/checkstyle/checkstyle.xml b/script/checkstyle/checkstyle.xml index 564ca7947b1..e144b3debe4 100644 --- a/script/checkstyle/checkstyle.xml +++ b/script/checkstyle/checkstyle.xml @@ -282,5 +282,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/WarehouseWorkerPool.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/WarehouseWorkerPool.java index 77174a8a341..1c302455456 100644 --- a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/WarehouseWorkerPool.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/WarehouseWorkerPool.java @@ -18,14 +18,13 @@ package org.apache.hertzbeat.warehouse; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.SynchronousQueue; import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; /** * warehouse worker thread pool diff --git a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/config/WarehouseProperties.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/config/WarehouseProperties.java index e63d505642c..f0c7548ae26 100644 --- a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/config/WarehouseProperties.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/config/WarehouseProperties.java @@ -17,11 +17,10 @@ package org.apache.hertzbeat.warehouse.config; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.context.properties.bind.DefaultValue; - import java.time.ZoneId; import java.util.List; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.bind.DefaultValue; /** * Data warehouse configuration properties diff --git a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/controller/MetricsDataController.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/controller/MetricsDataController.java index 31b506c110a..71647b794b3 100644 --- a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/controller/MetricsDataController.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/controller/MetricsDataController.java @@ -17,6 +17,17 @@ package org.apache.hertzbeat.warehouse.controller; +import static org.apache.hertzbeat.common.constants.CommonConstants.FAIL_CODE; +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.entity.dto.Field; import org.apache.hertzbeat.common.entity.dto.Message; import org.apache.hertzbeat.common.entity.dto.MetricsData; @@ -24,14 +35,10 @@ import org.apache.hertzbeat.common.entity.dto.Value; import org.apache.hertzbeat.common.entity.dto.ValueRow; import org.apache.hertzbeat.common.entity.message.CollectRep; -import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.warehouse.store.AbstractHistoryDataStorage; import org.apache.hertzbeat.warehouse.store.AbstractRealTimeDataStorage; import org.apache.hertzbeat.warehouse.store.HistoryJpaDatabaseDataStorage; import org.apache.hertzbeat.warehouse.store.RealTimeMemoryDataStorage; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -39,15 +46,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -import static org.apache.hertzbeat.common.constants.CommonConstants.FAIL_CODE; -import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; - /** * Indicator data query interface */ diff --git a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/service/WarehouseService.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/service/WarehouseService.java index 1505916c01b..aba1235156b 100644 --- a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/service/WarehouseService.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/service/WarehouseService.java @@ -17,9 +17,8 @@ package org.apache.hertzbeat.warehouse.service; -import org.apache.hertzbeat.common.entity.message.CollectRep; - import java.util.List; +import org.apache.hertzbeat.common.entity.message.CollectRep; /** * service for warehouse diff --git a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/service/WarehouseServiceImpl.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/service/WarehouseServiceImpl.java index a1a641e793e..69f3e61876e 100644 --- a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/service/WarehouseServiceImpl.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/service/WarehouseServiceImpl.java @@ -17,15 +17,14 @@ package org.apache.hertzbeat.warehouse.service; +import java.util.Collections; +import java.util.List; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.entity.message.CollectRep; import org.apache.hertzbeat.warehouse.store.AbstractRealTimeDataStorage; import org.apache.hertzbeat.warehouse.store.RealTimeMemoryDataStorage; import org.springframework.stereotype.Service; -import java.util.Collections; -import java.util.List; - /** * warehouse service impl */ diff --git a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/AbstractHistoryDataStorage.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/AbstractHistoryDataStorage.java index 9de2316119a..f3b047de520 100644 --- a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/AbstractHistoryDataStorage.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/AbstractHistoryDataStorage.java @@ -17,14 +17,13 @@ package org.apache.hertzbeat.warehouse.store; +import java.util.List; +import java.util.Map; +import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.entity.dto.Value; import org.apache.hertzbeat.common.entity.message.CollectRep; -import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.DisposableBean; -import java.util.List; -import java.util.Map; - /** * data storage abstract class */ diff --git a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/AbstractRealTimeDataStorage.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/AbstractRealTimeDataStorage.java index cb91ab6ad70..6973cb640c0 100644 --- a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/AbstractRealTimeDataStorage.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/AbstractRealTimeDataStorage.java @@ -17,13 +17,12 @@ package org.apache.hertzbeat.warehouse.store; -import org.apache.hertzbeat.common.entity.message.CollectRep; +import java.util.List; import lombok.extern.slf4j.Slf4j; +import org.apache.hertzbeat.common.entity.message.CollectRep; import org.springframework.beans.factory.DisposableBean; import org.springframework.lang.NonNull; -import java.util.List; - /** * Real-time data storage abstract class */ diff --git a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/DataStorageDispatch.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/DataStorageDispatch.java index 41474d63828..2a6d84690e4 100644 --- a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/DataStorageDispatch.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/DataStorageDispatch.java @@ -17,14 +17,13 @@ package org.apache.hertzbeat.warehouse.store; +import java.util.List; +import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.entity.message.CollectRep; import org.apache.hertzbeat.common.queue.CommonDataQueue; import org.apache.hertzbeat.warehouse.WarehouseWorkerPool; -import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import java.util.List; - /** * dispatch storage metrics data */ diff --git a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryGrepTimeDbDataStorage.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryGrepTimeDbDataStorage.java index 0fd340055ed..e9cd2606765 100644 --- a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryGrepTimeDbDataStorage.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryGrepTimeDbDataStorage.java @@ -17,29 +17,45 @@ package org.apache.hertzbeat.warehouse.store; -import io.greptime.models.*; -import lombok.extern.slf4j.Slf4j; -import org.apache.arrow.flight.FlightRuntimeException; -import org.apache.hertzbeat.common.entity.dto.Value; -import org.apache.hertzbeat.common.entity.message.CollectRep; -import org.apache.hertzbeat.common.constants.CommonConstants; -import org.apache.hertzbeat.common.util.JsonUtil; -import org.apache.hertzbeat.common.util.TimePeriodUtil; -import org.apache.hertzbeat.warehouse.config.WarehouseProperties; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.stereotype.Component; import io.greptime.GreptimeDB; +import io.greptime.models.ColumnDataType; +import io.greptime.models.Err; +import io.greptime.models.QueryOk; +import io.greptime.models.QueryRequest; +import io.greptime.models.Result; +import io.greptime.models.Row; +import io.greptime.models.SelectExprType; +import io.greptime.models.SelectRows; +import io.greptime.models.SemanticType; +import io.greptime.models.TableName; +import io.greptime.models.TableSchema; +import io.greptime.models.WriteOk; +import io.greptime.models.WriteRows; import io.greptime.options.GreptimeOptions; - import java.math.BigDecimal; import java.math.RoundingMode; import java.time.Duration; import java.time.ZonedDateTime; import java.time.temporal.TemporalAmount; -import java.util.*; +import java.util.Arrays; +import java.util.Calendar; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; +import lombok.extern.slf4j.Slf4j; +import org.apache.arrow.flight.FlightRuntimeException; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.dto.Value; +import org.apache.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.util.JsonUtil; +import org.apache.hertzbeat.common.util.TimePeriodUtil; +import org.apache.hertzbeat.warehouse.config.WarehouseProperties; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Component; /** * greptimeDB data storage diff --git a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryInfluxdbDataStorage.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryInfluxdbDataStorage.java index 5f70b36e371..a786e4f856b 100644 --- a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryInfluxdbDataStorage.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryInfluxdbDataStorage.java @@ -17,14 +17,31 @@ package org.apache.hertzbeat.warehouse.store; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.security.SecureRandom; +import java.security.cert.X509Certificate; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.TimeUnit; +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLSocketFactory; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; import lombok.extern.slf4j.Slf4j; import okhttp3.OkHttpClient; -import org.apache.http.ssl.SSLContexts; import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.entity.dto.Value; import org.apache.hertzbeat.common.entity.message.CollectRep; import org.apache.hertzbeat.common.util.JsonUtil; import org.apache.hertzbeat.warehouse.config.WarehouseProperties; +import org.apache.http.ssl.SSLContexts; import org.influxdb.InfluxDB; import org.influxdb.InfluxDBFactory; import org.influxdb.dto.BatchPoints; @@ -34,14 +51,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; -import javax.net.ssl.*; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.security.SecureRandom; -import java.security.cert.X509Certificate; -import java.util.*; -import java.util.concurrent.TimeUnit; - /** * HistoryInfluxdbDataStorage class */ diff --git a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryIotDbDataStorage.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryIotDbDataStorage.java index 5003f407e34..b5665104ae6 100644 --- a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryIotDbDataStorage.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryIotDbDataStorage.java @@ -17,13 +17,20 @@ package org.apache.hertzbeat.warehouse.store; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import lombok.extern.slf4j.Slf4j; +import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.entity.dto.Value; import org.apache.hertzbeat.common.entity.message.CollectRep; -import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.util.JsonUtil; import org.apache.hertzbeat.warehouse.config.IotDbVersion; import org.apache.hertzbeat.warehouse.config.WarehouseProperties; -import lombok.extern.slf4j.Slf4j; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.pool.SessionDataSetWrapper; @@ -35,10 +42,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.*; - /** * IoTDB data storage */ diff --git a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryJpaDatabaseDataStorage.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryJpaDatabaseDataStorage.java index 61cd8b9c505..9324ccc9f88 100644 --- a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryJpaDatabaseDataStorage.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryJpaDatabaseDataStorage.java @@ -18,6 +18,21 @@ package org.apache.hertzbeat.warehouse.store; import com.google.common.util.concurrent.ThreadFactoryBuilder; +import jakarta.persistence.criteria.Predicate; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.time.Duration; +import java.time.ZonedDateTime; +import java.time.temporal.TemporalAmount; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; @@ -34,18 +49,6 @@ import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Component; -import jakarta.persistence.criteria.Predicate; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.time.Duration; -import java.time.ZonedDateTime; -import java.time.temporal.TemporalAmount; -import java.util.*; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.TimeUnit; - /** * data storage by mysql/h2 - jpa */ diff --git a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryTdEngineDataStorage.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryTdEngineDataStorage.java index bd9ccfc1d1f..1fff1a401f1 100644 --- a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryTdEngineDataStorage.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryTdEngineDataStorage.java @@ -17,18 +17,8 @@ package org.apache.hertzbeat.warehouse.store; -import org.apache.hertzbeat.common.entity.dto.Value; -import org.apache.hertzbeat.common.entity.message.CollectRep; -import org.apache.hertzbeat.common.constants.CommonConstants; -import org.apache.hertzbeat.common.util.JsonUtil; -import org.apache.hertzbeat.warehouse.config.WarehouseProperties; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; -import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.context.annotation.Primary; -import org.springframework.stereotype.Component; - import java.math.BigDecimal; import java.math.RoundingMode; import java.sql.Connection; @@ -36,8 +26,21 @@ import java.sql.SQLException; import java.sql.Statement; import java.sql.Timestamp; -import java.util.*; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.regex.Pattern; +import lombok.extern.slf4j.Slf4j; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.dto.Value; +import org.apache.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.util.JsonUtil; +import org.apache.hertzbeat.warehouse.config.WarehouseProperties; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Primary; +import org.springframework.stereotype.Component; /** * tdengine data storage diff --git a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryVictoriaMetricsDataStorage.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryVictoriaMetricsDataStorage.java index 999932ac593..6033e43972c 100644 --- a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryVictoriaMetricsDataStorage.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryVictoriaMetricsDataStorage.java @@ -18,6 +18,20 @@ package org.apache.hertzbeat.warehouse.store; import com.fasterxml.jackson.databind.JsonNode; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.net.URI; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.time.Duration; +import java.time.ZonedDateTime; +import java.time.temporal.TemporalAmount; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -34,22 +48,16 @@ import org.apache.hertzbeat.warehouse.config.WarehouseProperties; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Primary; -import org.springframework.http.*; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponentsBuilder; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.net.URI; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.time.Duration; -import java.time.ZonedDateTime; -import java.time.temporal.TemporalAmount; -import java.util.*; - /** * tdengine data storage */ diff --git a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/MetricsDataRedisCodec.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/MetricsDataRedisCodec.java index 39d44b68c28..d3b8318b064 100644 --- a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/MetricsDataRedisCodec.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/MetricsDataRedisCodec.java @@ -17,12 +17,11 @@ package org.apache.hertzbeat.warehouse.store; -import org.apache.hertzbeat.common.entity.message.CollectRep; import io.lettuce.core.codec.RedisCodec; -import lombok.extern.slf4j.Slf4j; - import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; +import lombok.extern.slf4j.Slf4j; +import org.apache.hertzbeat.common.entity.message.CollectRep; /** * MetricsData redis serialization diff --git a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/RealTimeMemoryDataStorage.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/RealTimeMemoryDataStorage.java index 71770cef2ca..3f9d1defc43 100644 --- a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/RealTimeMemoryDataStorage.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/RealTimeMemoryDataStorage.java @@ -17,18 +17,17 @@ package org.apache.hertzbeat.warehouse.store; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.entity.message.CollectRep; import org.apache.hertzbeat.warehouse.config.WarehouseProperties; -import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.lang.NonNull; import org.springframework.stereotype.Component; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - /** * Store and collect real-time data - memory */ diff --git a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/RealTimeRedisDataStorage.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/RealTimeRedisDataStorage.java index 0c47ad9244c..7dcefb05fb0 100644 --- a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/RealTimeRedisDataStorage.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/RealTimeRedisDataStorage.java @@ -17,24 +17,23 @@ package org.apache.hertzbeat.warehouse.store; -import org.apache.hertzbeat.common.entity.message.CollectRep; -import org.apache.hertzbeat.warehouse.config.WarehouseProperties; import io.lettuce.core.RedisClient; import io.lettuce.core.RedisURI; import io.lettuce.core.api.StatefulRedisConnection; import io.lettuce.core.api.async.RedisAsyncCommands; import io.lettuce.core.api.sync.RedisCommands; -import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.context.annotation.Primary; -import org.springframework.lang.NonNull; -import org.springframework.stereotype.Component; - import java.time.Duration; import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.List; import java.util.Map; +import lombok.extern.slf4j.Slf4j; +import org.apache.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.warehouse.config.WarehouseProperties; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Primary; +import org.springframework.lang.NonNull; +import org.springframework.stereotype.Component; /** * redis storage collects real-time data