diff --git a/.asf.yaml b/.asf.yaml new file mode 100644 index 00000000000..ede10c49214 --- /dev/null +++ b/.asf.yaml @@ -0,0 +1,45 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +github: + description: HertzBeat is a real-time monitoring system with agentless, performance cluster, prometheus-compatible, custom monitoring and status page building capabilities. + homepage: https://hertzbeat.apache.org/ + labels: + - monitoring + - monitor + - self-hosted + - status + - prometheus + - uptime-monitoring + - status-page + enabled_merge_buttons: + squash: true + merge: false + rebase: false + protected_branches: + master: + required_status_checks: + strict: true + required_pull_request_reviews: + dismiss_stale_reviews: true + required_approving_review_count: 1 +notifications: + commits: notifications@hertzbeat.apache.org + issues: notifications@hertzbeat.apache.org + pullrequests: notifications@hertzbeat.apache.org + jobs: notifications@hertzbeat.apache.org + discussions: dev@hertzbeat.apache.org diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index ffa2a2a9f4b..6fa9a128077 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -55,7 +55,7 @@ further defined and clarified by project maintainers. ## Enforcement Instances of abusive, harassing or otherwise unacceptable behavior may be -reported by contacting the project team at gongchao@apache.org. All +reported by contacting the project team at dev@hertzbeat.apache.org. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate for the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b9792cc0898..fed732e8515 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -34,7 +34,7 @@ Even small corrections to typos are very welcome :) 1. Requires `maven3+`, `java17` and `lombok` environments 2. (Optional) Modify the configuration file-`manager/src/main/resources/application.yml` -3. Start `springboot manager` service `manager/src/main/java/org/dromara/hertzbeat/manager/Manager.java` +3. Start `springboot manager` service `manager/src/main/java/org/apache/hertzbeat/manager/Manager.java` - Front-web start @@ -170,7 +170,7 @@ Add WeChat account `tan-cloud` to pull you into the WeChat group. 1. 需要`maven3+`, `java17`和`lombok`环境 2. (可选)修改配置文件配置信息-`manager/src/main/resources/application.yml` -3. 启动`springboot manager`服务 `manager/src/main/java/org/dromara/hertzbeat/manager/Manager.java` +3. 启动`springboot manager`服务 `manager/src/main/java/org/apache/hertzbeat/manager/Manager.java` - 前端启动 diff --git a/alerter/README.md b/alerter/README.md deleted file mode 100644 index cf9a65783a7..00000000000 --- a/alerter/README.md +++ /dev/null @@ -1,4 +0,0 @@ -### Alerter - -Processing data according to threshold rules to determine alarms, and alarm distribution functions. -根据告警规则配置信息，处理指标数据判断告警，告警分发。 diff --git a/alerter/pom.xml b/alerter/pom.xml index 620b1ab8edc..00c085e2647 100644 --- a/alerter/pom.xml +++ b/alerter/pom.xml @@ -20,7 +20,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> hertzbeat - org.dromara.hertzbeat + org.apache.hertzbeat 2.0-SNAPSHOT 4.0.0 @@ -34,7 +34,7 @@ - org.dromara.hertzbeat + org.apache.hertzbeat hertzbeat-common provided diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/AlerterProperties.java b/alerter/src/main/java/org/apache/hertzbeat/alert/AlerterProperties.java similarity index 98% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/AlerterProperties.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/AlerterProperties.java index cba11b86e51..edae0348568 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/AlerterProperties.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/AlerterProperties.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert; +package org.apache.hertzbeat.alert; import lombok.Getter; import lombok.Setter; @@ -24,7 +24,6 @@ /** * alerter prop config - * */ @Component @ConfigurationProperties(prefix = "alerter") diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/AlerterWorkerPool.java b/alerter/src/main/java/org/apache/hertzbeat/alert/AlerterWorkerPool.java similarity index 98% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/AlerterWorkerPool.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/AlerterWorkerPool.java index e0108d49e90..384c6a65d33 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/AlerterWorkerPool.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/AlerterWorkerPool.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert; +package org.apache.hertzbeat.alert; import com.google.common.util.concurrent.ThreadFactoryBuilder; import lombok.extern.slf4j.Slf4j; @@ -29,7 +29,6 @@ /** * alarm module thread pool - * */ @Component @Slf4j diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/calculate/CalculateAlarm.java b/alerter/src/main/java/org/apache/hertzbeat/alert/calculate/CalculateAlarm.java similarity index 94% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/calculate/CalculateAlarm.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/calculate/CalculateAlarm.java index e5a17e2f6c3..dfb2d123973 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/calculate/CalculateAlarm.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/calculate/CalculateAlarm.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.calculate; +package org.apache.hertzbeat.alert.calculate; import com.googlecode.aviator.AviatorEvaluator; import com.googlecode.aviator.Expression; @@ -24,23 +24,23 @@ import com.googlecode.aviator.exception.ExpressionSyntaxErrorException; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.dromara.hertzbeat.alert.AlerterWorkerPool; -import org.dromara.hertzbeat.alert.dao.AlertMonitorDao; -import org.dromara.hertzbeat.alert.reduce.AlarmCommonReduce; -import org.dromara.hertzbeat.alert.service.AlertDefineService; -import org.dromara.hertzbeat.alert.service.AlertService; -import org.dromara.hertzbeat.alert.util.AlertTemplateUtil; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.alerter.AlertDefine; -import org.dromara.hertzbeat.common.entity.manager.Monitor; -import org.dromara.hertzbeat.common.entity.manager.TagItem; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.queue.CommonDataQueue; -import org.dromara.hertzbeat.common.support.event.MonitorDeletedEvent; -import org.dromara.hertzbeat.common.support.event.SystemConfigChangeEvent; -import org.dromara.hertzbeat.common.util.CommonUtil; -import org.dromara.hertzbeat.common.util.ResourceBundleUtil; +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.AlertService; +import org.apache.hertzbeat.alert.util.AlertTemplateUtil; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.alerter.Alert; +import org.apache.hertzbeat.common.entity.alerter.AlertDefine; +import org.apache.hertzbeat.common.entity.manager.Monitor; +import org.apache.hertzbeat.common.entity.manager.TagItem; +import org.apache.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.queue.CommonDataQueue; +import org.apache.hertzbeat.common.support.event.MonitorDeletedEvent; +import org.apache.hertzbeat.common.support.event.SystemConfigChangeEvent; +import org.apache.hertzbeat.common.util.CommonUtil; +import org.apache.hertzbeat.common.util.ResourceBundleUtil; import org.springframework.context.event.EventListener; import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Component; @@ -51,11 +51,10 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; -import static org.dromara.hertzbeat.common.constants.CommonConstants.*; +import static org.apache.hertzbeat.common.constants.CommonConstants.*; /** * Calculate alarms based on the alarm definition rules and collected data - * */ @Component @Slf4j @@ -283,8 +282,8 @@ private void afterThresholdRuleMatch(long currentTimeMilli, long monitorId, Stri fieldValueMap.put(TAG_METRICS, metrics); fieldValueMap.put(TAG_METRIC, define.getField()); Map tags = new HashMap<>(8); - tags.put(CommonConstants.TAG_MONITOR_ID, String.valueOf(monitorId)); - tags.put(CommonConstants.TAG_MONITOR_APP, app); + tags.put(TAG_MONITOR_ID, String.valueOf(monitorId)); + tags.put(TAG_MONITOR_APP, app); tags.put(CommonConstants.TAG_THRESHOLD_ID, String.valueOf(define.getId())); if (!CollectionUtils.isEmpty(define.getTags())) { for (TagItem tagItem : define.getTags()) { @@ -351,8 +350,8 @@ private void handlerAvailableMetrics(long monitorId, String app, CollectRep.Metr if (metricsData.getCode() != CollectRep.Code.SUCCESS) { Alert preAlert = triggeredAlertMap.get(String.valueOf(monitorId)); Map tags = new HashMap<>(6); - tags.put(CommonConstants.TAG_MONITOR_ID, String.valueOf(monitorId)); - tags.put(CommonConstants.TAG_MONITOR_APP, app); + tags.put(TAG_MONITOR_ID, String.valueOf(monitorId)); + tags.put(TAG_MONITOR_APP, app); tags.put(CommonConstants.TAG_THRESHOLD_ID, String.valueOf(avaAlertDefine.getId())); tags.put(TAG_METRICS, CommonConstants.AVAILABILITY); tags.put(TAG_CODE, metricsData.getCode().name()); diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/config/AlerterAutoConfiguration.java b/alerter/src/main/java/org/apache/hertzbeat/alert/config/AlerterAutoConfiguration.java similarity index 90% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/config/AlerterAutoConfiguration.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/config/AlerterAutoConfiguration.java index ff627034dcc..516bc7849a0 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/config/AlerterAutoConfiguration.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/config/AlerterAutoConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.config; +package org.apache.hertzbeat.alert.config; import org.springframework.context.annotation.ComponentScan; @@ -23,6 +23,6 @@ * Alert auto configuration. * @version 2.1 */ -@ComponentScan(basePackages = "org.dromara.hertzbeat.alert") +@ComponentScan(basePackages = "org.apache.hertzbeat.alert") public class AlerterAutoConfiguration { } diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertConvergeController.java b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertConvergeController.java similarity index 90% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertConvergeController.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertConvergeController.java index 086fce158a4..cd355f0f33b 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertConvergeController.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertConvergeController.java @@ -15,26 +15,25 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.controller; +package org.apache.hertzbeat.alert.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import org.dromara.hertzbeat.alert.service.AlertConvergeService; -import org.dromara.hertzbeat.common.entity.alerter.AlertConverge; -import org.dromara.hertzbeat.common.entity.dto.Message; +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.dromara.hertzbeat.common.constants.CommonConstants.MONITOR_NOT_EXIST_CODE; +import static org.apache.hertzbeat.common.constants.CommonConstants.MONITOR_NOT_EXIST_CODE; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; /** * Alarm Converge management API - * */ @Tag(name = "Alert Converge API | 告警收敛管理API") @RestController diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertConvergesController.java b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertConvergesController.java similarity index 95% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertConvergesController.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertConvergesController.java index 9ac7bb3a2eb..e5f6c64f125 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertConvergesController.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertConvergesController.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.controller; +package org.apache.hertzbeat.alert.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import org.dromara.hertzbeat.alert.service.AlertConvergeService; -import org.dromara.hertzbeat.common.entity.alerter.AlertConverge; -import org.dromara.hertzbeat.common.entity.dto.Message; +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.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -42,7 +42,6 @@ /** * Converge the batch API for alarms - * */ @Tag(name = "Alert Converge Batch API | 告警收敛管理API") @RestController diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertDefineController.java b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertDefineController.java similarity index 93% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertDefineController.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertDefineController.java index 34f5e215101..615b4950a11 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertDefineController.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertDefineController.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.controller; +package org.apache.hertzbeat.alert.controller; -import org.dromara.hertzbeat.common.entity.alerter.AlertDefine; -import org.dromara.hertzbeat.common.entity.alerter.AlertDefineMonitorBind; -import org.dromara.hertzbeat.alert.service.AlertDefineService; -import org.dromara.hertzbeat.common.entity.dto.Message; +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 io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -40,12 +40,11 @@ import java.util.List; import java.util.stream.Collectors; -import static org.dromara.hertzbeat.common.constants.CommonConstants.MONITOR_NOT_EXIST_CODE; +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 - * */ @Tag(name = "Alert Define API | 告警定义管理API") @RestController diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertDefinesController.java b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertDefinesController.java similarity index 96% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertDefinesController.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertDefinesController.java index b63d62dac24..f62ea286ae2 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertDefinesController.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertDefinesController.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.controller; +package org.apache.hertzbeat.alert.controller; -import org.dromara.hertzbeat.common.entity.alerter.AlertDefine; -import org.dromara.hertzbeat.alert.service.AlertDefineService; -import org.dromara.hertzbeat.common.entity.dto.Message; +import org.apache.hertzbeat.common.entity.alerter.AlertDefine; +import org.apache.hertzbeat.alert.service.AlertDefineService; +import org.apache.hertzbeat.common.entity.dto.Message; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -44,7 +44,6 @@ /** * Define the batch API for alarms - * */ @Tag(name = "Alert Define Batch API | 告警定义管理API") @RestController diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertReportController.java b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertReportController.java similarity index 90% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertReportController.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertReportController.java index 59e746d426d..106940a9e33 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertReportController.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertReportController.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.controller; +package org.apache.hertzbeat.alert.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.alert.dto.CloudAlertReportAbstract; -import org.dromara.hertzbeat.alert.dto.GeneralCloudAlertReport; -import org.dromara.hertzbeat.alert.enums.CloudServiceAlarmInformationEnum; -import org.dromara.hertzbeat.alert.service.AlertService; -import org.dromara.hertzbeat.common.entity.dto.AlertReport; -import org.dromara.hertzbeat.common.entity.dto.Message; -import org.dromara.hertzbeat.common.util.JsonUtil; +import org.apache.hertzbeat.alert.dto.CloudAlertReportAbstract; +import org.apache.hertzbeat.alert.dto.GeneralCloudAlertReport; +import org.apache.hertzbeat.alert.enums.CloudServiceAlarmInformationEnum; +import org.apache.hertzbeat.alert.service.AlertService; +import org.apache.hertzbeat.common.entity.dto.AlertReport; +import org.apache.hertzbeat.common.entity.dto.Message; +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.*; @@ -38,7 +38,6 @@ /** * Extern Alarm Manage API - * */ @Tag(name = "Extern Alarm Manage API | 第三方告警管理API") @RestController diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertSilenceController.java b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertSilenceController.java similarity index 90% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertSilenceController.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertSilenceController.java index 8e74b53695d..20c81871154 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertSilenceController.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertSilenceController.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.controller; +package org.apache.hertzbeat.alert.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import org.dromara.hertzbeat.alert.service.AlertSilenceService; -import org.dromara.hertzbeat.common.entity.alerter.AlertSilence; -import org.dromara.hertzbeat.common.entity.dto.Message; +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.*; @@ -30,12 +30,11 @@ import jakarta.validation.Valid; -import static org.dromara.hertzbeat.common.constants.CommonConstants.MONITOR_NOT_EXIST_CODE; +import static org.apache.hertzbeat.common.constants.CommonConstants.MONITOR_NOT_EXIST_CODE; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; /** * Alarm Silence management API - * */ @Tag(name = "Alert Silence API | 告警静默管理API") @RestController diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertSilencesController.java b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertSilencesController.java similarity index 95% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertSilencesController.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertSilencesController.java index 2f52573f90a..65b5c559c5b 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertSilencesController.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertSilencesController.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.controller; +package org.apache.hertzbeat.alert.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import org.dromara.hertzbeat.alert.service.AlertSilenceService; -import org.dromara.hertzbeat.common.entity.alerter.AlertSilence; -import org.dromara.hertzbeat.common.entity.dto.Message; +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.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -42,7 +42,6 @@ /** * Silence the batch API for alarms - * */ @Tag(name = "Alert Silence Batch API | 告警静默管理API") @RestController diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertsController.java b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertsController.java similarity index 96% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertsController.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertsController.java index e39f633149a..80847ee8a3c 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertsController.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertsController.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.controller; +package org.apache.hertzbeat.alert.controller; -import org.dromara.hertzbeat.alert.dto.AlertSummary; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.alert.service.AlertService; -import org.dromara.hertzbeat.common.entity.dto.Message; +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 io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -42,8 +42,6 @@ /** * Alarm Management API - * - * */ @Tag(name = "Alarm Manage Batch API | 告警批量管理API") @RestController diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/dao/AlertConvergeDao.java b/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertConvergeDao.java similarity index 91% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/dao/AlertConvergeDao.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertConvergeDao.java index bc5de2507ce..6b17f3110f7 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/dao/AlertConvergeDao.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertConvergeDao.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.dao; +package org.apache.hertzbeat.alert.dao; -import org.dromara.hertzbeat.common.entity.alerter.AlertConverge; +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; @@ -26,14 +26,11 @@ /** * AlertConverge Dao - * - * */ public interface AlertConvergeDao extends JpaRepository, JpaSpecificationExecutor { /** * Delete alarm converge based on the ID list - * * @param convergeIds alert converge id list */ @Modifying diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/dao/AlertDao.java b/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertDao.java similarity index 86% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/dao/AlertDao.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertDao.java index d9ac7cb5a9b..96a825297da 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/dao/AlertDao.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertDao.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.dao; +package org.apache.hertzbeat.alert.dao; -import org.dromara.hertzbeat.alert.dto.AlertPriorityNum; -import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.apache.hertzbeat.alert.dto.AlertPriorityNum; +import org.apache.hertzbeat.common.entity.alerter.Alert; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Modifying; @@ -30,7 +30,6 @@ /** * Alert Database Operations - * */ public interface AlertDao extends JpaRepository, JpaSpecificationExecutor { @@ -54,6 +53,6 @@ public interface AlertDao extends JpaRepository, JpaSpecificationEx * 查询各个告警级别的未处理告警数量 * @return List of alerts num */ - @Query("select new org.dromara.hertzbeat.alert.dto.AlertPriorityNum(mo.priority, count(mo.id)) from Alert mo where mo.status = 0 group by mo.priority") + @Query("select new org.apache.hertzbeat.alert.dto.AlertPriorityNum(mo.priority, count(mo.id)) from Alert mo where mo.status = 0 group by mo.priority") List findAlertPriorityNum(); } diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/dao/AlertDefineBindDao.java b/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertDefineBindDao.java similarity index 94% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/dao/AlertDefineBindDao.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertDefineBindDao.java index c6856ce6c1b..a6f8dad57dc 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/dao/AlertDefineBindDao.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertDefineBindDao.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.dao; +package org.apache.hertzbeat.alert.dao; -import org.dromara.hertzbeat.common.entity.alerter.AlertDefineMonitorBind; +import org.apache.hertzbeat.common.entity.alerter.AlertDefineMonitorBind; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; @@ -26,7 +26,6 @@ /** * AlertDefineBind database operations - * */ public interface AlertDefineBindDao extends JpaRepository, JpaSpecificationExecutor { diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/dao/AlertDefineDao.java b/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertDefineDao.java similarity index 96% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/dao/AlertDefineDao.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertDefineDao.java index 0c1f96dfc08..8364b330c90 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/dao/AlertDefineDao.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertDefineDao.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.dao; +package org.apache.hertzbeat.alert.dao; -import org.dromara.hertzbeat.common.entity.alerter.AlertDefine; +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; @@ -28,7 +28,6 @@ /** * AlertDefine Dao - * */ public interface AlertDefineDao extends JpaRepository, JpaSpecificationExecutor { diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/dao/AlertMonitorDao.java b/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertMonitorDao.java similarity index 91% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/dao/AlertMonitorDao.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertMonitorDao.java index 7ff493ae478..bf6e72949b2 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/dao/AlertMonitorDao.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertMonitorDao.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.dao; +package org.apache.hertzbeat.alert.dao; -import org.dromara.hertzbeat.common.entity.manager.Monitor; -import org.dromara.hertzbeat.common.entity.manager.Tag; +import org.apache.hertzbeat.common.entity.manager.Monitor; +import org.apache.hertzbeat.common.entity.manager.Tag; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Query; @@ -28,7 +28,6 @@ /** * Alert Monitor Dao - * */ public interface AlertMonitorDao extends JpaRepository, JpaSpecificationExecutor { diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/dao/AlertSilenceDao.java b/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertSilenceDao.java similarity index 92% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/dao/AlertSilenceDao.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertSilenceDao.java index 0ce7365f219..3e168dbf79b 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/dao/AlertSilenceDao.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/dao/AlertSilenceDao.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.dao; +package org.apache.hertzbeat.alert.dao; -import org.dromara.hertzbeat.common.entity.alerter.AlertSilence; +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; @@ -26,8 +26,6 @@ /** * AlertSilence Dao - * - * */ public interface AlertSilenceDao extends JpaRepository, JpaSpecificationExecutor { diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/dto/AlertPriorityNum.java b/alerter/src/main/java/org/apache/hertzbeat/alert/dto/AlertPriorityNum.java similarity index 96% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/dto/AlertPriorityNum.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/dto/AlertPriorityNum.java index 75a38fc93e8..8e85effa58f 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/dto/AlertPriorityNum.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/dto/AlertPriorityNum.java @@ -15,14 +15,13 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.dto; +package org.apache.hertzbeat.alert.dto; import lombok.AllArgsConstructor; import lombok.Data; /** * Number of monitoring level alarms - * */ @Data @AllArgsConstructor diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/dto/AlertSummary.java b/alerter/src/main/java/org/apache/hertzbeat/alert/dto/AlertSummary.java similarity index 98% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/dto/AlertSummary.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/dto/AlertSummary.java index a216b991b87..2fc14a4fb09 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/dto/AlertSummary.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/dto/AlertSummary.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.dto; +package org.apache.hertzbeat.alert.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -27,7 +27,6 @@ /** * Alarm Statistics Information - * */ @Data @AllArgsConstructor diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/dto/CloudAlertReportAbstract.java b/alerter/src/main/java/org/apache/hertzbeat/alert/dto/CloudAlertReportAbstract.java similarity index 90% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/dto/CloudAlertReportAbstract.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/dto/CloudAlertReportAbstract.java index 24dc59770b1..f3fba3e6133 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/dto/CloudAlertReportAbstract.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/dto/CloudAlertReportAbstract.java @@ -15,15 +15,16 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.dto; +package org.apache.hertzbeat.alert.dto; import com.fasterxml.jackson.annotation.JsonIgnore; +import org.apache.hertzbeat.common.entity.dto.AlertReport; import java.util.Map; /** * Abstract parent of cloud service alarm information - * {@link org.dromara.hertzbeat.common.entity.dto.AlertReport} - The method corresponds to the parameter of this class one by one. For details about the method, see this class + * {@link AlertReport} - The method corresponds to the parameter of this class one by one. For details about the method, see this class */ public abstract class CloudAlertReportAbstract { diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/dto/GeneralCloudAlertReport.java b/alerter/src/main/java/org/apache/hertzbeat/alert/dto/GeneralCloudAlertReport.java similarity index 93% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/dto/GeneralCloudAlertReport.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/dto/GeneralCloudAlertReport.java index 6d56788f42b..34b5dc9ddb3 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/dto/GeneralCloudAlertReport.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/dto/GeneralCloudAlertReport.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.dto; +package org.apache.hertzbeat.alert.dto; import lombok.*; import org.apache.commons.lang3.StringUtils; -import org.dromara.hertzbeat.alert.util.DateUtil; -import org.dromara.hertzbeat.common.entity.dto.AlertReport; +import org.apache.hertzbeat.alert.util.DateUtil; +import org.apache.hertzbeat.common.entity.dto.AlertReport; /** * Generic cloud alarm entity class diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/dto/TenCloudAlertReport.java b/alerter/src/main/java/org/apache/hertzbeat/alert/dto/TenCloudAlertReport.java similarity index 98% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/dto/TenCloudAlertReport.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/dto/TenCloudAlertReport.java index 136b7a0d851..25a396f634d 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/dto/TenCloudAlertReport.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/dto/TenCloudAlertReport.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.dto; +package org.apache.hertzbeat.alert.dto; import com.fasterxml.jackson.annotation.JsonProperty; @@ -24,7 +24,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.dromara.hertzbeat.alert.util.DateUtil; +import org.apache.hertzbeat.alert.util.DateUtil; import java.io.Serializable; import java.util.Map; diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/enums/CloudServiceAlarmInformationEnum.java b/alerter/src/main/java/org/apache/hertzbeat/alert/enums/CloudServiceAlarmInformationEnum.java similarity index 90% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/enums/CloudServiceAlarmInformationEnum.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/enums/CloudServiceAlarmInformationEnum.java index aa5db4d8f45..bb0e6d0169e 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/enums/CloudServiceAlarmInformationEnum.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/enums/CloudServiceAlarmInformationEnum.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.enums; +package org.apache.hertzbeat.alert.enums; import lombok.AllArgsConstructor; import lombok.Getter; -import org.dromara.hertzbeat.alert.dto.CloudAlertReportAbstract; -import org.dromara.hertzbeat.alert.dto.TenCloudAlertReport; +import org.apache.hertzbeat.alert.dto.CloudAlertReportAbstract; +import org.apache.hertzbeat.alert.dto.TenCloudAlertReport; import java.util.Arrays; diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/reduce/AlarmCommonReduce.java b/alerter/src/main/java/org/apache/hertzbeat/alert/reduce/AlarmCommonReduce.java similarity index 87% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/reduce/AlarmCommonReduce.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/reduce/AlarmCommonReduce.java index 45d8da7ed91..2da97519983 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/reduce/AlarmCommonReduce.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/reduce/AlarmCommonReduce.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.reduce; +package org.apache.hertzbeat.alert.reduce; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.alert.dao.AlertMonitorDao; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.Tag; -import org.dromara.hertzbeat.common.queue.CommonDataQueue; +import org.apache.hertzbeat.alert.dao.AlertMonitorDao; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.alerter.Alert; +import org.apache.hertzbeat.common.entity.manager.Tag; +import org.apache.hertzbeat.common.queue.CommonDataQueue; import org.springframework.stereotype.Service; import java.util.HashMap; @@ -32,8 +32,6 @@ /** * reduce alarm and send alert data - * - * */ @Service @RequiredArgsConstructor diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/reduce/AlarmConvergeReduce.java b/alerter/src/main/java/org/apache/hertzbeat/alert/reduce/AlarmConvergeReduce.java similarity index 93% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/reduce/AlarmConvergeReduce.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/reduce/AlarmConvergeReduce.java index 21f087201ae..6fd387f6f83 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/reduce/AlarmConvergeReduce.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/reduce/AlarmConvergeReduce.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.reduce; +package org.apache.hertzbeat.alert.reduce; -import org.dromara.hertzbeat.alert.dao.AlertConvergeDao; -import org.dromara.hertzbeat.common.cache.CacheFactory; -import org.dromara.hertzbeat.common.cache.CommonCacheService; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.alerter.AlertConverge; -import org.dromara.hertzbeat.common.entity.manager.TagItem; +import org.apache.hertzbeat.alert.dao.AlertConvergeDao; +import org.apache.hertzbeat.common.cache.CacheFactory; +import org.apache.hertzbeat.common.cache.CommonCacheService; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.alerter.Alert; +import org.apache.hertzbeat.common.entity.alerter.AlertConverge; +import org.apache.hertzbeat.common.entity.manager.TagItem; import org.springframework.stereotype.Service; import java.util.Arrays; @@ -34,8 +34,6 @@ /** * alarm converge - * - * */ @Service public class AlarmConvergeReduce { diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/reduce/AlarmSilenceReduce.java b/alerter/src/main/java/org/apache/hertzbeat/alert/reduce/AlarmSilenceReduce.java similarity index 91% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/reduce/AlarmSilenceReduce.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/reduce/AlarmSilenceReduce.java index 58a0e3c4e0e..ab82daae892 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/reduce/AlarmSilenceReduce.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/reduce/AlarmSilenceReduce.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.reduce; +package org.apache.hertzbeat.alert.reduce; import lombok.RequiredArgsConstructor; -import org.dromara.hertzbeat.alert.dao.AlertSilenceDao; -import org.dromara.hertzbeat.common.cache.CacheFactory; -import org.dromara.hertzbeat.common.cache.CommonCacheService; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.alerter.AlertSilence; -import org.dromara.hertzbeat.common.entity.manager.TagItem; +import org.apache.hertzbeat.alert.dao.AlertSilenceDao; +import org.apache.hertzbeat.common.cache.CacheFactory; +import org.apache.hertzbeat.common.cache.CommonCacheService; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.alerter.Alert; +import org.apache.hertzbeat.common.entity.alerter.AlertSilence; +import org.apache.hertzbeat.common.entity.manager.TagItem; import org.springframework.stereotype.Service; import java.time.LocalDateTime; @@ -35,8 +35,6 @@ /** * silence alarm - * - * */ @Service @RequiredArgsConstructor @@ -46,7 +44,6 @@ public class AlarmSilenceReduce { /** * alert silence filter data - * * @param alert alert * @return true when not filter */ diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/service/AlertConvergeService.java b/alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertConvergeService.java similarity index 94% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/service/AlertConvergeService.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertConvergeService.java index e446b5bf867..3e24c151d29 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/service/AlertConvergeService.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertConvergeService.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.service; +package org.apache.hertzbeat.alert.service; -import org.dromara.hertzbeat.common.entity.alerter.AlertConverge; +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; @@ -26,13 +26,10 @@ /** * management interface service for alert converge - * - * */ public interface AlertConvergeService { /** * Verify the correctness of the request data parameters - * * @param alertConverge AlertConverge * @param isModify whether modify * @throws IllegalArgumentException A checksum parameter error is thrown @@ -41,7 +38,6 @@ public interface AlertConvergeService { /** * New AlertConverge - * * @param alertConverge AlertConverge Entity * @throws RuntimeException Added procedure exception throwing */ @@ -49,7 +45,6 @@ public interface AlertConvergeService { /** * Modifying an AlertConverge - * * @param alertConverge Alarm definition Entity * @throws RuntimeException Exception thrown during modification */ @@ -57,7 +52,6 @@ public interface AlertConvergeService { /** * Obtain AlertConverge information - * * @param convergeId AlertConverge ID * @return AlertConverge * @throws RuntimeException An exception was thrown during the query @@ -67,7 +61,6 @@ public interface AlertConvergeService { /** * Delete AlertConverge in batches - * * @param convergeIds AlertConverge IDs * @throws RuntimeException Exception thrown during deletion */ @@ -75,7 +68,6 @@ public interface AlertConvergeService { /** * Dynamic conditional query - * * @param specification Query conditions * @param pageRequest Paging parameters * @return The query results diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/service/AlertDefineImExportService.java b/alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertDefineImExportService.java similarity index 91% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/service/AlertDefineImExportService.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertDefineImExportService.java index 2e138cb0005..85c116cf1e4 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/service/AlertDefineImExportService.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertDefineImExportService.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.service; +package org.apache.hertzbeat.alert.service; import java.io.InputStream; import java.io.OutputStream; @@ -24,16 +24,11 @@ /** * Configuration Import Export - * 配置导入导出 - * - * - * Created by a-little-fool on 2023/12/25 */ public interface AlertDefineImExportService { /** * Import Configuration * 导入配置 - * * @param is 输入流 */ void importConfig(InputStream is); @@ -41,7 +36,6 @@ public interface AlertDefineImExportService { /** * Export Configuration * 导出配置 - * * @param os 输出流 * @param configList 配置列表 */ @@ -50,7 +44,6 @@ public interface AlertDefineImExportService { /** * Export file type * 导出文件类型 - * * @return 文件类型 */ String type(); @@ -58,7 +51,6 @@ public interface AlertDefineImExportService { /** * Get Export File Name * 获取导出文件名 - * * @return 文件名 */ String getFileName(); diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/service/AlertDefineService.java b/alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertDefineService.java similarity index 96% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/service/AlertDefineService.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertDefineService.java index eb68b724d4c..fa5427345ce 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/service/AlertDefineService.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertDefineService.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.service; +package org.apache.hertzbeat.alert.service; -import org.dromara.hertzbeat.common.entity.alerter.AlertDefine; -import org.dromara.hertzbeat.common.entity.alerter.AlertDefineMonitorBind; +import org.apache.hertzbeat.common.entity.alerter.AlertDefine; +import org.apache.hertzbeat.common.entity.alerter.AlertDefineMonitorBind; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.jpa.domain.Specification; @@ -31,7 +31,6 @@ /** * Alarm define manager service - * */ public interface AlertDefineService { diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/service/AlertService.java b/alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertService.java similarity index 92% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/service/AlertService.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertService.java index 0fe77ddbee3..b8df04eafb7 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/service/AlertService.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertService.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.service; +package org.apache.hertzbeat.alert.service; -import org.dromara.hertzbeat.alert.dto.AlertSummary; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.dto.AlertReport; +import org.apache.hertzbeat.alert.dto.AlertSummary; +import org.apache.hertzbeat.common.entity.alerter.Alert; +import org.apache.hertzbeat.common.entity.dto.AlertReport; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.jpa.domain.Specification; @@ -29,7 +29,6 @@ /** * Alarm information management interface - * */ public interface AlertService { diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/service/AlertSilenceService.java b/alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertSilenceService.java similarity index 94% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/service/AlertSilenceService.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertSilenceService.java index b800c9684b8..1703edb8480 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/service/AlertSilenceService.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertSilenceService.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.service; +package org.apache.hertzbeat.alert.service; -import org.dromara.hertzbeat.common.entity.alerter.AlertSilence; +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; @@ -26,13 +26,10 @@ /** * management interface service for alert silence - * - * */ public interface AlertSilenceService { /** * Verify the correctness of the request data parameters - * * @param alertSilence AlertSilence * @param isModify whether modify * @throws IllegalArgumentException A checksum parameter error is thrown @@ -41,7 +38,6 @@ public interface AlertSilenceService { /** * New AlertSilence - * * @param alertSilence AlertSilence Entity * @throws RuntimeException Added procedure exception throwing */ @@ -49,7 +45,6 @@ public interface AlertSilenceService { /** * Modifying an AlertSilence - * * @param alertSilence Alarm definition Entity * @throws RuntimeException Exception thrown during modification */ @@ -57,7 +52,6 @@ public interface AlertSilenceService { /** * Obtain AlertSilence information - * * @param silenceId AlertSilence ID * @return AlertSilence * @throws RuntimeException An exception was thrown during the query @@ -67,7 +61,6 @@ public interface AlertSilenceService { /** * Delete AlertSilence in batches - * * @param silenceIds AlertSilence IDs * @throws RuntimeException Exception thrown during deletion */ @@ -75,7 +68,6 @@ public interface AlertSilenceService { /** * Dynamic conditional query - * * @param specification Query conditions * @param pageRequest Paging parameters * @return The query results diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertConvergeServiceImpl.java b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertConvergeServiceImpl.java similarity index 85% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertConvergeServiceImpl.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertConvergeServiceImpl.java index 6e8ca86104e..c02f56710aa 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertConvergeServiceImpl.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertConvergeServiceImpl.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.service.impl; +package org.apache.hertzbeat.alert.service.impl; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.alert.dao.AlertConvergeDao; -import org.dromara.hertzbeat.alert.service.AlertConvergeService; -import org.dromara.hertzbeat.common.cache.CacheFactory; -import org.dromara.hertzbeat.common.cache.CommonCacheService; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.alerter.AlertConverge; +import org.apache.hertzbeat.alert.dao.AlertConvergeDao; +import org.apache.hertzbeat.alert.service.AlertConvergeService; +import org.apache.hertzbeat.common.cache.CacheFactory; +import org.apache.hertzbeat.common.cache.CommonCacheService; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.alerter.AlertConverge; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -35,7 +35,6 @@ /** * implement for alert converge service - * */ @Service @Transactional(rollbackFor = Exception.class) @@ -43,7 +42,7 @@ public class AlertConvergeServiceImpl implements AlertConvergeService { @Autowired - private AlertConvergeDao alertConvergeDao; + private AlertConvergeDao alertConvergeDao; @Override public void validate(AlertConverge alertConverge, boolean isModify) throws IllegalArgumentException { diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertDefineAbstractImExportServiceImpl.java b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineAbstractImExportServiceImpl.java similarity index 92% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertDefineAbstractImExportServiceImpl.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineAbstractImExportServiceImpl.java index a396dd8d1fd..9fb28707809 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertDefineAbstractImExportServiceImpl.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineAbstractImExportServiceImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.service.impl; +package org.apache.hertzbeat.alert.service.impl; import cn.afterturn.easypoi.excel.annotation.Excel; @@ -24,10 +24,10 @@ import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.alert.service.AlertDefineImExportService; -import org.dromara.hertzbeat.alert.service.AlertDefineService; -import org.dromara.hertzbeat.common.entity.alerter.AlertDefine; -import org.dromara.hertzbeat.common.entity.manager.TagItem; +import org.apache.hertzbeat.alert.service.AlertDefineImExportService; +import org.apache.hertzbeat.alert.service.AlertDefineService; +import org.apache.hertzbeat.common.entity.alerter.AlertDefine; +import org.apache.hertzbeat.common.entity.manager.TagItem; import org.springframework.beans.BeanUtils; import org.springframework.context.annotation.Lazy; import org.springframework.util.CollectionUtils; @@ -41,10 +41,6 @@ /** * Configuration Import Export - * 配置导入导出 - * - * - * Created by a-little-fool on 2023/12/25 */ @Slf4j public abstract class AlertDefineAbstractImExportServiceImpl implements AlertDefineImExportService { @@ -87,8 +83,6 @@ public void exportConfig(OutputStream os, List configList) { /** * Export Configuration to Output Stream - * 导出配置到输出流 - * * @param exportAlertDefineList 配置列表 * @param os 输出流 */ diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertDefineExcelImExportServiceImpl.java b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineExcelImExportServiceImpl.java similarity index 96% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertDefineExcelImExportServiceImpl.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineExcelImExportServiceImpl.java index 16a0cf7d221..7542996922e 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertDefineExcelImExportServiceImpl.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineExcelImExportServiceImpl.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.service.impl; +package org.apache.hertzbeat.alert.service.impl; import com.fasterxml.jackson.core.type.TypeReference; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.*; -import org.dromara.hertzbeat.common.entity.manager.TagItem; -import org.dromara.hertzbeat.common.util.JsonUtil; +import org.apache.hertzbeat.common.entity.manager.TagItem; +import org.apache.hertzbeat.common.util.JsonUtil; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; @@ -33,10 +33,6 @@ /** * Configure the import and export EXCEL format - * 配置导入导出 EXCEL格式 - * - * - * Created by a-little-fool on 2023/12/25 */ @Slf4j @Service @@ -46,8 +42,6 @@ public class AlertDefineExcelImExportServiceImpl extends AlertDefineAbstractImEx /** * Export file type - * 导出文件类型 - * * @return 文件类型 */ @Override @@ -57,8 +51,6 @@ public String type() { /** * Get Export File Name - * 获取导出文件名 - * * @return 文件名 */ @Override @@ -69,8 +61,6 @@ public String getFileName() { /** * Parsing an input stream into a form - * 将输入流解析为表单 - * * @param is 输入流 * @return 表单 */ @@ -184,8 +174,6 @@ private AlertDefineDTO extractAlertDefineDataFromRow(Row row) { /** * Export Configuration to Output Stream - * 导出配置到输出流 - * * @param exportAlertDefineList 配置列表 * @param os 输出流 */ diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertDefineJsonImExportServiceImpl.java b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineJsonImExportServiceImpl.java similarity index 94% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertDefineJsonImExportServiceImpl.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineJsonImExportServiceImpl.java index 097d8f83730..4b0a23bf374 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertDefineJsonImExportServiceImpl.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineJsonImExportServiceImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.service.impl; +package org.apache.hertzbeat.alert.service.impl; import com.fasterxml.jackson.core.type.TypeReference; @@ -32,10 +32,6 @@ /** * Configure the import and export JSON format - * 配置导入导出 JSON格式 - * - * - * Created by a-little-fool on 2023/12/25 */ @Slf4j @RequiredArgsConstructor diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertDefineServiceImpl.java b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineServiceImpl.java similarity index 94% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertDefineServiceImpl.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineServiceImpl.java index 2c107098dba..d8ba1dd5a9f 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertDefineServiceImpl.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineServiceImpl.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.service.impl; +package org.apache.hertzbeat.alert.service.impl; import com.googlecode.aviator.AviatorEvaluator; -import org.dromara.hertzbeat.alert.dao.AlertDefineBindDao; -import org.dromara.hertzbeat.alert.dao.AlertDefineDao; -import org.dromara.hertzbeat.alert.service.AlertDefineImExportService; -import org.dromara.hertzbeat.common.entity.alerter.AlertDefine; -import org.dromara.hertzbeat.common.entity.alerter.AlertDefineMonitorBind; -import org.dromara.hertzbeat.alert.service.AlertDefineService; +import org.apache.hertzbeat.alert.dao.AlertDefineBindDao; +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; @@ -43,7 +43,6 @@ /** * Alarm definition management interface implementation - * */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertDefineYamlImExportServiceImpl.java b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineYamlImExportServiceImpl.java similarity index 94% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertDefineYamlImExportServiceImpl.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineYamlImExportServiceImpl.java index ca7a17be1d9..2d162d67053 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertDefineYamlImExportServiceImpl.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineYamlImExportServiceImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.service.impl; +package org.apache.hertzbeat.alert.service.impl; import lombok.extern.slf4j.Slf4j; @@ -32,10 +32,6 @@ /** * Configure the import and export Yaml format - * 配置导入导出 Yaml格式 - * - * - * Created by a-little-fool on 2023/12/25 */ @Slf4j @Service diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertServiceImpl.java b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertServiceImpl.java similarity index 91% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertServiceImpl.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertServiceImpl.java index 4923d9d897a..ec6ebb56d1f 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertServiceImpl.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertServiceImpl.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.service.impl; - -import org.dromara.hertzbeat.alert.reduce.AlarmCommonReduce; -import org.dromara.hertzbeat.alert.dao.AlertDao; -import org.dromara.hertzbeat.alert.dto.AlertPriorityNum; -import org.dromara.hertzbeat.alert.dto.AlertSummary; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.alert.service.AlertService; -import org.dromara.hertzbeat.common.entity.dto.AlertReport; -import org.dromara.hertzbeat.common.constants.CommonConstants; +package org.apache.hertzbeat.alert.service.impl; + +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.service.AlertService; +import org.apache.hertzbeat.common.entity.dto.AlertReport; +import org.apache.hertzbeat.common.constants.CommonConstants; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; @@ -44,7 +44,6 @@ /** * Realization of Alarm Information Service - * */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertSilenceServiceImpl.java b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertSilenceServiceImpl.java similarity index 88% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertSilenceServiceImpl.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertSilenceServiceImpl.java index 71b21d83075..c171a6072dd 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertSilenceServiceImpl.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertSilenceServiceImpl.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.service.impl; +package org.apache.hertzbeat.alert.service.impl; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.alert.dao.AlertSilenceDao; -import org.dromara.hertzbeat.alert.service.AlertSilenceService; -import org.dromara.hertzbeat.common.cache.CacheFactory; -import org.dromara.hertzbeat.common.cache.CommonCacheService; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.alerter.AlertSilence; +import org.apache.hertzbeat.alert.dao.AlertSilenceDao; +import org.apache.hertzbeat.alert.service.AlertSilenceService; +import org.apache.hertzbeat.common.cache.CacheFactory; +import org.apache.hertzbeat.common.cache.CommonCacheService; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.alerter.AlertSilence; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -36,8 +36,6 @@ /** * management interface service implement for alert silence - * - * */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/util/AlertTemplateUtil.java b/alerter/src/main/java/org/apache/hertzbeat/alert/util/AlertTemplateUtil.java similarity index 97% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/util/AlertTemplateUtil.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/util/AlertTemplateUtil.java index 0060be3e152..fe5feaf9c04 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/util/AlertTemplateUtil.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/util/AlertTemplateUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.util; +package org.apache.hertzbeat.alert.util; import lombok.extern.slf4j.Slf4j; @@ -26,7 +26,6 @@ /** * Alarm template keyword matching replacement engine tool * 告警模版关键字匹配替换引擎工具 - * */ @Slf4j public class AlertTemplateUtil { diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/util/DateUtil.java b/alerter/src/main/java/org/apache/hertzbeat/alert/util/DateUtil.java similarity index 97% rename from alerter/src/main/java/org/dromara/hertzbeat/alert/util/DateUtil.java rename to alerter/src/main/java/org/apache/hertzbeat/alert/util/DateUtil.java index 513d77e1709..5d2801f3eb2 100644 --- a/alerter/src/main/java/org/dromara/hertzbeat/alert/util/DateUtil.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/util/DateUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.util; +package org.apache.hertzbeat.alert.util; import lombok.extern.slf4j.Slf4j; diff --git a/alerter/src/main/resources/META-INF/spring.factories b/alerter/src/main/resources/META-INF/spring.factories index 1bab83e6acc..35a92d63018 100644 --- a/alerter/src/main/resources/META-INF/spring.factories +++ b/alerter/src/main/resources/META-INF/spring.factories @@ -14,4 +14,4 @@ # limitations under the License. org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.dromara.hertzbeat.alert.config.AlerterAutoConfiguration \ No newline at end of file +org.apache.hertzbeat.alert.config.AlerterAutoConfiguration \ No newline at end of file diff --git a/alerter/src/test/java/org/dromara/hertzbeat/alert/AlerterWorkerPoolTest.java b/alerter/src/test/java/org/apache/hertzbeat/alert/AlerterWorkerPoolTest.java similarity index 97% rename from alerter/src/test/java/org/dromara/hertzbeat/alert/AlerterWorkerPoolTest.java rename to alerter/src/test/java/org/apache/hertzbeat/alert/AlerterWorkerPoolTest.java index a81069d885a..1d4a1de6005 100644 --- a/alerter/src/test/java/org/dromara/hertzbeat/alert/AlerterWorkerPoolTest.java +++ b/alerter/src/test/java/org/apache/hertzbeat/alert/AlerterWorkerPoolTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert; +package org.apache.hertzbeat.alert; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/alerter/src/test/java/org/dromara/hertzbeat/alert/controller/AlertDefineControllerTest.java b/alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertDefineControllerTest.java similarity index 94% rename from alerter/src/test/java/org/dromara/hertzbeat/alert/controller/AlertDefineControllerTest.java rename to alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertDefineControllerTest.java index f3ef8ce7acc..556763a3406 100644 --- a/alerter/src/test/java/org/dromara/hertzbeat/alert/controller/AlertDefineControllerTest.java +++ b/alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertDefineControllerTest.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.controller; - -import org.dromara.hertzbeat.alert.service.impl.AlertDefineServiceImpl; -import org.dromara.hertzbeat.common.entity.alerter.AlertDefine; -import org.dromara.hertzbeat.common.entity.alerter.AlertDefineMonitorBind; -import org.dromara.hertzbeat.common.entity.manager.Monitor; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.util.JsonUtil; +package org.apache.hertzbeat.alert.controller; + +import org.apache.hertzbeat.alert.service.impl.AlertDefineServiceImpl; +import org.apache.hertzbeat.common.entity.alerter.AlertDefine; +import org.apache.hertzbeat.common.entity.alerter.AlertDefineMonitorBind; +import org.apache.hertzbeat.common.entity.manager.Monitor; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.util.JsonUtil; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/alerter/src/test/java/org/dromara/hertzbeat/alert/controller/AlertDefinesControllerTest.java b/alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertDefinesControllerTest.java similarity index 93% rename from alerter/src/test/java/org/dromara/hertzbeat/alert/controller/AlertDefinesControllerTest.java rename to alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertDefinesControllerTest.java index 25ab5340972..58532f2562e 100644 --- a/alerter/src/test/java/org/dromara/hertzbeat/alert/controller/AlertDefinesControllerTest.java +++ b/alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertDefinesControllerTest.java @@ -15,25 +15,22 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.controller; +package org.apache.hertzbeat.alert.controller; -import org.dromara.hertzbeat.alert.service.AlertDefineService; -import org.dromara.hertzbeat.common.entity.alerter.AlertDefine; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.util.JsonUtil; +import org.apache.hertzbeat.alert.service.AlertDefineService; +import org.apache.hertzbeat.common.entity.alerter.AlertDefine; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.util.JsonUtil; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.ArgumentMatcher; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; -import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; -import org.springframework.data.jpa.domain.Specification; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; diff --git a/alerter/src/test/java/org/dromara/hertzbeat/alert/controller/AlertReportControllerTest.java b/alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertReportControllerTest.java similarity index 93% rename from alerter/src/test/java/org/dromara/hertzbeat/alert/controller/AlertReportControllerTest.java rename to alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertReportControllerTest.java index 45ef092542d..b4cf822e6fe 100644 --- a/alerter/src/test/java/org/dromara/hertzbeat/alert/controller/AlertReportControllerTest.java +++ b/alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertReportControllerTest.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.controller; +package org.apache.hertzbeat.alert.controller; -import org.dromara.hertzbeat.alert.dto.GeneralCloudAlertReport; -import org.dromara.hertzbeat.alert.dto.TenCloudAlertReport; -import org.dromara.hertzbeat.alert.service.AlertService; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.util.JsonUtil; +import org.apache.hertzbeat.alert.dto.GeneralCloudAlertReport; +import org.apache.hertzbeat.alert.dto.TenCloudAlertReport; +import org.apache.hertzbeat.alert.service.AlertService; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.util.JsonUtil; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/alerter/src/test/java/org/dromara/hertzbeat/alert/controller/AlertsControllerTest.java b/alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertsControllerTest.java similarity index 93% rename from alerter/src/test/java/org/dromara/hertzbeat/alert/controller/AlertsControllerTest.java rename to alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertsControllerTest.java index d7020239f5f..9fff9255682 100644 --- a/alerter/src/test/java/org/dromara/hertzbeat/alert/controller/AlertsControllerTest.java +++ b/alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertsControllerTest.java @@ -15,14 +15,12 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.controller; - -import org.dromara.hertzbeat.alert.dto.AlertSummary; -import org.dromara.hertzbeat.alert.service.AlertService; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.dto.AlertReport; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.util.JsonUtil; +package org.apache.hertzbeat.alert.controller; + +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.constants.CommonConstants; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -35,7 +33,6 @@ import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; -import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.springframework.test.web.servlet.setup.MockMvcBuilders; diff --git a/alerter/src/test/java/org/dromara/hertzbeat/alert/service/AlertDefineServiceTest.java b/alerter/src/test/java/org/apache/hertzbeat/alert/service/AlertDefineServiceTest.java similarity index 94% rename from alerter/src/test/java/org/dromara/hertzbeat/alert/service/AlertDefineServiceTest.java rename to alerter/src/test/java/org/apache/hertzbeat/alert/service/AlertDefineServiceTest.java index 39a97cceec1..acbc20dc81c 100644 --- a/alerter/src/test/java/org/dromara/hertzbeat/alert/service/AlertDefineServiceTest.java +++ b/alerter/src/test/java/org/apache/hertzbeat/alert/service/AlertDefineServiceTest.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.service; - -import org.dromara.hertzbeat.alert.dao.AlertDefineBindDao; -import org.dromara.hertzbeat.alert.dao.AlertDefineDao; -import org.dromara.hertzbeat.alert.service.impl.AlertDefineServiceImpl; -import org.dromara.hertzbeat.common.entity.alerter.AlertDefine; -import org.dromara.hertzbeat.common.entity.alerter.AlertDefineMonitorBind; -import org.dromara.hertzbeat.common.entity.manager.Monitor; +package org.apache.hertzbeat.alert.service; + +import org.apache.hertzbeat.alert.dao.AlertDefineBindDao; +import org.apache.hertzbeat.alert.dao.AlertDefineDao; +import org.apache.hertzbeat.alert.service.impl.AlertDefineServiceImpl; +import org.apache.hertzbeat.common.entity.alerter.AlertDefine; +import org.apache.hertzbeat.common.entity.alerter.AlertDefineMonitorBind; +import org.apache.hertzbeat.common.entity.manager.Monitor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/alerter/src/test/java/org/dromara/hertzbeat/alert/service/AlertServiceTest.java b/alerter/src/test/java/org/apache/hertzbeat/alert/service/AlertServiceTest.java similarity index 96% rename from alerter/src/test/java/org/dromara/hertzbeat/alert/service/AlertServiceTest.java rename to alerter/src/test/java/org/apache/hertzbeat/alert/service/AlertServiceTest.java index 0b9e5f8649d..d32352e31cf 100644 --- a/alerter/src/test/java/org/dromara/hertzbeat/alert/service/AlertServiceTest.java +++ b/alerter/src/test/java/org/apache/hertzbeat/alert/service/AlertServiceTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.service; +package org.apache.hertzbeat.alert.service; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/alerter/src/test/java/org/dromara/hertzbeat/alert/util/AlertTemplateUtilTest.java b/alerter/src/test/java/org/apache/hertzbeat/alert/util/AlertTemplateUtilTest.java similarity index 98% rename from alerter/src/test/java/org/dromara/hertzbeat/alert/util/AlertTemplateUtilTest.java rename to alerter/src/test/java/org/apache/hertzbeat/alert/util/AlertTemplateUtilTest.java index e764c803e2d..22862b504e2 100644 --- a/alerter/src/test/java/org/dromara/hertzbeat/alert/util/AlertTemplateUtilTest.java +++ b/alerter/src/test/java/org/apache/hertzbeat/alert/util/AlertTemplateUtilTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.alert.util; +package org.apache.hertzbeat.alert.util; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/collector/README.md b/collector/README.md deleted file mode 100644 index 47d9b7247ad..00000000000 --- a/collector/README.md +++ /dev/null @@ -1,56 +0,0 @@ -### Collector - -Collect Metrics Data from peer-to-peer machine by common protocols. -使用通用协议远程采集获取对端指标数据。 - -support protocols：http/https, jdbc, ssh, telnet, jmx, ping, prometheus... - -## Supported - -> We define all monitoring collection types such as `mysql`, `jvm`, and `k8s` as `YML` monitoring templates, allowing users to import them to support corresponding types of monitoring. -> Welcome everyone to contribute your customized general monitoring type YML template during use. - - -- [Website](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-website.yml), [Port Telnet](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-port.yml), - [Http Api](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-api.yml), [Ping Connect](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-ping.yml), - [Jvm](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-jvm.yml), [SiteMap](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-fullsite.yml), - [Ssl Certificate](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-ssl_cert.yml), [SpringBoot2](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-springboot2.yml), - [FTP Server](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-ftp.yml), [SpringBoot3](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-springboot3.yml) -- [Mysql](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-mysql.yml), [PostgreSQL](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-postgresql.yml), - [MariaDB](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-mariadb.yml), [Redis](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-redis.yml), - [ElasticSearch](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-elasticsearch.yml), [SqlServer](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-sqlserver.yml), - [Oracle](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-oracle.yml), [MongoDB](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-mongodb.yml), - [DM](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-dm.yml), [OpenGauss](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-opengauss.yml), - [ClickHouse](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-clickhouse.yml), [IoTDB](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-iotdb.yml), - [Redis Cluster](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-redis_cluster.yml), [Redis Sentinel](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-redis_sentinel.yml) -- [Linux](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-linux.yml), [Ubuntu](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-ubuntu.yml), - [CentOS](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-centos.yml), [Windows](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-windows.yml), - [EulerOS](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-euleros.yml), [Fedora CoreOS](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-coreos.yml), - [OpenSUSE](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-opensuse.yml), [Rocky Linux](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-rockylinux.yml), - [Red Hat](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-redhat.yml), [FreeBSD](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-freebsd.yml), - [AlmaLinux](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-almalinux.yml), [Debian Linux](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-debian.yml) -- [Tomcat](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-tomcat.yml), [Nacos](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-nacos.yml), - [Zookeeper](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-zookeeper.yml), [RabbitMQ](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-rabbitmq.yml), - [Flink](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-flink.yml), [Kafka](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-kafka.yml), - [ShenYu](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-shenyu.yml), [DynamicTp](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-dynamic_tp.yml), - [Jetty](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-jetty.yml), [ActiveMQ](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-activemq.yml) -- [Kubernetes](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-kubernetes.yml), [Docker](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-docker.yml) -- [CiscoSwitch](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-cisco_switch.yml), [HpeSwitch](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-hpe_switch.yml), - [HuaweiSwitch](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-huawei_switch.yml), [TpLinkSwitch](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-tplink_switch.yml), - [H3cSwitch](https://raw.githubusercontent.com/dromara/hertzbeat/master/manager/src/main/resources/define/app-h3c_switch.yml) -- And More Your Custom Template. -- Notified Support `Discord` `Slack` `Telegram` `Email` `DingDing` `WeChat` `FeiShu` `Webhook` `SMS`. - -## Build HertzBeat Collector Install Package - -1. Execute command in root - -```mvn clean install``` - -2. Execute command in collector module - -```shell -cd collector - -mvn clean package -Pcluster -``` diff --git a/collector/pom.xml b/collector/pom.xml index 3bee315d608..33ef7c40583 100644 --- a/collector/pom.xml +++ b/collector/pom.xml @@ -19,7 +19,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> hertzbeat - org.dromara.hertzbeat + org.apache.hertzbeat 2.0-SNAPSHOT 4.0.0 @@ -51,12 +51,12 @@ - org.dromara.hertzbeat + org.apache.hertzbeat hertzbeat-common - org.dromara.hertzbeat + org.apache.hertzbeat hertzbeat-remoting @@ -263,7 +263,7 @@ false - org.dromara.hertzbeat.collector.Collector + org.apache.hertzbeat.collector.Collector false true diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/Collector.java b/collector/src/main/java/org/apache/hertzbeat/collector/Collector.java similarity index 89% rename from collector/src/main/java/org/dromara/hertzbeat/collector/Collector.java rename to collector/src/main/java/org/apache/hertzbeat/collector/Collector.java index 6f6d7f2245c..4d5f2ae6de1 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/Collector.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/Collector.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector; +package org.apache.hertzbeat.collector; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -26,10 +26,9 @@ /** * collector startup - * */ -@ComponentScan(basePackages = {"org.dromara.hertzbeat"}) -@ConfigurationPropertiesScan(basePackages = {"org.dromara.hertzbeat"}) +@ComponentScan(basePackages = {"org.apache.hertzbeat"}) +@ConfigurationPropertiesScan(basePackages = {"org.apache.hertzbeat"}) @SpringBootApplication public class Collector { public static void main(String[] args) { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/AbstractCollect.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/AbstractCollect.java similarity index 89% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/AbstractCollect.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/AbstractCollect.java index 63f3df08cf7..07bbf66426a 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/AbstractCollect.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/AbstractCollect.java @@ -15,15 +15,14 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect; +package org.apache.hertzbeat.collector.collect; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.entity.job.Metrics; +import org.apache.hertzbeat.common.entity.message.CollectRep; /** * Specific metrics collection implementation abstract class - * */ public abstract class AbstractCollect { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/CacheCloseable.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/CacheCloseable.java similarity index 90% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/CacheCloseable.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/CacheCloseable.java index d51d53d00a8..7e6fbdd93ef 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/CacheCloseable.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/CacheCloseable.java @@ -15,11 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.common.cache; +package org.apache.hertzbeat.collector.collect.common.cache; /** - * resource in cache remove callback - * + * resource in cache remove callback */ public interface CacheCloseable { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/CacheIdentifier.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/CacheIdentifier.java similarity index 95% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/CacheIdentifier.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/CacheIdentifier.java index 7e838fd705e..733f7e058ee 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/CacheIdentifier.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/CacheIdentifier.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.common.cache; +package org.apache.hertzbeat.collector.collect.common.cache; import lombok.Builder; import lombok.Data; @@ -24,7 +24,6 @@ /** * resource identifier in cache - * */ @Data @Builder diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/ConnectionCommonCache.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/ConnectionCommonCache.java similarity index 99% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/ConnectionCommonCache.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/ConnectionCommonCache.java index cb89770fb10..ac96988bdeb 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/ConnectionCommonCache.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/ConnectionCommonCache.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.common.cache; +package org.apache.hertzbeat.collector.collect.common.cache; import com.google.common.util.concurrent.ThreadFactoryBuilder; @@ -28,8 +28,6 @@ /** * lru common resource cache for client-server connection - * - * */ @Slf4j public class ConnectionCommonCache { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/JdbcConnect.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/JdbcConnect.java similarity index 95% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/JdbcConnect.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/JdbcConnect.java index 05aec3cb6ee..4825ad218fa 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/JdbcConnect.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/JdbcConnect.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.common.cache; +package org.apache.hertzbeat.collector.collect.common.cache; import lombok.extern.slf4j.Slf4j; @@ -23,7 +23,6 @@ /** * jdbc common connection - * */ @Slf4j public class JdbcConnect implements CacheCloseable { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/JmxConnect.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/JmxConnect.java similarity index 95% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/JmxConnect.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/JmxConnect.java index 1cc7ed91597..97a4f256690 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/JmxConnect.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/JmxConnect.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.common.cache; +package org.apache.hertzbeat.collector.collect.common.cache; import lombok.extern.slf4j.Slf4j; @@ -23,7 +23,6 @@ /** * jmx connect object - * **/ @Slf4j public class JmxConnect implements CacheCloseable { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/MongodbConnect.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/MongodbConnect.java similarity index 95% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/MongodbConnect.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/MongodbConnect.java index 5e27ef8ae6b..2194aefa9a8 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/MongodbConnect.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/MongodbConnect.java @@ -15,14 +15,13 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.common.cache; +package org.apache.hertzbeat.collector.collect.common.cache; import com.mongodb.client.MongoClient; import lombok.extern.slf4j.Slf4j; /** * mongodb connect client - * */ @Slf4j public class MongodbConnect implements CacheCloseable { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/RedisConnect.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/RedisConnect.java similarity index 95% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/RedisConnect.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/RedisConnect.java index 420bbb868f0..58ec840f050 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/RedisConnect.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/RedisConnect.java @@ -15,14 +15,13 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.common.cache; +package org.apache.hertzbeat.collector.collect.common.cache; import io.lettuce.core.api.StatefulConnection; import lombok.extern.slf4j.Slf4j; /** * redis connection - * */ @Slf4j public class RedisConnect implements CacheCloseable { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/SshConnect.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/SshConnect.java similarity index 95% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/SshConnect.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/SshConnect.java index 648ea0334f4..be7ea9acaf2 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/cache/SshConnect.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/SshConnect.java @@ -15,14 +15,13 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.common.cache; +package org.apache.hertzbeat.collector.collect.common.cache; import lombok.extern.slf4j.Slf4j; import org.apache.sshd.client.session.ClientSession; /** * ssh connection holder - * */ @Slf4j public class SshConnect implements CacheCloseable { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/http/CommonHttpClient.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/http/CommonHttpClient.java similarity index 99% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/http/CommonHttpClient.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/common/http/CommonHttpClient.java index df46203023a..f37ebbfcf79 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/http/CommonHttpClient.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/http/CommonHttpClient.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.common.http; +package org.apache.hertzbeat.collector.collect.common.http; import com.google.common.util.concurrent.ThreadFactoryBuilder; import lombok.extern.slf4j.Slf4j; @@ -45,7 +45,6 @@ /** * common http client - * */ @Slf4j public class CommonHttpClient { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/ssh/CommonSshClient.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/ssh/CommonSshClient.java similarity index 97% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/ssh/CommonSshClient.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/common/ssh/CommonSshClient.java index f187762fd5b..90b5444ef12 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/common/ssh/CommonSshClient.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/common/ssh/CommonSshClient.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.common.ssh; +package org.apache.hertzbeat.collector.collect.common.ssh; import lombok.extern.slf4j.Slf4j; import org.apache.sshd.client.ClientBuilder; @@ -29,7 +29,6 @@ /** * common ssh pool client - * */ @Slf4j public class CommonSshClient { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/database/JdbcCommonCollect.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/database/JdbcCommonCollect.java similarity index 94% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/database/JdbcCommonCollect.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/database/JdbcCommonCollect.java index afe32602383..5d0e011dfaf 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/database/JdbcCommonCollect.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/database/JdbcCommonCollect.java @@ -15,20 +15,20 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.database; +package org.apache.hertzbeat.collector.collect.database; -import org.dromara.hertzbeat.collector.collect.AbstractCollect; -import org.dromara.hertzbeat.collector.collect.common.cache.CacheIdentifier; -import org.dromara.hertzbeat.collector.collect.common.cache.ConnectionCommonCache; -import org.dromara.hertzbeat.collector.collect.common.cache.JdbcConnect; -import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; -import org.dromara.hertzbeat.collector.util.CollectUtil; -import org.dromara.hertzbeat.common.constants.CollectorConstants; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.job.protocol.JdbcProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.util.CommonUtil; +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.JdbcConnect; +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.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; @@ -47,7 +47,6 @@ /** * common query for database query - * */ @Slf4j public class JdbcCommonCollect extends AbstractCollect { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/database/JdbcSpiLoader.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/database/JdbcSpiLoader.java similarity index 96% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/database/JdbcSpiLoader.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/database/JdbcSpiLoader.java index b035032fe66..3cd412866ea 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/database/JdbcSpiLoader.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/database/JdbcSpiLoader.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.database; +package org.apache.hertzbeat.collector.collect.database; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; @@ -25,7 +25,6 @@ /** * load the jdbc driver first to avoid spi concurrent deadlock - * */ @Service @Slf4j diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/dns/DnsCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/dns/DnsCollectImpl.java similarity index 94% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/dns/DnsCollectImpl.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/dns/DnsCollectImpl.java index 3ce5afd54dc..1655571cb4d 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/dns/DnsCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/dns/DnsCollectImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.dns; +package org.apache.hertzbeat.collector.collect.dns; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -25,13 +25,13 @@ import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.dromara.hertzbeat.collector.collect.AbstractCollect; -import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.job.protocol.DnsProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.util.CommonUtil; +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.DnsProtocol; +import org.apache.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.util.CommonUtil; import org.springframework.util.StopWatch; import org.xbill.DNS.DClass; import org.xbill.DNS.Message; @@ -55,7 +55,6 @@ /** * dns protocol collection implementation - * */ @Slf4j public class DnsCollectImpl extends AbstractCollect { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/ftp/FtpCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/ftp/FtpCollectImpl.java similarity index 92% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/ftp/FtpCollectImpl.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/ftp/FtpCollectImpl.java index 404760e1632..be3246eb1f6 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/ftp/FtpCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/ftp/FtpCollectImpl.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.ftp; +package org.apache.hertzbeat.collector.collect.ftp; -import org.dromara.hertzbeat.collector.collect.AbstractCollect; -import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.job.protocol.FtpProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.util.CommonUtil; +import org.apache.hertzbeat.collector.dispatch.DispatchConstants; +import org.apache.hertzbeat.collector.collect.AbstractCollect; +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; @@ -35,7 +35,6 @@ /** * ftp protocol collection implementation - * */ @Slf4j public class FtpCollectImpl extends AbstractCollect { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/HttpCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/HttpCollectImpl.java similarity index 95% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/HttpCollectImpl.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/http/HttpCollectImpl.java index 1747b63f1aa..c7783f7a1e1 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/HttpCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/HttpCollectImpl.java @@ -15,28 +15,28 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.http; +package org.apache.hertzbeat.collector.collect.http; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import org.dromara.hertzbeat.collector.collect.AbstractCollect; -import org.dromara.hertzbeat.collector.collect.common.http.CommonHttpClient; -import org.dromara.hertzbeat.collector.collect.http.promethus.exporter.ExporterParser; -import org.dromara.hertzbeat.collector.collect.http.promethus.exporter.MetricFamily; -import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; -import org.dromara.hertzbeat.collector.util.CollectUtil; -import org.dromara.hertzbeat.common.constants.CollectorConstants; -import org.dromara.hertzbeat.collector.util.JsonPathParser; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.job.protocol.HttpProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.util.CommonUtil; -import org.dromara.hertzbeat.common.util.IpDomainUtil; -import org.dromara.hertzbeat.collector.collect.http.promethus.AbstractPrometheusParse; -import org.dromara.hertzbeat.collector.collect.http.promethus.PrometheusParseCreater; +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.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; @@ -81,13 +81,11 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import static org.dromara.hertzbeat.common.constants.SignConstants.RIGHT_DASH; +import static org.apache.hertzbeat.common.constants.SignConstants.RIGHT_DASH; /** * http https collect - * - * */ @Slf4j public class HttpCollectImpl extends AbstractCollect { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/SslCertificateCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/SslCertificateCollectImpl.java similarity index 91% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/SslCertificateCollectImpl.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/http/SslCertificateCollectImpl.java index d263c5ac9cd..7f9a17f388f 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/SslCertificateCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/SslCertificateCollectImpl.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.http; +package org.apache.hertzbeat.collector.collect.http; -import org.dromara.hertzbeat.collector.collect.AbstractCollect; -import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; -import org.dromara.hertzbeat.common.constants.CollectorConstants; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.job.protocol.HttpProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.util.CommonUtil; -import org.dromara.hertzbeat.common.util.IpDomainUtil; +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; @@ -40,12 +40,11 @@ import java.security.cert.X509Certificate; import java.util.Date; -import static org.dromara.hertzbeat.common.constants.SignConstants.RIGHT_DASH; +import static org.apache.hertzbeat.common.constants.SignConstants.RIGHT_DASH; /** * ssl Certificate - * */ @Slf4j public class SslCertificateCollectImpl extends AbstractCollect { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/AbstractPrometheusParse.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/AbstractPrometheusParse.java similarity index 92% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/AbstractPrometheusParse.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/AbstractPrometheusParse.java index 84cbd0b3b85..36f994d2e62 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/AbstractPrometheusParse.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/AbstractPrometheusParse.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.http.promethus; +package org.apache.hertzbeat.collector.collect.http.promethus; -import org.dromara.hertzbeat.common.entity.job.protocol.HttpProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.entity.job.protocol.HttpProtocol; +import org.apache.hertzbeat.common.entity.message.CollectRep; import java.util.List; diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/ParseException.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/ParseException.java similarity index 93% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/ParseException.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/ParseException.java index e4b1a098a19..a571e1c9e50 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/ParseException.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/ParseException.java @@ -15,11 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.http.promethus; +package org.apache.hertzbeat.collector.collect.http.promethus; /** * Parse Exception - * */ public class ParseException extends RuntimeException { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/PrometheusLastParser.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/PrometheusLastParser.java similarity index 85% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/PrometheusLastParser.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/PrometheusLastParser.java index 05b96fd8811..29cc3cf3c0d 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/PrometheusLastParser.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/PrometheusLastParser.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.http.promethus; +package org.apache.hertzbeat.collector.collect.http.promethus; -import org.dromara.hertzbeat.common.entity.job.protocol.HttpProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.constants.CommonConstants; +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 lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -27,7 +27,6 @@ /** * Prometheus Last Parser - * */ @Slf4j @NoArgsConstructor diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/PrometheusMatrixParser.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/PrometheusMatrixParser.java similarity index 88% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/PrometheusMatrixParser.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/PrometheusMatrixParser.java index 882e3c9cf8b..b0e395ba9e9 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/PrometheusMatrixParser.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/PrometheusMatrixParser.java @@ -15,24 +15,22 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.http.promethus; +package org.apache.hertzbeat.collector.collect.http.promethus; import com.google.gson.JsonElement; -import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; -import org.dromara.hertzbeat.collector.util.CollectUtil; -import org.dromara.hertzbeat.common.entity.dto.PromVectorOrMatrix; -import org.dromara.hertzbeat.common.entity.job.protocol.HttpProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.util.JsonUtil; +import org.apache.hertzbeat.collector.dispatch.DispatchConstants; +import org.apache.hertzbeat.collector.util.CollectUtil; +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" */ @NoArgsConstructor diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/PrometheusParseCreater.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/PrometheusParseCreater.java similarity index 95% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/PrometheusParseCreater.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/PrometheusParseCreater.java index db3c48c89f7..8078ec0688d 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/PrometheusParseCreater.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/PrometheusParseCreater.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.http.promethus; +package org.apache.hertzbeat.collector.collect.http.promethus; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.InitializingBean; @@ -23,7 +23,6 @@ /** * prometheus parse creater - * */ @Slf4j @Component diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/PrometheusVectorParser.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/PrometheusVectorParser.java similarity index 88% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/PrometheusVectorParser.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/PrometheusVectorParser.java index a95d644b245..b50ee953a1d 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/PrometheusVectorParser.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/PrometheusVectorParser.java @@ -15,24 +15,22 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.http.promethus; +package org.apache.hertzbeat.collector.collect.http.promethus; import com.google.gson.JsonElement; -import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; -import org.dromara.hertzbeat.collector.util.CollectUtil; -import org.dromara.hertzbeat.common.entity.dto.PromVectorOrMatrix; -import org.dromara.hertzbeat.common.entity.job.protocol.HttpProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.util.JsonUtil; +import org.apache.hertzbeat.collector.dispatch.DispatchConstants; +import org.apache.hertzbeat.collector.util.CollectUtil; +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" */ @NoArgsConstructor diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/exporter/ExporterParser.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/exporter/ExporterParser.java similarity index 98% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/exporter/ExporterParser.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/exporter/ExporterParser.java index 0a3bd04562b..359d8a2144a 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/exporter/ExporterParser.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/exporter/ExporterParser.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.http.promethus.exporter; +package org.apache.hertzbeat.collector.collect.http.promethus.exporter; -import org.dromara.hertzbeat.collector.collect.http.promethus.ParseException; -import org.dromara.hertzbeat.common.util.StrBuffer; +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; @@ -31,8 +31,6 @@ import java.util.concurrent.locks.ReentrantLock; /** - * - * * Resolves the data passed by prometheus's exporter interface http:xxx/metrics * Reference: prometheus text_parse.go code, entry: TextToMetricFamilies */ diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/exporter/MetricFamily.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/exporter/MetricFamily.java similarity index 98% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/exporter/MetricFamily.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/exporter/MetricFamily.java index c4c641cad29..7dbbfdc2d94 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/exporter/MetricFamily.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/exporter/MetricFamily.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.http.promethus.exporter; +package org.apache.hertzbeat.collector.collect.http.promethus.exporter; import lombok.Data; import lombok.ToString; @@ -24,7 +24,6 @@ import java.util.List; /** - * * */ @Data diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/exporter/MetricType.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/exporter/MetricType.java similarity index 95% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/exporter/MetricType.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/exporter/MetricType.java index 8d81977b27f..91ab39e6947 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/promethus/exporter/MetricType.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/exporter/MetricType.java @@ -15,12 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.http.promethus.exporter; +package org.apache.hertzbeat.collector.collect.http.promethus.exporter; /** * prometheus metrics type - * - * */ public enum MetricType { // for string metric info diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/httpsd/HttpsdImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/HttpsdImpl.java similarity index 82% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/httpsd/HttpsdImpl.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/HttpsdImpl.java index b373a2c773e..5abe04c4faa 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/httpsd/HttpsdImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/HttpsdImpl.java @@ -1,26 +1,25 @@ -package org.dromara.hertzbeat.collector.collect.httpsd; +package org.apache.hertzbeat.collector.collect.httpsd; import com.ecwid.consul.transport.TransportException; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.dromara.hertzbeat.collector.collect.AbstractCollect; -import org.dromara.hertzbeat.collector.collect.httpsd.discovery.DiscoveryClient; -import org.dromara.hertzbeat.collector.collect.httpsd.discovery.DiscoveryClientManagement; -import org.dromara.hertzbeat.collector.collect.httpsd.discovery.ServerInfo; -import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; -import org.dromara.hertzbeat.common.constants.CollectorConstants; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.job.protocol.HttpsdProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.util.CommonUtil; +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; +import org.apache.hertzbeat.common.entity.job.protocol.HttpsdProtocol; +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 - * */ @Slf4j public class HttpsdImpl extends AbstractCollect { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/httpsd/constant/DiscoveryClientInstance.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/constant/DiscoveryClientInstance.java similarity index 91% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/httpsd/constant/DiscoveryClientInstance.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/constant/DiscoveryClientInstance.java index fb4cc4f7427..c6181ee6a73 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/httpsd/constant/DiscoveryClientInstance.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/constant/DiscoveryClientInstance.java @@ -1,4 +1,4 @@ -package org.dromara.hertzbeat.collector.collect.httpsd.constant; +package org.apache.hertzbeat.collector.collect.httpsd.constant; import org.apache.commons.lang3.StringUtils; @@ -6,7 +6,6 @@ /** * Discovery Client Instance Name For Httpsd monitor - * */ public enum DiscoveryClientInstance { CONSUL("Consul"), diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/httpsd/discovery/ConnectConfig.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/ConnectConfig.java similarity index 78% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/httpsd/discovery/ConnectConfig.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/ConnectConfig.java index ca2a4673f44..f8a32c74c37 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/httpsd/discovery/ConnectConfig.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/ConnectConfig.java @@ -1,4 +1,4 @@ -package org.dromara.hertzbeat.collector.collect.httpsd.discovery; +package org.apache.hertzbeat.collector.collect.httpsd.discovery; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/httpsd/discovery/DiscoveryClient.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/DiscoveryClient.java similarity index 69% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/httpsd/discovery/DiscoveryClient.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/DiscoveryClient.java index 07666b8e1bd..ba017267bac 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/httpsd/discovery/DiscoveryClient.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/DiscoveryClient.java @@ -1,6 +1,6 @@ -package org.dromara.hertzbeat.collector.collect.httpsd.discovery; +package org.apache.hertzbeat.collector.collect.httpsd.discovery; -import org.dromara.hertzbeat.common.entity.job.protocol.HttpsdProtocol; +import org.apache.hertzbeat.common.entity.job.protocol.HttpsdProtocol; import java.util.List; diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/httpsd/discovery/DiscoveryClientManagement.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/DiscoveryClientManagement.java similarity index 75% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/httpsd/discovery/DiscoveryClientManagement.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/DiscoveryClientManagement.java index a484f45110f..c5d43c28d50 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/httpsd/discovery/DiscoveryClientManagement.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/DiscoveryClientManagement.java @@ -1,9 +1,9 @@ -package org.dromara.hertzbeat.collector.collect.httpsd.discovery; +package org.apache.hertzbeat.collector.collect.httpsd.discovery; -import org.dromara.hertzbeat.collector.collect.httpsd.constant.DiscoveryClientInstance; -import org.dromara.hertzbeat.collector.collect.httpsd.discovery.impl.ConsulDiscoveryClient; -import org.dromara.hertzbeat.collector.collect.httpsd.discovery.impl.NacosDiscoveryClient; -import org.dromara.hertzbeat.common.entity.job.protocol.HttpsdProtocol; +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; diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/httpsd/discovery/ServerInfo.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/ServerInfo.java similarity index 80% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/httpsd/discovery/ServerInfo.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/ServerInfo.java index 1b5162ec06e..c219e006b5b 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/httpsd/discovery/ServerInfo.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/ServerInfo.java @@ -1,4 +1,4 @@ -package org.dromara.hertzbeat.collector.collect.httpsd.discovery; +package org.apache.hertzbeat.collector.collect.httpsd.discovery; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/httpsd/discovery/ServiceInstance.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/ServiceInstance.java similarity index 83% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/httpsd/discovery/ServiceInstance.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/ServiceInstance.java index f3e8f4cabcd..6bc80728b64 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/httpsd/discovery/ServiceInstance.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/ServiceInstance.java @@ -1,4 +1,4 @@ -package org.dromara.hertzbeat.collector.collect.httpsd.discovery; +package org.apache.hertzbeat.collector.collect.httpsd.discovery; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/httpsd/discovery/impl/ConsulDiscoveryClient.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/impl/ConsulDiscoveryClient.java similarity index 84% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/httpsd/discovery/impl/ConsulDiscoveryClient.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/impl/ConsulDiscoveryClient.java index 7b5ac4f4a38..dce086c40c7 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/httpsd/discovery/impl/ConsulDiscoveryClient.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/impl/ConsulDiscoveryClient.java @@ -1,4 +1,4 @@ -package org.dromara.hertzbeat.collector.collect.httpsd.discovery.impl; +package org.apache.hertzbeat.collector.collect.httpsd.discovery.impl; import com.ecwid.consul.v1.ConsulClient; import com.ecwid.consul.v1.agent.model.Check; @@ -6,11 +6,11 @@ import com.ecwid.consul.v1.agent.model.Service; import com.google.common.collect.Lists; import org.apache.commons.lang3.StringUtils; -import org.dromara.hertzbeat.collector.collect.httpsd.discovery.ConnectConfig; -import org.dromara.hertzbeat.collector.collect.httpsd.discovery.DiscoveryClient; -import org.dromara.hertzbeat.collector.collect.httpsd.discovery.ServerInfo; -import org.dromara.hertzbeat.collector.collect.httpsd.discovery.ServiceInstance; -import org.dromara.hertzbeat.common.entity.job.protocol.HttpsdProtocol; +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.Collection; import java.util.List; diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/httpsd/discovery/impl/NacosDiscoveryClient.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/impl/NacosDiscoveryClient.java similarity index 87% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/httpsd/discovery/impl/NacosDiscoveryClient.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/impl/NacosDiscoveryClient.java index f248022b011..0945e67c1dc 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/httpsd/discovery/impl/NacosDiscoveryClient.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/httpsd/discovery/impl/NacosDiscoveryClient.java @@ -1,14 +1,14 @@ -package org.dromara.hertzbeat.collector.collect.httpsd.discovery.impl; +package org.apache.hertzbeat.collector.collect.httpsd.discovery.impl; import com.alibaba.nacos.api.exception.NacosException; import com.alibaba.nacos.api.naming.NamingFactory; import com.alibaba.nacos.api.naming.NamingService; import com.google.common.collect.Lists; -import org.dromara.hertzbeat.collector.collect.httpsd.discovery.ConnectConfig; -import org.dromara.hertzbeat.collector.collect.httpsd.discovery.DiscoveryClient; -import org.dromara.hertzbeat.collector.collect.httpsd.discovery.ServerInfo; -import org.dromara.hertzbeat.collector.collect.httpsd.discovery.ServiceInstance; -import org.dromara.hertzbeat.common.entity.job.protocol.HttpsdProtocol; +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; diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/icmp/IcmpCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/icmp/IcmpCollectImpl.java similarity index 87% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/icmp/IcmpCollectImpl.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/icmp/IcmpCollectImpl.java index f7fbebd7d76..9373f8fda13 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/icmp/IcmpCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/icmp/IcmpCollectImpl.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.icmp; +package org.apache.hertzbeat.collector.collect.icmp; -import org.dromara.hertzbeat.collector.collect.AbstractCollect; -import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; -import org.dromara.hertzbeat.common.constants.CollectorConstants; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.job.protocol.IcmpProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.util.CommonUtil; +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.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; @@ -33,7 +33,6 @@ /** * icmp ping collect - * */ @Slf4j public class IcmpCollectImpl extends AbstractCollect { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/jmx/JmxCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/jmx/JmxCollectImpl.java similarity index 92% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/jmx/JmxCollectImpl.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/jmx/JmxCollectImpl.java index d5bad2a0d56..900fbeb6676 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/jmx/JmxCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/jmx/JmxCollectImpl.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.jmx; - -import org.dromara.hertzbeat.collector.collect.AbstractCollect; -import org.dromara.hertzbeat.collector.collect.common.cache.CacheIdentifier; -import org.dromara.hertzbeat.collector.collect.common.cache.ConnectionCommonCache; -import org.dromara.hertzbeat.collector.collect.common.cache.JmxConnect; -import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.job.protocol.JmxProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.util.CommonUtil; +package org.apache.hertzbeat.collector.collect.jmx; + +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.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; @@ -44,7 +44,6 @@ /** * jmx protocol acquisition implementation - * */ @Slf4j public class JmxCollectImpl extends AbstractCollect { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/memcached/MemcachedCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/memcached/MemcachedCollectImpl.java similarity index 91% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/memcached/MemcachedCollectImpl.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/memcached/MemcachedCollectImpl.java index 5fc3dd62e4a..40feca2ba96 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/memcached/MemcachedCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/memcached/MemcachedCollectImpl.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.memcached; +package org.apache.hertzbeat.collector.collect.memcached; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.collector.collect.AbstractCollect; -import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; -import org.dromara.hertzbeat.common.constants.CollectorConstants; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.job.protocol.MemcachedProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.util.CommonUtil; +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; diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/mongodb/MongodbSingleCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/mongodb/MongodbSingleCollectImpl.java similarity index 93% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/mongodb/MongodbSingleCollectImpl.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/mongodb/MongodbSingleCollectImpl.java index f650264c4f7..069455d8c65 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/mongodb/MongodbSingleCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/mongodb/MongodbSingleCollectImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.mongodb; +package org.apache.hertzbeat.collector.collect.mongodb; import com.mongodb.ConnectionString; import com.mongodb.MongoClientSettings; @@ -26,17 +26,17 @@ import com.mongodb.client.MongoClients; import com.mongodb.client.MongoDatabase; import lombok.extern.slf4j.Slf4j; +import org.apache.hertzbeat.collector.dispatch.DispatchConstants; import org.bson.Document; -import org.dromara.hertzbeat.collector.collect.AbstractCollect; -import org.dromara.hertzbeat.collector.collect.common.cache.CacheIdentifier; -import org.dromara.hertzbeat.collector.collect.common.cache.ConnectionCommonCache; -import org.dromara.hertzbeat.collector.collect.common.cache.MongodbConnect; -import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.job.protocol.MongodbProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.util.CommonUtil; +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.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.springframework.util.Assert; import java.net.URLEncoder; @@ -48,8 +48,6 @@ /** * Mongodb single collect - *

- *

* see also https://www.mongodb.com/languages/java, * https://www.mongodb.com/docs/manual/reference/command/serverStatus/#metrics */ diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/mq/RocketmqCollectData.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/mq/RocketmqCollectData.java similarity index 98% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/mq/RocketmqCollectData.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/mq/RocketmqCollectData.java index 6b09db3eb5a..5625a14960f 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/mq/RocketmqCollectData.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/mq/RocketmqCollectData.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.mq; +package org.apache.hertzbeat.collector.collect.mq; import lombok.Data; @@ -24,8 +24,6 @@ /** * rocketmq collect data - * - * */ @Data public class RocketmqCollectData { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/mq/RocketmqSingleCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/mq/RocketmqSingleCollectImpl.java similarity index 96% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/mq/RocketmqSingleCollectImpl.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/mq/RocketmqSingleCollectImpl.java index 8aea7cda5e9..c67f2c6c6d4 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/mq/RocketmqSingleCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/mq/RocketmqSingleCollectImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.mq; +package org.apache.hertzbeat.collector.collect.mq; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; @@ -23,6 +23,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.hertzbeat.collector.dispatch.DispatchConstants; import org.apache.rocketmq.acl.common.AclClientRPCHook; import org.apache.rocketmq.acl.common.SessionCredentials; import org.apache.rocketmq.common.MixAll; @@ -36,14 +37,13 @@ import org.apache.rocketmq.common.utils.ThreadUtils; import org.apache.rocketmq.remoting.RPCHook; import org.apache.rocketmq.tools.admin.DefaultMQAdminExt; -import org.dromara.hertzbeat.collector.collect.AbstractCollect; -import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; -import org.dromara.hertzbeat.collector.util.JsonPathParser; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.job.protocol.RocketmqProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.util.CommonUtil; +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; @@ -64,9 +64,6 @@ /** * rocketmq collect - * - * - * @since 5/6/2023 */ @Slf4j public class RocketmqSingleCollectImpl extends AbstractCollect implements DisposableBean { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/nebulagraph/NebulaGraphCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/nebulagraph/NebulaGraphCollectImpl.java similarity index 91% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/nebulagraph/NebulaGraphCollectImpl.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/nebulagraph/NebulaGraphCollectImpl.java index 65c5bec8ebb..c378716f2ad 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/nebulagraph/NebulaGraphCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/nebulagraph/NebulaGraphCollectImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.nebulagraph; +package org.apache.hertzbeat.collector.collect.nebulagraph; import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpHeaders; @@ -27,17 +27,17 @@ import org.apache.http.client.protocol.HttpClientContext; import org.apache.http.protocol.HttpContext; import org.apache.http.util.EntityUtils; -import org.dromara.hertzbeat.collector.collect.AbstractCollect; -import org.dromara.hertzbeat.collector.collect.common.http.CommonHttpClient; -import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; -import org.dromara.hertzbeat.collector.util.CollectUtil; -import org.dromara.hertzbeat.common.constants.CollectorConstants; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.job.protocol.NebulaGraphProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.util.CommonUtil; -import org.dromara.hertzbeat.common.util.IpDomainUtil; +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.NebulaGraphProtocol; +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; diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/nginx/NginxCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/nginx/NginxCollectImpl.java similarity index 94% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/nginx/NginxCollectImpl.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/nginx/NginxCollectImpl.java index 5ee48eed4c2..9f975ac02e8 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/nginx/NginxCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/nginx/NginxCollectImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.nginx; +package org.apache.hertzbeat.collector.collect.nginx; import lombok.AllArgsConstructor; import lombok.Builder; @@ -23,6 +23,8 @@ import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +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; @@ -32,17 +34,15 @@ import org.apache.http.client.protocol.HttpClientContext; import org.apache.http.protocol.HttpContext; import org.apache.http.util.EntityUtils; -import org.dromara.hertzbeat.collector.collect.AbstractCollect; -import org.dromara.hertzbeat.collector.collect.common.http.CommonHttpClient; -import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; -import org.dromara.hertzbeat.collector.util.CollectUtil; -import org.dromara.hertzbeat.common.constants.CollectorConstants; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.job.protocol.NginxProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.util.CommonUtil; -import org.dromara.hertzbeat.common.util.IpDomainUtil; +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; @@ -54,12 +54,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import static org.dromara.hertzbeat.common.constants.SignConstants.RIGHT_DASH; +import static org.apache.hertzbeat.common.constants.SignConstants.RIGHT_DASH; /** * nginx collect - * - * */ @Slf4j public class NginxCollectImpl extends AbstractCollect { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/ntp/NtpCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/ntp/NtpCollectImpl.java similarity index 90% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/ntp/NtpCollectImpl.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/ntp/NtpCollectImpl.java index b577d458444..9f7737a7382 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/ntp/NtpCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/ntp/NtpCollectImpl.java @@ -15,22 +15,22 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.ntp; +package org.apache.hertzbeat.collector.collect.ntp; 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.dromara.hertzbeat.collector.collect.AbstractCollect; -import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; -import org.dromara.hertzbeat.collector.util.CollectUtil; -import org.dromara.hertzbeat.common.constants.CollectorConstants; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.job.protocol.NtpProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.util.CommonUtil; +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.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.job.Metrics; +import org.apache.hertzbeat.common.entity.job.protocol.NtpProtocol; +import org.apache.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.util.CommonUtil; import java.io.IOException; import java.net.InetAddress; diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/pop3/Pop3CollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/pop3/Pop3CollectImpl.java similarity index 92% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/pop3/Pop3CollectImpl.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/pop3/Pop3CollectImpl.java index c65fc360adb..4c6533d2d0e 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/pop3/Pop3CollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/pop3/Pop3CollectImpl.java @@ -15,21 +15,21 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.pop3; +package org.apache.hertzbeat.collector.collect.pop3; import lombok.extern.slf4j.Slf4j; import org.apache.commons.net.pop3.POP3MessageInfo; -import org.dromara.hertzbeat.collector.collect.AbstractCollect; -import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; -import org.dromara.hertzbeat.common.constants.CollectorConstants; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.job.protocol.Pop3Protocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; +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.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.dromara.hertzbeat.common.util.CommonUtil; +import org.apache.hertzbeat.common.util.CommonUtil; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -40,7 +40,6 @@ /** * pop3 collect - * */ @Slf4j public class Pop3CollectImpl extends AbstractCollect { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/prometheus/PrometheusAutoCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/PrometheusAutoCollectImpl.java similarity index 94% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/prometheus/PrometheusAutoCollectImpl.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/PrometheusAutoCollectImpl.java index 92e026c9055..e964ccffc0c 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/prometheus/PrometheusAutoCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/PrometheusAutoCollectImpl.java @@ -15,10 +15,13 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.prometheus; +package org.apache.hertzbeat.collector.collect.prometheus; import lombok.extern.slf4j.Slf4j; import org.apache.commons.net.util.Base64; +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.http.HttpHeaders; import org.apache.http.HttpHost; import org.apache.http.HttpStatus; @@ -38,18 +41,15 @@ import org.apache.http.impl.client.BasicCredentialsProvider; import org.apache.http.protocol.HttpContext; import org.apache.http.util.EntityUtils; -import org.dromara.hertzbeat.collector.collect.common.http.CommonHttpClient; -import org.dromara.hertzbeat.collector.collect.prometheus.parser.MetricFamily; -import org.dromara.hertzbeat.collector.collect.prometheus.parser.TextParser; -import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; -import org.dromara.hertzbeat.collector.util.CollectUtil; -import org.dromara.hertzbeat.common.constants.CollectorConstants; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.job.protocol.PrometheusProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.util.CommonUtil; -import org.dromara.hertzbeat.common.util.IpDomainUtil; +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; @@ -62,12 +62,11 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import static org.dromara.hertzbeat.common.constants.SignConstants.RIGHT_DASH; +import static org.apache.hertzbeat.common.constants.SignConstants.RIGHT_DASH; /** * prometheus auto collect - * */ @Slf4j public class PrometheusAutoCollectImpl { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/prometheus/parser/MetricFamily.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/parser/MetricFamily.java similarity index 95% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/prometheus/parser/MetricFamily.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/parser/MetricFamily.java index fd21f8dc59f..e838ea71eb1 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/prometheus/parser/MetricFamily.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/parser/MetricFamily.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.prometheus.parser; +package org.apache.hertzbeat.collector.collect.prometheus.parser; import lombok.Data; import lombok.ToString; @@ -24,7 +24,6 @@ /** * metric family - * */ @Data @ToString diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/prometheus/parser/TextParser.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/parser/TextParser.java similarity index 98% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/prometheus/parser/TextParser.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/parser/TextParser.java index 00e49611df6..23b91063d9e 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/prometheus/parser/TextParser.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/parser/TextParser.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.prometheus.parser; +package org.apache.hertzbeat.collector.collect.prometheus.parser; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.collector.collect.http.promethus.ParseException; -import org.dromara.hertzbeat.common.util.StrBuffer; +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; @@ -29,8 +29,6 @@ import java.util.concurrent.ConcurrentHashMap; /** - * - * * Resolves the data passed by prometheus's exporter interface http:xxx/metrics * Reference: prometheus text_parse.go code, entry: TextToMetricFamilies */ diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/push/PushCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/push/PushCollectImpl.java similarity index 88% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/push/PushCollectImpl.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/push/PushCollectImpl.java index 3021044c46f..4730ab69b96 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/push/PushCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/push/PushCollectImpl.java @@ -15,10 +15,12 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.push; +package org.apache.hertzbeat.collector.collect.push; import com.fasterxml.jackson.core.type.TypeReference; import lombok.extern.slf4j.Slf4j; +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; @@ -28,19 +30,17 @@ import org.apache.http.client.protocol.HttpClientContext; import org.apache.http.protocol.HttpContext; import org.apache.http.util.EntityUtils; -import org.dromara.hertzbeat.collector.collect.AbstractCollect; -import org.dromara.hertzbeat.collector.collect.common.http.CommonHttpClient; -import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; -import org.dromara.hertzbeat.collector.util.CollectUtil; -import org.dromara.hertzbeat.common.constants.CollectorConstants; -import org.dromara.hertzbeat.common.entity.dto.Message; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.job.protocol.PushProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.entity.push.PushMetricsDto; -import org.dromara.hertzbeat.common.util.CommonUtil; -import org.dromara.hertzbeat.common.util.IpDomainUtil; -import org.dromara.hertzbeat.common.util.JsonUtil; +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; +import org.apache.hertzbeat.common.entity.job.Metrics; +import org.apache.hertzbeat.common.entity.job.protocol.PushProtocol; +import org.apache.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.entity.push.PushMetricsDto; +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; @@ -50,8 +50,6 @@ /** * push style collect - * - * */ @Slf4j public class PushCollectImpl extends AbstractCollect { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/redis/RedisCommonCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/redis/RedisCommonCollectImpl.java similarity index 93% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/redis/RedisCommonCollectImpl.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/redis/RedisCommonCollectImpl.java index b067ee68c1d..1d7bd1d1d5c 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/redis/RedisCommonCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/redis/RedisCommonCollectImpl.java @@ -15,21 +15,21 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.redis; +package org.apache.hertzbeat.collector.collect.redis; -import org.dromara.hertzbeat.collector.collect.AbstractCollect; -import org.dromara.hertzbeat.collector.collect.common.cache.CacheIdentifier; -import org.dromara.hertzbeat.collector.collect.common.cache.ConnectionCommonCache; -import org.dromara.hertzbeat.collector.collect.common.cache.RedisConnect; -import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; -import org.dromara.hertzbeat.collector.util.CollectUtil; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.job.protocol.RedisProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.util.CommonUtil; -import org.dromara.hertzbeat.common.util.MapCapUtil; -import org.dromara.hertzbeat.common.constants.SignConstants; +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; @@ -50,10 +50,6 @@ /** * Redis single cluster collector - * - * - * @version 1.0 - * */ @Slf4j public class RedisCommonCollectImpl extends AbstractCollect { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/smtp/SmtpCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/smtp/SmtpCollectImpl.java similarity index 89% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/smtp/SmtpCollectImpl.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/smtp/SmtpCollectImpl.java index 1677b918da1..1a8056fb4af 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/smtp/SmtpCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/smtp/SmtpCollectImpl.java @@ -15,19 +15,19 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.smtp; +package org.apache.hertzbeat.collector.collect.smtp; import lombok.extern.slf4j.Slf4j; import org.apache.commons.net.smtp.SMTP; -import org.dromara.hertzbeat.collector.collect.AbstractCollect; -import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; -import org.dromara.hertzbeat.collector.util.CollectUtil; -import org.dromara.hertzbeat.common.constants.CollectorConstants; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.job.protocol.SmtpProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.util.CommonUtil; +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.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.job.Metrics; +import org.apache.hertzbeat.common.entity.job.protocol.SmtpProtocol; +import org.apache.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.util.CommonUtil; import java.io.IOException; import java.net.SocketException; diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/snmp/SnmpCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/snmp/SnmpCollectImpl.java similarity index 96% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/snmp/SnmpCollectImpl.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/snmp/SnmpCollectImpl.java index 856af9f7608..7ab73d31f9b 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/snmp/SnmpCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/snmp/SnmpCollectImpl.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.snmp; +package org.apache.hertzbeat.collector.collect.snmp; -import org.dromara.hertzbeat.collector.collect.AbstractCollect; -import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; -import org.dromara.hertzbeat.collector.util.CollectUtil; -import org.dromara.hertzbeat.common.constants.CollectorConstants; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.job.protocol.SnmpProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.util.CommonUtil; +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.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; @@ -48,7 +48,6 @@ /** * Snmp protocol collection implementation - * */ @Slf4j public class SnmpCollectImpl extends AbstractCollect { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/ssh/SshCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/ssh/SshCollectImpl.java similarity index 93% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/ssh/SshCollectImpl.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/ssh/SshCollectImpl.java index 1c26ec2c0ae..146c0ac7269 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/ssh/SshCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/ssh/SshCollectImpl.java @@ -15,26 +15,26 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.ssh; +package org.apache.hertzbeat.collector.collect.ssh; +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.dromara.hertzbeat.collector.collect.AbstractCollect; -import org.dromara.hertzbeat.collector.collect.common.cache.CacheIdentifier; -import org.dromara.hertzbeat.collector.collect.common.cache.ConnectionCommonCache; -import org.dromara.hertzbeat.collector.collect.common.cache.SshConnect; -import org.dromara.hertzbeat.collector.collect.common.ssh.CommonSshClient; -import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; -import org.dromara.hertzbeat.collector.util.CollectUtil; -import org.dromara.hertzbeat.collector.util.PrivateKeyUtils; -import org.dromara.hertzbeat.common.constants.CollectorConstants; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.job.protocol.SshProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.util.CommonUtil; +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.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; @@ -60,7 +60,6 @@ /** * Ssh protocol collection implementation - * */ @Slf4j public class SshCollectImpl extends AbstractCollect { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/strategy/CollectStrategyFactory.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/strategy/CollectStrategyFactory.java similarity index 94% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/strategy/CollectStrategyFactory.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/strategy/CollectStrategyFactory.java index fab606a3f3f..ef678d97f21 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/strategy/CollectStrategyFactory.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/strategy/CollectStrategyFactory.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.strategy; +package org.apache.hertzbeat.collector.collect.strategy; -import org.dromara.hertzbeat.collector.collect.AbstractCollect; +import org.apache.hertzbeat.collector.collect.AbstractCollect; import org.springframework.boot.CommandLineRunner; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; @@ -28,7 +28,6 @@ /** * Specific metrics collection factory - * */ @Configuration @Order(value = Ordered.HIGHEST_PRECEDENCE + 1) diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/telnet/TelnetCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/telnet/TelnetCollectImpl.java similarity index 89% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/telnet/TelnetCollectImpl.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/telnet/TelnetCollectImpl.java index 622fa144694..d5804bc1cf0 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/telnet/TelnetCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/telnet/TelnetCollectImpl.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.telnet; +package org.apache.hertzbeat.collector.collect.telnet; -import org.dromara.hertzbeat.collector.collect.AbstractCollect; -import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; -import org.dromara.hertzbeat.collector.util.CollectUtil; -import org.dromara.hertzbeat.common.constants.CollectorConstants; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.job.protocol.TelnetProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.util.CommonUtil; +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.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; @@ -37,7 +37,6 @@ /** * telnet collect - * */ @Slf4j public class TelnetCollectImpl extends AbstractCollect { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/udp/UdpCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/udp/UdpCollectImpl.java similarity index 86% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/udp/UdpCollectImpl.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/udp/UdpCollectImpl.java index 2cd2beeb1a2..d38e31fc759 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/udp/UdpCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/udp/UdpCollectImpl.java @@ -15,25 +15,24 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.udp; +package org.apache.hertzbeat.collector.collect.udp; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.collector.collect.AbstractCollect; -import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; -import org.dromara.hertzbeat.collector.util.CollectUtil; -import org.dromara.hertzbeat.common.constants.CollectorConstants; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.job.protocol.UdpProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.util.CommonUtil; +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.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.job.Metrics; +import org.apache.hertzbeat.common.entity.job.protocol.UdpProtocol; +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 - * */ @Slf4j public class UdpCollectImpl extends AbstractCollect { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/websocket/WebsocketCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/websocket/WebsocketCollectImpl.java similarity index 92% rename from collector/src/main/java/org/dromara/hertzbeat/collector/collect/websocket/WebsocketCollectImpl.java rename to collector/src/main/java/org/apache/hertzbeat/collector/collect/websocket/WebsocketCollectImpl.java index f90e7355626..7bcff5cb8ea 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/websocket/WebsocketCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/websocket/WebsocketCollectImpl.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.websocket; +package org.apache.hertzbeat.collector.collect.websocket; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.dromara.hertzbeat.collector.collect.AbstractCollect; -import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; -import org.dromara.hertzbeat.common.constants.CollectorConstants; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.job.protocol.WebsocketProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.util.CommonUtil; +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; diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/config/CollectorAutoConfiguration.java b/collector/src/main/java/org/apache/hertzbeat/collector/config/CollectorAutoConfiguration.java similarity index 86% rename from collector/src/main/java/org/dromara/hertzbeat/collector/config/CollectorAutoConfiguration.java rename to collector/src/main/java/org/apache/hertzbeat/collector/config/CollectorAutoConfiguration.java index 15cd1ba1372..e4bfd909556 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/config/CollectorAutoConfiguration.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/config/CollectorAutoConfiguration.java @@ -15,15 +15,14 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.config; +package org.apache.hertzbeat.collector.config; import org.springframework.context.annotation.ComponentScan; /** * Collector Auto Configuration * @version 2.1 - * Created by Musk.Chen on 2023/1/14 */ -@ComponentScan(basePackages = "org.dromara.hertzbeat.collector") +@ComponentScan(basePackages = "org.apache.hertzbeat.collector") public class CollectorAutoConfiguration { } diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/CollectDataDispatch.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/CollectDataDispatch.java similarity index 87% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/CollectDataDispatch.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/CollectDataDispatch.java index 9ad5eba2f87..1bb4573ae88 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/CollectDataDispatch.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/CollectDataDispatch.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch; +package org.apache.hertzbeat.collector.dispatch; -import org.dromara.hertzbeat.collector.dispatch.timer.Timeout; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.message.CollectRep; +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; diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/CommonDispatcher.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/CommonDispatcher.java similarity index 96% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/CommonDispatcher.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/CommonDispatcher.java index d1925374885..254a7c5bc7a 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/CommonDispatcher.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/CommonDispatcher.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch; +package org.apache.hertzbeat.collector.dispatch; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.google.gson.Gson; @@ -23,17 +23,17 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.collector.dispatch.entrance.internal.CollectJobService; -import org.dromara.hertzbeat.collector.dispatch.timer.Timeout; -import org.dromara.hertzbeat.collector.dispatch.timer.TimerDispatch; -import org.dromara.hertzbeat.collector.dispatch.timer.WheelTimerTask; -import org.dromara.hertzbeat.collector.dispatch.unit.UnitConvert; -import org.dromara.hertzbeat.collector.util.CollectUtil; -import org.dromara.hertzbeat.common.entity.job.Configmap; -import org.dromara.hertzbeat.common.entity.job.Job; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.queue.CommonDataQueue; +import org.apache.hertzbeat.collector.dispatch.entrance.internal.CollectJobService; +import org.apache.hertzbeat.collector.dispatch.timer.Timeout; +import org.apache.hertzbeat.collector.dispatch.timer.TimerDispatch; +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.entity.job.Configmap; +import org.apache.hertzbeat.common.entity.job.Job; +import org.apache.hertzbeat.common.entity.job.Metrics; +import org.apache.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.queue.CommonDataQueue; import org.springframework.stereotype.Component; import java.util.*; @@ -43,7 +43,6 @@ /** * Collection task and response data scheduler - * */ @Component @Slf4j diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/DispatchConstants.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/DispatchConstants.java similarity index 98% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/DispatchConstants.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/DispatchConstants.java index 5de56e3fa3e..81357b56973 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/DispatchConstants.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/DispatchConstants.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch; +package org.apache.hertzbeat.collector.dispatch; /** * dispatch constant diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/DispatchProperties.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/DispatchProperties.java similarity index 99% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/DispatchProperties.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/DispatchProperties.java index ee9335bcc3d..a8442fdf83c 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/DispatchProperties.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/DispatchProperties.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch; +package org.apache.hertzbeat.collector.dispatch; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/MetricsCollect.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/MetricsCollect.java similarity index 95% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/MetricsCollect.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/MetricsCollect.java index ef0f35412f5..be9c08f4a20 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/MetricsCollect.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/MetricsCollect.java @@ -15,25 +15,25 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch; +package org.apache.hertzbeat.collector.dispatch; import com.googlecode.aviator.AviatorEvaluator; import com.googlecode.aviator.Expression; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.collector.collect.AbstractCollect; -import org.dromara.hertzbeat.collector.collect.prometheus.PrometheusAutoCollectImpl; -import org.dromara.hertzbeat.collector.collect.strategy.CollectStrategyFactory; -import org.dromara.hertzbeat.collector.dispatch.timer.Timeout; -import org.dromara.hertzbeat.collector.dispatch.timer.WheelTimerTask; -import org.dromara.hertzbeat.collector.dispatch.unit.UnitConvert; -import org.dromara.hertzbeat.collector.util.CollectUtil; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.job.Job; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.util.CommonUtil; -import org.dromara.hertzbeat.common.util.Pair; +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.util.CollectUtil; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.job.Job; +import org.apache.hertzbeat.common.entity.job.Metrics; +import org.apache.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.util.CommonUtil; +import org.apache.hertzbeat.common.util.Pair; import java.util.*; import java.util.stream.Collectors; diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/MetricsCollectorQueue.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/MetricsCollectorQueue.java similarity index 96% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/MetricsCollectorQueue.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/MetricsCollectorQueue.java index 5982fd9e298..6829e44c2aa 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/MetricsCollectorQueue.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/MetricsCollectorQueue.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch; +package org.apache.hertzbeat.collector.dispatch; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/MetricsTaskDispatch.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/MetricsTaskDispatch.java similarity index 89% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/MetricsTaskDispatch.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/MetricsTaskDispatch.java index 2d1a6514d7c..b6bb4c4e608 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/MetricsTaskDispatch.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/MetricsTaskDispatch.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch; +package org.apache.hertzbeat.collector.dispatch; -import org.dromara.hertzbeat.collector.dispatch.timer.Timeout; +import org.apache.hertzbeat.collector.dispatch.timer.Timeout; /** * Metrics collection task scheduler interface diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/WorkerPool.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/WorkerPool.java similarity index 98% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/WorkerPool.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/WorkerPool.java index 6ef64ad6a93..2f8aaac7686 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/WorkerPool.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/WorkerPool.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch; +package org.apache.hertzbeat.collector.dispatch; import com.google.common.util.concurrent.ThreadFactoryBuilder; import lombok.extern.slf4j.Slf4j; diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/CollectServer.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/CollectServer.java similarity index 88% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/CollectServer.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/CollectServer.java index d676089ebe1..d63b57112bd 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/CollectServer.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/CollectServer.java @@ -15,25 +15,26 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch.entrance; +package org.apache.hertzbeat.collector.dispatch.entrance; import com.google.common.util.concurrent.ThreadFactoryBuilder; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.collector.dispatch.DispatchProperties; -import org.dromara.hertzbeat.collector.dispatch.entrance.internal.CollectJobService; -import org.dromara.hertzbeat.collector.dispatch.entrance.processor.*; -import org.dromara.hertzbeat.collector.dispatch.timer.TimerDispatch; -import org.dromara.hertzbeat.common.entity.dto.CollectorInfo; -import org.dromara.hertzbeat.common.entity.message.ClusterMsg; -import org.dromara.hertzbeat.common.support.CommonThreadPool; -import org.dromara.hertzbeat.common.util.IpDomainUtil; -import org.dromara.hertzbeat.common.util.JsonUtil; -import org.dromara.hertzbeat.remoting.RemotingClient; -import org.dromara.hertzbeat.remoting.event.NettyEventListener; -import org.dromara.hertzbeat.remoting.netty.NettyClientConfig; -import org.dromara.hertzbeat.remoting.netty.NettyRemotingClient; +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.timer.TimerDispatch; +import org.apache.hertzbeat.common.entity.dto.CollectorInfo; +import org.apache.hertzbeat.common.entity.message.ClusterMsg; +import org.apache.hertzbeat.common.support.CommonThreadPool; +import org.apache.hertzbeat.common.util.IpDomainUtil; +import org.apache.hertzbeat.common.util.JsonUtil; +import org.apache.hertzbeat.remoting.RemotingClient; +import org.apache.hertzbeat.remoting.event.NettyEventListener; +import org.apache.hertzbeat.remoting.netty.NettyClientConfig; +import org.apache.hertzbeat.remoting.netty.NettyRemotingClient; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.core.Ordered; diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/internal/CollectJobService.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/internal/CollectJobService.java similarity index 89% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/internal/CollectJobService.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/internal/CollectJobService.java index 7a7044416c2..44e3515d254 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/internal/CollectJobService.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/internal/CollectJobService.java @@ -15,20 +15,20 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch.entrance.internal; - -import org.dromara.hertzbeat.collector.dispatch.DispatchProperties; -import org.dromara.hertzbeat.collector.dispatch.WorkerPool; -import org.dromara.hertzbeat.collector.dispatch.entrance.CollectServer; -import org.dromara.hertzbeat.collector.dispatch.timer.TimerDispatch; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.job.Job; -import org.dromara.hertzbeat.common.entity.message.ClusterMsg; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.util.IpDomainUtil; -import org.dromara.hertzbeat.common.util.JsonUtil; +package org.apache.hertzbeat.collector.dispatch.entrance.internal; + +import org.apache.hertzbeat.collector.dispatch.DispatchProperties; +import org.apache.hertzbeat.collector.dispatch.WorkerPool; +import org.apache.hertzbeat.collector.dispatch.entrance.CollectServer; +import org.apache.hertzbeat.collector.dispatch.timer.TimerDispatch; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.job.Job; +import org.apache.hertzbeat.common.entity.message.ClusterMsg; +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.dromara.hertzbeat.common.util.ProtoJsonUtil; +import org.apache.hertzbeat.common.util.ProtoJsonUtil; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; @@ -41,8 +41,6 @@ /** * Collection job management provides api interface * 采集job管理提供api接口 - * - * */ @Service @Slf4j diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/internal/CollectResponseEventListener.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/internal/CollectResponseEventListener.java similarity index 90% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/internal/CollectResponseEventListener.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/internal/CollectResponseEventListener.java index 9f0b3594c53..8f63be23ce2 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/internal/CollectResponseEventListener.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/internal/CollectResponseEventListener.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch.entrance.internal; +package org.apache.hertzbeat.collector.dispatch.entrance.internal; -import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.entity.message.CollectRep; import java.util.EventListener; import java.util.List; @@ -25,8 +25,6 @@ /** * One-time collection task response result listener * 一次性采集任务响应结果监听器 - * - * */ public interface CollectResponseEventListener extends EventListener { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/processor/CollectCyclicDataProcessor.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/CollectCyclicDataProcessor.java similarity index 81% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/processor/CollectCyclicDataProcessor.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/CollectCyclicDataProcessor.java index 5e87340d7ac..d25a7493aa7 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/processor/CollectCyclicDataProcessor.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/CollectCyclicDataProcessor.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch.entrance.processor; +package org.apache.hertzbeat.collector.dispatch.entrance.processor; import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.collector.dispatch.entrance.CollectServer; -import org.dromara.hertzbeat.common.entity.job.Job; -import org.dromara.hertzbeat.common.entity.message.ClusterMsg; -import org.dromara.hertzbeat.common.util.JsonUtil; -import org.dromara.hertzbeat.remoting.netty.NettyRemotingProcessor; +import org.apache.hertzbeat.collector.dispatch.entrance.CollectServer; +import org.apache.hertzbeat.common.entity.job.Job; +import org.apache.hertzbeat.common.entity.message.ClusterMsg; +import org.apache.hertzbeat.common.util.JsonUtil; +import org.apache.hertzbeat.remoting.netty.NettyRemotingProcessor; /** * handle cyclic data message diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/processor/CollectOneTimeDataProcessor.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/CollectOneTimeDataProcessor.java similarity index 79% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/processor/CollectOneTimeDataProcessor.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/CollectOneTimeDataProcessor.java index ce69eeee1e5..151bd92fc97 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/processor/CollectOneTimeDataProcessor.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/CollectOneTimeDataProcessor.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch.entrance.processor; +package org.apache.hertzbeat.collector.dispatch.entrance.processor; import io.netty.channel.ChannelHandlerContext; -import org.dromara.hertzbeat.collector.dispatch.entrance.CollectServer; -import org.dromara.hertzbeat.common.entity.job.Job; -import org.dromara.hertzbeat.common.entity.message.ClusterMsg; -import org.dromara.hertzbeat.common.util.JsonUtil; -import org.dromara.hertzbeat.remoting.netty.NettyRemotingProcessor; +import org.apache.hertzbeat.collector.dispatch.entrance.CollectServer; +import org.apache.hertzbeat.common.entity.job.Job; +import org.apache.hertzbeat.common.entity.message.ClusterMsg; +import org.apache.hertzbeat.common.util.JsonUtil; +import org.apache.hertzbeat.remoting.netty.NettyRemotingProcessor; /** * handle one-time collect data response message diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/processor/DeleteCyclicTaskProcessor.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/DeleteCyclicTaskProcessor.java similarity index 85% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/processor/DeleteCyclicTaskProcessor.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/DeleteCyclicTaskProcessor.java index 5b8613c7d0f..a1ba8e0c2ef 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/processor/DeleteCyclicTaskProcessor.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/DeleteCyclicTaskProcessor.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch.entrance.processor; +package org.apache.hertzbeat.collector.dispatch.entrance.processor; import com.fasterxml.jackson.core.type.TypeReference; import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.collector.dispatch.entrance.CollectServer; -import org.dromara.hertzbeat.common.entity.message.ClusterMsg; -import org.dromara.hertzbeat.common.util.JsonUtil; -import org.dromara.hertzbeat.remoting.netty.NettyRemotingProcessor; +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; diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/processor/GoCloseProcessor.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/GoCloseProcessor.java similarity index 81% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/processor/GoCloseProcessor.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/GoCloseProcessor.java index f3c277e8994..725fd9e3a43 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/processor/GoCloseProcessor.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/GoCloseProcessor.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch.entrance.processor; +package org.apache.hertzbeat.collector.dispatch.entrance.processor; import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.collector.dispatch.entrance.CollectServer; -import org.dromara.hertzbeat.collector.dispatch.timer.TimerDispatch; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.message.ClusterMsg; -import org.dromara.hertzbeat.common.support.SpringContextHolder; -import org.dromara.hertzbeat.remoting.netty.NettyRemotingProcessor; +import org.apache.hertzbeat.collector.dispatch.entrance.CollectServer; +import org.apache.hertzbeat.collector.dispatch.timer.TimerDispatch; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.message.ClusterMsg; +import org.apache.hertzbeat.common.support.SpringContextHolder; +import org.apache.hertzbeat.remoting.netty.NettyRemotingProcessor; import org.springframework.boot.SpringApplication; /** diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/processor/GoOfflineProcessor.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/GoOfflineProcessor.java similarity index 83% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/processor/GoOfflineProcessor.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/GoOfflineProcessor.java index f124915a549..1e8dbb2b041 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/processor/GoOfflineProcessor.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/GoOfflineProcessor.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch.entrance.processor; +package org.apache.hertzbeat.collector.dispatch.entrance.processor; import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.collector.dispatch.timer.TimerDispatch; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.message.ClusterMsg; -import org.dromara.hertzbeat.common.support.SpringContextHolder; -import org.dromara.hertzbeat.remoting.netty.NettyRemotingProcessor; +import org.apache.hertzbeat.collector.dispatch.timer.TimerDispatch; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.message.ClusterMsg; +import org.apache.hertzbeat.common.support.SpringContextHolder; +import org.apache.hertzbeat.remoting.netty.NettyRemotingProcessor; /** * handle collector offline message diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/processor/GoOnlineProcessor.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/GoOnlineProcessor.java similarity index 81% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/processor/GoOnlineProcessor.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/GoOnlineProcessor.java index 3c8d8cac800..ce3b9eae339 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/processor/GoOnlineProcessor.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/GoOnlineProcessor.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch.entrance.processor; +package org.apache.hertzbeat.collector.dispatch.entrance.processor; import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.collector.dispatch.timer.TimerDispatch; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.message.ClusterMsg; -import org.dromara.hertzbeat.common.support.SpringContextHolder; -import org.dromara.hertzbeat.remoting.netty.NettyRemotingProcessor; +import org.apache.hertzbeat.collector.dispatch.timer.TimerDispatch; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.message.ClusterMsg; +import org.apache.hertzbeat.common.support.SpringContextHolder; +import org.apache.hertzbeat.remoting.netty.NettyRemotingProcessor; /** * handle collector online message diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/processor/HeartbeatProcessor.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/HeartbeatProcessor.java similarity index 86% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/processor/HeartbeatProcessor.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/HeartbeatProcessor.java index 5fff1d14058..9fc036cf01c 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/entrance/processor/HeartbeatProcessor.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/HeartbeatProcessor.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch.entrance.processor; +package org.apache.hertzbeat.collector.dispatch.entrance.processor; import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.entity.message.ClusterMsg; -import org.dromara.hertzbeat.remoting.netty.NettyRemotingProcessor; +import org.apache.hertzbeat.common.entity.message.ClusterMsg; +import org.apache.hertzbeat.remoting.netty.NettyRemotingProcessor; /** * handle heartbeat message diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/export/NettyDataQueue.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/export/NettyDataQueue.java similarity index 85% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/export/NettyDataQueue.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/export/NettyDataQueue.java index 688c6e5fa4f..3f8060bcbcb 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/export/NettyDataQueue.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/export/NettyDataQueue.java @@ -15,20 +15,19 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch.export; +package org.apache.hertzbeat.collector.dispatch.export; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.collector.dispatch.entrance.internal.CollectJobService; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.queue.CommonDataQueue; +import org.apache.hertzbeat.collector.dispatch.entrance.internal.CollectJobService; +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.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Configuration; /** * for collector instance - * send collect response data by netty - * + * send collect response data by netty */ @Configuration @ConditionalOnProperty(prefix = "common.queue", name = "type", havingValue = "netty") diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/HashedWheelTimer.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/HashedWheelTimer.java similarity index 99% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/HashedWheelTimer.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/HashedWheelTimer.java index 4000ae51a52..72b6a30e2ed 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/HashedWheelTimer.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/HashedWheelTimer.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch.timer; +package org.apache.hertzbeat.collector.dispatch.timer; -import org.dromara.hertzbeat.common.util.NetworkUtil; +import org.apache.hertzbeat.common.util.NetworkUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -77,7 +77,6 @@ * and Hierarchical Timing Wheels: data structures to efficiently implement a * timer facility'. More comprehensive slides are located * here. - * */ @SuppressWarnings("PMD") public class HashedWheelTimer implements Timer { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/Timeout.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/Timeout.java similarity index 96% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/Timeout.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/Timeout.java index 7444a37fffb..0098c63c326 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/Timeout.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/Timeout.java @@ -15,12 +15,11 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch.timer; +package org.apache.hertzbeat.collector.dispatch.timer; /** * A handle associated with a {@link TimerTask} that is returned by a * {@link Timer}. - * */ @SuppressWarnings("PMD") public interface Timeout { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/Timer.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/Timer.java similarity index 97% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/Timer.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/Timer.java index e9a56b7d469..cfc5842b0af 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/Timer.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/Timer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch.timer; +package org.apache.hertzbeat.collector.dispatch.timer; import java.util.Set; import java.util.concurrent.TimeUnit; @@ -23,8 +23,6 @@ /** * Schedules {@link TimerTask}s for one-time future execution in a background * thread. - * - * */ public interface Timer { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/TimerDispatch.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/TimerDispatch.java similarity index 88% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/TimerDispatch.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/TimerDispatch.java index c00922838b3..a7449439c83 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/TimerDispatch.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/TimerDispatch.java @@ -15,20 +15,18 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch.timer; +package org.apache.hertzbeat.collector.dispatch.timer; -import org.dromara.hertzbeat.collector.dispatch.entrance.internal.CollectResponseEventListener; -import org.dromara.hertzbeat.common.entity.job.Job; -import org.dromara.hertzbeat.common.entity.message.CollectRep; +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 - * - * */ public interface TimerDispatch { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/TimerDispatcher.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/TimerDispatcher.java similarity index 94% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/TimerDispatcher.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/TimerDispatcher.java index ce394d046cc..ce094e581a0 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/TimerDispatcher.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/TimerDispatcher.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch.timer; +package org.apache.hertzbeat.collector.dispatch.timer; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.collector.dispatch.entrance.internal.CollectResponseEventListener; -import org.dromara.hertzbeat.common.entity.job.Job; -import org.dromara.hertzbeat.common.entity.message.CollectRep; +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 org.springframework.beans.factory.DisposableBean; import org.springframework.stereotype.Component; @@ -32,7 +32,6 @@ /** * job timer dispatcher - * */ @Component @Slf4j diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/TimerTask.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/TimerTask.java similarity index 95% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/TimerTask.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/TimerTask.java index 1e5e749e4e6..a6d27fac789 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/TimerTask.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/TimerTask.java @@ -15,21 +15,19 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch.timer; +package org.apache.hertzbeat.collector.dispatch.timer; import java.util.concurrent.TimeUnit; /** * A task which is executed after the delay specified with * {@link Timer#newTimeout(TimerTask, long, TimeUnit)} (TimerTask, long, TimeUnit)}. - * */ public interface TimerTask { /** * Executed after the delay specified with * {@link Timer#newTimeout(TimerTask, long, TimeUnit)}. - * * @param timeout a handle which is associated with this task * @throws Exception when error happen */ diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/WheelTimerTask.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/WheelTimerTask.java similarity index 85% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/WheelTimerTask.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/WheelTimerTask.java index 14b59ce166c..a12fd42539a 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/timer/WheelTimerTask.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/WheelTimerTask.java @@ -15,20 +15,20 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch.timer; +package org.apache.hertzbeat.collector.dispatch.timer; import com.google.gson.Gson; import com.google.gson.JsonElement; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; -import org.dromara.hertzbeat.collector.dispatch.MetricsTaskDispatch; -import org.dromara.hertzbeat.collector.util.CollectUtil; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.job.Configmap; -import org.dromara.hertzbeat.common.entity.job.Job; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.support.SpringContextHolder; -import org.dromara.hertzbeat.common.util.AesUtil; +import org.apache.hertzbeat.collector.dispatch.DispatchConstants; +import org.apache.hertzbeat.collector.dispatch.MetricsTaskDispatch; +import org.apache.hertzbeat.collector.util.CollectUtil; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.job.Configmap; +import org.apache.hertzbeat.common.entity.job.Job; +import org.apache.hertzbeat.common.entity.job.Metrics; +import org.apache.hertzbeat.common.support.SpringContextHolder; +import org.apache.hertzbeat.common.util.AesUtil; import java.util.ArrayList; import java.util.List; @@ -37,7 +37,6 @@ /** * Timer Task implementation - * */ @Slf4j public class WheelTimerTask implements TimerTask { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/unit/DataUnit.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/unit/DataUnit.java similarity index 96% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/unit/DataUnit.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/unit/DataUnit.java index 957ba2c0aaf..e8b6c489b50 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/unit/DataUnit.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/unit/DataUnit.java @@ -15,13 +15,11 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch.unit; +package org.apache.hertzbeat.collector.dispatch.unit; /** * the enum of data size * 数据空间大小的枚举类 - * - * */ public enum DataUnit { /** diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/unit/TimeLengthUnit.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/unit/TimeLengthUnit.java similarity index 96% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/unit/TimeLengthUnit.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/unit/TimeLengthUnit.java index 0cf30f788ae..1e90c0e2614 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/unit/TimeLengthUnit.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/unit/TimeLengthUnit.java @@ -15,12 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch.unit; +package org.apache.hertzbeat.collector.dispatch.unit; /** * the enum of time length - * - * */ public enum TimeLengthUnit { /** diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/unit/UnitConvert.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/unit/UnitConvert.java similarity index 89% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/unit/UnitConvert.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/unit/UnitConvert.java index f3fb26976c6..f5c23585708 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/unit/UnitConvert.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/unit/UnitConvert.java @@ -15,13 +15,11 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch.unit; +package org.apache.hertzbeat.collector.dispatch.unit; /** * the interface of unit convert - * Unit conversion interface classes and deal with mon. Org.dromara.hertzbeat.com entity. The job. The Metrics# units - * - * + * Unit conversion interface classes and deal with mon. org.apache.hertzbeat.com entity. The job. The Metrics# units */ public interface UnitConvert { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/unit/impl/DataSizeConvert.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/unit/impl/DataSizeConvert.java similarity index 92% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/unit/impl/DataSizeConvert.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/unit/impl/DataSizeConvert.java index 2de6c02608a..1f01f735ee6 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/unit/impl/DataSizeConvert.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/unit/impl/DataSizeConvert.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch.unit.impl; +package org.apache.hertzbeat.collector.dispatch.unit.impl; -import org.dromara.hertzbeat.collector.dispatch.unit.DataUnit; -import org.dromara.hertzbeat.collector.dispatch.unit.UnitConvert; +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; @@ -27,8 +27,6 @@ /** * the convert of data size * 数据空间大小转换 - * - * */ @Component public final class DataSizeConvert implements UnitConvert { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/unit/impl/TimeLengthConvert.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/unit/impl/TimeLengthConvert.java similarity index 92% rename from collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/unit/impl/TimeLengthConvert.java rename to collector/src/main/java/org/apache/hertzbeat/collector/dispatch/unit/impl/TimeLengthConvert.java index edbbcfa44af..a13ff9feb05 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/dispatch/unit/impl/TimeLengthConvert.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/unit/impl/TimeLengthConvert.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch.unit.impl; +package org.apache.hertzbeat.collector.dispatch.unit.impl; -import org.dromara.hertzbeat.collector.dispatch.unit.TimeLengthUnit; -import org.dromara.hertzbeat.collector.dispatch.unit.UnitConvert; +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; @@ -27,8 +27,6 @@ /** * the convert of time length * 时间长短转换 - * - * */ @Component public final class TimeLengthConvert implements UnitConvert { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/util/CollectUtil.java b/collector/src/main/java/org/apache/hertzbeat/collector/util/CollectUtil.java similarity index 98% rename from collector/src/main/java/org/dromara/hertzbeat/collector/util/CollectUtil.java rename to collector/src/main/java/org/apache/hertzbeat/collector/util/CollectUtil.java index 7bc2092a5dc..5b0b9fdc30a 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/util/CollectUtil.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/util/CollectUtil.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.util; +package org.apache.hertzbeat.collector.util; import com.fasterxml.jackson.core.type.TypeReference; import com.google.gson.*; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.job.Configmap; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.util.JsonUtil; +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; @@ -32,7 +32,6 @@ /** * util for collector - * */ @Slf4j public class CollectUtil { @@ -50,7 +49,6 @@ public class CollectUtil { /** * count match keyword number - * * @param content content * @param keyword keyword * @return match num diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/util/JsonPathParser.java b/collector/src/main/java/org/apache/hertzbeat/collector/util/JsonPathParser.java similarity index 97% rename from collector/src/main/java/org/dromara/hertzbeat/collector/util/JsonPathParser.java rename to collector/src/main/java/org/apache/hertzbeat/collector/util/JsonPathParser.java index a9d03bc672f..63378f0fdf7 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/util/JsonPathParser.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/util/JsonPathParser.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.util; +package org.apache.hertzbeat.collector.util; import com.jayway.jsonpath.*; import com.jayway.jsonpath.spi.cache.CacheProvider; @@ -25,7 +25,6 @@ /** * json path parser - * */ public class JsonPathParser { diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/util/PrivateKeyUtils.java b/collector/src/main/java/org/apache/hertzbeat/collector/util/PrivateKeyUtils.java similarity index 97% rename from collector/src/main/java/org/dromara/hertzbeat/collector/util/PrivateKeyUtils.java rename to collector/src/main/java/org/apache/hertzbeat/collector/util/PrivateKeyUtils.java index 5199150e739..641eab297cc 100644 --- a/collector/src/main/java/org/dromara/hertzbeat/collector/util/PrivateKeyUtils.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/util/PrivateKeyUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.util; +package org.apache.hertzbeat.collector.util; import lombok.experimental.UtilityClass; import lombok.extern.slf4j.Slf4j; @@ -28,7 +28,6 @@ /** * private key util * write private key to ~/.ssh - * */ @Slf4j @UtilityClass @@ -38,7 +37,6 @@ public class PrivateKeyUtils { /** * write private key to ~/.ssh, filename is ~/.ssh/id_rsa_${host} - * * @param host host * @param keyStr key string * @return key file path diff --git a/collector/src/main/resources/META-INF/services/org.apache.hertzbeat.collector.collect.AbstractCollect b/collector/src/main/resources/META-INF/services/org.apache.hertzbeat.collector.collect.AbstractCollect new file mode 100644 index 00000000000..b4a4b61296a --- /dev/null +++ b/collector/src/main/resources/META-INF/services/org.apache.hertzbeat.collector.collect.AbstractCollect @@ -0,0 +1,23 @@ +org.apache.hertzbeat.collector.collect.http.HttpCollectImpl +org.apache.hertzbeat.collector.collect.http.SslCertificateCollectImpl +org.apache.hertzbeat.collector.collect.database.JdbcCommonCollect +org.apache.hertzbeat.collector.collect.icmp.IcmpCollectImpl +org.apache.hertzbeat.collector.collect.jmx.JmxCollectImpl +org.apache.hertzbeat.collector.collect.redis.RedisCommonCollectImpl +org.apache.hertzbeat.collector.collect.mongodb.MongodbSingleCollectImpl +org.apache.hertzbeat.collector.collect.snmp.SnmpCollectImpl +org.apache.hertzbeat.collector.collect.ssh.SshCollectImpl +org.apache.hertzbeat.collector.collect.telnet.TelnetCollectImpl +org.apache.hertzbeat.collector.collect.smtp.SmtpCollectImpl +org.apache.hertzbeat.collector.collect.ntp.NtpCollectImpl +org.apache.hertzbeat.collector.collect.websocket.WebsocketCollectImpl +org.apache.hertzbeat.collector.collect.ftp.FtpCollectImpl +org.apache.hertzbeat.collector.collect.mq.RocketmqSingleCollectImpl +org.apache.hertzbeat.collector.collect.udp.UdpCollectImpl +org.apache.hertzbeat.collector.collect.push.PushCollectImpl +org.apache.hertzbeat.collector.collect.dns.DnsCollectImpl +org.apache.hertzbeat.collector.collect.nginx.NginxCollectImpl +org.apache.hertzbeat.collector.collect.memcached.MemcachedCollectImpl +org.apache.hertzbeat.collector.collect.nebulagraph.NebulaGraphCollectImpl +org.apache.hertzbeat.collector.collect.pop3.Pop3CollectImpl +org.apache.hertzbeat.collector.collect.httpsd.HttpsdImpl diff --git a/collector/src/main/resources/META-INF/services/org.dromara.hertzbeat.collector.collect.AbstractCollect b/collector/src/main/resources/META-INF/services/org.dromara.hertzbeat.collector.collect.AbstractCollect deleted file mode 100644 index 2793bbeb482..00000000000 --- a/collector/src/main/resources/META-INF/services/org.dromara.hertzbeat.collector.collect.AbstractCollect +++ /dev/null @@ -1,23 +0,0 @@ -org.dromara.hertzbeat.collector.collect.http.HttpCollectImpl -org.dromara.hertzbeat.collector.collect.http.SslCertificateCollectImpl -org.dromara.hertzbeat.collector.collect.database.JdbcCommonCollect -org.dromara.hertzbeat.collector.collect.icmp.IcmpCollectImpl -org.dromara.hertzbeat.collector.collect.jmx.JmxCollectImpl -org.dromara.hertzbeat.collector.collect.redis.RedisCommonCollectImpl -org.dromara.hertzbeat.collector.collect.mongodb.MongodbSingleCollectImpl -org.dromara.hertzbeat.collector.collect.snmp.SnmpCollectImpl -org.dromara.hertzbeat.collector.collect.ssh.SshCollectImpl -org.dromara.hertzbeat.collector.collect.telnet.TelnetCollectImpl -org.dromara.hertzbeat.collector.collect.smtp.SmtpCollectImpl -org.dromara.hertzbeat.collector.collect.ntp.NtpCollectImpl -org.dromara.hertzbeat.collector.collect.websocket.WebsocketCollectImpl -org.dromara.hertzbeat.collector.collect.ftp.FtpCollectImpl -org.dromara.hertzbeat.collector.collect.mq.RocketmqSingleCollectImpl -org.dromara.hertzbeat.collector.collect.udp.UdpCollectImpl -org.dromara.hertzbeat.collector.collect.push.PushCollectImpl -org.dromara.hertzbeat.collector.collect.dns.DnsCollectImpl -org.dromara.hertzbeat.collector.collect.nginx.NginxCollectImpl -org.dromara.hertzbeat.collector.collect.memcached.MemcachedCollectImpl -org.dromara.hertzbeat.collector.collect.nebulagraph.NebulaGraphCollectImpl -org.dromara.hertzbeat.collector.collect.pop3.Pop3CollectImpl -org.dromara.hertzbeat.collector.collect.httpsd.HttpsdImpl diff --git a/collector/src/main/resources/META-INF/spring.factories b/collector/src/main/resources/META-INF/spring.factories index f7593858cd6..0a1a1d775cc 100644 --- a/collector/src/main/resources/META-INF/spring.factories +++ b/collector/src/main/resources/META-INF/spring.factories @@ -14,5 +14,5 @@ # limitations under the License. org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.dromara.hertzbeat.collector.config.CollectorAutoConfiguration +org.apache.hertzbeat.collector.config.CollectorAutoConfiguration diff --git a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/common/cache/CommonCacheTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/collect/common/cache/CommonCacheTest.java similarity index 95% rename from collector/src/test/java/org/dromara/hertzbeat/collector/collect/common/cache/CommonCacheTest.java rename to collector/src/test/java/org/apache/hertzbeat/collector/collect/common/cache/CommonCacheTest.java index 95511595209..2c59705cedc 100644 --- a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/common/cache/CommonCacheTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/collect/common/cache/CommonCacheTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.common.cache; +package org.apache.hertzbeat.collector.collect.common.cache; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/common/http/CommonHttpClientTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/collect/common/http/CommonHttpClientTest.java similarity index 95% rename from collector/src/test/java/org/dromara/hertzbeat/collector/collect/common/http/CommonHttpClientTest.java rename to collector/src/test/java/org/apache/hertzbeat/collector/collect/common/http/CommonHttpClientTest.java index 20fbdad3c13..bd7f2f2324c 100644 --- a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/common/http/CommonHttpClientTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/collect/common/http/CommonHttpClientTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.common.http; +package org.apache.hertzbeat.collector.collect.common.http; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/common/ssh/CommonSshClientTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/collect/common/ssh/CommonSshClientTest.java similarity index 94% rename from collector/src/test/java/org/dromara/hertzbeat/collector/collect/common/ssh/CommonSshClientTest.java rename to collector/src/test/java/org/apache/hertzbeat/collector/collect/common/ssh/CommonSshClientTest.java index 8cc9122497c..78a6ca7568e 100644 --- a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/common/ssh/CommonSshClientTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/collect/common/ssh/CommonSshClientTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.common.ssh; +package org.apache.hertzbeat.collector.collect.common.ssh; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/database/JdbcCommonCollectTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/collect/database/JdbcCommonCollectTest.java similarity index 94% rename from collector/src/test/java/org/dromara/hertzbeat/collector/collect/database/JdbcCommonCollectTest.java rename to collector/src/test/java/org/apache/hertzbeat/collector/collect/database/JdbcCommonCollectTest.java index 0f0031478b5..cb332d69184 100644 --- a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/database/JdbcCommonCollectTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/collect/database/JdbcCommonCollectTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.database; +package org.apache.hertzbeat.collector.collect.database; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/database/JdbcSpiLoaderTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/collect/database/JdbcSpiLoaderTest.java similarity index 94% rename from collector/src/test/java/org/dromara/hertzbeat/collector/collect/database/JdbcSpiLoaderTest.java rename to collector/src/test/java/org/apache/hertzbeat/collector/collect/database/JdbcSpiLoaderTest.java index 49d54d9f25f..be04b3d06dd 100644 --- a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/database/JdbcSpiLoaderTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/collect/database/JdbcSpiLoaderTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.database; +package org.apache.hertzbeat.collector.collect.database; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/dns/DnsCollectImplTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/collect/dns/DnsCollectImplTest.java similarity index 87% rename from collector/src/test/java/org/dromara/hertzbeat/collector/collect/dns/DnsCollectImplTest.java rename to collector/src/test/java/org/apache/hertzbeat/collector/collect/dns/DnsCollectImplTest.java index 00d8dd59745..a23d3f566bd 100644 --- a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/dns/DnsCollectImplTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/collect/dns/DnsCollectImplTest.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.dns; +package org.apache.hertzbeat.collector.collect.dns; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.job.protocol.DnsProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.entity.job.Metrics; +import org.apache.hertzbeat.common.entity.job.protocol.DnsProtocol; +import org.apache.hertzbeat.common.entity.message.CollectRep; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/http/HttpCollectImplTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/collect/http/HttpCollectImplTest.java similarity index 95% rename from collector/src/test/java/org/dromara/hertzbeat/collector/collect/http/HttpCollectImplTest.java rename to collector/src/test/java/org/apache/hertzbeat/collector/collect/http/HttpCollectImplTest.java index 55f0047a4eb..5cf86da63cb 100644 --- a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/http/HttpCollectImplTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/collect/http/HttpCollectImplTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.http; +package org.apache.hertzbeat.collector.collect.http; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/http/SslCertificateCollectImplTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/collect/http/SslCertificateCollectImplTest.java similarity index 95% rename from collector/src/test/java/org/dromara/hertzbeat/collector/collect/http/SslCertificateCollectImplTest.java rename to collector/src/test/java/org/apache/hertzbeat/collector/collect/http/SslCertificateCollectImplTest.java index 4aa98c477a7..263a7dbe559 100644 --- a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/http/SslCertificateCollectImplTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/collect/http/SslCertificateCollectImplTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.http; +package org.apache.hertzbeat.collector.collect.http; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/http/promethus/exporter/ExporterParserTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/collect/http/promethus/exporter/ExporterParserTest.java similarity index 98% rename from collector/src/test/java/org/dromara/hertzbeat/collector/collect/http/promethus/exporter/ExporterParserTest.java rename to collector/src/test/java/org/apache/hertzbeat/collector/collect/http/promethus/exporter/ExporterParserTest.java index 5ac1dc604c9..cde41da2600 100644 --- a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/http/promethus/exporter/ExporterParserTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/collect/http/promethus/exporter/ExporterParserTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.http.promethus.exporter; +package org.apache.hertzbeat.collector.collect.http.promethus.exporter; import org.junit.jupiter.api.Test; diff --git a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/icmp/IcmpCollectImplTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/collect/icmp/IcmpCollectImplTest.java similarity index 95% rename from collector/src/test/java/org/dromara/hertzbeat/collector/collect/icmp/IcmpCollectImplTest.java rename to collector/src/test/java/org/apache/hertzbeat/collector/collect/icmp/IcmpCollectImplTest.java index b168319b335..592ab8ed3c6 100644 --- a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/icmp/IcmpCollectImplTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/collect/icmp/IcmpCollectImplTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.icmp; +package org.apache.hertzbeat.collector.collect.icmp; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/jmx/JmxCollectImplTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/collect/jmx/JmxCollectImplTest.java similarity index 95% rename from collector/src/test/java/org/dromara/hertzbeat/collector/collect/jmx/JmxCollectImplTest.java rename to collector/src/test/java/org/apache/hertzbeat/collector/collect/jmx/JmxCollectImplTest.java index 349d99bfcb6..83ac9d1bfbe 100644 --- a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/jmx/JmxCollectImplTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/collect/jmx/JmxCollectImplTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.jmx; +package org.apache.hertzbeat.collector.collect.jmx; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/nginx/NginxCollectImplTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/collect/nginx/NginxCollectImplTest.java similarity index 95% rename from collector/src/test/java/org/dromara/hertzbeat/collector/collect/nginx/NginxCollectImplTest.java rename to collector/src/test/java/org/apache/hertzbeat/collector/collect/nginx/NginxCollectImplTest.java index 3ae92ec727a..3f1d3c7fc14 100644 --- a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/nginx/NginxCollectImplTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/collect/nginx/NginxCollectImplTest.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.nginx; +package org.apache.hertzbeat.collector.collect.nginx; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.job.protocol.NginxProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; +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.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/redis/RedisClusterCollectImplTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/collect/redis/RedisClusterCollectImplTest.java similarity index 89% rename from collector/src/test/java/org/dromara/hertzbeat/collector/collect/redis/RedisClusterCollectImplTest.java rename to collector/src/test/java/org/apache/hertzbeat/collector/collect/redis/RedisClusterCollectImplTest.java index b96b5cbe62c..801acc8591b 100644 --- a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/redis/RedisClusterCollectImplTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/collect/redis/RedisClusterCollectImplTest.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.redis; +package org.apache.hertzbeat.collector.collect.redis; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.job.protocol.RedisProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; +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.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/redis/RedisSingleCollectImplTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/collect/redis/RedisSingleCollectImplTest.java similarity index 89% rename from collector/src/test/java/org/dromara/hertzbeat/collector/collect/redis/RedisSingleCollectImplTest.java rename to collector/src/test/java/org/apache/hertzbeat/collector/collect/redis/RedisSingleCollectImplTest.java index f5639e6ae53..b5351be84e9 100644 --- a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/redis/RedisSingleCollectImplTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/collect/redis/RedisSingleCollectImplTest.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.redis; +package org.apache.hertzbeat.collector.collect.redis; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.job.protocol.RedisProtocol; -import org.dromara.hertzbeat.common.entity.message.CollectRep; +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.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/snmp/SnmpCollectImplTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/collect/snmp/SnmpCollectImplTest.java similarity index 95% rename from collector/src/test/java/org/dromara/hertzbeat/collector/collect/snmp/SnmpCollectImplTest.java rename to collector/src/test/java/org/apache/hertzbeat/collector/collect/snmp/SnmpCollectImplTest.java index 19ae47253dd..3929f581121 100644 --- a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/snmp/SnmpCollectImplTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/collect/snmp/SnmpCollectImplTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.snmp; +package org.apache.hertzbeat.collector.collect.snmp; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/ssh/SshCollectImplTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/collect/ssh/SshCollectImplTest.java similarity index 95% rename from collector/src/test/java/org/dromara/hertzbeat/collector/collect/ssh/SshCollectImplTest.java rename to collector/src/test/java/org/apache/hertzbeat/collector/collect/ssh/SshCollectImplTest.java index 447dee737cb..e490abf44d2 100644 --- a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/ssh/SshCollectImplTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/collect/ssh/SshCollectImplTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.ssh; +package org.apache.hertzbeat.collector.collect.ssh; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/telnet/TelnetCollectImplTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/collect/telnet/TelnetCollectImplTest.java similarity index 95% rename from collector/src/test/java/org/dromara/hertzbeat/collector/collect/telnet/TelnetCollectImplTest.java rename to collector/src/test/java/org/apache/hertzbeat/collector/collect/telnet/TelnetCollectImplTest.java index 3bb2fd1d206..055b8981c63 100644 --- a/collector/src/test/java/org/dromara/hertzbeat/collector/collect/telnet/TelnetCollectImplTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/collect/telnet/TelnetCollectImplTest.java @@ -15,10 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.collect.telnet; +package org.apache.hertzbeat.collector.collect.telnet; import org.apache.commons.net.telnet.TelnetClient; -import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.ConnectException; diff --git a/collector/src/test/java/org/dromara/hertzbeat/collector/dispatch/CommonDispatcherTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/dispatch/CommonDispatcherTest.java similarity index 95% rename from collector/src/test/java/org/dromara/hertzbeat/collector/dispatch/CommonDispatcherTest.java rename to collector/src/test/java/org/apache/hertzbeat/collector/dispatch/CommonDispatcherTest.java index d29858df1e4..21d552fadf4 100644 --- a/collector/src/test/java/org/dromara/hertzbeat/collector/dispatch/CommonDispatcherTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/dispatch/CommonDispatcherTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch; +package org.apache.hertzbeat.collector.dispatch; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/collector/src/test/java/org/dromara/hertzbeat/collector/dispatch/MetricsCollectorQueueTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/dispatch/MetricsCollectorQueueTest.java similarity index 95% rename from collector/src/test/java/org/dromara/hertzbeat/collector/dispatch/MetricsCollectorQueueTest.java rename to collector/src/test/java/org/apache/hertzbeat/collector/dispatch/MetricsCollectorQueueTest.java index 82fccb1264c..97f884f85a0 100644 --- a/collector/src/test/java/org/dromara/hertzbeat/collector/dispatch/MetricsCollectorQueueTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/dispatch/MetricsCollectorQueueTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch; +package org.apache.hertzbeat.collector.dispatch; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/collector/src/test/java/org/dromara/hertzbeat/collector/dispatch/WorkerPoolTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/dispatch/WorkerPoolTest.java similarity index 95% rename from collector/src/test/java/org/dromara/hertzbeat/collector/dispatch/WorkerPoolTest.java rename to collector/src/test/java/org/apache/hertzbeat/collector/dispatch/WorkerPoolTest.java index 07986a1a497..ba4223285c6 100644 --- a/collector/src/test/java/org/dromara/hertzbeat/collector/dispatch/WorkerPoolTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/dispatch/WorkerPoolTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch; +package org.apache.hertzbeat.collector.dispatch; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/collector/src/test/java/org/dromara/hertzbeat/collector/dispatch/entrance/internal/CollectJobServiceTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/dispatch/entrance/internal/CollectJobServiceTest.java similarity index 94% rename from collector/src/test/java/org/dromara/hertzbeat/collector/dispatch/entrance/internal/CollectJobServiceTest.java rename to collector/src/test/java/org/apache/hertzbeat/collector/dispatch/entrance/internal/CollectJobServiceTest.java index e14990d4b00..3a71b4d149c 100644 --- a/collector/src/test/java/org/dromara/hertzbeat/collector/dispatch/entrance/internal/CollectJobServiceTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/dispatch/entrance/internal/CollectJobServiceTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch.entrance.internal; +package org.apache.hertzbeat.collector.dispatch.entrance.internal; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/collector/src/test/java/org/dromara/hertzbeat/collector/dispatch/unit/TimeLengthConvertTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/dispatch/unit/TimeLengthConvertTest.java similarity index 94% rename from collector/src/test/java/org/dromara/hertzbeat/collector/dispatch/unit/TimeLengthConvertTest.java rename to collector/src/test/java/org/apache/hertzbeat/collector/dispatch/unit/TimeLengthConvertTest.java index ea611f3b26d..11b1d69de23 100644 --- a/collector/src/test/java/org/dromara/hertzbeat/collector/dispatch/unit/TimeLengthConvertTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/dispatch/unit/TimeLengthConvertTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.dispatch.unit; +package org.apache.hertzbeat.collector.dispatch.unit; -import org.dromara.hertzbeat.collector.dispatch.unit.impl.TimeLengthConvert; +import org.apache.hertzbeat.collector.dispatch.unit.impl.TimeLengthConvert; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/collector/src/test/java/org/dromara/hertzbeat/collector/util/CollectUtilTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/util/CollectUtilTest.java similarity index 97% rename from collector/src/test/java/org/dromara/hertzbeat/collector/util/CollectUtilTest.java rename to collector/src/test/java/org/apache/hertzbeat/collector/util/CollectUtilTest.java index 1f2ef4a04a8..2f10ab0df45 100644 --- a/collector/src/test/java/org/dromara/hertzbeat/collector/util/CollectUtilTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/util/CollectUtilTest.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.util; +package org.apache.hertzbeat.collector.util; import com.google.gson.Gson; import com.google.gson.JsonElement; -import org.dromara.hertzbeat.common.entity.job.Configmap; -import org.dromara.hertzbeat.common.entity.job.Metrics; +import org.apache.hertzbeat.common.entity.job.Configmap; +import org.apache.hertzbeat.common.entity.job.Metrics; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/collector/src/test/java/org/dromara/hertzbeat/collector/util/JsonPathParserTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/util/JsonPathParserTest.java similarity index 99% rename from collector/src/test/java/org/dromara/hertzbeat/collector/util/JsonPathParserTest.java rename to collector/src/test/java/org/apache/hertzbeat/collector/util/JsonPathParserTest.java index ee61cbe69d8..fe775ad096f 100644 --- a/collector/src/test/java/org/dromara/hertzbeat/collector/util/JsonPathParserTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/util/JsonPathParserTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.util; +package org.apache.hertzbeat.collector.util; import com.jayway.jsonpath.TypeRef; import org.junit.jupiter.api.BeforeEach; diff --git a/collector/src/test/java/org/dromara/hertzbeat/collector/util/PrivateKeyUtilsTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/util/PrivateKeyUtilsTest.java similarity index 98% rename from collector/src/test/java/org/dromara/hertzbeat/collector/util/PrivateKeyUtilsTest.java rename to collector/src/test/java/org/apache/hertzbeat/collector/util/PrivateKeyUtilsTest.java index 707df4a5742..cf14e131d36 100644 --- a/collector/src/test/java/org/dromara/hertzbeat/collector/util/PrivateKeyUtilsTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/util/PrivateKeyUtilsTest.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.collector.util; +package org.apache.hertzbeat.collector.util; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/common/README.md b/common/README.md deleted file mode 100644 index 0cb19ef4b64..00000000000 --- a/common/README.md +++ /dev/null @@ -1,4 +0,0 @@ -## Common lib - - -### Some Conventions diff --git a/common/pom.xml b/common/pom.xml index c9c63d86f92..dde1a652e54 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -20,7 +20,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> hertzbeat - org.dromara.hertzbeat + org.apache.hertzbeat 2.0-SNAPSHOT diff --git a/common/src/main/java/org/dromara/hertzbeat/common/cache/CacheFactory.java b/common/src/main/java/org/apache/hertzbeat/common/cache/CacheFactory.java similarity index 97% rename from common/src/main/java/org/dromara/hertzbeat/common/cache/CacheFactory.java rename to common/src/main/java/org/apache/hertzbeat/common/cache/CacheFactory.java index ee59f170cfc..40cf2689970 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/cache/CacheFactory.java +++ b/common/src/main/java/org/apache/hertzbeat/common/cache/CacheFactory.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.cache; +package org.apache.hertzbeat.common.cache; import java.time.Duration; /** * common cache factory - * */ public class CacheFactory { private CacheFactory() {} diff --git a/common/src/main/java/org/dromara/hertzbeat/common/cache/CaffeineCacheServiceImpl.java b/common/src/main/java/org/apache/hertzbeat/common/cache/CaffeineCacheServiceImpl.java similarity index 98% rename from common/src/main/java/org/dromara/hertzbeat/common/cache/CaffeineCacheServiceImpl.java rename to common/src/main/java/org/apache/hertzbeat/common/cache/CaffeineCacheServiceImpl.java index 4dde085e62f..71ae72f1a2b 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/cache/CaffeineCacheServiceImpl.java +++ b/common/src/main/java/org/apache/hertzbeat/common/cache/CaffeineCacheServiceImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.cache; +package org.apache.hertzbeat.common.cache; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; @@ -24,7 +24,6 @@ /** * caffeine cache impl - * */ public class CaffeineCacheServiceImpl implements CommonCacheService { private final Cache cache; diff --git a/common/src/main/java/org/dromara/hertzbeat/common/cache/CommonCacheService.java b/common/src/main/java/org/apache/hertzbeat/common/cache/CommonCacheService.java similarity index 96% rename from common/src/main/java/org/dromara/hertzbeat/common/cache/CommonCacheService.java rename to common/src/main/java/org/apache/hertzbeat/common/cache/CommonCacheService.java index cfa1ae406df..15be0cc0d85 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/cache/CommonCacheService.java +++ b/common/src/main/java/org/apache/hertzbeat/common/cache/CommonCacheService.java @@ -15,11 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.cache; +package org.apache.hertzbeat.common.cache; /** * common cache service - * */ public interface CommonCacheService { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/config/AviatorConfiguration.java b/common/src/main/java/org/apache/hertzbeat/common/config/AviatorConfiguration.java similarity index 99% rename from common/src/main/java/org/dromara/hertzbeat/common/config/AviatorConfiguration.java rename to common/src/main/java/org/apache/hertzbeat/common/config/AviatorConfiguration.java index 82f7d5cf92f..de2d789b14a 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/config/AviatorConfiguration.java +++ b/common/src/main/java/org/apache/hertzbeat/common/config/AviatorConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.config; +package org.apache.hertzbeat.common.config; import com.googlecode.aviator.AviatorEvaluator; import com.googlecode.aviator.AviatorEvaluatorInstance; @@ -39,7 +39,6 @@ /** * aviator config - * */ @Configuration @Slf4j diff --git a/common/src/main/java/org/dromara/hertzbeat/common/config/CommonConfig.java b/common/src/main/java/org/apache/hertzbeat/common/config/CommonConfig.java similarity index 89% rename from common/src/main/java/org/dromara/hertzbeat/common/config/CommonConfig.java rename to common/src/main/java/org/apache/hertzbeat/common/config/CommonConfig.java index b257c202516..7dfaf4ab597 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/config/CommonConfig.java +++ b/common/src/main/java/org/apache/hertzbeat/common/config/CommonConfig.java @@ -15,18 +15,17 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.config; +package org.apache.hertzbeat.common.config; -import org.dromara.hertzbeat.common.util.AesUtil; +import org.apache.hertzbeat.common.util.AesUtil; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; /** * common module config - * */ -@ComponentScan(basePackages = "org.dromara.hertzbeat.common") +@ComponentScan(basePackages = "org.apache.hertzbeat.common") @EnableConfigurationProperties(CommonProperties.class) @Configuration public class CommonConfig { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/config/CommonProperties.java b/common/src/main/java/org/apache/hertzbeat/common/config/CommonProperties.java similarity index 99% rename from common/src/main/java/org/dromara/hertzbeat/common/config/CommonProperties.java rename to common/src/main/java/org/apache/hertzbeat/common/config/CommonProperties.java index 0e09f91b8a3..8ac112dba6f 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/config/CommonProperties.java +++ b/common/src/main/java/org/apache/hertzbeat/common/config/CommonProperties.java @@ -15,14 +15,12 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.config; +package org.apache.hertzbeat.common.config; import org.springframework.boot.context.properties.ConfigurationProperties; /** * common module properties - * - * */ @ConfigurationProperties(prefix = "common") public class CommonProperties { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/constants/CollectorConstants.java b/common/src/main/java/org/apache/hertzbeat/common/constants/CollectorConstants.java similarity index 96% rename from common/src/main/java/org/dromara/hertzbeat/common/constants/CollectorConstants.java rename to common/src/main/java/org/apache/hertzbeat/common/constants/CollectorConstants.java index 0957a73da6c..13ffc3b83b5 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/constants/CollectorConstants.java +++ b/common/src/main/java/org/apache/hertzbeat/common/constants/CollectorConstants.java @@ -15,11 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.constants; +package org.apache.hertzbeat.common.constants; /** * collector constant - * */ public interface CollectorConstants { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/constants/CommonConstants.java b/common/src/main/java/org/apache/hertzbeat/common/constants/CommonConstants.java similarity index 99% rename from common/src/main/java/org/dromara/hertzbeat/common/constants/CommonConstants.java rename to common/src/main/java/org/apache/hertzbeat/common/constants/CommonConstants.java index afd13bdd8a6..0c268f9600b 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/constants/CommonConstants.java +++ b/common/src/main/java/org/apache/hertzbeat/common/constants/CommonConstants.java @@ -15,11 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.constants; +package org.apache.hertzbeat.common.constants; /** * Public Common Constant - * */ public interface CommonConstants { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/constants/SignConstants.java b/common/src/main/java/org/apache/hertzbeat/common/constants/SignConstants.java similarity index 95% rename from common/src/main/java/org/dromara/hertzbeat/common/constants/SignConstants.java rename to common/src/main/java/org/apache/hertzbeat/common/constants/SignConstants.java index 4bda2afbe95..1ac831d5aa2 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/constants/SignConstants.java +++ b/common/src/main/java/org/apache/hertzbeat/common/constants/SignConstants.java @@ -15,11 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.constants; +package org.apache.hertzbeat.common.constants; /** * Sign Constants - * */ public interface SignConstants { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/alerter/Alert.java b/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/Alert.java similarity index 96% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/alerter/Alert.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/alerter/Alert.java index f5b80ade928..632393bd35f 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/alerter/Alert.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/Alert.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.alerter; +package org.apache.hertzbeat.common.entity.alerter; -import org.dromara.hertzbeat.common.util.JsonUtil; +import org.apache.hertzbeat.common.util.JsonUtil; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; @@ -43,7 +43,6 @@ /** * Alarm record entity - * */ @Entity @Table(name = "hzb_alert") @@ -57,7 +56,7 @@ public class Alert { @Id @GeneratedValue(strategy = GenerationType.IDENTITY, generator = "snow-flake-id") - @GenericGenerator(name = "snow-flake-id", strategy = "org.dromara.hertzbeat.common.util.SnowFlakeIdGenerator") + @GenericGenerator(name = "snow-flake-id", strategy = "org.apache.hertzbeat.common.util.SnowFlakeIdGenerator") @Schema(title = "Alarm record entity primary key index ID", description = "告警记录实体主键索引ID", example = "87584674384", accessMode = READ_ONLY) diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/alerter/AlertConverge.java b/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertConverge.java similarity index 94% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/alerter/AlertConverge.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertConverge.java index b21b971c53a..d1eb0d7928b 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/alerter/AlertConverge.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertConverge.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.alerter; +package org.apache.hertzbeat.common.entity.alerter; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.hertzbeat.common.entity.manager.JsonByteListAttributeConverter; -import org.dromara.hertzbeat.common.entity.manager.JsonTagListAttributeConverter; -import org.dromara.hertzbeat.common.entity.manager.TagItem; +import org.apache.hertzbeat.common.entity.manager.JsonByteListAttributeConverter; +import org.apache.hertzbeat.common.entity.manager.JsonTagListAttributeConverter; +import org.apache.hertzbeat.common.entity.manager.TagItem; import org.hibernate.validator.constraints.Length; import org.springframework.data.annotation.CreatedBy; import org.springframework.data.annotation.CreatedDate; @@ -43,7 +43,6 @@ /** * Alert Converge strategy entity - * */ @Entity @Table(name = "hzb_alert_converge") diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/alerter/AlertDefine.java b/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefine.java similarity index 96% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/alerter/AlertDefine.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefine.java index 2d8c8c62e35..8145f3675c7 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/alerter/AlertDefine.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefine.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.alerter; +package org.apache.hertzbeat.common.entity.alerter; import com.google.common.base.Objects; import io.swagger.v3.oas.annotations.media.Schema; @@ -23,8 +23,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.hertzbeat.common.entity.manager.JsonTagListAttributeConverter; -import org.dromara.hertzbeat.common.entity.manager.TagItem; +import org.apache.hertzbeat.common.entity.manager.JsonTagListAttributeConverter; +import org.apache.hertzbeat.common.entity.manager.TagItem; import org.hibernate.validator.constraints.Length; import org.springframework.data.annotation.CreatedBy; import org.springframework.data.annotation.CreatedDate; @@ -46,7 +46,6 @@ /** * Alarm Define Rule Entity - * */ @Entity @Table(name = "hzb_alert_define") diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/alerter/AlertDefineMonitorBind.java b/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefineMonitorBind.java similarity index 96% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/alerter/AlertDefineMonitorBind.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefineMonitorBind.java index 3427f6aee96..912b7558839 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/alerter/AlertDefineMonitorBind.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefineMonitorBind.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.alerter; +package org.apache.hertzbeat.common.entity.alerter; -import org.dromara.hertzbeat.common.entity.manager.Monitor; +import org.apache.hertzbeat.common.entity.manager.Monitor; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; @@ -38,7 +38,6 @@ /** * Alarm Threshold Relate Monitor Entity - * */ @Entity @Table(name = "hzb_alert_define_monitor_bind", indexes = { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/alerter/AlertSilence.java b/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertSilence.java similarity index 94% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/alerter/AlertSilence.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertSilence.java index 3bc504a38a4..16b51354da1 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/alerter/AlertSilence.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertSilence.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.alerter; +package org.apache.hertzbeat.common.entity.alerter; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.hertzbeat.common.entity.manager.JsonByteListAttributeConverter; -import org.dromara.hertzbeat.common.entity.manager.JsonTagListAttributeConverter; -import org.dromara.hertzbeat.common.entity.manager.TagItem; +import org.apache.hertzbeat.common.entity.manager.JsonByteListAttributeConverter; +import org.apache.hertzbeat.common.entity.manager.JsonTagListAttributeConverter; +import org.apache.hertzbeat.common.entity.manager.TagItem; import org.hibernate.validator.constraints.Length; import org.springframework.data.annotation.CreatedBy; import org.springframework.data.annotation.CreatedDate; @@ -43,7 +43,6 @@ /** * Alert Silence strategy entity - * */ @Entity @Table(name = "hzb_alert_silence") diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/alerter/JsonMapAttributeConverter.java b/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/JsonMapAttributeConverter.java similarity index 93% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/alerter/JsonMapAttributeConverter.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/alerter/JsonMapAttributeConverter.java index 54e3aa2c3a4..834d151017e 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/alerter/JsonMapAttributeConverter.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/alerter/JsonMapAttributeConverter.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.alerter; +package org.apache.hertzbeat.common.entity.alerter; -import org.dromara.hertzbeat.common.util.JsonUtil; +import org.apache.hertzbeat.common.util.JsonUtil; import com.fasterxml.jackson.core.type.TypeReference; import jakarta.persistence.AttributeConverter; @@ -25,7 +25,6 @@ /** * json map converter - * */ public class JsonMapAttributeConverter implements AttributeConverter, String> { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/AlertReport.java b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/AlertReport.java similarity index 98% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/dto/AlertReport.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/dto/AlertReport.java index 593149fbbbd..372c8d59bcc 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/AlertReport.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/AlertReport.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.dto; +package org.apache.hertzbeat.common.entity.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -30,7 +30,6 @@ /** * Alarm Report Content Entity - * */ @Data @Builder diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/CollectorInfo.java b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/CollectorInfo.java similarity index 92% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/dto/CollectorInfo.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/dto/CollectorInfo.java index 843ea47813a..d23531bfa2b 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/CollectorInfo.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/CollectorInfo.java @@ -15,20 +15,19 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.dto; +package org.apache.hertzbeat.common.entity.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.constants.CommonConstants; import jakarta.validation.constraints.NotNull; /** * collector info - * */ @Data @Builder diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/CollectorSummary.java b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/CollectorSummary.java similarity index 92% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/dto/CollectorSummary.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/dto/CollectorSummary.java index ce5ff607128..f043a2ae483 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/CollectorSummary.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/CollectorSummary.java @@ -15,18 +15,17 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.dto; +package org.apache.hertzbeat.common.entity.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.hertzbeat.common.entity.manager.Collector; +import org.apache.hertzbeat.common.entity.manager.Collector; /** * collector summary - * */ @Data @Builder diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/Field.java b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/Field.java similarity index 96% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/dto/Field.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/dto/Field.java index afaad82ddd7..72c7ccd77b8 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/Field.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/Field.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.dto; +package org.apache.hertzbeat.common.entity.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -25,7 +25,6 @@ /** * monitoring metrics field - * */ @Data @Builder diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/Message.java b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/Message.java similarity index 92% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/dto/Message.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/dto/Message.java index 32de62be5c7..5505b7ab598 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/Message.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/Message.java @@ -15,12 +15,11 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.dto; +package org.apache.hertzbeat.common.entity.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; - -import static org.dromara.hertzbeat.common.constants.CommonConstants.SUCCESS_CODE; +import org.apache.hertzbeat.common.constants.CommonConstants; /** * Unified message structure definition for front and back ends @@ -30,8 +29,6 @@ * msg: message, * code: 3432 * } - * - * */ @Data @Schema(description = "Common message structure") @@ -53,7 +50,7 @@ public class Message { * response code, not http code */ @Schema(title = "Response Code") - private byte code = SUCCESS_CODE; + private byte code = CommonConstants.SUCCESS_CODE; public static Message success() { return new Message<>(); diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/MetricsData.java b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsData.java similarity index 96% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/dto/MetricsData.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsData.java index 3cd7cc34e82..4f63ec9f211 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/MetricsData.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsData.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.dto; +package org.apache.hertzbeat.common.entity.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -27,7 +27,6 @@ /** * Monitoring Metrics Data - * */ @Data @Builder diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/MetricsHistoryData.java b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsHistoryData.java similarity index 96% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/dto/MetricsHistoryData.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsHistoryData.java index a3e5ec8514a..5cbb8ae3228 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/MetricsHistoryData.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsHistoryData.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.dto; +package org.apache.hertzbeat.common.entity.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -28,7 +28,6 @@ /** * Metric History Range Query Data - * */ @Data @Builder diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/PromVectorOrMatrix.java b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/PromVectorOrMatrix.java similarity index 98% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/dto/PromVectorOrMatrix.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/dto/PromVectorOrMatrix.java index 865262edafe..483dc82dbd1 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/PromVectorOrMatrix.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/PromVectorOrMatrix.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.dto; +package org.apache.hertzbeat.common.entity.dto; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; @@ -32,7 +32,6 @@ /** * prometheus vector or matrix entity - * */ @lombok.Data @AllArgsConstructor diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/Value.java b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/Value.java similarity index 97% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/dto/Value.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/dto/Value.java index 75731c5a6f3..6898fdef458 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/Value.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/Value.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.dto; +package org.apache.hertzbeat.common.entity.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -25,7 +25,6 @@ /** * Monitoring Metrics Data - * */ @Data @Builder diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/ValueRow.java b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/ValueRow.java similarity index 96% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/dto/ValueRow.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/dto/ValueRow.java index 95fa7b5b102..0d2c3007f39 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/ValueRow.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/dto/ValueRow.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.dto; +package org.apache.hertzbeat.common.entity.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -28,8 +28,6 @@ /** * Monitoring Metrics DataRow - * - * */ @Data @Builder diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/Configmap.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/Configmap.java similarity index 96% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/job/Configmap.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/job/Configmap.java index 08f415e20f5..675e08679ff 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/Configmap.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/Configmap.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.job; +package org.apache.hertzbeat.common.entity.job; import lombok.AllArgsConstructor; import lombok.Builder; @@ -26,7 +26,6 @@ * Monitoring configuration parameter properties and values * During the process, you need to replace the content with the identifier ^_^key^_^ * in the protocol configuration parameter with the real value in the configuration parameter - * */ @Data @AllArgsConstructor @@ -37,7 +36,6 @@ public class Configmap { /** * Parameter key, replace the content with the identifier ^^_key_^^ in the protocol * configuration parameter with the real value in the configuration parameter - *

* 参数key,将协议配置参数里面的标识符为^^_key_^^的内容替换为配置参数里的真实值 */ private String key; diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/Job.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/Job.java similarity index 97% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/job/Job.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/job/Job.java index 23bb1076ef9..9987b0543c6 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/Job.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/Job.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.job; +package org.apache.hertzbeat.common.entity.job; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -24,16 +24,15 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.entity.manager.ParamDefine; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.util.JsonUtil; +import org.apache.hertzbeat.common.entity.manager.ParamDefine; +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 - * */ @Data @AllArgsConstructor diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/Metrics.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/Metrics.java similarity index 97% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/job/Metrics.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/job/Metrics.java index 4fba9eb3ec1..1f78e7919c8 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/Metrics.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/Metrics.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.job; +package org.apache.hertzbeat.common.entity.job; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; @@ -23,8 +23,9 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.entity.job.protocol.*; -import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.entity.job.protocol.*; +import org.apache.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.entity.job.protocol.*; import java.util.List; import java.util.Map; @@ -35,8 +36,6 @@ /** * Details of the monitoring metrics collected * eg: cpu | memory | health - * - * */ @Data @AllArgsConstructor diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/DnsProtocol.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/DnsProtocol.java similarity index 95% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/DnsProtocol.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/DnsProtocol.java index 4e4e25e99cc..6909683b795 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/DnsProtocol.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/DnsProtocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.job.protocol; +package org.apache.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/FtpProtocol.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/FtpProtocol.java similarity index 95% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/FtpProtocol.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/FtpProtocol.java index e929f9aee3a..66ccf9036a0 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/FtpProtocol.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/FtpProtocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.job.protocol; +package org.apache.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; @@ -24,7 +24,6 @@ /** * ftp protocol - * */ @Data @Builder diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/HttpProtocol.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/HttpProtocol.java similarity index 98% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/HttpProtocol.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/HttpProtocol.java index e79ffd7996e..86102c824dd 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/HttpProtocol.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/HttpProtocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.job.protocol; +package org.apache.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; @@ -27,7 +27,6 @@ /** * http 协议配置 - * */ @Data @Builder diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/HttpsdProtocol.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/HttpsdProtocol.java similarity index 89% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/HttpsdProtocol.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/HttpsdProtocol.java index fb9f9df215b..c4c5efaaa11 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/HttpsdProtocol.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/HttpsdProtocol.java @@ -1,4 +1,4 @@ -package org.dromara.hertzbeat.common.entity.job.protocol; +package org.apache.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/IcmpProtocol.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/IcmpProtocol.java similarity index 95% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/IcmpProtocol.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/IcmpProtocol.java index 682b12f56e5..3ba88704cb1 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/IcmpProtocol.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/IcmpProtocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.job.protocol; +package org.apache.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; @@ -24,7 +24,6 @@ /** * ICMP (PING) PROTOCOL CONFIGURATION - * */ @Data @Builder diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/JdbcProtocol.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/JdbcProtocol.java similarity index 96% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/JdbcProtocol.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/JdbcProtocol.java index f2bfcada0f4..9e2617af491 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/JdbcProtocol.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/JdbcProtocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.job.protocol; +package org.apache.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; @@ -24,7 +24,6 @@ /** * Database configuration information implemented by the common jdbc specification - * */ @Data @Builder diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/JmxProtocol.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/JmxProtocol.java similarity index 96% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/JmxProtocol.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/JmxProtocol.java index 1796915826e..0087bfe41a4 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/JmxProtocol.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/JmxProtocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.job.protocol; +package org.apache.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; @@ -24,8 +24,6 @@ /** * Jmx protocol - * - * **/ @Data @Builder diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/MemcachedProtocol.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MemcachedProtocol.java similarity index 95% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/MemcachedProtocol.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MemcachedProtocol.java index 951d026dd95..d2b90c78a17 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/MemcachedProtocol.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MemcachedProtocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.job.protocol; +package org.apache.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/MongodbProtocol.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MongodbProtocol.java similarity index 96% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/MongodbProtocol.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MongodbProtocol.java index a5c4b5a87f5..b3be39e055f 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/MongodbProtocol.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MongodbProtocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.job.protocol; +package org.apache.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/NebulaGraphProtocol.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NebulaGraphProtocol.java similarity index 96% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/NebulaGraphProtocol.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NebulaGraphProtocol.java index 09c185474a7..90a9b611179 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/NebulaGraphProtocol.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NebulaGraphProtocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.job.protocol; +package org.apache.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/NginxProtocol.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NginxProtocol.java similarity index 96% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/NginxProtocol.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NginxProtocol.java index c53e9ea4094..d26511b9c0b 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/NginxProtocol.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NginxProtocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.job.protocol; +package org.apache.hertzbeat.common.entity.job.protocol; import org.apache.commons.lang3.StringUtils; import lombok.AllArgsConstructor; diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/NtpProtocol.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NtpProtocol.java similarity index 95% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/NtpProtocol.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NtpProtocol.java index c42d3130edb..70b713d2447 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/NtpProtocol.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NtpProtocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.job.protocol; +package org.apache.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/Pop3Protocol.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/Pop3Protocol.java similarity index 96% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/Pop3Protocol.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/Pop3Protocol.java index 2f40e0a01f0..ef1a9ec2ae8 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/Pop3Protocol.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/Pop3Protocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.job.protocol; +package org.apache.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/PrometheusProtocol.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PrometheusProtocol.java similarity index 97% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/PrometheusProtocol.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PrometheusProtocol.java index a66e279c9c6..9357bea0f2d 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/PrometheusProtocol.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PrometheusProtocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.job.protocol; +package org.apache.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; @@ -26,7 +26,6 @@ /** * Prometheus Protocol configuration - * */ @Data @Builder diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/PushProtocol.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PushProtocol.java similarity index 90% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/PushProtocol.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PushProtocol.java index dff46ee33bb..156ff335ea3 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/PushProtocol.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PushProtocol.java @@ -15,20 +15,18 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.job.protocol; +package org.apache.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.hertzbeat.common.entity.dto.Field; +import org.apache.hertzbeat.common.entity.dto.Field; import java.util.List; /** * push protocol definition - * - * */ @Data @Builder diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/RedisProtocol.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RedisProtocol.java similarity index 95% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/RedisProtocol.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RedisProtocol.java index e78405b7ff8..741bdd9f3a8 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/RedisProtocol.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RedisProtocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.job.protocol; +package org.apache.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; @@ -24,7 +24,6 @@ /** * Redis Protocol - * @version 1.0 */ @Data @Builder diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/RocketmqProtocol.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RocketmqProtocol.java similarity index 95% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/RocketmqProtocol.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RocketmqProtocol.java index ebc7dfff584..ce6d4dcce7a 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/RocketmqProtocol.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RocketmqProtocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.job.protocol; +package org.apache.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; @@ -24,7 +24,6 @@ /** * rocketmq protocol - * */ @Data @Builder diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/SmtpProtocol.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SmtpProtocol.java similarity index 95% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/SmtpProtocol.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SmtpProtocol.java index 41a2cc964a7..2c5638037d9 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/SmtpProtocol.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SmtpProtocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.job.protocol; +package org.apache.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/SnmpProtocol.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SnmpProtocol.java similarity index 97% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/SnmpProtocol.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SnmpProtocol.java index da442fe98f4..15ef62b8286 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/SnmpProtocol.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SnmpProtocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.job.protocol; +package org.apache.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; @@ -26,7 +26,6 @@ /** * snmp Protocol configuration - * */ @Data @Builder diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/SshProtocol.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SshProtocol.java similarity index 96% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/SshProtocol.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SshProtocol.java index 1f624bc068b..e3f09b7abbb 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/SshProtocol.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SshProtocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.job.protocol; +package org.apache.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; @@ -24,7 +24,6 @@ /** * ssh Protocol parameter configuration - * */ @Data @Builder diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/TelnetProtocol.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/TelnetProtocol.java similarity index 95% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/TelnetProtocol.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/TelnetProtocol.java index 43864de140a..3ee5d67e01e 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/TelnetProtocol.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/TelnetProtocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.job.protocol; +package org.apache.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; @@ -24,7 +24,6 @@ /** * telnet Protocol configuration - * */ @Data @Builder diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/UdpProtocol.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/UdpProtocol.java similarity index 95% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/UdpProtocol.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/UdpProtocol.java index e06fa0b4f2f..26e273f81ab 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/UdpProtocol.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/UdpProtocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.job.protocol; +package org.apache.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; @@ -24,7 +24,6 @@ /** * Use udp implemented by socket for service port availability detection - * */ @Data @Builder diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/WebsocketProtocol.java b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/WebsocketProtocol.java similarity index 95% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/WebsocketProtocol.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/WebsocketProtocol.java index c57936e73ae..9d46b00028c 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/job/protocol/WebsocketProtocol.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/WebsocketProtocol.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.job.protocol; +package org.apache.hertzbeat.common.entity.job.protocol; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/Collector.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/Collector.java similarity index 98% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/manager/Collector.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/manager/Collector.java index cfabc94d9dc..7e14b37c810 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/Collector.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/Collector.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.manager; +package org.apache.hertzbeat.common.entity.manager; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -41,8 +41,6 @@ /** * collector entity - * - * */ @Entity @Table(name = "hzb_collector", uniqueConstraints = @UniqueConstraint(columnNames = {"name"})) diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/CollectorMonitorBind.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/CollectorMonitorBind.java similarity index 98% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/manager/CollectorMonitorBind.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/manager/CollectorMonitorBind.java index 637bcdfea26..4da786487be 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/CollectorMonitorBind.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/CollectorMonitorBind.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.manager; +package org.apache.hertzbeat.common.entity.manager; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -40,8 +40,6 @@ /** * collector entity - * - * */ @Entity @Table(name = "hzb_collector_monitor_bind", indexes = { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/GeneralConfig.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/GeneralConfig.java similarity index 97% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/manager/GeneralConfig.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/manager/GeneralConfig.java index c42e0f23715..7cbbb8991f7 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/GeneralConfig.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/GeneralConfig.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.manager; +package org.apache.hertzbeat.common.entity.manager; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -38,8 +38,6 @@ /** * Common Config Entity - * - * */ @Entity @Table(name = "hzb_config") diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/JsonByteListAttributeConverter.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonByteListAttributeConverter.java similarity index 92% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/manager/JsonByteListAttributeConverter.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonByteListAttributeConverter.java index 5e9c67f8a5f..ab13cbbd9cf 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/JsonByteListAttributeConverter.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonByteListAttributeConverter.java @@ -15,18 +15,16 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.manager; +package org.apache.hertzbeat.common.entity.manager; import com.fasterxml.jackson.core.type.TypeReference; -import org.dromara.hertzbeat.common.util.JsonUtil; +import org.apache.hertzbeat.common.util.JsonUtil; import jakarta.persistence.AttributeConverter; import java.util.List; /** * json str to list Byte converter - * - * */ public class JsonByteListAttributeConverter implements AttributeConverter, String> { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/JsonOptionListAttributeConverter.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonOptionListAttributeConverter.java similarity index 90% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/manager/JsonOptionListAttributeConverter.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonOptionListAttributeConverter.java index a704e257868..bb1b656264b 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/JsonOptionListAttributeConverter.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonOptionListAttributeConverter.java @@ -15,18 +15,16 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.manager; +package org.apache.hertzbeat.common.entity.manager; import com.fasterxml.jackson.core.type.TypeReference; -import org.dromara.hertzbeat.common.util.JsonUtil; +import org.apache.hertzbeat.common.util.JsonUtil; import jakarta.persistence.AttributeConverter; import java.util.List; /** - * json str to list paramDefine.Option - * - * + * json str to list paramDefine.Option */ public class JsonOptionListAttributeConverter implements AttributeConverter, String> { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/JsonTagAttributeConverter.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonTagAttributeConverter.java similarity index 92% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/manager/JsonTagAttributeConverter.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonTagAttributeConverter.java index 5f8d0181492..a254a95a50c 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/JsonTagAttributeConverter.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonTagAttributeConverter.java @@ -15,17 +15,15 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.manager; +package org.apache.hertzbeat.common.entity.manager; import com.fasterxml.jackson.core.type.TypeReference; -import org.dromara.hertzbeat.common.util.JsonUtil; +import org.apache.hertzbeat.common.util.JsonUtil; import jakarta.persistence.AttributeConverter; /** * json str to tag item - * - * */ public class JsonTagAttributeConverter implements AttributeConverter { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/JsonTagListAttributeConverter.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonTagListAttributeConverter.java similarity index 93% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/manager/JsonTagListAttributeConverter.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonTagListAttributeConverter.java index b6d2f82ae76..aa447f165cc 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/JsonTagListAttributeConverter.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonTagListAttributeConverter.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.manager; +package org.apache.hertzbeat.common.entity.manager; import com.fasterxml.jackson.core.type.TypeReference; -import org.dromara.hertzbeat.common.util.JsonUtil; +import org.apache.hertzbeat.common.util.JsonUtil; import jakarta.persistence.AttributeConverter; import java.util.List; @@ -26,9 +26,7 @@ import java.util.stream.Collectors; /** - * json str to tag list - * - * + * json str to tag list */ public class JsonTagListAttributeConverter implements AttributeConverter, String> { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/Monitor.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/Monitor.java similarity index 97% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/manager/Monitor.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/manager/Monitor.java index 921e499f9b1..fe9d5ca3deb 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/Monitor.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/Monitor.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.manager; +package org.apache.hertzbeat.common.entity.manager; -import org.dromara.hertzbeat.common.support.valid.HostValid; +import org.apache.hertzbeat.common.support.valid.HostValid; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; @@ -40,7 +40,6 @@ /** * Monitor Entity - * */ @Entity @Table(name = "hzb_monitor", indexes = { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/NoticeReceiver.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/NoticeReceiver.java similarity index 99% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/manager/NoticeReceiver.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/manager/NoticeReceiver.java index 14bfe2c6277..cf40b2d7086 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/NoticeReceiver.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/NoticeReceiver.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.manager; +package org.apache.hertzbeat.common.entity.manager; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -41,7 +41,6 @@ /** * Message notification recipient entity * 消息通知接收人实体 - * */ @Entity @Table(name = "hzb_notice_receiver") diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/NoticeRule.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/NoticeRule.java similarity index 98% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/manager/NoticeRule.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/manager/NoticeRule.java index 2ab7450f324..4faf60a9849 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/NoticeRule.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/NoticeRule.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.manager; +package org.apache.hertzbeat.common.entity.manager; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -40,7 +40,6 @@ /** * Notification strategy entity * 通知策略 - * */ @Entity @Table(name = "hzb_notice_rule") diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/NoticeTemplate.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/NoticeTemplate.java similarity index 98% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/manager/NoticeTemplate.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/manager/NoticeTemplate.java index 032d1c6e69a..3f38727b290 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/NoticeTemplate.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/NoticeTemplate.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.manager; +package org.apache.hertzbeat.common.entity.manager; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -41,7 +41,6 @@ /** * Notification template entity * 通知模版 - * */ @Entity @Table(name = "hzb_notice_template") diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/Param.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/Param.java similarity index 98% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/manager/Param.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/manager/Param.java index 7855376667c..5f6853dae0e 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/Param.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/Param.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.manager; +package org.apache.hertzbeat.common.entity.manager; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -39,7 +39,6 @@ /** * Monitor parameter values * 监控参数值 - * */ @Entity @Table(name = "hzb_param", indexes = { @Index(columnList = "monitorId") }, diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/ParamDefine.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/ParamDefine.java similarity index 98% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/manager/ParamDefine.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/manager/ParamDefine.java index c9c085d3872..6bfe4ad5afa 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/ParamDefine.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/ParamDefine.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.manager; +package org.apache.hertzbeat.common.entity.manager; -import org.dromara.hertzbeat.common.entity.alerter.JsonMapAttributeConverter; +import org.apache.hertzbeat.common.entity.alerter.JsonMapAttributeConverter; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; @@ -40,7 +40,6 @@ /** * Monitoring parameter definitions * 监控参数定义 - * */ @Entity @Table(name = "hzb_param_define") diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/StatusPageComponent.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageComponent.java similarity index 98% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/manager/StatusPageComponent.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageComponent.java index 2a817d73576..ca616fce998 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/StatusPageComponent.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageComponent.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.manager; +package org.apache.hertzbeat.common.entity.manager; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -34,7 +34,6 @@ /** * status page component entity - * */ @Entity @Table(name = "hzb_status_page_component") diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/StatusPageHistory.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageHistory.java similarity index 98% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/manager/StatusPageHistory.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageHistory.java index b5fb2fc2159..87b428bf10f 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/StatusPageHistory.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageHistory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.manager; +package org.apache.hertzbeat.common.entity.manager; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -35,7 +35,6 @@ /** * status page history entity - * */ @Entity @Table(name = "hzb_status_page_history") diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/StatusPageIncident.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncident.java similarity index 98% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/manager/StatusPageIncident.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncident.java index d4761552583..19eb75453a7 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/StatusPageIncident.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncident.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.manager; +package org.apache.hertzbeat.common.entity.manager; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -36,7 +36,6 @@ /** * status page incident entity - * */ @Entity @Table(name = "hzb_status_page_incident") diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/StatusPageIncidentComponentBind.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentComponentBind.java similarity index 97% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/manager/StatusPageIncidentComponentBind.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentComponentBind.java index 4fad89c0f18..d1b859a24d0 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/StatusPageIncidentComponentBind.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentComponentBind.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.manager; +package org.apache.hertzbeat.common.entity.manager; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -32,7 +32,6 @@ /** * status page incident component bind entity - * */ @Entity @Table(name = "hzb_status_page_incident_component_bind", indexes = { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/StatusPageIncidentContent.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentContent.java similarity index 98% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/manager/StatusPageIncidentContent.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentContent.java index da7f293b40d..36a36c12712 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/StatusPageIncidentContent.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentContent.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.manager; +package org.apache.hertzbeat.common.entity.manager; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -34,7 +34,6 @@ /** * status page incident entity content. - * */ @Entity @Table(name = "hzb_status_page_incident_content") diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/StatusPageOrg.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageOrg.java similarity index 98% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/manager/StatusPageOrg.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageOrg.java index b1d34a4aa9b..8b998c84757 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/StatusPageOrg.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageOrg.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.manager; +package org.apache.hertzbeat.common.entity.manager; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -35,7 +35,6 @@ /** * status page org entity - * */ @Entity @Table(name = "hzb_status_page_org") diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/Tag.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/Tag.java similarity index 98% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/manager/Tag.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/manager/Tag.java index 8bc3b37500a..465ce4916d1 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/Tag.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/Tag.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.manager; +package org.apache.hertzbeat.common.entity.manager; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -39,7 +39,6 @@ /** * Tag Entity - * */ @Entity @Table(name = "hzb_tag") diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/TagItem.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/TagItem.java similarity index 95% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/manager/TagItem.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/manager/TagItem.java index 3ebc0de66ef..627595fbc77 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/TagItem.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/TagItem.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.manager; +package org.apache.hertzbeat.common.entity.manager; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -26,8 +26,6 @@ /** * tag item - * - * */ @AllArgsConstructor @NoArgsConstructor diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/TagMonitorBind.java b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/TagMonitorBind.java similarity index 97% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/manager/TagMonitorBind.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/manager/TagMonitorBind.java index 1358a70eb35..21ff9474bc7 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/TagMonitorBind.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/manager/TagMonitorBind.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.manager; +package org.apache.hertzbeat.common.entity.manager; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -34,7 +34,6 @@ /** * Tag Bind Monitor * 标签与监控关联实体 - * */ @Entity @Table(name = "hzb_tag_monitor_bind", indexes = { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/message/ClusterMsg.java b/common/src/main/java/org/apache/hertzbeat/common/entity/message/ClusterMsg.java similarity index 94% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/message/ClusterMsg.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/message/ClusterMsg.java index 582972ad585..71b16bd731c 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/message/ClusterMsg.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/message/ClusterMsg.java @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: cluster_msg.proto -package org.dromara.hertzbeat.common.entity.message; +package org.apache.hertzbeat.common.entity.message; @SuppressWarnings("all") public final class ClusterMsg { @@ -19,7 +19,7 @@ public static void registerAllExtensions( } /** - * Protobuf enum {@code org.dromara.hertzbeat.common.entity.message.MessageType} + * Protobuf enum {@code org.apache.hertzbeat.common.entity.message.MessageType} */ public enum MessageType implements com.google.protobuf.ProtocolMessageEnum { @@ -271,11 +271,11 @@ private MessageType(int value) { this.value = value; } - // @@protoc_insertion_point(enum_scope:org.dromara.hertzbeat.common.entity.message.MessageType) + // @@protoc_insertion_point(enum_scope:org.apache.hertzbeat.common.entity.message.MessageType) } /** - * Protobuf enum {@code org.dromara.hertzbeat.common.entity.message.Direction} + * Protobuf enum {@code org.apache.hertzbeat.common.entity.message.Direction} */ public enum Direction implements com.google.protobuf.ProtocolMessageEnum { @@ -401,11 +401,11 @@ private Direction(int value) { this.value = value; } - // @@protoc_insertion_point(enum_scope:org.dromara.hertzbeat.common.entity.message.Direction) + // @@protoc_insertion_point(enum_scope:org.apache.hertzbeat.common.entity.message.Direction) } public interface MessageOrBuilder extends - // @@protoc_insertion_point(interface_extends:org.dromara.hertzbeat.common.entity.message.Message) + // @@protoc_insertion_point(interface_extends:org.apache.hertzbeat.common.entity.message.Message) com.google.protobuf.MessageOrBuilder { /** @@ -436,7 +436,7 @@ public interface MessageOrBuilder extends * message direction * * - * .org.dromara.hertzbeat.common.entity.message.Direction direction = 2; + * .org.apache.hertzbeat.common.entity.message.Direction direction = 2; * * @return The enum numeric value on the wire for direction. */ @@ -447,7 +447,7 @@ public interface MessageOrBuilder extends * message direction * * - * .org.dromara.hertzbeat.common.entity.message.Direction direction = 2; + * .org.apache.hertzbeat.common.entity.message.Direction direction = 2; * * @return The direction. */ @@ -458,7 +458,7 @@ public interface MessageOrBuilder extends * message type * * - * .org.dromara.hertzbeat.common.entity.message.MessageType type = 3; + * .org.apache.hertzbeat.common.entity.message.MessageType type = 3; * * @return The enum numeric value on the wire for type. */ @@ -469,7 +469,7 @@ public interface MessageOrBuilder extends * message type * * - * .org.dromara.hertzbeat.common.entity.message.MessageType type = 3; + * .org.apache.hertzbeat.common.entity.message.MessageType type = 3; * * @return The type. */ @@ -500,11 +500,11 @@ public interface MessageOrBuilder extends } /** - * Protobuf type {@code org.dromara.hertzbeat.common.entity.message.Message} + * Protobuf type {@code org.apache.hertzbeat.common.entity.message.Message} */ public static final class Message extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:org.dromara.hertzbeat.common.entity.message.Message) + // @@protoc_insertion_point(message_implements:org.apache.hertzbeat.common.entity.message.Message) MessageOrBuilder { private static final long serialVersionUID = 0L; @@ -668,7 +668,7 @@ public String getIdentity() { * message direction * * - * .org.dromara.hertzbeat.common.entity.message.Direction direction = 2; + * .org.apache.hertzbeat.common.entity.message.Direction direction = 2; * * @return The enum numeric value on the wire for direction. */ @@ -682,7 +682,7 @@ public int getDirectionValue() { * message direction * * - * .org.dromara.hertzbeat.common.entity.message.Direction direction = 2; + * .org.apache.hertzbeat.common.entity.message.Direction direction = 2; * * @return The direction. */ @@ -701,7 +701,7 @@ public Direction getDirection() { * message type * * - * .org.dromara.hertzbeat.common.entity.message.MessageType type = 3; + * .org.apache.hertzbeat.common.entity.message.MessageType type = 3; * * @return The enum numeric value on the wire for type. */ @@ -715,7 +715,7 @@ public int getTypeValue() { * message type * * - * .org.dromara.hertzbeat.common.entity.message.MessageType type = 3; + * .org.apache.hertzbeat.common.entity.message.MessageType type = 3; * * @return The type. */ @@ -979,11 +979,11 @@ protected Builder newBuilderForType( } /** - * Protobuf type {@code org.dromara.hertzbeat.common.entity.message.Message} + * Protobuf type {@code org.apache.hertzbeat.common.entity.message.Message} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:org.dromara.hertzbeat.common.entity.message.Message) + // @@protoc_insertion_point(builder_implements:org.apache.hertzbeat.common.entity.message.Message) MessageOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @@ -998,7 +998,7 @@ public static final class Builder extends Message.class, Builder.class); } - // Construct using org.dromara.hertzbeat.common.entity.message.ClusterMsg.Message.newBuilder() + // Construct using message.entity.org.apache.hertzbeat.common.ClusterMsg.Message.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -1266,7 +1266,7 @@ public Builder setIdentityBytes( * message direction * * - * .org.dromara.hertzbeat.common.entity.message.Direction direction = 2; + * .org.apache.hertzbeat.common.entity.message.Direction direction = 2; * * @return The enum numeric value on the wire for direction. */ @@ -1280,7 +1280,7 @@ public int getDirectionValue() { * message direction * * - * .org.dromara.hertzbeat.common.entity.message.Direction direction = 2; + * .org.apache.hertzbeat.common.entity.message.Direction direction = 2; * * @param value The enum numeric value on the wire for direction to set. * @return This builder for chaining. @@ -1297,7 +1297,7 @@ public Builder setDirectionValue(int value) { * message direction * * - * .org.dromara.hertzbeat.common.entity.message.Direction direction = 2; + * .org.apache.hertzbeat.common.entity.message.Direction direction = 2; * * @return The direction. */ @@ -1313,7 +1313,7 @@ public Direction getDirection() { * message direction * * - * .org.dromara.hertzbeat.common.entity.message.Direction direction = 2; + * .org.apache.hertzbeat.common.entity.message.Direction direction = 2; * * @param value The direction to set. * @return This builder for chaining. @@ -1333,7 +1333,7 @@ public Builder setDirection(Direction value) { * message direction * * - * .org.dromara.hertzbeat.common.entity.message.Direction direction = 2; + * .org.apache.hertzbeat.common.entity.message.Direction direction = 2; * * @return This builder for chaining. */ @@ -1351,7 +1351,7 @@ public Builder clearDirection() { * message type * * - * .org.dromara.hertzbeat.common.entity.message.MessageType type = 3; + * .org.apache.hertzbeat.common.entity.message.MessageType type = 3; * * @return The enum numeric value on the wire for type. */ @@ -1365,7 +1365,7 @@ public int getTypeValue() { * message type * * - * .org.dromara.hertzbeat.common.entity.message.MessageType type = 3; + * .org.apache.hertzbeat.common.entity.message.MessageType type = 3; * * @param value The enum numeric value on the wire for type to set. * @return This builder for chaining. @@ -1382,7 +1382,7 @@ public Builder setTypeValue(int value) { * message type * * - * .org.dromara.hertzbeat.common.entity.message.MessageType type = 3; + * .org.apache.hertzbeat.common.entity.message.MessageType type = 3; * * @return The type. */ @@ -1398,7 +1398,7 @@ public MessageType getType() { * message type * * - * .org.dromara.hertzbeat.common.entity.message.MessageType type = 3; + * .org.apache.hertzbeat.common.entity.message.MessageType type = 3; * * @param value The type to set. * @return This builder for chaining. @@ -1418,7 +1418,7 @@ public Builder setType(MessageType value) { * message type * * - * .org.dromara.hertzbeat.common.entity.message.MessageType type = 3; + * .org.apache.hertzbeat.common.entity.message.MessageType type = 3; * * @return This builder for chaining. */ @@ -1548,10 +1548,10 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:org.dromara.hertzbeat.common.entity.message.Message) + // @@protoc_insertion_point(builder_scope:org.apache.hertzbeat.common.entity.message.Message) } - // @@protoc_insertion_point(class_scope:org.dromara.hertzbeat.common.entity.message.Message) + // @@protoc_insertion_point(class_scope:org.apache.hertzbeat.common.entity.message.Message) private static final Message DEFAULT_INSTANCE; static { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/message/CollectRep.java b/common/src/main/java/org/apache/hertzbeat/common/entity/message/CollectRep.java similarity index 96% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/message/CollectRep.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/message/CollectRep.java index aa7284ae2d2..d013360ea81 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/message/CollectRep.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/message/CollectRep.java @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: collect_rep.proto -package org.dromara.hertzbeat.common.entity.message; +package org.apache.hertzbeat.common.entity.message; @SuppressWarnings("all") public final class CollectRep { @@ -16,7 +16,7 @@ public static void registerAllExtensions( (com.google.protobuf.ExtensionRegistryLite) registry); } /** - * Protobuf enum {@code org.dromara.hertzbeat.common.entity.message.Code} + * Protobuf enum {@code org.apache.hertzbeat.common.entity.message.Code} */ public enum Code implements com.google.protobuf.ProtocolMessageEnum { @@ -204,11 +204,11 @@ private Code(int value) { this.value = value; } - // @@protoc_insertion_point(enum_scope:org.dromara.hertzbeat.common.entity.message.Code) + // @@protoc_insertion_point(enum_scope:org.apache.hertzbeat.common.entity.message.Code) } public interface MetricsDataOrBuilder extends - // @@protoc_insertion_point(interface_extends:org.dromara.hertzbeat.common.entity.message.MetricsData) + // @@protoc_insertion_point(interface_extends:org.apache.hertzbeat.common.entity.message.MetricsData) com.google.protobuf.MessageOrBuilder { /** @@ -296,7 +296,7 @@ public interface MetricsDataOrBuilder extends * collect response code * * - * .org.dromara.hertzbeat.common.entity.message.Code code = 7; + * .org.apache.hertzbeat.common.entity.message.Code code = 7; * @return The enum numeric value on the wire for code. */ int getCodeValue(); @@ -305,7 +305,7 @@ public interface MetricsDataOrBuilder extends * collect response code * * - * .org.dromara.hertzbeat.common.entity.message.Code code = 7; + * .org.apache.hertzbeat.common.entity.message.Code code = 7; * @return The code. */ Code getCode(); @@ -335,7 +335,7 @@ public interface MetricsDataOrBuilder extends * monitoring collect metric field * * - * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 9; + * repeated .org.apache.hertzbeat.common.entity.message.Field fields = 9; */ java.util.List getFieldsList(); @@ -344,7 +344,7 @@ public interface MetricsDataOrBuilder extends * monitoring collect metric field * * - * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 9; + * repeated .org.apache.hertzbeat.common.entity.message.Field fields = 9; */ Field getFields(int index); /** @@ -352,7 +352,7 @@ public interface MetricsDataOrBuilder extends * monitoring collect metric field * * - * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 9; + * repeated .org.apache.hertzbeat.common.entity.message.Field fields = 9; */ int getFieldsCount(); /** @@ -360,7 +360,7 @@ public interface MetricsDataOrBuilder extends * monitoring collect metric field * * - * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 9; + * repeated .org.apache.hertzbeat.common.entity.message.Field fields = 9; */ java.util.List getFieldsOrBuilderList(); @@ -369,7 +369,7 @@ public interface MetricsDataOrBuilder extends * monitoring collect metric field * * - * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 9; + * repeated .org.apache.hertzbeat.common.entity.message.Field fields = 9; */ FieldOrBuilder getFieldsOrBuilder( int index); @@ -379,7 +379,7 @@ FieldOrBuilder getFieldsOrBuilder( * monitoring collect metric data, mapping with the fields * * - * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 10; + * repeated .org.apache.hertzbeat.common.entity.message.ValueRow values = 10; */ java.util.List getValuesList(); @@ -388,7 +388,7 @@ FieldOrBuilder getFieldsOrBuilder( * monitoring collect metric data, mapping with the fields * * - * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 10; + * repeated .org.apache.hertzbeat.common.entity.message.ValueRow values = 10; */ ValueRow getValues(int index); /** @@ -396,7 +396,7 @@ FieldOrBuilder getFieldsOrBuilder( * monitoring collect metric data, mapping with the fields * * - * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 10; + * repeated .org.apache.hertzbeat.common.entity.message.ValueRow values = 10; */ int getValuesCount(); /** @@ -404,7 +404,7 @@ FieldOrBuilder getFieldsOrBuilder( * monitoring collect metric data, mapping with the fields * * - * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 10; + * repeated .org.apache.hertzbeat.common.entity.message.ValueRow values = 10; */ java.util.List getValuesOrBuilderList(); @@ -413,17 +413,17 @@ FieldOrBuilder getFieldsOrBuilder( * monitoring collect metric data, mapping with the fields * * - * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 10; + * repeated .org.apache.hertzbeat.common.entity.message.ValueRow values = 10; */ ValueRowOrBuilder getValuesOrBuilder( int index); } /** - * Protobuf type {@code org.dromara.hertzbeat.common.entity.message.MetricsData} + * Protobuf type {@code org.apache.hertzbeat.common.entity.message.MetricsData} */ public static final class MetricsData extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:org.dromara.hertzbeat.common.entity.message.MetricsData) + // @@protoc_insertion_point(message_implements:org.apache.hertzbeat.common.entity.message.MetricsData) MetricsDataOrBuilder { private static final long serialVersionUID = 0L; // Use MetricsData.newBuilder() to construct. @@ -731,7 +731,7 @@ public long getTime() { * collect response code * * - * .org.dromara.hertzbeat.common.entity.message.Code code = 7; + * .org.apache.hertzbeat.common.entity.message.Code code = 7; * @return The enum numeric value on the wire for code. */ @Override public int getCodeValue() { @@ -742,7 +742,7 @@ public long getTime() { * collect response code * * - * .org.dromara.hertzbeat.common.entity.message.Code code = 7; + * .org.apache.hertzbeat.common.entity.message.Code code = 7; * @return The code. */ @Override public Code getCode() { @@ -804,7 +804,7 @@ public String getMsg() { * monitoring collect metric field * * - * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 9; + * repeated .org.apache.hertzbeat.common.entity.message.Field fields = 9; */ @Override public java.util.List getFieldsList() { @@ -815,7 +815,7 @@ public java.util.List getFieldsList() { * monitoring collect metric field * * - * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 9; + * repeated .org.apache.hertzbeat.common.entity.message.Field fields = 9; */ @Override public java.util.List @@ -827,7 +827,7 @@ public java.util.List getFieldsList() { * monitoring collect metric field * * - * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 9; + * repeated .org.apache.hertzbeat.common.entity.message.Field fields = 9; */ @Override public int getFieldsCount() { @@ -838,7 +838,7 @@ public int getFieldsCount() { * monitoring collect metric field * * - * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 9; + * repeated .org.apache.hertzbeat.common.entity.message.Field fields = 9; */ @Override public Field getFields(int index) { @@ -849,7 +849,7 @@ public Field getFields(int index) { * monitoring collect metric field * * - * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 9; + * repeated .org.apache.hertzbeat.common.entity.message.Field fields = 9; */ @Override public FieldOrBuilder getFieldsOrBuilder( @@ -864,7 +864,7 @@ public FieldOrBuilder getFieldsOrBuilder( * monitoring collect metric data, mapping with the fields * * - * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 10; + * repeated .org.apache.hertzbeat.common.entity.message.ValueRow values = 10; */ @Override public java.util.List getValuesList() { @@ -875,7 +875,7 @@ public java.util.List getValuesList() { * monitoring collect metric data, mapping with the fields * * - * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 10; + * repeated .org.apache.hertzbeat.common.entity.message.ValueRow values = 10; */ @Override public java.util.List @@ -887,7 +887,7 @@ public java.util.List getValuesList() { * monitoring collect metric data, mapping with the fields * * - * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 10; + * repeated .org.apache.hertzbeat.common.entity.message.ValueRow values = 10; */ @Override public int getValuesCount() { @@ -898,7 +898,7 @@ public int getValuesCount() { * monitoring collect metric data, mapping with the fields * * - * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 10; + * repeated .org.apache.hertzbeat.common.entity.message.ValueRow values = 10; */ @Override public ValueRow getValues(int index) { @@ -909,7 +909,7 @@ public ValueRow getValues(int index) { * monitoring collect metric data, mapping with the fields * * - * repeated .org.dromara.hertzbeat.common.entity.message.ValueRow values = 10; + * repeated .org.apache.hertzbeat.common.entity.message.ValueRow values = 10; */ @Override public ValueRowOrBuilder getValuesOrBuilder( @@ -1175,11 +1175,11 @@ protected Builder newBuilderForType( return builder; } /** - * Protobuf type {@code org.dromara.hertzbeat.common.entity.message.MetricsData} + * Protobuf type {@code org.apache.hertzbeat.common.entity.message.MetricsData} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:org.dromara.hertzbeat.common.entity.message.MetricsData) + // @@protoc_insertion_point(builder_implements:org.apache.hertzbeat.common.entity.message.MetricsData) MetricsDataOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @@ -1194,7 +1194,7 @@ public static final class Builder extends MetricsData.class, Builder.class); } - // Construct using org.dromara.hertzbeat.common.entity.message.CollectRep.MetricsData.newBuilder() + // Construct using message.entity.org.apache.hertzbeat.common.CollectRep.MetricsData.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -1822,7 +1822,7 @@ public Builder clearTime() { * collect response code * * - * .org.dromara.hertzbeat.common.entity.message.Code code = 7; + * .org.apache.hertzbeat.common.entity.message.Code code = 7; * @return The enum numeric value on the wire for code. */ @Override public int getCodeValue() { @@ -1833,7 +1833,7 @@ public Builder clearTime() { * collect response code * * - * .org.dromara.hertzbeat.common.entity.message.Code code = 7; + * .org.apache.hertzbeat.common.entity.message.Code code = 7; * @param value The enum numeric value on the wire for code to set. * @return This builder for chaining. */ @@ -1848,7 +1848,7 @@ public Builder setCodeValue(int value) { * collect response code * * - * .org.dromara.hertzbeat.common.entity.message.Code code = 7; + * .org.apache.hertzbeat.common.entity.message.Code code = 7; * @return The code. */ @Override @@ -1862,7 +1862,7 @@ public Code getCode() { * collect response code * * - * .org.dromara.hertzbeat.common.entity.message.Code code = 7; + * .org.apache.hertzbeat.common.entity.message.Code code = 7; * @param value The code to set. * @return This builder for chaining. */ @@ -1880,7 +1880,7 @@ public Builder setCode(Code value) { * collect response code * * - * .org.dromara.hertzbeat.common.entity.message.Code code = 7; + * .org.apache.hertzbeat.common.entity.message.Code code = 7; * @return This builder for chaining. */ public Builder clearCode() { @@ -2003,7 +2003,7 @@ private void ensureFieldsIsMutable() { * monitoring collect metric field * * - * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 9; + * repeated .org.apache.hertzbeat.common.entity.message.Field fields = 9; */ public java.util.List getFieldsList() { if (fieldsBuilder_ == null) { @@ -2017,7 +2017,7 @@ public java.util.List getFieldsList() { * monitoring collect metric field * * - * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 9; + * repeated .org.apache.hertzbeat.common.entity.message.Field fields = 9; */ public int getFieldsCount() { if (fieldsBuilder_ == null) { @@ -2031,7 +2031,7 @@ public int getFieldsCount() { * monitoring collect metric field * * - * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 9; + * repeated .org.apache.hertzbeat.common.entity.message.Field fields = 9; */ public Field getFields(int index) { if (fieldsBuilder_ == null) { @@ -2045,7 +2045,7 @@ public Field getFields(int index) { * monitoring collect metric field * * - * repeated .org.dromara.hertzbeat.common.entity.message.Field fields = 9; + * repeated .org.apache.hertzbeat.common.entity.message.Field fields = 9; */ public Builder setFields( int index, Field value) { @@ -3158,7 +3158,7 @@ public static final class Builder extends Field.class, Builder.class); } - // Construct using org.dromara.hertzbeat.common.entity.message.CollectRep.Field.newBuilder() + // Construct using message.entity.org.apache.hertzbeat.common.CollectRep.Field.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -4005,7 +4005,7 @@ public static final class Builder extends ValueRow.class, Builder.class); } - // Construct using org.dromara.hertzbeat.common.entity.message.CollectRep.ValueRow.newBuilder() + // Construct using message.entity.org.apache.hertzbeat.common.CollectRep.ValueRow.newBuilder() private Builder() { maybeForceBuilderInitialization(); } diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/push/PushMetrics.java b/common/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetrics.java similarity index 96% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/push/PushMetrics.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetrics.java index 6558f22d504..24fe09bafa7 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/push/PushMetrics.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetrics.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.push; +package org.apache.hertzbeat.common.entity.push; import lombok.AllArgsConstructor; import lombok.Builder; @@ -27,8 +27,6 @@ /** * push metrics entity - * - * */ @Entity @Table(name = "hzb_push_metrics", indexes = { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/push/PushMetricsDto.java b/common/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetricsDto.java similarity index 96% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/push/PushMetricsDto.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetricsDto.java index 060a38e4207..4856cf0b802 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/push/PushMetricsDto.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetricsDto.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.push; +package org.apache.hertzbeat.common.entity.push; import lombok.AllArgsConstructor; import lombok.Builder; @@ -28,8 +28,6 @@ /** * push metrics dto - * - * */ @Data @Builder diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/warehouse/History.java b/common/src/main/java/org/apache/hertzbeat/common/entity/warehouse/History.java similarity index 94% rename from common/src/main/java/org/dromara/hertzbeat/common/entity/warehouse/History.java rename to common/src/main/java/org/apache/hertzbeat/common/entity/warehouse/History.java index 1ba205faffe..d9fdf2cdc0f 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/entity/warehouse/History.java +++ b/common/src/main/java/org/apache/hertzbeat/common/entity/warehouse/History.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.entity.warehouse; +package org.apache.hertzbeat.common.entity.warehouse; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -31,7 +31,6 @@ /** * metrics history data entity - * */ @Entity @Table(name = "hzb_history", indexes = { @@ -49,7 +48,7 @@ public class History { @Id @GeneratedValue(strategy = GenerationType.IDENTITY, generator = "myid") - @GenericGenerator(name = "myid", strategy = "org.dromara.hertzbeat.common.util.SnowFlakeIdGenerator") + @GenericGenerator(name = "myid", strategy = "org.apache.hertzbeat.common.util.SnowFlakeIdGenerator") @Schema(description = "指标数据历史实体主键索引ID", example = "87584674384", accessMode = READ_ONLY) private Long id; diff --git a/common/src/main/java/org/dromara/hertzbeat/common/queue/CommonDataQueue.java b/common/src/main/java/org/apache/hertzbeat/common/queue/CommonDataQueue.java similarity index 92% rename from common/src/main/java/org/dromara/hertzbeat/common/queue/CommonDataQueue.java rename to common/src/main/java/org/apache/hertzbeat/common/queue/CommonDataQueue.java index 70686b87e0e..1f86d96a820 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/queue/CommonDataQueue.java +++ b/common/src/main/java/org/apache/hertzbeat/common/queue/CommonDataQueue.java @@ -15,15 +15,13 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.queue; +package org.apache.hertzbeat.common.queue; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.entity.alerter.Alert; +import org.apache.hertzbeat.common.entity.message.CollectRep; /** * common data queue - * - * */ public interface CommonDataQueue { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/queue/impl/InMemoryCommonDataQueue.java b/common/src/main/java/org/apache/hertzbeat/common/queue/impl/InMemoryCommonDataQueue.java similarity index 94% rename from common/src/main/java/org/dromara/hertzbeat/common/queue/impl/InMemoryCommonDataQueue.java rename to common/src/main/java/org/apache/hertzbeat/common/queue/impl/InMemoryCommonDataQueue.java index b138b8808b5..44868a0cfe5 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/queue/impl/InMemoryCommonDataQueue.java +++ b/common/src/main/java/org/apache/hertzbeat/common/queue/impl/InMemoryCommonDataQueue.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.queue.impl; +package org.apache.hertzbeat.common.queue.impl; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.queue.CommonDataQueue; +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; @@ -33,7 +33,6 @@ /** * common data queue implement memory - * */ @Configuration @ConditionalOnProperty(prefix = "common.queue", name = "type", havingValue = "memory", matchIfMissing = true) diff --git a/common/src/main/java/org/dromara/hertzbeat/common/queue/impl/KafkaCommonDataQueue.java b/common/src/main/java/org/apache/hertzbeat/common/queue/impl/KafkaCommonDataQueue.java similarity index 95% rename from common/src/main/java/org/dromara/hertzbeat/common/queue/impl/KafkaCommonDataQueue.java rename to common/src/main/java/org/apache/hertzbeat/common/queue/impl/KafkaCommonDataQueue.java index fd433ffa3b7..9d38f9520cf 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/queue/impl/KafkaCommonDataQueue.java +++ b/common/src/main/java/org/apache/hertzbeat/common/queue/impl/KafkaCommonDataQueue.java @@ -15,9 +15,16 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.queue.impl; +package org.apache.hertzbeat.common.queue.impl; 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.serialize.AlertDeserializer; +import org.apache.hertzbeat.common.serialize.AlertSerializer; +import org.apache.hertzbeat.common.serialize.KafkaMetricsDataDeserializer; +import org.apache.hertzbeat.common.serialize.KafkaMetricsDataSerializer; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; @@ -27,14 +34,7 @@ import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.serialization.LongDeserializer; import org.apache.kafka.common.serialization.LongSerializer; -import org.dromara.hertzbeat.common.config.CommonProperties; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.queue.CommonDataQueue; -import org.dromara.hertzbeat.common.serialize.AlertDeserializer; -import org.dromara.hertzbeat.common.serialize.AlertSerializer; -import org.dromara.hertzbeat.common.serialize.KafkaMetricsDataDeserializer; -import org.dromara.hertzbeat.common.serialize.KafkaMetricsDataSerializer; +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; @@ -47,8 +47,6 @@ /** * common data queue implement kafka - * - * */ @Configuration @ConditionalOnProperty(prefix = "common.queue", name = "type", havingValue = "kafka") diff --git a/common/src/main/java/org/dromara/hertzbeat/common/serialize/AlertDeserializer.java b/common/src/main/java/org/apache/hertzbeat/common/serialize/AlertDeserializer.java similarity index 90% rename from common/src/main/java/org/dromara/hertzbeat/common/serialize/AlertDeserializer.java rename to common/src/main/java/org/apache/hertzbeat/common/serialize/AlertDeserializer.java index eab8d931247..1c0551c2774 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/serialize/AlertDeserializer.java +++ b/common/src/main/java/org/apache/hertzbeat/common/serialize/AlertDeserializer.java @@ -15,18 +15,17 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.serialize; +package org.apache.hertzbeat.common.serialize; -import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.apache.hertzbeat.common.entity.alerter.Alert; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.serialization.Deserializer; -import org.dromara.hertzbeat.common.util.JsonUtil; +import org.apache.hertzbeat.common.util.JsonUtil; import java.util.Map; /** * kafka alert deserializer - * */ public class AlertDeserializer implements Deserializer { @Override diff --git a/common/src/main/java/org/dromara/hertzbeat/common/serialize/AlertSerializer.java b/common/src/main/java/org/apache/hertzbeat/common/serialize/AlertSerializer.java similarity index 90% rename from common/src/main/java/org/dromara/hertzbeat/common/serialize/AlertSerializer.java rename to common/src/main/java/org/apache/hertzbeat/common/serialize/AlertSerializer.java index c98a2f97989..5aa42bf7e16 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/serialize/AlertSerializer.java +++ b/common/src/main/java/org/apache/hertzbeat/common/serialize/AlertSerializer.java @@ -15,19 +15,18 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.serialize; +package org.apache.hertzbeat.common.serialize; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.serialization.Serializer; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.util.JsonUtil; +import org.apache.hertzbeat.common.entity.alerter.Alert; +import org.apache.hertzbeat.common.util.JsonUtil; import java.util.Map; /** * kafka alert entity serializer - * */ public class AlertSerializer implements Serializer { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/serialize/KafkaMetricsDataDeserializer.java b/common/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataDeserializer.java similarity index 94% rename from common/src/main/java/org/dromara/hertzbeat/common/serialize/KafkaMetricsDataDeserializer.java rename to common/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataDeserializer.java index bea47e33b00..aaa69615952 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/serialize/KafkaMetricsDataDeserializer.java +++ b/common/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataDeserializer.java @@ -15,18 +15,17 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.serialize; +package org.apache.hertzbeat.common.serialize; import com.google.protobuf.InvalidProtocolBufferException; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.serialization.Deserializer; -import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.entity.message.CollectRep; import java.util.Map; /** * kafka metrics data deserializer - * */ public class KafkaMetricsDataDeserializer implements Deserializer { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/serialize/KafkaMetricsDataSerializer.java b/common/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataSerializer.java similarity index 93% rename from common/src/main/java/org/dromara/hertzbeat/common/serialize/KafkaMetricsDataSerializer.java rename to common/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataSerializer.java index b2820cc82d8..526c17f91b5 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/serialize/KafkaMetricsDataSerializer.java +++ b/common/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataSerializer.java @@ -15,19 +15,18 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.serialize; +package org.apache.hertzbeat.common.serialize; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.serialization.Serializer; -import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.entity.message.CollectRep; import java.util.Map; /** * kafka metrics data serializer - * */ public class KafkaMetricsDataSerializer implements Serializer { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/service/TencentSmsClient.java b/common/src/main/java/org/apache/hertzbeat/common/service/TencentSmsClient.java similarity index 95% rename from common/src/main/java/org/dromara/hertzbeat/common/service/TencentSmsClient.java rename to common/src/main/java/org/apache/hertzbeat/common/service/TencentSmsClient.java index 58339cfa308..7a5628185bb 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/service/TencentSmsClient.java +++ b/common/src/main/java/org/apache/hertzbeat/common/service/TencentSmsClient.java @@ -15,22 +15,21 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.service; +package org.apache.hertzbeat.common.service; import com.tencentcloudapi.common.Credential; import com.tencentcloudapi.sms.v20210111.SmsClient; import com.tencentcloudapi.sms.v20210111.models.SendSmsRequest; import com.tencentcloudapi.sms.v20210111.models.SendSmsResponse; import com.tencentcloudapi.sms.v20210111.models.SendStatus; -import org.dromara.hertzbeat.common.config.CommonProperties; -import org.dromara.hertzbeat.common.support.exception.SendMessageException; +import org.apache.hertzbeat.common.support.exception.SendMessageException; +import org.apache.hertzbeat.common.config.CommonProperties; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; /** * sms service client for tencent cloud - * */ @Component @ConditionalOnProperty("common.sms.tencent.app-id") diff --git a/common/src/main/java/org/dromara/hertzbeat/common/support/CommonThreadPool.java b/common/src/main/java/org/apache/hertzbeat/common/support/CommonThreadPool.java similarity index 98% rename from common/src/main/java/org/dromara/hertzbeat/common/support/CommonThreadPool.java rename to common/src/main/java/org/apache/hertzbeat/common/support/CommonThreadPool.java index a9bf216a837..2c04c3e70df 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/support/CommonThreadPool.java +++ b/common/src/main/java/org/apache/hertzbeat/common/support/CommonThreadPool.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.support; +package org.apache.hertzbeat.common.support; import com.google.common.util.concurrent.ThreadFactoryBuilder; import lombok.extern.slf4j.Slf4j; @@ -30,7 +30,6 @@ /** * common task worker thread pool - * */ @Component @Slf4j diff --git a/common/src/main/java/org/dromara/hertzbeat/common/support/ResourceBundleUtf8Control.java b/common/src/main/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8Control.java similarity index 98% rename from common/src/main/java/org/dromara/hertzbeat/common/support/ResourceBundleUtf8Control.java rename to common/src/main/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8Control.java index 9fe65f116d0..8ab13a8ec48 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/support/ResourceBundleUtf8Control.java +++ b/common/src/main/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8Control.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.support; +package org.apache.hertzbeat.common.support; import lombok.extern.slf4j.Slf4j; @@ -34,7 +34,6 @@ /** * i18n resource bundle control - * */ @Slf4j public class ResourceBundleUtf8Control extends ResourceBundle.Control { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/support/SpringContextHolder.java b/common/src/main/java/org/apache/hertzbeat/common/support/SpringContextHolder.java similarity index 98% rename from common/src/main/java/org/dromara/hertzbeat/common/support/SpringContextHolder.java rename to common/src/main/java/org/apache/hertzbeat/common/support/SpringContextHolder.java index 31b82bcbc2e..fac3fe91396 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/support/SpringContextHolder.java +++ b/common/src/main/java/org/apache/hertzbeat/common/support/SpringContextHolder.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.support; +package org.apache.hertzbeat.common.support; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; @@ -25,7 +25,6 @@ /** * Spring ApplicationContext Holder - * */ @Component public class SpringContextHolder implements ApplicationContextAware { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/support/event/MonitorDeletedEvent.java b/common/src/main/java/org/apache/hertzbeat/common/support/event/MonitorDeletedEvent.java similarity index 95% rename from common/src/main/java/org/dromara/hertzbeat/common/support/event/MonitorDeletedEvent.java rename to common/src/main/java/org/apache/hertzbeat/common/support/event/MonitorDeletedEvent.java index 3b360709745..5049a46b5de 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/support/event/MonitorDeletedEvent.java +++ b/common/src/main/java/org/apache/hertzbeat/common/support/event/MonitorDeletedEvent.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.support.event; +package org.apache.hertzbeat.common.support.event; import org.springframework.context.ApplicationEvent; /** * the event for system config change - * */ public class MonitorDeletedEvent extends ApplicationEvent { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/support/event/SystemConfigChangeEvent.java b/common/src/main/java/org/apache/hertzbeat/common/support/event/SystemConfigChangeEvent.java similarity index 95% rename from common/src/main/java/org/dromara/hertzbeat/common/support/event/SystemConfigChangeEvent.java rename to common/src/main/java/org/apache/hertzbeat/common/support/event/SystemConfigChangeEvent.java index 10876e844cf..5d4e25d0247 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/support/event/SystemConfigChangeEvent.java +++ b/common/src/main/java/org/apache/hertzbeat/common/support/event/SystemConfigChangeEvent.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.support.event; +package org.apache.hertzbeat.common.support.event; import org.springframework.context.ApplicationEvent; /** * the event for system config change - * */ public class SystemConfigChangeEvent extends ApplicationEvent { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/support/exception/CommonException.java b/common/src/main/java/org/apache/hertzbeat/common/support/exception/CommonException.java similarity index 94% rename from common/src/main/java/org/dromara/hertzbeat/common/support/exception/CommonException.java rename to common/src/main/java/org/apache/hertzbeat/common/support/exception/CommonException.java index f6157f07a56..a0961bd5a27 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/support/exception/CommonException.java +++ b/common/src/main/java/org/apache/hertzbeat/common/support/exception/CommonException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.support.exception; +package org.apache.hertzbeat.common.support.exception; /** * common exception diff --git a/common/src/main/java/org/dromara/hertzbeat/common/support/exception/SendMessageException.java b/common/src/main/java/org/apache/hertzbeat/common/support/exception/SendMessageException.java similarity index 94% rename from common/src/main/java/org/dromara/hertzbeat/common/support/exception/SendMessageException.java rename to common/src/main/java/org/apache/hertzbeat/common/support/exception/SendMessageException.java index f2983cda583..7b74593630c 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/support/exception/SendMessageException.java +++ b/common/src/main/java/org/apache/hertzbeat/common/support/exception/SendMessageException.java @@ -15,11 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.support.exception; +package org.apache.hertzbeat.common.support.exception; /** * send message exception - * */ public class SendMessageException extends RuntimeException { public SendMessageException(String message) { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/support/valid/EmailParamValidator.java b/common/src/main/java/org/apache/hertzbeat/common/support/valid/EmailParamValidator.java similarity index 91% rename from common/src/main/java/org/dromara/hertzbeat/common/support/valid/EmailParamValidator.java rename to common/src/main/java/org/apache/hertzbeat/common/support/valid/EmailParamValidator.java index f61cd3a0e27..4787b72d4c8 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/support/valid/EmailParamValidator.java +++ b/common/src/main/java/org/apache/hertzbeat/common/support/valid/EmailParamValidator.java @@ -15,16 +15,15 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.support.valid; +package org.apache.hertzbeat.common.support.valid; -import org.dromara.hertzbeat.common.util.CommonUtil; +import org.apache.hertzbeat.common.util.CommonUtil; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; /** * email validator - * */ public class EmailParamValidator implements ConstraintValidator { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/support/valid/EmailValid.java b/common/src/main/java/org/apache/hertzbeat/common/support/valid/EmailValid.java similarity index 95% rename from common/src/main/java/org/dromara/hertzbeat/common/support/valid/EmailValid.java rename to common/src/main/java/org/apache/hertzbeat/common/support/valid/EmailValid.java index a5bce20fd0d..e7954352b51 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/support/valid/EmailValid.java +++ b/common/src/main/java/org/apache/hertzbeat/common/support/valid/EmailValid.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.support.valid; +package org.apache.hertzbeat.common.support.valid; import jakarta.validation.Constraint; import jakarta.validation.Payload; @@ -28,8 +28,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; /** - * EmailValid - * + * EmailValid */ @Target({ FIELD, PARAMETER }) @Retention(RUNTIME) diff --git a/common/src/main/java/org/dromara/hertzbeat/common/support/valid/HostParamValidator.java b/common/src/main/java/org/apache/hertzbeat/common/support/valid/HostParamValidator.java similarity index 93% rename from common/src/main/java/org/dromara/hertzbeat/common/support/valid/HostParamValidator.java rename to common/src/main/java/org/apache/hertzbeat/common/support/valid/HostParamValidator.java index 1358e50c584..26ad4c02aa3 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/support/valid/HostParamValidator.java +++ b/common/src/main/java/org/apache/hertzbeat/common/support/valid/HostParamValidator.java @@ -15,17 +15,15 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.support.valid; +package org.apache.hertzbeat.common.support.valid; -import org.dromara.hertzbeat.common.util.IpDomainUtil; +import org.apache.hertzbeat.common.util.IpDomainUtil; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; /** * Host Param Validator - * - * */ public class HostParamValidator implements ConstraintValidator { public static final String HTTP = "http://"; diff --git a/common/src/main/java/org/dromara/hertzbeat/common/support/valid/HostValid.java b/common/src/main/java/org/apache/hertzbeat/common/support/valid/HostValid.java similarity index 96% rename from common/src/main/java/org/dromara/hertzbeat/common/support/valid/HostValid.java rename to common/src/main/java/org/apache/hertzbeat/common/support/valid/HostValid.java index 3cda7dee92c..2db92492284 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/support/valid/HostValid.java +++ b/common/src/main/java/org/apache/hertzbeat/common/support/valid/HostValid.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.support.valid; +package org.apache.hertzbeat.common.support.valid; import jakarta.validation.Constraint; import jakarta.validation.Payload; @@ -29,7 +29,6 @@ /** * Host Param Validator - * */ @Target({ FIELD, PARAMETER }) @Retention(RUNTIME) diff --git a/common/src/main/java/org/dromara/hertzbeat/common/support/valid/PhoneNumParamValidator.java b/common/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumParamValidator.java similarity index 91% rename from common/src/main/java/org/dromara/hertzbeat/common/support/valid/PhoneNumParamValidator.java rename to common/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumParamValidator.java index 296f22239f4..1f8a8ca1e7f 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/support/valid/PhoneNumParamValidator.java +++ b/common/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumParamValidator.java @@ -15,17 +15,15 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.support.valid; +package org.apache.hertzbeat.common.support.valid; -import org.dromara.hertzbeat.common.util.CommonUtil; +import org.apache.hertzbeat.common.util.CommonUtil; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; /** * PhoneNum Param Validator - * - * */ public class PhoneNumParamValidator implements ConstraintValidator { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/support/valid/PhoneNumValid.java b/common/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumValid.java similarity index 96% rename from common/src/main/java/org/dromara/hertzbeat/common/support/valid/PhoneNumValid.java rename to common/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumValid.java index 2a3a5a4b055..686ed491f0a 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/support/valid/PhoneNumValid.java +++ b/common/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumValid.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.support.valid; +package org.apache.hertzbeat.common.support.valid; import jakarta.validation.Constraint; import jakarta.validation.Payload; @@ -29,7 +29,6 @@ /** * PhoneNum Param Validator - * */ @Target({ FIELD, PARAMETER }) @Retention(RUNTIME) diff --git a/common/src/main/java/org/dromara/hertzbeat/common/util/AesUtil.java b/common/src/main/java/org/apache/hertzbeat/common/util/AesUtil.java similarity index 99% rename from common/src/main/java/org/dromara/hertzbeat/common/util/AesUtil.java rename to common/src/main/java/org/apache/hertzbeat/common/util/AesUtil.java index 30e3b0a70e9..5d87af68d40 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/util/AesUtil.java +++ b/common/src/main/java/org/apache/hertzbeat/common/util/AesUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.util; +package org.apache.hertzbeat.common.util; import lombok.extern.slf4j.Slf4j; @@ -30,7 +30,6 @@ /** * AES Decode Encode Util - * */ @Slf4j public class AesUtil { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/util/Base64Util.java b/common/src/main/java/org/apache/hertzbeat/common/util/Base64Util.java similarity index 95% rename from common/src/main/java/org/dromara/hertzbeat/common/util/Base64Util.java rename to common/src/main/java/org/apache/hertzbeat/common/util/Base64Util.java index 8e87d6e51aa..5a559ebb491 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/util/Base64Util.java +++ b/common/src/main/java/org/apache/hertzbeat/common/util/Base64Util.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.util; +package org.apache.hertzbeat.common.util; import java.util.Base64; /** * base64 util - * */ public class Base64Util { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/util/CommonUtil.java b/common/src/main/java/org/apache/hertzbeat/common/util/CommonUtil.java similarity index 99% rename from common/src/main/java/org/dromara/hertzbeat/common/util/CommonUtil.java rename to common/src/main/java/org/apache/hertzbeat/common/util/CommonUtil.java index 89c616fa865..afa1a0afffd 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/util/CommonUtil.java +++ b/common/src/main/java/org/apache/hertzbeat/common/util/CommonUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.util; +package org.apache.hertzbeat.common.util; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -30,7 +30,6 @@ /** * common util - * */ @Slf4j public class CommonUtil { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/util/IntervalExpressionUtil.java b/common/src/main/java/org/apache/hertzbeat/common/util/IntervalExpressionUtil.java similarity index 98% rename from common/src/main/java/org/dromara/hertzbeat/common/util/IntervalExpressionUtil.java rename to common/src/main/java/org/apache/hertzbeat/common/util/IntervalExpressionUtil.java index fb8fa54c109..be0c9b6d308 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/util/IntervalExpressionUtil.java +++ b/common/src/main/java/org/apache/hertzbeat/common/util/IntervalExpressionUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.util; +package org.apache.hertzbeat.common.util; import lombok.extern.slf4j.Slf4j; @@ -27,8 +27,6 @@ * [a,+∞) = {a <= x} * (-∞,b] = {x <= b} * (-∞,a]||[b,+∞) = {x <= a || x >= b} - * - * */ @Slf4j public class IntervalExpressionUtil { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/util/IpDomainUtil.java b/common/src/main/java/org/apache/hertzbeat/common/util/IpDomainUtil.java similarity index 97% rename from common/src/main/java/org/dromara/hertzbeat/common/util/IpDomainUtil.java rename to common/src/main/java/org/apache/hertzbeat/common/util/IpDomainUtil.java index 8d11f101a77..b143888a2bb 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/util/IpDomainUtil.java +++ b/common/src/main/java/org/apache/hertzbeat/common/util/IpDomainUtil.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.util; +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 org.dromara.hertzbeat.common.constants.CollectorConstants; import java.net.Inet4Address; import java.net.InetAddress; @@ -30,7 +30,6 @@ /** * ipv4 ipv6 domain util - * */ @Slf4j public class IpDomainUtil { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/util/JsonUtil.java b/common/src/main/java/org/apache/hertzbeat/common/util/JsonUtil.java similarity index 98% rename from common/src/main/java/org/dromara/hertzbeat/common/util/JsonUtil.java rename to common/src/main/java/org/apache/hertzbeat/common/util/JsonUtil.java index 9aa2e64476d..ddfa00af14b 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/util/JsonUtil.java +++ b/common/src/main/java/org/apache/hertzbeat/common/util/JsonUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.util; +package org.apache.hertzbeat.common.util; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; @@ -32,7 +32,6 @@ /** * json util - * */ @ThreadSafe @Slf4j diff --git a/common/src/main/java/org/dromara/hertzbeat/common/util/LruHashMap.java b/common/src/main/java/org/apache/hertzbeat/common/util/LruHashMap.java similarity index 96% rename from common/src/main/java/org/dromara/hertzbeat/common/util/LruHashMap.java rename to common/src/main/java/org/apache/hertzbeat/common/util/LruHashMap.java index ea69aea2cf8..44a71e21b1c 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/util/LruHashMap.java +++ b/common/src/main/java/org/apache/hertzbeat/common/util/LruHashMap.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.util; +package org.apache.hertzbeat.common.util; import java.util.LinkedHashMap; import java.util.Map; @@ -23,8 +23,6 @@ /** * lru hash map * 最近最少使用淘汰算法map - * - * */ public class LruHashMap extends LinkedHashMap { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/util/MapCapUtil.java b/common/src/main/java/org/apache/hertzbeat/common/util/MapCapUtil.java similarity index 96% rename from common/src/main/java/org/dromara/hertzbeat/common/util/MapCapUtil.java rename to common/src/main/java/org/apache/hertzbeat/common/util/MapCapUtil.java index b50bb3d1d24..b29985ae539 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/util/MapCapUtil.java +++ b/common/src/main/java/org/apache/hertzbeat/common/util/MapCapUtil.java @@ -15,11 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.util; +package org.apache.hertzbeat.common.util; /** * map initial capacity calculation - * */ public class MapCapUtil { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/util/NetworkUtil.java b/common/src/main/java/org/apache/hertzbeat/common/util/NetworkUtil.java similarity index 97% rename from common/src/main/java/org/dromara/hertzbeat/common/util/NetworkUtil.java rename to common/src/main/java/org/apache/hertzbeat/common/util/NetworkUtil.java index deab447a8e3..f1d011a423d 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/util/NetworkUtil.java +++ b/common/src/main/java/org/apache/hertzbeat/common/util/NetworkUtil.java @@ -15,11 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.util; +package org.apache.hertzbeat.common.util; /** * network util - * */ public class NetworkUtil { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/util/Pair.java b/common/src/main/java/org/apache/hertzbeat/common/util/Pair.java similarity index 95% rename from common/src/main/java/org/dromara/hertzbeat/common/util/Pair.java rename to common/src/main/java/org/apache/hertzbeat/common/util/Pair.java index d7b31a66070..4bfad4f6560 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/util/Pair.java +++ b/common/src/main/java/org/apache/hertzbeat/common/util/Pair.java @@ -15,11 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.util; +package org.apache.hertzbeat.common.util; /** - * Pair KV - * + * Pair KV */ public class Pair { private K left; diff --git a/common/src/main/java/org/dromara/hertzbeat/common/util/ProtoJsonUtil.java b/common/src/main/java/org/apache/hertzbeat/common/util/ProtoJsonUtil.java similarity index 97% rename from common/src/main/java/org/dromara/hertzbeat/common/util/ProtoJsonUtil.java rename to common/src/main/java/org/apache/hertzbeat/common/util/ProtoJsonUtil.java index 4068f63c6ac..ca1fec27243 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/util/ProtoJsonUtil.java +++ b/common/src/main/java/org/apache/hertzbeat/common/util/ProtoJsonUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.util; +package org.apache.hertzbeat.common.util; import com.google.protobuf.Message; import com.google.protobuf.util.JsonFormat; @@ -23,7 +23,6 @@ /** * protobuf json convert util - * */ @Slf4j public class ProtoJsonUtil { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/util/ResourceBundleUtil.java b/common/src/main/java/org/apache/hertzbeat/common/util/ResourceBundleUtil.java similarity index 95% rename from common/src/main/java/org/dromara/hertzbeat/common/util/ResourceBundleUtil.java rename to common/src/main/java/org/apache/hertzbeat/common/util/ResourceBundleUtil.java index 7045e8a7524..070a0670f4f 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/util/ResourceBundleUtil.java +++ b/common/src/main/java/org/apache/hertzbeat/common/util/ResourceBundleUtil.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.util; +package org.apache.hertzbeat.common.util; -import org.dromara.hertzbeat.common.support.ResourceBundleUtf8Control; +import org.apache.hertzbeat.common.support.ResourceBundleUtf8Control; import lombok.extern.slf4j.Slf4j; import java.util.Locale; @@ -26,7 +26,6 @@ /** * i18n ResourceBundle util - * */ @Slf4j public class ResourceBundleUtil { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/util/SnowFlakeIdGenerator.java b/common/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdGenerator.java similarity index 96% rename from common/src/main/java/org/dromara/hertzbeat/common/util/SnowFlakeIdGenerator.java rename to common/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdGenerator.java index 0976355e493..f9b591a005f 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/util/SnowFlakeIdGenerator.java +++ b/common/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdGenerator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.util; +package org.apache.hertzbeat.common.util; import org.hibernate.HibernateException; import org.hibernate.engine.spi.SharedSessionContractImplementor; @@ -25,7 +25,6 @@ /** * Snowflake Algorithm Generator Tool - * */ public class SnowFlakeIdGenerator implements IdentifierGenerator { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/util/SnowFlakeIdWorker.java b/common/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdWorker.java similarity index 99% rename from common/src/main/java/org/dromara/hertzbeat/common/util/SnowFlakeIdWorker.java rename to common/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdWorker.java index 7ce777ca910..08db6c7e4b7 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/util/SnowFlakeIdWorker.java +++ b/common/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdWorker.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.util; +package org.apache.hertzbeat.common.util; import lombok.extern.slf4j.Slf4j; @@ -27,8 +27,6 @@ * 1位符号位+41位时间戳+4位机器ID+8位序列号 = 53位 * Note that because the front-end JS TS parses large numbers in json, the precision will be lost. * UUID cannot exceed hexadecimal 0x1FFFFFFFFFFFFFF (less than 53bit) - * - * */ @Slf4j public class SnowFlakeIdWorker { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/util/StrBuffer.java b/common/src/main/java/org/apache/hertzbeat/common/util/StrBuffer.java similarity index 98% rename from common/src/main/java/org/dromara/hertzbeat/common/util/StrBuffer.java rename to common/src/main/java/org/apache/hertzbeat/common/util/StrBuffer.java index 04ac2b78a03..ae8d9415bb0 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/util/StrBuffer.java +++ b/common/src/main/java/org/apache/hertzbeat/common/util/StrBuffer.java @@ -15,11 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.util; +package org.apache.hertzbeat.common.util; /** - * - * * In order to avoid generating too many String objects in the way of subString during ExporterParser parsing, use this class control * 为了避免ExporterParser解析过程中, 使用subString的方式生成过多的String对象, 使用该类控制 */ diff --git a/common/src/main/java/org/dromara/hertzbeat/common/util/TimePeriodUtil.java b/common/src/main/java/org/apache/hertzbeat/common/util/TimePeriodUtil.java similarity index 96% rename from common/src/main/java/org/dromara/hertzbeat/common/util/TimePeriodUtil.java rename to common/src/main/java/org/apache/hertzbeat/common/util/TimePeriodUtil.java index 42c8d02f4ae..534831ac082 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/util/TimePeriodUtil.java +++ b/common/src/main/java/org/apache/hertzbeat/common/util/TimePeriodUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.util; +package org.apache.hertzbeat.common.util; import java.time.Duration; import java.time.Period; @@ -23,7 +23,6 @@ /** * time util - * */ public class TimePeriodUtil { diff --git a/common/src/main/java/org/dromara/hertzbeat/common/util/prometheus/Label.java b/common/src/main/java/org/apache/hertzbeat/common/util/prometheus/Label.java similarity index 82% rename from common/src/main/java/org/dromara/hertzbeat/common/util/prometheus/Label.java rename to common/src/main/java/org/apache/hertzbeat/common/util/prometheus/Label.java index 06db9402563..ae9dddbebcd 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/util/prometheus/Label.java +++ b/common/src/main/java/org/apache/hertzbeat/common/util/prometheus/Label.java @@ -1,4 +1,4 @@ -package org.dromara.hertzbeat.common.util.prometheus; +package org.apache.hertzbeat.common.util.prometheus; import lombok.AllArgsConstructor; import lombok.Builder; @@ -7,8 +7,6 @@ /** * prometheus label entity - * - * */ @Data @Builder diff --git a/common/src/main/java/org/dromara/hertzbeat/common/util/prometheus/Metric.java b/common/src/main/java/org/apache/hertzbeat/common/util/prometheus/Metric.java similarity index 86% rename from common/src/main/java/org/dromara/hertzbeat/common/util/prometheus/Metric.java rename to common/src/main/java/org/apache/hertzbeat/common/util/prometheus/Metric.java index a8e0fe79aef..7af1cfe9f8c 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/util/prometheus/Metric.java +++ b/common/src/main/java/org/apache/hertzbeat/common/util/prometheus/Metric.java @@ -1,4 +1,4 @@ -package org.dromara.hertzbeat.common.util.prometheus; +package org.apache.hertzbeat.common.util.prometheus; import lombok.AllArgsConstructor; import lombok.Builder; @@ -9,8 +9,6 @@ /** * prometheus metric line entity - * - * */ @Data @Builder diff --git a/common/src/main/java/org/dromara/hertzbeat/common/util/prometheus/PrometheusUtil.java b/common/src/main/java/org/apache/hertzbeat/common/util/prometheus/PrometheusUtil.java similarity index 99% rename from common/src/main/java/org/dromara/hertzbeat/common/util/prometheus/PrometheusUtil.java rename to common/src/main/java/org/apache/hertzbeat/common/util/prometheus/PrometheusUtil.java index 4406f11d631..aa305fbe009 100644 --- a/common/src/main/java/org/dromara/hertzbeat/common/util/prometheus/PrometheusUtil.java +++ b/common/src/main/java/org/apache/hertzbeat/common/util/prometheus/PrometheusUtil.java @@ -1,4 +1,4 @@ -package org.dromara.hertzbeat.common.util.prometheus; +package org.apache.hertzbeat.common.util.prometheus; import java.io.IOException; import java.io.InputStream; @@ -8,8 +8,6 @@ /** * prometheus metric sparser - * - * */ public class PrometheusUtil { diff --git a/common/src/main/message/cluster_msg.proto b/common/src/main/message/cluster_msg.proto index af200b033b0..0506ca297eb 100644 --- a/common/src/main/message/cluster_msg.proto +++ b/common/src/main/message/cluster_msg.proto @@ -16,7 +16,7 @@ */ syntax = "proto3"; -package org.dromara.hertzbeat.common.entity.message; +package org.apache.hertzbeat.common.entity.message; message Message { diff --git a/common/src/main/message/collect_rep.proto b/common/src/main/message/collect_rep.proto index b82797aaae0..7a43bdac3e3 100644 --- a/common/src/main/message/collect_rep.proto +++ b/common/src/main/message/collect_rep.proto @@ -16,7 +16,7 @@ */ syntax = "proto3"; -package org.dromara.hertzbeat.common.entity.message; +package org.apache.hertzbeat.common.entity.message; message MetricsData { diff --git a/common/src/main/resources/META-INF/spring.factories b/common/src/main/resources/META-INF/spring.factories index f8693a5e993..9027bee7cb0 100644 --- a/common/src/main/resources/META-INF/spring.factories +++ b/common/src/main/resources/META-INF/spring.factories @@ -15,4 +15,4 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.dromara.hertzbeat.common.config.CommonConfig +org.apache.hertzbeat.common.config.CommonConfig diff --git a/common/src/test/java/org/dromara/hertzbeat/common/cache/CaffeineCacheTest.java b/common/src/test/java/org/apache/hertzbeat/common/cache/CaffeineCacheTest.java similarity index 97% rename from common/src/test/java/org/dromara/hertzbeat/common/cache/CaffeineCacheTest.java rename to common/src/test/java/org/apache/hertzbeat/common/cache/CaffeineCacheTest.java index ee2789d5ed6..96089a91dbb 100644 --- a/common/src/test/java/org/dromara/hertzbeat/common/cache/CaffeineCacheTest.java +++ b/common/src/test/java/org/apache/hertzbeat/common/cache/CaffeineCacheTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.cache; +package org.apache.hertzbeat.common.cache; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; diff --git a/common/src/test/java/org/dromara/hertzbeat/common/config/AviatorConfigurationTest.java b/common/src/test/java/org/apache/hertzbeat/common/config/AviatorConfigurationTest.java similarity index 99% rename from common/src/test/java/org/dromara/hertzbeat/common/config/AviatorConfigurationTest.java rename to common/src/test/java/org/apache/hertzbeat/common/config/AviatorConfigurationTest.java index a62d21c6cb6..4ca9dda797a 100644 --- a/common/src/test/java/org/dromara/hertzbeat/common/config/AviatorConfigurationTest.java +++ b/common/src/test/java/org/apache/hertzbeat/common/config/AviatorConfigurationTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.config; +package org.apache.hertzbeat.common.config; import com.googlecode.aviator.AviatorEvaluator; import com.googlecode.aviator.exception.UnsupportedFeatureException; diff --git a/common/src/test/java/org/dromara/hertzbeat/common/queue/CommonDataQueueTest.java b/common/src/test/java/org/apache/hertzbeat/common/queue/CommonDataQueueTest.java similarity index 96% rename from common/src/test/java/org/dromara/hertzbeat/common/queue/CommonDataQueueTest.java rename to common/src/test/java/org/apache/hertzbeat/common/queue/CommonDataQueueTest.java index 9489f183cc1..5b6e836d55b 100644 --- a/common/src/test/java/org/dromara/hertzbeat/common/queue/CommonDataQueueTest.java +++ b/common/src/test/java/org/apache/hertzbeat/common/queue/CommonDataQueueTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.queue; +package org.apache.hertzbeat.common.queue; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/common/src/test/java/org/dromara/hertzbeat/common/support/ResourceBundleUtf8ControlTest.java b/common/src/test/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8ControlTest.java similarity index 95% rename from common/src/test/java/org/dromara/hertzbeat/common/support/ResourceBundleUtf8ControlTest.java rename to common/src/test/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8ControlTest.java index b59477269e2..086b84a9e6c 100644 --- a/common/src/test/java/org/dromara/hertzbeat/common/support/ResourceBundleUtf8ControlTest.java +++ b/common/src/test/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8ControlTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.support; +package org.apache.hertzbeat.common.support; import org.junit.jupiter.api.Test; diff --git a/common/src/test/java/org/dromara/hertzbeat/common/support/SpringContextHolderTest.java b/common/src/test/java/org/apache/hertzbeat/common/support/SpringContextHolderTest.java similarity index 96% rename from common/src/test/java/org/dromara/hertzbeat/common/support/SpringContextHolderTest.java rename to common/src/test/java/org/apache/hertzbeat/common/support/SpringContextHolderTest.java index 0b594b2b53a..c4959745501 100644 --- a/common/src/test/java/org/dromara/hertzbeat/common/support/SpringContextHolderTest.java +++ b/common/src/test/java/org/apache/hertzbeat/common/support/SpringContextHolderTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.support; +package org.apache.hertzbeat.common.support; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/common/src/test/java/org/dromara/hertzbeat/common/util/AesUtilTest.java b/common/src/test/java/org/apache/hertzbeat/common/util/AesUtilTest.java similarity index 96% rename from common/src/test/java/org/dromara/hertzbeat/common/util/AesUtilTest.java rename to common/src/test/java/org/apache/hertzbeat/common/util/AesUtilTest.java index f9ccadf2616..c6cee240924 100644 --- a/common/src/test/java/org/dromara/hertzbeat/common/util/AesUtilTest.java +++ b/common/src/test/java/org/apache/hertzbeat/common/util/AesUtilTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.util; +package org.apache.hertzbeat.common.util; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/common/src/test/java/org/dromara/hertzbeat/common/util/Base64UtilTest.java b/common/src/test/java/org/apache/hertzbeat/common/util/Base64UtilTest.java similarity index 95% rename from common/src/test/java/org/dromara/hertzbeat/common/util/Base64UtilTest.java rename to common/src/test/java/org/apache/hertzbeat/common/util/Base64UtilTest.java index 0e27e7c708a..3d88e46cd6c 100644 --- a/common/src/test/java/org/dromara/hertzbeat/common/util/Base64UtilTest.java +++ b/common/src/test/java/org/apache/hertzbeat/common/util/Base64UtilTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.util; +package org.apache.hertzbeat.common.util; import org.junit.jupiter.api.Test; diff --git a/common/src/test/java/org/dromara/hertzbeat/common/util/CommonUtilTest.java b/common/src/test/java/org/apache/hertzbeat/common/util/CommonUtilTest.java similarity index 97% rename from common/src/test/java/org/dromara/hertzbeat/common/util/CommonUtilTest.java rename to common/src/test/java/org/apache/hertzbeat/common/util/CommonUtilTest.java index b394810f1d1..826c86af65e 100644 --- a/common/src/test/java/org/dromara/hertzbeat/common/util/CommonUtilTest.java +++ b/common/src/test/java/org/apache/hertzbeat/common/util/CommonUtilTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.util; +package org.apache.hertzbeat.common.util; import org.junit.jupiter.api.Test; diff --git a/common/src/test/java/org/dromara/hertzbeat/common/util/IntervalExpressionUtilTest.java b/common/src/test/java/org/apache/hertzbeat/common/util/IntervalExpressionUtilTest.java similarity index 96% rename from common/src/test/java/org/dromara/hertzbeat/common/util/IntervalExpressionUtilTest.java rename to common/src/test/java/org/apache/hertzbeat/common/util/IntervalExpressionUtilTest.java index 59a338e41ca..1a60cf5e354 100644 --- a/common/src/test/java/org/dromara/hertzbeat/common/util/IntervalExpressionUtilTest.java +++ b/common/src/test/java/org/apache/hertzbeat/common/util/IntervalExpressionUtilTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.util; +package org.apache.hertzbeat.common.util; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/common/src/test/java/org/dromara/hertzbeat/common/util/IpDomainUtilTest.java b/common/src/test/java/org/apache/hertzbeat/common/util/IpDomainUtilTest.java similarity index 98% rename from common/src/test/java/org/dromara/hertzbeat/common/util/IpDomainUtilTest.java rename to common/src/test/java/org/apache/hertzbeat/common/util/IpDomainUtilTest.java index fc508090d74..f1a8a4349df 100644 --- a/common/src/test/java/org/dromara/hertzbeat/common/util/IpDomainUtilTest.java +++ b/common/src/test/java/org/apache/hertzbeat/common/util/IpDomainUtilTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.util; +package org.apache.hertzbeat.common.util; import org.junit.jupiter.api.Test; diff --git a/common/src/test/java/org/dromara/hertzbeat/common/util/JsonUtilTest.java b/common/src/test/java/org/apache/hertzbeat/common/util/JsonUtilTest.java similarity index 94% rename from common/src/test/java/org/dromara/hertzbeat/common/util/JsonUtilTest.java rename to common/src/test/java/org/apache/hertzbeat/common/util/JsonUtilTest.java index 480942e81a1..a7456508db2 100644 --- a/common/src/test/java/org/dromara/hertzbeat/common/util/JsonUtilTest.java +++ b/common/src/test/java/org/apache/hertzbeat/common/util/JsonUtilTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.util; +package org.apache.hertzbeat.common.util; import com.fasterxml.jackson.core.type.TypeReference; -import org.dromara.hertzbeat.common.entity.manager.TagItem; +import org.apache.hertzbeat.common.entity.manager.TagItem; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/common/src/test/java/org/dromara/hertzbeat/common/util/LruHashMapTest.java b/common/src/test/java/org/apache/hertzbeat/common/util/LruHashMapTest.java similarity index 95% rename from common/src/test/java/org/dromara/hertzbeat/common/util/LruHashMapTest.java rename to common/src/test/java/org/apache/hertzbeat/common/util/LruHashMapTest.java index 9e435265e8f..f1f4ff815d1 100644 --- a/common/src/test/java/org/dromara/hertzbeat/common/util/LruHashMapTest.java +++ b/common/src/test/java/org/apache/hertzbeat/common/util/LruHashMapTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.util; +package org.apache.hertzbeat.common.util; import org.junit.jupiter.api.Test; diff --git a/common/src/test/java/org/dromara/hertzbeat/common/util/ProtoJsonUtilTest.java b/common/src/test/java/org/apache/hertzbeat/common/util/ProtoJsonUtilTest.java similarity index 96% rename from common/src/test/java/org/dromara/hertzbeat/common/util/ProtoJsonUtilTest.java rename to common/src/test/java/org/apache/hertzbeat/common/util/ProtoJsonUtilTest.java index 85e3e748db8..d6204e617fd 100644 --- a/common/src/test/java/org/dromara/hertzbeat/common/util/ProtoJsonUtilTest.java +++ b/common/src/test/java/org/apache/hertzbeat/common/util/ProtoJsonUtilTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.util; +package org.apache.hertzbeat.common.util; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/common/src/test/java/org/dromara/hertzbeat/common/util/ResourceBundleUtilTest.java b/common/src/test/java/org/apache/hertzbeat/common/util/ResourceBundleUtilTest.java similarity index 96% rename from common/src/test/java/org/dromara/hertzbeat/common/util/ResourceBundleUtilTest.java rename to common/src/test/java/org/apache/hertzbeat/common/util/ResourceBundleUtilTest.java index dd1cf161e03..92cb95902e2 100644 --- a/common/src/test/java/org/dromara/hertzbeat/common/util/ResourceBundleUtilTest.java +++ b/common/src/test/java/org/apache/hertzbeat/common/util/ResourceBundleUtilTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.util; +package org.apache.hertzbeat.common.util; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/common/src/test/java/org/dromara/hertzbeat/common/util/SnowFlakeIdGeneratorTest.java b/common/src/test/java/org/apache/hertzbeat/common/util/SnowFlakeIdGeneratorTest.java similarity index 97% rename from common/src/test/java/org/dromara/hertzbeat/common/util/SnowFlakeIdGeneratorTest.java rename to common/src/test/java/org/apache/hertzbeat/common/util/SnowFlakeIdGeneratorTest.java index 512165ff3b4..24a9b694e86 100644 --- a/common/src/test/java/org/dromara/hertzbeat/common/util/SnowFlakeIdGeneratorTest.java +++ b/common/src/test/java/org/apache/hertzbeat/common/util/SnowFlakeIdGeneratorTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.common.util; +package org.apache.hertzbeat.common.util; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/home/docs/others/contributing.md b/home/docs/others/contributing.md index d20749ca810..6078b09fb3a 100644 --- a/home/docs/others/contributing.md +++ b/home/docs/others/contributing.md @@ -38,7 +38,7 @@ Even small corrections to typos are very welcome :) 1. Requires `maven3+`, `java17` and `lombok` environments 2. (Optional) Modify the configuration file-`manager/src/main/resources/application.yml` -3. Start `springboot manager` service `manager/src/main/java/org/dromara/hertzbeat/manager/Manager.java` +3. Start `springboot manager` service `manager/src/main/java/org/apache/hertzbeat/manager/Manager.java` - Front-web start diff --git a/home/docs/start/iotdb-init.md b/home/docs/start/iotdb-init.md index bf44552bffc..57329621958 100644 --- a/home/docs/start/iotdb-init.md +++ b/home/docs/start/iotdb-init.md @@ -55,7 +55,7 @@ warehouse: rpc-port: 6667 username: root password: root - # org.dromara.hertzbeat.warehouse.config.IotDbVersion: V_0_13 || V_1_0 + # config.org.apache.hertzbeat.warehouse.IotDbVersion: V_0_13 || V_1_0 version: V_0_13 query-timeout-in-ms: -1 # default '7776000000'（90days,unit:ms,-1:no-expire） diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/others/contributing.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/others/contributing.md index 777295335e2..c85fe8bf7df 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/others/contributing.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/others/contributing.md @@ -37,7 +37,7 @@ sidebar_label: 贡献者指南 1. 需要`maven3+`, `java17`和`lombok`环境 2. (可选)修改配置文件配置信息-`manager/src/main/resources/application.yml` -3. 启动`springboot manager`服务 `manager/src/main/java/org/dromara/hertzbeat/manager/Manager.java` +3. 启动`springboot manager`服务 `manager/src/main/java/org/apache/hertzbeat/manager/Manager.java` - 前端启动 diff --git a/home/versioned_docs/version-v1.3.x/start/iotdb-init.md b/home/versioned_docs/version-v1.3.x/start/iotdb-init.md index 939e2f986e3..3ddf2bc2a10 100644 --- a/home/versioned_docs/version-v1.3.x/start/iotdb-init.md +++ b/home/versioned_docs/version-v1.3.x/start/iotdb-init.md @@ -54,7 +54,7 @@ warehouse: rpc-port: 6667 username: root password: root - # org.dromara.hertzbeat.warehouse.config.IotDbVersion: V_0_13 || V_1_0 + # config.org.apache.hertzbeat.warehouse.IotDbVersion: V_0_13 || V_1_0 version: V_0_13 query-timeout-in-ms: -1 # default '7776000000'（90days,unit:ms,-1:no-expire） diff --git a/home/versioned_docs/version-v1.4.x/start/iotdb-init.md b/home/versioned_docs/version-v1.4.x/start/iotdb-init.md index bf44552bffc..57329621958 100644 --- a/home/versioned_docs/version-v1.4.x/start/iotdb-init.md +++ b/home/versioned_docs/version-v1.4.x/start/iotdb-init.md @@ -55,7 +55,7 @@ warehouse: rpc-port: 6667 username: root password: root - # org.dromara.hertzbeat.warehouse.config.IotDbVersion: V_0_13 || V_1_0 + # config.org.apache.hertzbeat.warehouse.IotDbVersion: V_0_13 || V_1_0 version: V_0_13 query-timeout-in-ms: -1 # default '7776000000'（90days,unit:ms,-1:no-expire） diff --git a/manager/README.md b/manager/README.md deleted file mode 100644 index 2d816601bb8..00000000000 --- a/manager/README.md +++ /dev/null @@ -1,31 +0,0 @@ -### Manager Center - -Provides monitoring management, monitoring application configuration management, system user tenant background management, etc. -提供对监控的管理，监控应用配置的管理，系统用户租户后台管理等。 - -### Build HertzBeat Install Package - -1. Execute command in web-app - -```ng build --configuration production``` - -2. Execute command in root - -```mvn clean install``` - -The HertzBeat install package will at `manager/target/hertzbeat-{version}.tar.gz` - -3. Build package with jdk - -```mvn clean package -Pruntime``` - -4. Execute command in collector - -```mvn clean package -Pcluster``` - - -### Build Native - -Execute command in manager - -```mvn native:compile -Pnative -Dmaven.test.skip=true``` diff --git a/manager/pom.xml b/manager/pom.xml index ac937890208..cd8545beea1 100644 --- a/manager/pom.xml +++ b/manager/pom.xml @@ -19,7 +19,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> hertzbeat - org.dromara.hertzbeat + org.apache.hertzbeat 2.0-SNAPSHOT 4.0.0 @@ -43,7 +43,7 @@ - org.dromara.hertzbeat + org.apache.hertzbeat hertzbeat-common @@ -54,17 +54,17 @@ - org.dromara.hertzbeat + org.apache.hertzbeat hertzbeat-warehouse - org.dromara.hertzbeat + org.apache.hertzbeat hertzbeat-alerter - org.dromara.hertzbeat + org.apache.hertzbeat hertzbeat-collector @@ -75,12 +75,12 @@ - org.dromara.hertzbeat + org.apache.hertzbeat hertzbeat-remoting - org.dromara.hertzbeat + org.apache.hertzbeat hertzbeat-push @@ -209,7 +209,7 @@ false - org.dromara.hertzbeat.manager.Manager + org.apache.hertzbeat.manager.Manager false true diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/Manager.java b/manager/src/main/java/org/apache/hertzbeat/manager/Manager.java similarity index 83% rename from manager/src/main/java/org/dromara/hertzbeat/manager/Manager.java rename to manager/src/main/java/org/apache/hertzbeat/manager/Manager.java index accf1b78f61..4284f06b547 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/Manager.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/Manager.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager; +package org.apache.hertzbeat.manager; -import org.dromara.hertzbeat.manager.nativex.HertzbeatRuntimeHintsRegistrar; +import org.apache.hertzbeat.manager.nativex.HertzbeatRuntimeHintsRegistrar; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.domain.EntityScan; @@ -31,15 +31,14 @@ /** * start up class. - * */ @SpringBootApplication @EnableJpaAuditing -@EnableJpaRepositories(basePackages = {"org.dromara.hertzbeat"}) -@EntityScan(basePackages = {"org.dromara.hertzbeat"}) -@ComponentScan(basePackages = {"org.dromara.hertzbeat"}) -@ConfigurationPropertiesScan(basePackages = {"org.dromara.hertzbeat"}) +@EnableJpaRepositories(basePackages = {"org.apache.hertzbeat"}) +@EntityScan(basePackages = {"org.apache.hertzbeat"}) +@ComponentScan(basePackages = {"org.apache.hertzbeat"}) +@ConfigurationPropertiesScan(basePackages = {"org.apache.hertzbeat"}) @ImportRuntimeHints(HertzbeatRuntimeHintsRegistrar.class) public class Manager { public static void main(String[] args) { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/AlertNotifyHandler.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/AlertNotifyHandler.java similarity index 80% rename from manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/AlertNotifyHandler.java rename to manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/AlertNotifyHandler.java index 7881486ef14..7d17edf5ee4 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/AlertNotifyHandler.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/AlertNotifyHandler.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter; +package org.apache.hertzbeat.manager.component.alerter; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; -import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException; +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; /** * AlertNotifyHandler interface @@ -29,7 +29,6 @@ public interface AlertNotifyHandler { /** * 发送报警通知 - * * @param receiver Notification configuration information 通知配置信息 * @param noticeTemplate Notification configuration information 通知配置信息 * @param alert Alarm information 告警信息 @@ -39,7 +38,6 @@ public interface AlertNotifyHandler { /** * 通知类型 - * * @return 通知类型 */ byte type(); diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/AlertStoreHandler.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/AlertStoreHandler.java similarity index 91% rename from manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/AlertStoreHandler.java rename to manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/AlertStoreHandler.java index 38ca17b79bd..649ff589065 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/AlertStoreHandler.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/AlertStoreHandler.java @@ -15,14 +15,13 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter; +package org.apache.hertzbeat.manager.component.alerter; -import org.dromara.hertzbeat.common.entity.alerter.Alert; +import org.apache.hertzbeat.common.entity.alerter.Alert; /** * 报警持久化 * Alarm persistence - * */ public interface AlertStoreHandler { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/DispatcherAlarm.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/DispatcherAlarm.java similarity index 89% rename from manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/DispatcherAlarm.java rename to manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/DispatcherAlarm.java index 9742635cee2..76b9a92c540 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/DispatcherAlarm.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/DispatcherAlarm.java @@ -15,19 +15,19 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter; +package org.apache.hertzbeat.manager.component.alerter; import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.alert.AlerterWorkerPool; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; -import org.dromara.hertzbeat.common.entity.manager.NoticeRule; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; -import org.dromara.hertzbeat.common.queue.CommonDataQueue; -import org.dromara.hertzbeat.manager.service.NoticeConfigService; -import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException; -import org.dromara.hertzbeat.manager.support.exception.IgnoreException; +import org.apache.hertzbeat.alert.AlerterWorkerPool; +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.apache.hertzbeat.common.queue.CommonDataQueue; +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; @@ -37,8 +37,6 @@ /** * Alarm information storage and distribution * 告警信息入库分发 - * - * */ @Component @Slf4j diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/AbstractAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/AbstractAlertNotifyHandlerImpl.java similarity index 90% rename from manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/AbstractAlertNotifyHandlerImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/AbstractAlertNotifyHandlerImpl.java index eaf0a3b9936..4599c190262 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/AbstractAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/AbstractAlertNotifyHandlerImpl.java @@ -15,20 +15,20 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter.impl; +package org.apache.hertzbeat.manager.component.alerter.impl; import freemarker.cache.StringTemplateLoader; import freemarker.template.Configuration; import freemarker.template.TemplateException; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.alert.AlerterProperties; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; -import org.dromara.hertzbeat.common.support.event.SystemConfigChangeEvent; -import org.dromara.hertzbeat.common.util.ResourceBundleUtil; -import org.dromara.hertzbeat.manager.component.alerter.AlertNotifyHandler; -import org.dromara.hertzbeat.manager.service.NoticeConfigService; +import org.apache.hertzbeat.alert.AlerterProperties; +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.component.alerter.AlertNotifyHandler; +import org.apache.hertzbeat.manager.service.NoticeConfigService; import org.springframework.context.event.EventListener; import org.springframework.ui.freemarker.FreeMarkerTemplateUtils; import org.springframework.web.client.RestTemplate; @@ -44,9 +44,6 @@ import java.util.ResourceBundle; /** - * - * @version 2.1 - * Created by Musk.Chen on 2023/1/16 */ @Slf4j abstract class AbstractAlertNotifyHandlerImpl implements AlertNotifyHandler { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/CommonRobotNotifyResp.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/CommonRobotNotifyResp.java similarity index 94% rename from manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/CommonRobotNotifyResp.java rename to manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/CommonRobotNotifyResp.java index c0641958760..7c23a1fc7ac 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/CommonRobotNotifyResp.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/CommonRobotNotifyResp.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter.impl; +package org.apache.hertzbeat.manager.component.alerter.impl; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; @@ -24,8 +24,6 @@ /** * common robot http response entity - * - * */ @Data @AllArgsConstructor diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImpl.java similarity index 87% rename from manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImpl.java index 35c3e03346b..091c025b96a 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImpl.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter.impl; +package org.apache.hertzbeat.manager.component.alerter.impl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.alert.service.AlertService; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.Monitor; -import org.dromara.hertzbeat.manager.component.alerter.AlertStoreHandler; -import org.dromara.hertzbeat.manager.service.MonitorService; -import org.dromara.hertzbeat.manager.support.exception.IgnoreException; +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.support.exception.IgnoreException; import org.springframework.stereotype.Component; import java.util.Map; @@ -33,8 +33,6 @@ /** * 报警持久化 - 落地到数据库 * Alarm data persistence - landing in the database - * - * */ @Component @RequiredArgsConstructor diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImpl.java similarity index 91% rename from manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImpl.java index 93613107924..7e49e6d4641 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImpl.java @@ -15,23 +15,21 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter.impl; +package org.apache.hertzbeat.manager.component.alerter.impl; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; -import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException; +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.stereotype.Component; /** * Send alarm information through DingTalk robot * 通过钉钉机器人发送告警信息 - * - * */ @Component @RequiredArgsConstructor diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImpl.java similarity index 91% rename from manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImpl.java index b1e65fee42b..f0d5d3dd707 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImpl.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter.impl; +package org.apache.hertzbeat.manager.component.alerter.impl; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Builder; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; -import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException; +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.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; @@ -36,7 +36,6 @@ /** * Send alarm information through Discord robot - * Created by gcdd1993 on 2023/1/19 */ @Component @RequiredArgsConstructor diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/EmailAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/EmailAlertNotifyHandlerImpl.java similarity index 87% rename from manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/EmailAlertNotifyHandlerImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/EmailAlertNotifyHandlerImpl.java index 762910774bd..8d6ebe9e9eb 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/EmailAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/EmailAlertNotifyHandlerImpl.java @@ -15,22 +15,22 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter.impl; +package org.apache.hertzbeat.manager.component.alerter.impl; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.GeneralConfig; -import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; -import org.dromara.hertzbeat.common.support.event.SystemConfigChangeEvent; -import org.dromara.hertzbeat.common.util.ResourceBundleUtil; -import org.dromara.hertzbeat.manager.component.alerter.AlertNotifyHandler; -import org.dromara.hertzbeat.manager.dao.GeneralConfigDao; -import org.dromara.hertzbeat.manager.pojo.dto.EmailNoticeSender; -import org.dromara.hertzbeat.manager.service.MailService; -import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException; +import org.apache.hertzbeat.common.entity.alerter.Alert; +import org.apache.hertzbeat.common.entity.manager.GeneralConfig; +import org.apache.hertzbeat.common.entity.manager.NoticeReceiver; +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.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; import org.springframework.mail.javamail.JavaMailSender; diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImpl.java similarity index 93% rename from manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImpl.java index 51d10507fec..50582453d7b 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImpl.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter.impl; +package org.apache.hertzbeat.manager.component.alerter.impl; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; -import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException; +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.stereotype.Component; @@ -34,8 +34,6 @@ /** * Send alert information through FeiShu * 通过飞书发送告警信息 - * - * */ @Component @RequiredArgsConstructor diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/GotifyAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/GotifyAlertNotifyHandlerImpl.java similarity index 91% rename from manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/GotifyAlertNotifyHandlerImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/GotifyAlertNotifyHandlerImpl.java index bb539ca80a7..baf049391a3 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/GotifyAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/GotifyAlertNotifyHandlerImpl.java @@ -15,23 +15,21 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter.impl; +package org.apache.hertzbeat.manager.component.alerter.impl; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; -import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException; +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.stereotype.Component; /** * Gotify alert notify handler - * - * */ @Component @RequiredArgsConstructor diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/HuaweiCloudSmnAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/HuaweiCloudSmnAlertNotifyHandlerImpl.java similarity index 89% rename from manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/HuaweiCloudSmnAlertNotifyHandlerImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/HuaweiCloudSmnAlertNotifyHandlerImpl.java index 30f793490bf..9d9b50cae6b 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/HuaweiCloudSmnAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/HuaweiCloudSmnAlertNotifyHandlerImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter.impl; +package org.apache.hertzbeat.manager.component.alerter.impl; import com.huaweicloud.sdk.core.auth.BasicCredentials; import com.huaweicloud.sdk.smn.v2.SmnClient; @@ -24,11 +24,11 @@ import com.huaweicloud.sdk.smn.v2.region.SmnRegion; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; -import org.dromara.hertzbeat.common.util.ResourceBundleUtil; -import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException; +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.common.util.ResourceBundleUtil; +import org.apache.hertzbeat.manager.support.exception.AlertNoticeException; import org.springframework.stereotype.Component; import java.util.Map; diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/ServerChanAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/ServerChanAlertNotifyHandlerImpl.java similarity index 91% rename from manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/ServerChanAlertNotifyHandlerImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/ServerChanAlertNotifyHandlerImpl.java index 73a4f311a3e..85b8ba86fd1 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/ServerChanAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/ServerChanAlertNotifyHandlerImpl.java @@ -15,21 +15,20 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter.impl; +package org.apache.hertzbeat.manager.component.alerter.impl; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; -import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException; +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.stereotype.Component; /** * Server酱发送 - * * Send alarm information through Server */ @Component diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/SlackAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/SlackAlertNotifyHandlerImpl.java similarity index 88% rename from manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/SlackAlertNotifyHandlerImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/SlackAlertNotifyHandlerImpl.java index 00b6bfe1a33..babd89d921e 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/SlackAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/SlackAlertNotifyHandlerImpl.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter.impl; +package org.apache.hertzbeat.manager.component.alerter.impl; import lombok.Builder; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; -import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException; +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.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; @@ -37,10 +37,6 @@ /** * Send alarm information by Slack Webhook * 通过Slack Webhook发送告警信息 - * - * - * @version 2.1 - * Created by Musk.Chen on 2023/1/17 */ @Component @RequiredArgsConstructor diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/SmsAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/SmsAlertNotifyHandlerImpl.java similarity index 81% rename from manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/SmsAlertNotifyHandlerImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/SmsAlertNotifyHandlerImpl.java index 62bce8bcc78..e7cb069b272 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/SmsAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/SmsAlertNotifyHandlerImpl.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter.impl; +package org.apache.hertzbeat.manager.component.alerter.impl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; -import org.dromara.hertzbeat.common.service.TencentSmsClient; -import org.dromara.hertzbeat.common.util.ResourceBundleUtil; -import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException; +import org.apache.hertzbeat.common.constants.CommonConstants; +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.common.service.TencentSmsClient; +import org.apache.hertzbeat.common.util.ResourceBundleUtil; +import org.apache.hertzbeat.manager.support.exception.AlertNoticeException; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImpl.java similarity index 90% rename from manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImpl.java index b5f7a077b72..ffe0bce0993 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter.impl; +package org.apache.hertzbeat.manager.component.alerter.impl; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; @@ -23,20 +23,16 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; -import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException; +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.stereotype.Component; /** * Send alarm information by Telegram Bot * 通过Telegram Bot发送告警信息 - * - * - * @version 2.1 - * Created by Musk.Chen on 2023/1/16 */ @Component @Slf4j diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/WeChatAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WeChatAlertNotifyHandlerImpl.java similarity index 94% rename from manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/WeChatAlertNotifyHandlerImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WeChatAlertNotifyHandlerImpl.java index 64a7811f6e6..a7dd7247ed3 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/WeChatAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WeChatAlertNotifyHandlerImpl.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter.impl; +package org.apache.hertzbeat.manager.component.alerter.impl; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; +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; diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/WeWorkAppAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WeWorkAppAlertNotifyHandlerImpl.java similarity index 94% rename from manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/WeWorkAppAlertNotifyHandlerImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WeWorkAppAlertNotifyHandlerImpl.java index 90e7272ab99..ceee4e4f70e 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/WeWorkAppAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WeWorkAppAlertNotifyHandlerImpl.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter.impl; +package org.apache.hertzbeat.manager.component.alerter.impl; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.*; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; -import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException; +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.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; @@ -35,8 +35,6 @@ /** * WeChat app alert notify impl - * - * */ @Component @RequiredArgsConstructor diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImpl.java similarity index 91% rename from manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImpl.java index ab4829bf868..5e5256ade4e 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImpl.java @@ -15,22 +15,20 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter.impl; +package org.apache.hertzbeat.manager.component.alerter.impl; import lombok.*; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; -import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException; +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.stereotype.Component; /** * Send alarm information through enterprise WeChat * 通过企业微信发送告警信息 - * - * */ @Component @RequiredArgsConstructor diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/WebHookAlertNotifyHandlerImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WebHookAlertNotifyHandlerImpl.java similarity index 90% rename from manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/WebHookAlertNotifyHandlerImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WebHookAlertNotifyHandlerImpl.java index f50620e69ba..cacbbefda14 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/component/alerter/impl/WebHookAlertNotifyHandlerImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/impl/WebHookAlertNotifyHandlerImpl.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter.impl; +package org.apache.hertzbeat.manager.component.alerter.impl; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; -import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException; +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.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/component/status/CalculateStatus.java b/manager/src/main/java/org/apache/hertzbeat/manager/component/status/CalculateStatus.java similarity index 95% rename from manager/src/main/java/org/dromara/hertzbeat/manager/component/status/CalculateStatus.java rename to manager/src/main/java/org/apache/hertzbeat/manager/component/status/CalculateStatus.java index a9437bfe6d5..5a5625a152d 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/component/status/CalculateStatus.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/status/CalculateStatus.java @@ -15,14 +15,19 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.status; +package org.apache.hertzbeat.manager.component.status; import com.google.common.util.concurrent.ThreadFactoryBuilder; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.manager.*; -import org.dromara.hertzbeat.manager.config.StatusProperties; -import org.dromara.hertzbeat.manager.dao.*; +import org.apache.hertzbeat.common.entity.manager.*; +import org.apache.hertzbeat.common.constants.CommonConstants; +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; @@ -39,7 +44,6 @@ /** * calculate component status for status page - * */ @Component @Slf4j diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/config/AngularErrorViewResolver.java b/manager/src/main/java/org/apache/hertzbeat/manager/config/AngularErrorViewResolver.java similarity index 99% rename from manager/src/main/java/org/dromara/hertzbeat/manager/config/AngularErrorViewResolver.java rename to manager/src/main/java/org/apache/hertzbeat/manager/config/AngularErrorViewResolver.java index 07703f7f636..223167b57ea 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/config/AngularErrorViewResolver.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/config/AngularErrorViewResolver.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.config; +package org.apache.hertzbeat.manager.config; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.template.TemplateAvailabilityProvider; @@ -41,8 +41,6 @@ /** * Solve the front-end routing problem of angular static website resources with DefaultErrorViewResolver and route the 404 website request to the angular front-end * 同DefaultErrorViewResolver 解决angular静态网站资源前端路由问题 把404的网站请求给angular前端进行路由 - * - * */ @Configuration @Slf4j diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/config/CommonCommandLineRunner.java b/manager/src/main/java/org/apache/hertzbeat/manager/config/CommonCommandLineRunner.java similarity index 85% rename from manager/src/main/java/org/dromara/hertzbeat/manager/config/CommonCommandLineRunner.java rename to manager/src/main/java/org/apache/hertzbeat/manager/config/CommonCommandLineRunner.java index 3dfd3956411..9b87e222458 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/config/CommonCommandLineRunner.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/config/CommonCommandLineRunner.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.config; +package org.apache.hertzbeat.manager.config; import com.fasterxml.jackson.databind.ObjectMapper; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.manager.GeneralConfig; -import org.dromara.hertzbeat.manager.dao.GeneralConfigDao; -import org.dromara.hertzbeat.manager.pojo.dto.SystemConfig; -import org.dromara.hertzbeat.manager.pojo.dto.TemplateConfig; -import org.dromara.hertzbeat.manager.service.AppService; -import org.dromara.hertzbeat.manager.service.impl.SystemGeneralConfigServiceImpl; -import org.dromara.hertzbeat.manager.service.impl.TemplateConfigServiceImpl; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.manager.GeneralConfig; +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; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/config/HeaderRequestInterceptor.java b/manager/src/main/java/org/apache/hertzbeat/manager/config/HeaderRequestInterceptor.java similarity index 97% rename from manager/src/main/java/org/dromara/hertzbeat/manager/config/HeaderRequestInterceptor.java rename to manager/src/main/java/org/apache/hertzbeat/manager/config/HeaderRequestInterceptor.java index 84fad942d29..a29b63bfe46 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/config/HeaderRequestInterceptor.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/config/HeaderRequestInterceptor.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.config; +package org.apache.hertzbeat.manager.config; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpRequest; @@ -29,8 +29,6 @@ /** * Rest Template interceptor adds request header information * restTemplate拦截器添加请求头信息 - * - * */ public class HeaderRequestInterceptor implements ClientHttpRequestInterceptor { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/config/JpaAuditorConfig.java b/manager/src/main/java/org/apache/hertzbeat/manager/config/JpaAuditorConfig.java similarity index 96% rename from manager/src/main/java/org/dromara/hertzbeat/manager/config/JpaAuditorConfig.java rename to manager/src/main/java/org/apache/hertzbeat/manager/config/JpaAuditorConfig.java index a0db2796a1c..de851475fc8 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/config/JpaAuditorConfig.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/config/JpaAuditorConfig.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.config; +package org.apache.hertzbeat.manager.config; import com.usthe.sureness.subject.SubjectSum; import com.usthe.sureness.util.SurenessContextHolder; @@ -26,8 +26,6 @@ /** * generate auditor for jpa auditing - * - * */ @Configuration public class JpaAuditorConfig implements AuditorAware { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/config/RestTemplateConfig.java b/manager/src/main/java/org/apache/hertzbeat/manager/config/RestTemplateConfig.java similarity index 97% rename from manager/src/main/java/org/dromara/hertzbeat/manager/config/RestTemplateConfig.java rename to manager/src/main/java/org/apache/hertzbeat/manager/config/RestTemplateConfig.java index 52b48dbd4ab..a0865b4494c 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/config/RestTemplateConfig.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/config/RestTemplateConfig.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.config; +package org.apache.hertzbeat.manager.config; import okhttp3.OkHttpClient; import org.springframework.context.annotation.Bean; @@ -30,8 +30,6 @@ /** * restTemplate config * todo 连接池 - * - * */ @Configuration public class RestTemplateConfig { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/config/SchedulerConfig.java b/manager/src/main/java/org/apache/hertzbeat/manager/config/SchedulerConfig.java similarity index 87% rename from manager/src/main/java/org/dromara/hertzbeat/manager/config/SchedulerConfig.java rename to manager/src/main/java/org/apache/hertzbeat/manager/config/SchedulerConfig.java index 2b87fc94c06..1a8ad4221b5 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/config/SchedulerConfig.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/config/SchedulerConfig.java @@ -15,18 +15,17 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.config; +package org.apache.hertzbeat.manager.config; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.manager.scheduler.ConsistentHash; -import org.dromara.hertzbeat.manager.scheduler.SchedulerProperties; +import org.apache.hertzbeat.manager.scheduler.ConsistentHash; +import org.apache.hertzbeat.manager.scheduler.SchedulerProperties; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; /** * scheduler config - * */ @Configuration @AutoConfigureAfter(value = {SchedulerProperties.class}) diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/config/SecurityCorsConfiguration.java b/manager/src/main/java/org/apache/hertzbeat/manager/config/SecurityCorsConfiguration.java similarity index 97% rename from manager/src/main/java/org/dromara/hertzbeat/manager/config/SecurityCorsConfiguration.java rename to manager/src/main/java/org/apache/hertzbeat/manager/config/SecurityCorsConfiguration.java index d9014d70d02..b93d24ebdee 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/config/SecurityCorsConfiguration.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/config/SecurityCorsConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.config; +package org.apache.hertzbeat.manager.config; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; @@ -27,7 +27,6 @@ import java.util.Collections; /** - * * SecurityCorsConfiguration class */ @Configuration diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/config/StatusProperties.java b/manager/src/main/java/org/apache/hertzbeat/manager/config/StatusProperties.java similarity index 97% rename from manager/src/main/java/org/dromara/hertzbeat/manager/config/StatusProperties.java rename to manager/src/main/java/org/apache/hertzbeat/manager/config/StatusProperties.java index 101ca11b1b7..cc41b91e8b7 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/config/StatusProperties.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/config/StatusProperties.java @@ -15,14 +15,13 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.config; +package org.apache.hertzbeat.manager.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; /** * status page properties - * */ @ConfigurationProperties(prefix = "status") @Component diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/config/SwaggerConfig.java b/manager/src/main/java/org/apache/hertzbeat/manager/config/SwaggerConfig.java similarity index 98% rename from manager/src/main/java/org/dromara/hertzbeat/manager/config/SwaggerConfig.java rename to manager/src/main/java/org/apache/hertzbeat/manager/config/SwaggerConfig.java index 52f85c45af7..a845eb3d828 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/config/SwaggerConfig.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/config/SwaggerConfig.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.config; +package org.apache.hertzbeat.manager.config; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.ExternalDocumentation; @@ -31,8 +31,6 @@ /** * swagger config * url: /swagger-ui/index.html - * - * */ @Configuration public class SwaggerConfig { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/controller/AccountController.java b/manager/src/main/java/org/apache/hertzbeat/manager/controller/AccountController.java similarity index 93% rename from manager/src/main/java/org/dromara/hertzbeat/manager/controller/AccountController.java rename to manager/src/main/java/org/apache/hertzbeat/manager/controller/AccountController.java index 593e7c435f5..c7017794b19 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/controller/AccountController.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/controller/AccountController.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.controller; +package org.apache.hertzbeat.manager.controller; import com.usthe.sureness.provider.SurenessAccount; import com.usthe.sureness.provider.SurenessAccountProvider; @@ -27,10 +27,10 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.entity.dto.Message; -import org.dromara.hertzbeat.common.util.JsonUtil; -import org.dromara.hertzbeat.manager.pojo.dto.LoginDto; -import org.dromara.hertzbeat.manager.pojo.dto.RefreshTokenResponse; +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.*; @@ -40,14 +40,12 @@ import java.util.List; import java.util.Map; -import static org.dromara.hertzbeat.common.constants.CommonConstants.MONITOR_LOGIN_FAILED_CODE; +import static org.apache.hertzbeat.common.constants.CommonConstants.MONITOR_LOGIN_FAILED_CODE; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; /** * Authentication registration TOKEN management API * 认证注册TOKEN管理API - * - * */ @Tag(name = "Auth Manage API | 认证注册TOKEN管理API") @RestController() diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/controller/AppController.java b/manager/src/main/java/org/apache/hertzbeat/manager/controller/AppController.java similarity index 94% rename from manager/src/main/java/org/dromara/hertzbeat/manager/controller/AppController.java rename to manager/src/main/java/org/apache/hertzbeat/manager/controller/AppController.java index fc48f2b6b30..6956b798210 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/controller/AppController.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/controller/AppController.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.controller; +package org.apache.hertzbeat.manager.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import org.dromara.hertzbeat.common.entity.dto.Message; -import org.dromara.hertzbeat.common.entity.job.Job; -import org.dromara.hertzbeat.common.entity.manager.ParamDefine; -import org.dromara.hertzbeat.manager.pojo.dto.Hierarchy; -import org.dromara.hertzbeat.manager.pojo.dto.MonitorDefineDto; -import org.dromara.hertzbeat.manager.service.AppService; +import org.apache.hertzbeat.common.entity.dto.Message; +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.MonitorDefineDto; +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.*; @@ -34,14 +34,12 @@ import java.util.List; import java.util.Locale; -import static org.dromara.hertzbeat.common.constants.CommonConstants.FAIL_CODE; +import static org.apache.hertzbeat.common.constants.CommonConstants.FAIL_CODE; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; /** * Monitoring Type Management API * 监控类型管理API - * - * */ @Tag(name = "Monitor Type Manage API | 监控类型管理API") @RestController diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/controller/CollectorController.java b/manager/src/main/java/org/apache/hertzbeat/manager/controller/CollectorController.java similarity index 92% rename from manager/src/main/java/org/dromara/hertzbeat/manager/controller/CollectorController.java rename to manager/src/main/java/org/apache/hertzbeat/manager/controller/CollectorController.java index 2e3df69a582..c626d23c2b3 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/controller/CollectorController.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/controller/CollectorController.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.controller; +package org.apache.hertzbeat.manager.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.dto.CollectorSummary; -import org.dromara.hertzbeat.common.entity.dto.Message; -import org.dromara.hertzbeat.common.entity.manager.Collector; -import org.dromara.hertzbeat.common.util.IpDomainUtil; -import org.dromara.hertzbeat.manager.scheduler.netty.ManageServer; -import org.dromara.hertzbeat.manager.service.CollectorService; +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.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -44,7 +44,6 @@ /** * collector API - * */ @Tag(name = "Collector Manage API | 采集器信息管理API") @RestController() diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/controller/GeneralConfigController.java b/manager/src/main/java/org/apache/hertzbeat/manager/controller/GeneralConfigController.java similarity index 92% rename from manager/src/main/java/org/dromara/hertzbeat/manager/controller/GeneralConfigController.java rename to manager/src/main/java/org/apache/hertzbeat/manager/controller/GeneralConfigController.java index 9f7d074ddd8..7b3bf6e213a 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/controller/GeneralConfigController.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/controller/GeneralConfigController.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.controller; +package org.apache.hertzbeat.manager.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.entity.dto.Message; -import org.dromara.hertzbeat.manager.pojo.dto.TemplateConfig; -import org.dromara.hertzbeat.manager.service.GeneralConfigService; -import org.dromara.hertzbeat.manager.service.impl.TemplateConfigServiceImpl; +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.*; @@ -39,8 +39,6 @@ /** * Alert sender Configuration API * 告警发送端配置API - * - * */ @RestController @RequestMapping(value = "/api/config", produces = {APPLICATION_JSON_VALUE}) diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/controller/I18nController.java b/manager/src/main/java/org/apache/hertzbeat/manager/controller/I18nController.java similarity index 93% rename from manager/src/main/java/org/dromara/hertzbeat/manager/controller/I18nController.java rename to manager/src/main/java/org/apache/hertzbeat/manager/controller/I18nController.java index b2f944d9d77..41bf6e40567 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/controller/I18nController.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/controller/I18nController.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.controller; +package org.apache.hertzbeat.manager.controller; -import org.dromara.hertzbeat.common.entity.dto.Message; -import org.dromara.hertzbeat.manager.service.AppService; +import org.apache.hertzbeat.common.entity.dto.Message; +import org.apache.hertzbeat.manager.service.AppService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -34,8 +34,6 @@ /** * Internationalization I 18 N * 国际化I18N - * - * */ @Tag(name = "I18N API | I18N国际化资源API") @RestController diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/controller/MetricsController.java b/manager/src/main/java/org/apache/hertzbeat/manager/controller/MetricsController.java similarity index 89% rename from manager/src/main/java/org/dromara/hertzbeat/manager/controller/MetricsController.java rename to manager/src/main/java/org/apache/hertzbeat/manager/controller/MetricsController.java index 48f592d4003..d4e7e7dfc12 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/controller/MetricsController.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/controller/MetricsController.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.controller; +package org.apache.hertzbeat.manager.controller; -import org.dromara.hertzbeat.common.entity.dto.Message; -import org.dromara.hertzbeat.common.queue.CommonDataQueue; -import org.dromara.hertzbeat.common.queue.impl.InMemoryCommonDataQueue; +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; @@ -35,8 +35,6 @@ /** * hertzbeat metrics exporter - * - * */ @Tag(name = "Inner Metrics Exporter API | 内部监控指标API") @RestController diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/controller/MonitorController.java b/manager/src/main/java/org/apache/hertzbeat/manager/controller/MonitorController.java similarity index 94% rename from manager/src/main/java/org/dromara/hertzbeat/manager/controller/MonitorController.java rename to manager/src/main/java/org/apache/hertzbeat/manager/controller/MonitorController.java index ef32ebe63ab..3846511b605 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/controller/MonitorController.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/controller/MonitorController.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.controller; +package org.apache.hertzbeat.manager.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import org.dromara.hertzbeat.common.entity.dto.Message; -import org.dromara.hertzbeat.common.entity.manager.Monitor; -import org.dromara.hertzbeat.manager.pojo.dto.MonitorDto; -import org.dromara.hertzbeat.manager.service.MonitorService; +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.*; @@ -31,14 +31,12 @@ import jakarta.validation.Valid; import java.util.List; -import static org.dromara.hertzbeat.common.constants.CommonConstants.MONITOR_NOT_EXIST_CODE; +import static org.apache.hertzbeat.common.constants.CommonConstants.MONITOR_NOT_EXIST_CODE; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; /** * Monitoring management API * 监控管理API - * - * */ @Tag(name = "Monitor Manage API | 监控管理API") @RestController diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/controller/MonitorsController.java b/manager/src/main/java/org/apache/hertzbeat/manager/controller/MonitorsController.java similarity index 96% rename from manager/src/main/java/org/dromara/hertzbeat/manager/controller/MonitorsController.java rename to manager/src/main/java/org/apache/hertzbeat/manager/controller/MonitorsController.java index 795912bf127..8a2aeb07a90 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/controller/MonitorsController.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/controller/MonitorsController.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.controller; +package org.apache.hertzbeat.manager.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import org.dromara.hertzbeat.common.entity.dto.Message; -import org.dromara.hertzbeat.common.entity.manager.Monitor; -import org.dromara.hertzbeat.manager.service.MonitorService; +import org.apache.hertzbeat.common.entity.dto.Message; +import org.apache.hertzbeat.common.entity.manager.Monitor; +import org.apache.hertzbeat.manager.service.MonitorService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -47,8 +47,6 @@ /** * Monitor and manage batch API * 监控管理批量API - * - * */ @Tag(name = "Monitor Manage Batch API | 监控列表API") @RestController @@ -97,9 +95,9 @@ public ResponseEntity>> getMonitors( if (StringUtils.hasText(tag)) { String[] tagArr = tag.split(":"); String tagName = tagArr[0]; - ListJoin tagJoin = root + ListJoin tagJoin = root .join(root.getModel() - .getList("tags", org.dromara.hertzbeat.common.entity.manager.Tag.class), JoinType.LEFT); + .getList("tags", org.apache.hertzbeat.common.entity.manager.Tag.class), JoinType.LEFT); if (tagArr.length == TAG_LENGTH) { String tagValue = tagArr[1]; andList.add(criteriaBuilder.equal(tagJoin.get("name"), tagName)); diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/controller/NoticeConfigController.java b/manager/src/main/java/org/apache/hertzbeat/manager/controller/NoticeConfigController.java similarity index 95% rename from manager/src/main/java/org/dromara/hertzbeat/manager/controller/NoticeConfigController.java rename to manager/src/main/java/org/apache/hertzbeat/manager/controller/NoticeConfigController.java index 354d66327e1..2e6fa3dab8f 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/controller/NoticeConfigController.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/controller/NoticeConfigController.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.controller; +package org.apache.hertzbeat.manager.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import org.dromara.hertzbeat.common.entity.dto.Message; -import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; -import org.dromara.hertzbeat.common.entity.manager.NoticeRule; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; -import org.dromara.hertzbeat.manager.service.NoticeConfigService; +import org.apache.hertzbeat.common.entity.dto.Message; +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.apache.hertzbeat.manager.service.NoticeConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.jpa.domain.Specification; import org.springframework.http.ResponseEntity; @@ -35,15 +35,13 @@ import java.util.List; import java.util.Optional; -import static org.dromara.hertzbeat.common.constants.CommonConstants.FAIL_CODE; +import static org.apache.hertzbeat.common.constants.CommonConstants.FAIL_CODE; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; /** * Message Notification Configuration API * 消息通知配置API - * - * */ @Tag(name = "Notification Config API | 消息通知配置API") @RestController() diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/controller/StatusPageController.java b/manager/src/main/java/org/apache/hertzbeat/manager/controller/StatusPageController.java similarity index 92% rename from manager/src/main/java/org/dromara/hertzbeat/manager/controller/StatusPageController.java rename to manager/src/main/java/org/apache/hertzbeat/manager/controller/StatusPageController.java index 4bd3c066340..06d9f75b2f4 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/controller/StatusPageController.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/controller/StatusPageController.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.controller; +package org.apache.hertzbeat.manager.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.dto.Message; -import org.dromara.hertzbeat.common.entity.manager.StatusPageComponent; -import org.dromara.hertzbeat.common.entity.manager.StatusPageIncident; -import org.dromara.hertzbeat.common.entity.manager.StatusPageOrg; -import org.dromara.hertzbeat.manager.service.StatusPageService; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.dto.Message; +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.service.StatusPageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -36,7 +36,6 @@ /** * status page endpoint controller - * */ @Tag(name = "Status Page API | 状态页API") @RestController() diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/controller/StatusPagePublicController.java b/manager/src/main/java/org/apache/hertzbeat/manager/controller/StatusPagePublicController.java similarity index 87% rename from manager/src/main/java/org/dromara/hertzbeat/manager/controller/StatusPagePublicController.java rename to manager/src/main/java/org/apache/hertzbeat/manager/controller/StatusPagePublicController.java index 642e912fe55..a5cbb7277c3 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/controller/StatusPagePublicController.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/controller/StatusPagePublicController.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.controller; +package org.apache.hertzbeat.manager.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.dto.Message; -import org.dromara.hertzbeat.common.entity.manager.StatusPageIncident; -import org.dromara.hertzbeat.common.entity.manager.StatusPageOrg; -import org.dromara.hertzbeat.manager.pojo.dto.ComponentStatus; -import org.dromara.hertzbeat.manager.service.StatusPageService; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.dto.Message; +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 org.apache.hertzbeat.manager.service.StatusPageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -35,7 +35,6 @@ /** * status page public endpoint controller - * */ @Tag(name = "Status Page Public API | 状态页对外API") @RestController() diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/controller/SummaryController.java b/manager/src/main/java/org/apache/hertzbeat/manager/controller/SummaryController.java similarity index 87% rename from manager/src/main/java/org/dromara/hertzbeat/manager/controller/SummaryController.java rename to manager/src/main/java/org/apache/hertzbeat/manager/controller/SummaryController.java index 66f82fd8537..2053328aa40 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/controller/SummaryController.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/controller/SummaryController.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.controller; +package org.apache.hertzbeat.manager.controller; -import org.dromara.hertzbeat.common.entity.dto.Message; -import org.dromara.hertzbeat.manager.pojo.dto.AppCount; -import org.dromara.hertzbeat.manager.pojo.dto.Dashboard; -import org.dromara.hertzbeat.manager.service.MonitorService; +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; @@ -34,8 +34,6 @@ /** * System Summary Statistics API * 系统摘要统计API - * - * */ @Tag(name = "Summary Statistics API | 系统摘要统计API") @RestController diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/controller/TagController.java b/manager/src/main/java/org/apache/hertzbeat/manager/controller/TagController.java similarity index 96% rename from manager/src/main/java/org/dromara/hertzbeat/manager/controller/TagController.java rename to manager/src/main/java/org/apache/hertzbeat/manager/controller/TagController.java index f7545e3afdc..5fff0836de8 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/controller/TagController.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/controller/TagController.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.controller; +package org.apache.hertzbeat.manager.controller; -import org.dromara.hertzbeat.common.entity.dto.Message; -import org.dromara.hertzbeat.common.entity.manager.Tag; -import org.dromara.hertzbeat.manager.service.TagService; +import org.apache.hertzbeat.common.entity.dto.Message; +import org.apache.hertzbeat.common.entity.manager.Tag; +import org.apache.hertzbeat.manager.service.TagService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import org.springframework.beans.factory.annotation.Autowired; @@ -39,8 +39,6 @@ /** * Tags management API * 标签管理API - * - * */ @io.swagger.v3.oas.annotations.tags.Tag(name = "Tag Manage API | 标签管理API") @RestController diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/dao/CollectorDao.java b/manager/src/main/java/org/apache/hertzbeat/manager/dao/CollectorDao.java similarity index 92% rename from manager/src/main/java/org/dromara/hertzbeat/manager/dao/CollectorDao.java rename to manager/src/main/java/org/apache/hertzbeat/manager/dao/CollectorDao.java index 157cf62e021..a9902f6376d 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/dao/CollectorDao.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/dao/CollectorDao.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.dao; +package org.apache.hertzbeat.manager.dao; -import org.dromara.hertzbeat.common.entity.manager.Collector; +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; @@ -27,9 +27,6 @@ /** * Collector repository - * - * - * */ public interface CollectorDao extends JpaRepository, JpaSpecificationExecutor { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/dao/CollectorMonitorBindDao.java b/manager/src/main/java/org/apache/hertzbeat/manager/dao/CollectorMonitorBindDao.java similarity index 94% rename from manager/src/main/java/org/dromara/hertzbeat/manager/dao/CollectorMonitorBindDao.java rename to manager/src/main/java/org/apache/hertzbeat/manager/dao/CollectorMonitorBindDao.java index 4bc4812634c..a6b428c1090 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/dao/CollectorMonitorBindDao.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/dao/CollectorMonitorBindDao.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.dao; +package org.apache.hertzbeat.manager.dao; -import org.dromara.hertzbeat.common.entity.manager.CollectorMonitorBind; +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; @@ -29,9 +29,6 @@ /** * CollectorMonitorBind repository - * - * - * */ public interface CollectorMonitorBindDao extends JpaRepository, JpaSpecificationExecutor { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/dao/GeneralConfigDao.java b/manager/src/main/java/org/apache/hertzbeat/manager/dao/GeneralConfigDao.java similarity index 93% rename from manager/src/main/java/org/dromara/hertzbeat/manager/dao/GeneralConfigDao.java rename to manager/src/main/java/org/apache/hertzbeat/manager/dao/GeneralConfigDao.java index 8f7d3e48d2c..12f51d1b615 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/dao/GeneralConfigDao.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/dao/GeneralConfigDao.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.dao; +package org.apache.hertzbeat.manager.dao; -import org.dromara.hertzbeat.common.entity.manager.GeneralConfig; +import org.apache.hertzbeat.common.entity.manager.GeneralConfig; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.stereotype.Component; @@ -27,7 +27,6 @@ * todo common config data cache *

该接口继承了JpaRepository和JpaSpecificationExecutor两个接口，提供基本的CRUD操作和规范查询能力。

*

This interface inherits the two interfaces JpaRepository and JpaSpecificationExecutor, providing basic CRUD operations and specification query capabilities.

- * */ @Component public interface GeneralConfigDao extends JpaRepository, JpaSpecificationExecutor { @@ -35,7 +34,6 @@ public interface GeneralConfigDao extends JpaRepository, Jp /** * 通过类型查询 * Query by type - * * @param type 类型 * @return 返回查询到的配置信息 Return the queried configuration information */ diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/dao/MonitorDao.java b/manager/src/main/java/org/apache/hertzbeat/manager/dao/MonitorDao.java similarity index 90% rename from manager/src/main/java/org/dromara/hertzbeat/manager/dao/MonitorDao.java rename to manager/src/main/java/org/apache/hertzbeat/manager/dao/MonitorDao.java index d1e1a670dbe..550d17bc2d7 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/dao/MonitorDao.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/dao/MonitorDao.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.dao; +package org.apache.hertzbeat.manager.dao; -import org.dromara.hertzbeat.manager.pojo.dto.AppCount; -import org.dromara.hertzbeat.common.entity.manager.Monitor; +import org.apache.hertzbeat.manager.pojo.dto.AppCount; +import org.apache.hertzbeat.common.entity.manager.Monitor; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Modifying; @@ -31,9 +31,6 @@ /** * AuthResources 数据库操作 - * - * - * */ public interface MonitorDao extends JpaRepository, JpaSpecificationExecutor { @@ -41,7 +38,6 @@ public interface MonitorDao extends JpaRepository, JpaSpecificati /** * Delete monitor based on monitor ID list * 根据监控任务ID列表删除监控 - * * @param monitorIds Monitoring ID List 监控任务ID列表 */ void deleteAllByIdIn(Set monitorIds); @@ -49,7 +45,6 @@ public interface MonitorDao extends JpaRepository, JpaSpecificati /** * Query monitoring based on monitoring ID list * 根据监控任务ID列表查询监控 - * * @param monitorIds Monitoring ID List 监控任务ID列表 * @return Monitor List 监控列表 */ @@ -58,7 +53,6 @@ public interface MonitorDao extends JpaRepository, JpaSpecificati /** * Query monitoring by monitoring type * 根据监控类型查询监控 - * * @param app Monitor Type 监控类型 * @return Monitor List 监控列表 */ @@ -67,7 +61,6 @@ public interface MonitorDao extends JpaRepository, JpaSpecificati /** * Querying Monitoring of Sent Collection Tasks * 查询已下发采集任务的监控 - * * @param status Monitor Status 任务状态 * @return Monitor List 监控列表 */ @@ -75,7 +68,6 @@ public interface MonitorDao extends JpaRepository, JpaSpecificati /** * Query monitoring by monitoring name 根据任务名称查询监控 - * * @param name monitoring name 任务名称 * @return monitoring list 监控列表 */ @@ -84,16 +76,14 @@ public interface MonitorDao extends JpaRepository, JpaSpecificati /** * Query the monitoring category - the number of monitoring corresponding to the status * 查询监控类别-状态对应的监控数量 - * * @return Monitoring Category-Status and Monitoring Quantity Mapping 监控类别-状态与监控数量映射 */ - @Query("select new org.dromara.hertzbeat.manager.pojo.dto.AppCount(mo.app, mo.status, COUNT(mo.id)) from Monitor mo group by mo.app, mo.status") + @Query("select new org.apache.hertzbeat.manager.pojo.dto.AppCount(mo.app, mo.status, COUNT(mo.id)) from Monitor mo group by mo.app, mo.status") List findAppsStatusCount(); /** * Update the status of the specified monitor * 更新指定监控的状态 - * * @param id Monitor ID 监控任务ID * @param status 任务状态 Monitor Status */ diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/dao/NoticeReceiverDao.java b/manager/src/main/java/org/apache/hertzbeat/manager/dao/NoticeReceiverDao.java similarity index 90% rename from manager/src/main/java/org/dromara/hertzbeat/manager/dao/NoticeReceiverDao.java rename to manager/src/main/java/org/apache/hertzbeat/manager/dao/NoticeReceiverDao.java index ee752d5868a..52df1f26ba3 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/dao/NoticeReceiverDao.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/dao/NoticeReceiverDao.java @@ -15,16 +15,14 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.dao; +package org.apache.hertzbeat.manager.dao; -import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; +import org.apache.hertzbeat.common.entity.manager.NoticeReceiver; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; /** * NoticeReceiver数据库操作 - * - * */ public interface NoticeReceiverDao extends JpaRepository, JpaSpecificationExecutor { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/dao/NoticeRuleDao.java b/manager/src/main/java/org/apache/hertzbeat/manager/dao/NoticeRuleDao.java similarity index 92% rename from manager/src/main/java/org/dromara/hertzbeat/manager/dao/NoticeRuleDao.java rename to manager/src/main/java/org/apache/hertzbeat/manager/dao/NoticeRuleDao.java index 3bf6e31c62c..e65d42e898c 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/dao/NoticeRuleDao.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/dao/NoticeRuleDao.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.dao; +package org.apache.hertzbeat.manager.dao; -import org.dromara.hertzbeat.common.entity.manager.NoticeRule; +import org.apache.hertzbeat.common.entity.manager.NoticeRule; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; @@ -26,7 +26,6 @@ /** * NoticeRule数据库操作 * NoticeRule database operations - * */ public interface NoticeRuleDao extends JpaRepository, JpaSpecificationExecutor { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/dao/NoticeTemplateDao.java b/manager/src/main/java/org/apache/hertzbeat/manager/dao/NoticeTemplateDao.java similarity index 91% rename from manager/src/main/java/org/dromara/hertzbeat/manager/dao/NoticeTemplateDao.java rename to manager/src/main/java/org/apache/hertzbeat/manager/dao/NoticeTemplateDao.java index 1dc5c077a18..5eb3f664f11 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/dao/NoticeTemplateDao.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/dao/NoticeTemplateDao.java @@ -15,16 +15,15 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.dao; +package org.apache.hertzbeat.manager.dao; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; +import org.apache.hertzbeat.common.entity.manager.NoticeTemplate; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; /** * NoticeTemplate数据库操作 * Query all enabled notification policies - * */ public interface NoticeTemplateDao extends JpaRepository, JpaSpecificationExecutor { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/dao/ParamDao.java b/manager/src/main/java/org/apache/hertzbeat/manager/dao/ParamDao.java similarity index 93% rename from manager/src/main/java/org/dromara/hertzbeat/manager/dao/ParamDao.java rename to manager/src/main/java/org/apache/hertzbeat/manager/dao/ParamDao.java index dca1ae12dbc..94a1ff59e2a 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/dao/ParamDao.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/dao/ParamDao.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.dao; +package org.apache.hertzbeat.manager.dao; -import org.dromara.hertzbeat.common.entity.manager.Param; +import org.apache.hertzbeat.common.entity.manager.Param; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; @@ -26,15 +26,12 @@ /** * ParamDao 数据库操作 * ParamDao database operations - * - * */ public interface ParamDao extends JpaRepository { /** * Query the list of parameters associated with the monitoring ID' * 根据监控任务ID查询与之关联的参数列表 - * * @param monitorId Monitor ID 监控任务ID * @return list of parameter values 参数值列表 */ @@ -43,7 +40,6 @@ public interface ParamDao extends JpaRepository { /** * Remove the parameter list associated with the monitoring ID based on it * 根据监控任务ID删除与之关联的参数列表 - * * @param monitorId Monitor Id 监控任务ID */ void deleteParamsByMonitorId(long monitorId); @@ -51,7 +47,6 @@ public interface ParamDao extends JpaRepository { /** * Remove the parameter list associated with the monitoring ID list based on it * 根据监控任务ID列表删除与之关联的参数列表 - * * @param monitorIds Monitoring ID List 监控任务ID列表 */ void deleteParamsByMonitorIdIn(Set monitorIds); diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/dao/ParamDefineDao.java b/manager/src/main/java/org/apache/hertzbeat/manager/dao/ParamDefineDao.java similarity index 91% rename from manager/src/main/java/org/dromara/hertzbeat/manager/dao/ParamDefineDao.java rename to manager/src/main/java/org/apache/hertzbeat/manager/dao/ParamDefineDao.java index fde913bafda..938ec922c11 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/dao/ParamDefineDao.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/dao/ParamDefineDao.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.dao; +package org.apache.hertzbeat.manager.dao; -import org.dromara.hertzbeat.common.entity.manager.ParamDefine; +import org.apache.hertzbeat.common.entity.manager.ParamDefine; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; @@ -25,16 +25,12 @@ /** * Param Define Database Operations * ParamDefine数据库操作 - * - * - * */ public interface ParamDefineDao extends JpaRepository { /** * Query the parameter definitions under it according to the monitoring type * 根据监控类型查询其下的参数定义 - * * @param app Monitoring type 监控类型 * @return parameter definition list 参数定义列表 */ diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/dao/StatusPageComponentDao.java b/manager/src/main/java/org/apache/hertzbeat/manager/dao/StatusPageComponentDao.java similarity index 91% rename from manager/src/main/java/org/dromara/hertzbeat/manager/dao/StatusPageComponentDao.java rename to manager/src/main/java/org/apache/hertzbeat/manager/dao/StatusPageComponentDao.java index 97c84956834..56d1504c884 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/dao/StatusPageComponentDao.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/dao/StatusPageComponentDao.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.dao; +package org.apache.hertzbeat.manager.dao; -import org.dromara.hertzbeat.common.entity.manager.StatusPageComponent; +import org.apache.hertzbeat.common.entity.manager.StatusPageComponent; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; @@ -25,8 +25,6 @@ /** * StatusPageComponent DAO interface. - * - * */ public interface StatusPageComponentDao extends JpaRepository, JpaSpecificationExecutor { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/dao/StatusPageHistoryDao.java b/manager/src/main/java/org/apache/hertzbeat/manager/dao/StatusPageHistoryDao.java similarity index 93% rename from manager/src/main/java/org/dromara/hertzbeat/manager/dao/StatusPageHistoryDao.java rename to manager/src/main/java/org/apache/hertzbeat/manager/dao/StatusPageHistoryDao.java index 2caf113f0aa..4654f589127 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/dao/StatusPageHistoryDao.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/dao/StatusPageHistoryDao.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.dao; +package org.apache.hertzbeat.manager.dao; -import org.dromara.hertzbeat.common.entity.manager.StatusPageHistory; +import org.apache.hertzbeat.common.entity.manager.StatusPageHistory; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; @@ -25,8 +25,6 @@ /** * StatusPageOrg DAO interface. - * - * */ public interface StatusPageHistoryDao extends JpaRepository, JpaSpecificationExecutor { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/dao/StatusPageIncidentDao.java b/manager/src/main/java/org/apache/hertzbeat/manager/dao/StatusPageIncidentDao.java similarity index 90% rename from manager/src/main/java/org/dromara/hertzbeat/manager/dao/StatusPageIncidentDao.java rename to manager/src/main/java/org/apache/hertzbeat/manager/dao/StatusPageIncidentDao.java index 6f716ab21f3..c213a365c2c 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/dao/StatusPageIncidentDao.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/dao/StatusPageIncidentDao.java @@ -15,16 +15,14 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.dao; +package org.apache.hertzbeat.manager.dao; -import org.dromara.hertzbeat.common.entity.manager.StatusPageIncident; +import org.apache.hertzbeat.common.entity.manager.StatusPageIncident; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; /** * StatusPageIncident DAO interface. - * - * */ public interface StatusPageIncidentDao extends JpaRepository, JpaSpecificationExecutor { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/dao/StatusPageOrgDao.java b/manager/src/main/java/org/apache/hertzbeat/manager/dao/StatusPageOrgDao.java similarity index 90% rename from manager/src/main/java/org/dromara/hertzbeat/manager/dao/StatusPageOrgDao.java rename to manager/src/main/java/org/apache/hertzbeat/manager/dao/StatusPageOrgDao.java index bdcc627b5fc..eb5ed9c3def 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/dao/StatusPageOrgDao.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/dao/StatusPageOrgDao.java @@ -15,16 +15,14 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.dao; +package org.apache.hertzbeat.manager.dao; -import org.dromara.hertzbeat.common.entity.manager.StatusPageOrg; +import org.apache.hertzbeat.common.entity.manager.StatusPageOrg; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; /** * StatusPageOrg DAO interface. - * - * */ public interface StatusPageOrgDao extends JpaRepository, JpaSpecificationExecutor { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/dao/TagDao.java b/manager/src/main/java/org/apache/hertzbeat/manager/dao/TagDao.java similarity index 92% rename from manager/src/main/java/org/dromara/hertzbeat/manager/dao/TagDao.java rename to manager/src/main/java/org/apache/hertzbeat/manager/dao/TagDao.java index 9e1d6e44503..e5e51326bf7 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/dao/TagDao.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/dao/TagDao.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.dao; +package org.apache.hertzbeat.manager.dao; -import org.dromara.hertzbeat.common.entity.manager.Tag; +import org.apache.hertzbeat.common.entity.manager.Tag; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; @@ -27,22 +27,17 @@ /** * tag repository - * - * - * */ public interface TagDao extends JpaRepository, JpaSpecificationExecutor { /** * delete tags by tag id - * * @param ids id list */ void deleteTagsByIdIn(Set ids); /** * find tags by tag id - * * @param ids id list * @return tag list */ @@ -50,7 +45,6 @@ public interface TagDao extends JpaRepository, JpaSpecificationExecut /** * find tag by name and value - * * @param name tag name * @param value tag value * @return tag diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/dao/TagMonitorBindDao.java b/manager/src/main/java/org/apache/hertzbeat/manager/dao/TagMonitorBindDao.java similarity index 91% rename from manager/src/main/java/org/dromara/hertzbeat/manager/dao/TagMonitorBindDao.java rename to manager/src/main/java/org/apache/hertzbeat/manager/dao/TagMonitorBindDao.java index 044cb95ebf7..95738ab4ba8 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/dao/TagMonitorBindDao.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/dao/TagMonitorBindDao.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.dao; +package org.apache.hertzbeat.manager.dao; -import org.dromara.hertzbeat.common.entity.manager.TagMonitorBind; +import org.apache.hertzbeat.common.entity.manager.TagMonitorBind; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; @@ -25,15 +25,11 @@ /** * TagMonitorBindDao repository - * - * - * */ public interface TagMonitorBindDao extends JpaRepository, JpaSpecificationExecutor { /** * delete tags bind by monitor id - * * @param monitorId monitorId */ void deleteTagMonitorBindsByMonitorId(Long monitorId); diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/nativex/HertzbeatRuntimeHintsRegistrar.java b/manager/src/main/java/org/apache/hertzbeat/manager/nativex/HertzbeatRuntimeHintsRegistrar.java similarity index 97% rename from manager/src/main/java/org/dromara/hertzbeat/manager/nativex/HertzbeatRuntimeHintsRegistrar.java rename to manager/src/main/java/org/apache/hertzbeat/manager/nativex/HertzbeatRuntimeHintsRegistrar.java index 83844d7ff69..b5efd359691 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/nativex/HertzbeatRuntimeHintsRegistrar.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/nativex/HertzbeatRuntimeHintsRegistrar.java @@ -1,4 +1,4 @@ -package org.dromara.hertzbeat.manager.nativex; +package org.apache.hertzbeat.manager.nativex; import org.apache.sshd.common.channel.ChannelListener; import org.apache.sshd.common.forward.PortForwardingEventListener; @@ -18,8 +18,6 @@ import java.util.Set; /** - * - * @since 2023/11/3 15:23 */ public class HertzbeatRuntimeHintsRegistrar implements RuntimeHintsRegistrar { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/AppCount.java b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/AppCount.java similarity index 97% rename from manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/AppCount.java rename to manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/AppCount.java index 547c3e5f341..9e15055fd5f 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/AppCount.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/AppCount.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.pojo.dto; +package org.apache.hertzbeat.manager.pojo.dto; import lombok.AllArgsConstructor; import lombok.Data; @@ -23,7 +23,6 @@ /** * AppCount class - * */ @AllArgsConstructor @NoArgsConstructor diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/ComponentStatus.java b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/ComponentStatus.java similarity index 87% rename from manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/ComponentStatus.java rename to manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/ComponentStatus.java index cb0b9a46a52..42a11cc2551 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/ComponentStatus.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/ComponentStatus.java @@ -15,20 +15,19 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.pojo.dto; +package org.apache.hertzbeat.manager.pojo.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.hertzbeat.common.entity.manager.StatusPageComponent; -import org.dromara.hertzbeat.common.entity.manager.StatusPageHistory; +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 - * */ @Data @AllArgsConstructor diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/Dashboard.java b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/Dashboard.java similarity index 95% rename from manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/Dashboard.java rename to manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/Dashboard.java index a2f2652885f..834e63cbd16 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/Dashboard.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/Dashboard.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.pojo.dto; +package org.apache.hertzbeat.manager.pojo.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -27,7 +27,6 @@ /** * 大屏仪表盘统计信息 * Large screen dashboard statistics - * */ @Data @AllArgsConstructor diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/EmailNoticeSender.java b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/EmailNoticeSender.java similarity index 97% rename from manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/EmailNoticeSender.java rename to manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/EmailNoticeSender.java index f17014da0d9..5de1ccb10b1 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/EmailNoticeSender.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/EmailNoticeSender.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.pojo.dto; +package org.apache.hertzbeat.manager.pojo.dto; import lombok.AllArgsConstructor; import lombok.Data; @@ -27,7 +27,6 @@ /** * 邮件账号配置dto * Email account configuration dto - * */ @Data @NoArgsConstructor diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/FileDTO.java b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/FileDTO.java similarity index 95% rename from manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/FileDTO.java rename to manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/FileDTO.java index 9eaaf007f5a..042ff3fd167 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/FileDTO.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/FileDTO.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.pojo.dto; +package org.apache.hertzbeat.manager.pojo.dto; import lombok.AllArgsConstructor; import lombok.Builder; @@ -27,7 +27,6 @@ /** * 文件存储 * File storage - * * Created by gcdd1993 on 2023/9/13 */ @Data diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/Hierarchy.java b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/Hierarchy.java similarity index 98% rename from manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/Hierarchy.java rename to manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/Hierarchy.java index 46e04767633..1d2e9c82e1a 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/Hierarchy.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/Hierarchy.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.pojo.dto; +package org.apache.hertzbeat.manager.pojo.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -29,7 +29,6 @@ /** * Hierarchical structure * eg: Monitoring Type metrics Information Hierarchy Relationship - * */ @AllArgsConstructor @NoArgsConstructor diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/LoginDto.java b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/LoginDto.java similarity index 97% rename from manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/LoginDto.java rename to manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/LoginDto.java index 9e2e151216b..a285bff017e 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/LoginDto.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/LoginDto.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.pojo.dto; +package org.apache.hertzbeat.manager.pojo.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -32,9 +32,6 @@ /** * Login registered account information transfer body username phone email * 登录注册账户信息传输体 username phone email - * - * - * */ @Data @Builder diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/MonitorDefineDto.java b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/MonitorDefineDto.java similarity index 96% rename from manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/MonitorDefineDto.java rename to manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/MonitorDefineDto.java index b3bbfd77184..3ba9a82a60c 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/MonitorDefineDto.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/MonitorDefineDto.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.pojo.dto; +package org.apache.hertzbeat.manager.pojo.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -29,9 +29,6 @@ /** * monitor define - * - * - * */ @Data @Builder diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/MonitorDto.java b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/MonitorDto.java similarity index 92% rename from manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/MonitorDto.java rename to manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/MonitorDto.java index cb7b7c1b19f..5320d7b446e 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/MonitorDto.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/MonitorDto.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.pojo.dto; +package org.apache.hertzbeat.manager.pojo.dto; -import org.dromara.hertzbeat.common.entity.manager.Monitor; -import org.dromara.hertzbeat.common.entity.manager.Param; +import org.apache.hertzbeat.common.entity.manager.Monitor; +import org.apache.hertzbeat.common.entity.manager.Param; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -31,7 +31,6 @@ /** * Monitoring Information External Interaction Entities - * */ @Data @Schema(description = "Monitoring information entities | 监控信息实体") diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/ObjectStoreConfigChangeEvent.java b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/ObjectStoreConfigChangeEvent.java similarity index 93% rename from manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/ObjectStoreConfigChangeEvent.java rename to manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/ObjectStoreConfigChangeEvent.java index d6d11db54c1..8820ae0012c 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/ObjectStoreConfigChangeEvent.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/ObjectStoreConfigChangeEvent.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.pojo.dto; +package org.apache.hertzbeat.manager.pojo.dto; import lombok.Getter; import org.springframework.context.ApplicationEvent; @@ -23,8 +23,6 @@ import java.util.UUID; /** - * - * Created by gcdd1993 on 2023/9/28 */ @Getter public class ObjectStoreConfigChangeEvent extends ApplicationEvent { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/ObjectStoreDTO.java b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/ObjectStoreDTO.java similarity index 95% rename from manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/ObjectStoreDTO.java rename to manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/ObjectStoreDTO.java index 8da6ec995a7..a4e33e62989 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/ObjectStoreDTO.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/ObjectStoreDTO.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.pojo.dto; +package org.apache.hertzbeat.manager.pojo.dto; import lombok.AllArgsConstructor; import lombok.Builder; @@ -25,8 +25,6 @@ /** * 文件存储容器 * file storage container - * - * Created by gcdd1993 on 2023/9/13 */ @Data @Builder diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/ParamDefineDto.java b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/ParamDefineDto.java similarity index 90% rename from manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/ParamDefineDto.java rename to manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/ParamDefineDto.java index dd3ed106d15..0572e6eb24e 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/ParamDefineDto.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/ParamDefineDto.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.pojo.dto; +package org.apache.hertzbeat.manager.pojo.dto; -import org.dromara.hertzbeat.common.entity.manager.ParamDefine; +import org.apache.hertzbeat.common.entity.manager.ParamDefine; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -27,7 +27,6 @@ /** * 参数定义传输实体 * Parameters define transfer entities - * */ @Data @AllArgsConstructor diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/RefreshTokenResponse.java b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/RefreshTokenResponse.java similarity index 96% rename from manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/RefreshTokenResponse.java rename to manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/RefreshTokenResponse.java index ff6911be1b4..7b2070123ca 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/RefreshTokenResponse.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/RefreshTokenResponse.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.pojo.dto; +package org.apache.hertzbeat.manager.pojo.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -26,7 +26,6 @@ /** * Refresh Token Response - * */ @Data @Builder diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/SystemConfig.java b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/SystemConfig.java similarity index 96% rename from manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/SystemConfig.java rename to manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/SystemConfig.java index dd30780b900..d1c616dab66 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/SystemConfig.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/SystemConfig.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.pojo.dto; +package org.apache.hertzbeat.manager.pojo.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/TemplateConfig.java b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/TemplateConfig.java similarity index 96% rename from manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/TemplateConfig.java rename to manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/TemplateConfig.java index f9cce85e50d..8b07f1285af 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/pojo/dto/TemplateConfig.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/TemplateConfig.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.pojo.dto; +package org.apache.hertzbeat.manager.pojo.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/AssignJobs.java b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/AssignJobs.java similarity index 98% rename from manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/AssignJobs.java rename to manager/src/main/java/org/apache/hertzbeat/manager/scheduler/AssignJobs.java index 92540d07e22..583787b4384 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/AssignJobs.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/AssignJobs.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.scheduler; +package org.apache.hertzbeat.manager.scheduler; import lombok.Data; import lombok.extern.slf4j.Slf4j; diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/CollectJobScheduling.java b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectJobScheduling.java similarity index 93% rename from manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/CollectJobScheduling.java rename to manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectJobScheduling.java index d267bdeac19..d620bb65f1e 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/CollectJobScheduling.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectJobScheduling.java @@ -15,24 +15,22 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.scheduler; +package org.apache.hertzbeat.manager.scheduler; -import org.dromara.hertzbeat.common.entity.job.Job; -import org.dromara.hertzbeat.common.entity.message.CollectRep; +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接口 - * */ public interface CollectJobScheduling { /** * Execute a one-time collection task and get the collected data response * 执行一次性采集任务,获取采集数据响应 - * * @param job Collect task details 采集任务详情 * @return Collection results 采集结果 */ @@ -41,7 +39,6 @@ public interface CollectJobScheduling { /** * Execute a one-time collection task and get the collected data response * 执行一次性采集任务,获取采集数据响应 - * * @param job Collect task details 采集任务详情 * @param collector collector identity name * @return Collection results 采集结果 @@ -51,7 +48,6 @@ public interface CollectJobScheduling { /** * Issue periodic asynchronous collection tasks * 下发周期性异步采集任务 - * * @param job Collect task details 采集任务详情 * @param collector collector identity name * @return long Job ID 采集任务ID @@ -61,7 +57,6 @@ public interface CollectJobScheduling { /** * Update the periodic asynchronous collection tasks that have been delivered * 更新已经下发的周期性异步采集任务 - * * @param modifyJob Collect task details 采集任务详情 * @return long Job ID 新采集任务ID */ @@ -70,7 +65,6 @@ public interface CollectJobScheduling { /** * Update the periodic asynchronous collection tasks that have been delivered * 更新已经下发的周期性异步采集任务 - * * @param modifyJob Collect task details 采集任务详情 * @param collector collector identity name * @return long Job ID 新采集任务ID @@ -80,7 +74,6 @@ public interface CollectJobScheduling { /** * Cancel periodic asynchronous collection tasks * 取消周期性异步采集任务 - * * @param jobId Job ID 采集任务ID */ void cancelAsyncCollectJob(Long jobId); diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/CollectorAndJobScheduler.java b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectorAndJobScheduler.java similarity index 93% rename from manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/CollectorAndJobScheduler.java rename to manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectorAndJobScheduler.java index d6f82100371..154732af96c 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/CollectorAndJobScheduler.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectorAndJobScheduler.java @@ -15,30 +15,30 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.scheduler; +package org.apache.hertzbeat.manager.scheduler; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.collector.dispatch.entrance.internal.CollectJobService; -import org.dromara.hertzbeat.collector.dispatch.entrance.internal.CollectResponseEventListener; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.dto.CollectorInfo; -import org.dromara.hertzbeat.common.entity.job.Configmap; -import org.dromara.hertzbeat.common.entity.job.Job; -import org.dromara.hertzbeat.common.entity.manager.Collector; -import org.dromara.hertzbeat.common.entity.manager.CollectorMonitorBind; -import org.dromara.hertzbeat.common.entity.manager.Monitor; -import org.dromara.hertzbeat.common.entity.manager.Param; -import org.dromara.hertzbeat.common.entity.manager.ParamDefine; -import org.dromara.hertzbeat.common.entity.message.ClusterMsg; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.util.JsonUtil; -import org.dromara.hertzbeat.common.util.SnowFlakeIdGenerator; -import org.dromara.hertzbeat.manager.dao.CollectorDao; -import org.dromara.hertzbeat.manager.dao.CollectorMonitorBindDao; -import org.dromara.hertzbeat.manager.dao.MonitorDao; -import org.dromara.hertzbeat.manager.dao.ParamDao; -import org.dromara.hertzbeat.manager.scheduler.netty.ManageServer; -import org.dromara.hertzbeat.manager.service.AppService; +import org.apache.hertzbeat.collector.dispatch.entrance.internal.CollectJobService; +import org.apache.hertzbeat.collector.dispatch.entrance.internal.CollectResponseEventListener; +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.common.entity.message.ClusterMsg; +import org.apache.hertzbeat.common.entity.message.CollectRep; +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.service.AppService; +import org.apache.hertzbeat.manager.scheduler.netty.ManageServer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.stereotype.Component; @@ -58,8 +58,6 @@ /** * collector service - * - * */ @Component @AutoConfigureAfter(value = {SchedulerProperties.class}) diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/CollectorScheduling.java b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectorScheduling.java similarity index 94% rename from manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/CollectorScheduling.java rename to manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectorScheduling.java index 6237bf2c56f..76ad110c81a 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/CollectorScheduling.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectorScheduling.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.scheduler; +package org.apache.hertzbeat.manager.scheduler; -import org.dromara.hertzbeat.common.entity.dto.CollectorInfo; +import org.apache.hertzbeat.common.entity.dto.CollectorInfo; /** * slave collector service - * */ public interface CollectorScheduling { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/ConcurrentTreeMap.java b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/ConcurrentTreeMap.java similarity index 97% rename from manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/ConcurrentTreeMap.java rename to manager/src/main/java/org/apache/hertzbeat/manager/scheduler/ConcurrentTreeMap.java index 5d1e7bf4a93..c6f2deede4a 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/ConcurrentTreeMap.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/ConcurrentTreeMap.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.scheduler; +package org.apache.hertzbeat.manager.scheduler; import java.util.Map; import java.util.TreeMap; @@ -23,7 +23,6 @@ /** * concurrent treemap - * */ public class ConcurrentTreeMap extends TreeMap { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/ConsistentHash.java b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/ConsistentHash.java similarity index 99% rename from manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/ConsistentHash.java rename to manager/src/main/java/org/apache/hertzbeat/manager/scheduler/ConsistentHash.java index dc381009e65..5370cb6b294 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/ConsistentHash.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/ConsistentHash.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.scheduler; +package org.apache.hertzbeat.manager.scheduler; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.constants.CommonConstants; import java.util.*; import java.util.concurrent.ConcurrentHashMap; @@ -29,7 +29,6 @@ /** * 一致性hash实现的采集器与任务映射调度 * Collector and task mapping scheduling implemented by consistent hashing - * */ @Slf4j public class ConsistentHash { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/SchedulerInit.java b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/SchedulerInit.java similarity index 88% rename from manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/SchedulerInit.java rename to manager/src/main/java/org/apache/hertzbeat/manager/scheduler/SchedulerInit.java index 51a38acb045..d00d6e000d0 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/SchedulerInit.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/SchedulerInit.java @@ -15,19 +15,20 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.scheduler; +package org.apache.hertzbeat.manager.scheduler; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.dto.CollectorInfo; -import org.dromara.hertzbeat.common.entity.job.Configmap; -import org.dromara.hertzbeat.common.entity.job.Job; -import org.dromara.hertzbeat.common.entity.manager.*; -import org.dromara.hertzbeat.manager.dao.CollectorDao; -import org.dromara.hertzbeat.manager.dao.CollectorMonitorBindDao; -import org.dromara.hertzbeat.manager.dao.MonitorDao; -import org.dromara.hertzbeat.manager.dao.ParamDao; -import org.dromara.hertzbeat.manager.service.AppService; +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.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; @@ -40,8 +41,6 @@ /** * scheduler init - * - * */ @Configuration @Order(value = Ordered.LOWEST_PRECEDENCE - 1) diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/SchedulerProperties.java b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/SchedulerProperties.java similarity index 97% rename from manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/SchedulerProperties.java rename to manager/src/main/java/org/apache/hertzbeat/manager/scheduler/SchedulerProperties.java index 8e99e5660e9..54bf19d95d0 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/SchedulerProperties.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/SchedulerProperties.java @@ -15,14 +15,13 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.scheduler; +package org.apache.hertzbeat.manager.scheduler; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; /** * scheduler properties config - * */ @Component @ConfigurationProperties(prefix = "scheduler") diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/netty/ManageServer.java b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/ManageServer.java similarity index 87% rename from manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/netty/ManageServer.java rename to manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/ManageServer.java index 54766166327..9b6f9414daf 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/netty/ManageServer.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/ManageServer.java @@ -15,23 +15,23 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.scheduler.netty; +package org.apache.hertzbeat.manager.scheduler.netty; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.entity.message.ClusterMsg; -import org.dromara.hertzbeat.common.support.CommonThreadPool; -import org.dromara.hertzbeat.manager.scheduler.netty.process.CollectCyclicDataResponseProcessor; -import org.dromara.hertzbeat.manager.scheduler.netty.process.CollectOneTimeDataResponseProcessor; -import org.dromara.hertzbeat.manager.scheduler.netty.process.CollectorOfflineProcessor; -import org.dromara.hertzbeat.manager.scheduler.netty.process.CollectorOnlineProcessor; -import org.dromara.hertzbeat.manager.scheduler.netty.process.HeartbeatProcessor; -import org.dromara.hertzbeat.manager.scheduler.CollectorAndJobScheduler; -import org.dromara.hertzbeat.manager.scheduler.SchedulerProperties; -import org.dromara.hertzbeat.remoting.RemotingServer; -import org.dromara.hertzbeat.remoting.event.NettyEventListener; -import org.dromara.hertzbeat.remoting.netty.NettyRemotingServer; -import org.dromara.hertzbeat.remoting.netty.NettyServerConfig; +import org.apache.hertzbeat.common.entity.message.ClusterMsg; +import org.apache.hertzbeat.common.support.CommonThreadPool; +import org.apache.hertzbeat.manager.scheduler.CollectorAndJobScheduler; +import org.apache.hertzbeat.manager.scheduler.SchedulerProperties; +import org.apache.hertzbeat.manager.scheduler.netty.process.CollectCyclicDataResponseProcessor; +import org.apache.hertzbeat.manager.scheduler.netty.process.CollectOneTimeDataResponseProcessor; +import org.apache.hertzbeat.manager.scheduler.netty.process.CollectorOfflineProcessor; +import org.apache.hertzbeat.manager.scheduler.netty.process.CollectorOnlineProcessor; +import org.apache.hertzbeat.manager.scheduler.netty.process.HeartbeatProcessor; +import org.apache.hertzbeat.remoting.RemotingServer; +import org.apache.hertzbeat.remoting.event.NettyEventListener; +import org.apache.hertzbeat.remoting.netty.NettyRemotingServer; +import org.apache.hertzbeat.remoting.netty.NettyServerConfig; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.core.Ordered; diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/netty/process/CollectCyclicDataResponseProcessor.java b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/process/CollectCyclicDataResponseProcessor.java similarity index 77% rename from manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/netty/process/CollectCyclicDataResponseProcessor.java rename to manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/process/CollectCyclicDataResponseProcessor.java index ab21508b5ac..b881d3350f7 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/netty/process/CollectCyclicDataResponseProcessor.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/process/CollectCyclicDataResponseProcessor.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.scheduler.netty.process; +package org.apache.hertzbeat.manager.scheduler.netty.process; import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.entity.message.ClusterMsg; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.queue.CommonDataQueue; -import org.dromara.hertzbeat.common.support.SpringContextHolder; -import org.dromara.hertzbeat.common.util.ProtoJsonUtil; -import org.dromara.hertzbeat.remoting.netty.NettyRemotingProcessor; +import org.apache.hertzbeat.common.entity.message.ClusterMsg; +import org.apache.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.queue.CommonDataQueue; +import org.apache.hertzbeat.common.support.SpringContextHolder; +import org.apache.hertzbeat.common.util.ProtoJsonUtil; +import org.apache.hertzbeat.remoting.netty.NettyRemotingProcessor; /** * handle cyclic data response message diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/netty/process/CollectOneTimeDataResponseProcessor.java b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/process/CollectOneTimeDataResponseProcessor.java similarity index 84% rename from manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/netty/process/CollectOneTimeDataResponseProcessor.java rename to manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/process/CollectOneTimeDataResponseProcessor.java index 72281d884f7..c6388d86b56 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/netty/process/CollectOneTimeDataResponseProcessor.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/process/CollectOneTimeDataResponseProcessor.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.scheduler.netty.process; +package org.apache.hertzbeat.manager.scheduler.netty.process; import com.fasterxml.jackson.core.type.TypeReference; import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.entity.message.ClusterMsg; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.util.JsonUtil; -import org.dromara.hertzbeat.common.util.ProtoJsonUtil; -import org.dromara.hertzbeat.manager.scheduler.netty.ManageServer; -import org.dromara.hertzbeat.remoting.netty.NettyRemotingProcessor; +import org.apache.hertzbeat.common.entity.message.ClusterMsg; +import org.apache.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.util.JsonUtil; +import org.apache.hertzbeat.common.util.ProtoJsonUtil; +import org.apache.hertzbeat.manager.scheduler.netty.ManageServer; +import org.apache.hertzbeat.remoting.netty.NettyRemotingProcessor; import java.util.ArrayList; import java.util.List; diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/netty/process/CollectorOfflineProcessor.java b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/process/CollectorOfflineProcessor.java similarity index 85% rename from manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/netty/process/CollectorOfflineProcessor.java rename to manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/process/CollectorOfflineProcessor.java index c668659aa6c..85c5b0d132e 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/netty/process/CollectorOfflineProcessor.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/process/CollectorOfflineProcessor.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.scheduler.netty.process; +package org.apache.hertzbeat.manager.scheduler.netty.process; import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.entity.message.ClusterMsg; -import org.dromara.hertzbeat.manager.scheduler.netty.ManageServer; -import org.dromara.hertzbeat.remoting.netty.NettyRemotingProcessor; +import org.apache.hertzbeat.common.entity.message.ClusterMsg; +import org.apache.hertzbeat.manager.scheduler.netty.ManageServer; +import org.apache.hertzbeat.remoting.netty.NettyRemotingProcessor; /** * handle collector offline message diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/netty/process/CollectorOnlineProcessor.java b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/process/CollectorOnlineProcessor.java similarity index 82% rename from manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/netty/process/CollectorOnlineProcessor.java rename to manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/process/CollectorOnlineProcessor.java index 7242d2909d8..66f7d62a7c9 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/netty/process/CollectorOnlineProcessor.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/process/CollectorOnlineProcessor.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.scheduler.netty.process; +package org.apache.hertzbeat.manager.scheduler.netty.process; import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.entity.dto.CollectorInfo; -import org.dromara.hertzbeat.common.entity.message.ClusterMsg; -import org.dromara.hertzbeat.common.util.JsonUtil; -import org.dromara.hertzbeat.manager.scheduler.netty.ManageServer; -import org.dromara.hertzbeat.remoting.netty.NettyRemotingProcessor; +import org.apache.hertzbeat.common.entity.dto.CollectorInfo; +import org.apache.hertzbeat.common.entity.message.ClusterMsg; +import org.apache.hertzbeat.common.util.JsonUtil; +import org.apache.hertzbeat.manager.scheduler.netty.ManageServer; +import org.apache.hertzbeat.remoting.netty.NettyRemotingProcessor; /** * handle collector online message diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/netty/process/HeartbeatProcessor.java b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/process/HeartbeatProcessor.java similarity index 87% rename from manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/netty/process/HeartbeatProcessor.java rename to manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/process/HeartbeatProcessor.java index 7437bbce00f..c5a12b59726 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/netty/process/HeartbeatProcessor.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/process/HeartbeatProcessor.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.scheduler.netty.process; +package org.apache.hertzbeat.manager.scheduler.netty.process; import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.entity.message.ClusterMsg; -import org.dromara.hertzbeat.manager.scheduler.netty.ManageServer; -import org.dromara.hertzbeat.remoting.netty.NettyRemotingProcessor; +import org.apache.hertzbeat.common.entity.message.ClusterMsg; +import org.apache.hertzbeat.manager.scheduler.netty.ManageServer; +import org.apache.hertzbeat.remoting.netty.NettyRemotingProcessor; /** * handle heartbeat message diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/AppService.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/AppService.java similarity index 92% rename from manager/src/main/java/org/dromara/hertzbeat/manager/service/AppService.java rename to manager/src/main/java/org/apache/hertzbeat/manager/service/AppService.java index 8a8285f0b06..74bc705b640 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/AppService.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/AppService.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service; +package org.apache.hertzbeat.manager.service; -import org.dromara.hertzbeat.common.entity.job.Job; -import org.dromara.hertzbeat.common.entity.manager.ParamDefine; -import org.dromara.hertzbeat.manager.pojo.dto.Hierarchy; -import org.dromara.hertzbeat.manager.pojo.dto.TemplateConfig; +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; @@ -34,7 +34,6 @@ public interface AppService { /** * Query the defined parameter structure based on the monitoring type * 根据监控类型查询定义的参数结构 - * * @param app Monitoring type 监控类型 * @return list of parameter structures 参数结构列表 */ @@ -63,7 +62,6 @@ public interface AppService { /** * Get monitor structure definition based on monitor type name - * * @param app Monitoring type name * @return Monitoring Structure Definition Optional */ diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/AvailableAlertDefineInit.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/AvailableAlertDefineInit.java similarity index 91% rename from manager/src/main/java/org/dromara/hertzbeat/manager/service/AvailableAlertDefineInit.java rename to manager/src/main/java/org/apache/hertzbeat/manager/service/AvailableAlertDefineInit.java index 33593b57db3..b0de617d44b 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/AvailableAlertDefineInit.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/AvailableAlertDefineInit.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service; +package org.apache.hertzbeat.manager.service; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.alert.dao.AlertDefineDao; -import org.dromara.hertzbeat.common.entity.alerter.AlertDefine; -import org.dromara.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.alert.dao.AlertDefineDao; +import org.apache.hertzbeat.common.entity.alerter.AlertDefine; +import org.apache.hertzbeat.common.constants.CommonConstants; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.core.Ordered; @@ -32,8 +32,6 @@ /** * available alert define database record init - * - * */ @Service @Order(value = Ordered.HIGHEST_PRECEDENCE + 1) diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/CollectorService.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/CollectorService.java similarity index 89% rename from manager/src/main/java/org/dromara/hertzbeat/manager/service/CollectorService.java rename to manager/src/main/java/org/apache/hertzbeat/manager/service/CollectorService.java index a274159877a..a7caa727cd8 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/CollectorService.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/CollectorService.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service; +package org.apache.hertzbeat.manager.service; -import org.dromara.hertzbeat.common.entity.dto.CollectorSummary; -import org.dromara.hertzbeat.common.entity.manager.Collector; +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; @@ -27,13 +27,11 @@ /** * collector service - * */ public interface CollectorService { /** * Dynamic conditional query - * * @param specification Query conditions * @param pageRequest pageIndex pageSize * @return Search result diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/GeneralConfigService.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/GeneralConfigService.java similarity index 95% rename from manager/src/main/java/org/dromara/hertzbeat/manager/service/GeneralConfigService.java rename to manager/src/main/java/org/apache/hertzbeat/manager/service/GeneralConfigService.java index c394a3dad3c..d33e80549a5 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/GeneralConfigService.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/GeneralConfigService.java @@ -15,14 +15,12 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service; +package org.apache.hertzbeat.manager.service; /** * ConfigService接口，提供配置的增删查改操作。 - * *

ConfigService interface provides CRUD operations for configurations.

* @param 配置类型 - * * @version 1.0 */ public interface GeneralConfigService { @@ -36,14 +34,12 @@ public interface GeneralConfigService { /** * 保存更新配置 - * * @param config 需要保存的配置 */ void saveConfig(T config); /** * 获取配置 - * * @return 查询到的配置 */ T getConfig(); diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/ImExportService.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/ImExportService.java similarity index 95% rename from manager/src/main/java/org/dromara/hertzbeat/manager/service/ImExportService.java rename to manager/src/main/java/org/apache/hertzbeat/manager/service/ImExportService.java index 1b6624f4ba1..59e911c7e5e 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/ImExportService.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/ImExportService.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service; +package org.apache.hertzbeat.manager.service; import java.io.InputStream; import java.io.OutputStream; @@ -24,8 +24,6 @@ /** * Configuration Import Export * 配置导入导出 - * - * * Created by gcdd1993 on 2023/3/31 */ public interface ImExportService { @@ -33,7 +31,6 @@ public interface ImExportService { /** * Import Configuration * 导入配置 - * * @param is 输入流 */ void importConfig(InputStream is); @@ -41,7 +38,6 @@ public interface ImExportService { /** * Export Configuration * 导出配置 - * * @param os 输出流 * @param configList 配置列表 */ @@ -50,7 +46,6 @@ public interface ImExportService { /** * Export file type * 导出文件类型 - * * @return 文件类型 */ String type(); @@ -58,7 +53,6 @@ public interface ImExportService { /** * Get Export File Name * 获取导出文件名 - * * @return 文件名 */ String getFileName(); diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/MailService.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/MailService.java similarity index 89% rename from manager/src/main/java/org/dromara/hertzbeat/manager/service/MailService.java rename to manager/src/main/java/org/apache/hertzbeat/manager/service/MailService.java index b2cca294d49..e4d9cf91659 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/MailService.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/MailService.java @@ -15,18 +15,16 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service; +package org.apache.hertzbeat.manager.service; import freemarker.template.TemplateException; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; +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 */ public interface MailService { @@ -34,7 +32,6 @@ public interface MailService { /** * Build an alert email template * 构建告警邮件模版 - * * @param alert Alarm data element information 告警数据元信息 * @param noticeTemplate NoticeTemplate information 模板信息 * @return content of email 邮件内容 diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/MonitorService.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/MonitorService.java similarity index 92% rename from manager/src/main/java/org/dromara/hertzbeat/manager/service/MonitorService.java rename to manager/src/main/java/org/apache/hertzbeat/manager/service/MonitorService.java index de5a5407c44..99cc3c6bdb3 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/MonitorService.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/MonitorService.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service; - -import org.dromara.hertzbeat.common.entity.job.Job; -import org.dromara.hertzbeat.common.entity.manager.Monitor; -import org.dromara.hertzbeat.common.entity.manager.Param; -import org.dromara.hertzbeat.manager.pojo.dto.AppCount; -import org.dromara.hertzbeat.manager.pojo.dto.MonitorDto; -import org.dromara.hertzbeat.manager.support.exception.MonitorDetectException; +package org.apache.hertzbeat.manager.service; + +import org.apache.hertzbeat.common.entity.job.Job; +import org.apache.hertzbeat.common.entity.manager.Monitor; +import org.apache.hertzbeat.common.entity.manager.Param; +import org.apache.hertzbeat.manager.pojo.dto.AppCount; +import org.apache.hertzbeat.manager.pojo.dto.MonitorDto; +import org.apache.hertzbeat.manager.support.exception.MonitorDetectException; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.jpa.domain.Specification; @@ -36,7 +36,6 @@ /** * 监控管理服务 * Monitoring and management services - * */ public interface MonitorService { @@ -44,7 +43,6 @@ public interface MonitorService { /** * Monitoring Availability Probes * 监控可用性探测 - * * @param monitor Monitoring entity information 监控实体信息 * @param params Parameter information 参数信息 * @param collector collector pinned @@ -54,7 +52,6 @@ public interface MonitorService { /** * Add monitoring 新增监控 - * * @param monitor Monitoring Entity 监控实体 * @param params Parameter information 参数信息 * @param collector collector pinned @@ -65,7 +62,6 @@ public interface MonitorService { /** * Verify the correctness of request data parameters * 校验请求数据参数正确性 - * * @param monitorDto monitorDto * @param isModify Whether it is a modification monitoring 是否是修改监控 * @throws IllegalArgumentException Validation parameter error thrown 校验参数错误抛出 @@ -75,7 +71,6 @@ public interface MonitorService { /** * Modify update monitoring * 修改更新监控 - * * @param monitor Monitor Entity 监控实体 * @param params Parameter information 参数信息 * @param collector collector pinned @@ -86,7 +81,6 @@ public interface MonitorService { /** * Delete Monitor * 删除监控 - * * @param id Monitor ID 监控任务ID * @throws RuntimeException Exception thrown during deletion 删除过程中异常抛出 */ @@ -95,7 +89,6 @@ public interface MonitorService { /** * Batch delete monitoring * 批量删除监控 - * * @param ids Monitoring ID List 监控任务ID列表 * @throws RuntimeException Exception thrown during deletion 删除过程中异常抛出 */ @@ -104,7 +97,6 @@ public interface MonitorService { /** * Get monitoring information * 获取监控信息 - * * @param id Monitor ID 监控任务ID * @return MonitorDto Monitor Entity 監控实体 * @throws RuntimeException Exception thrown during query 查询过程中异常抛出 @@ -114,7 +106,6 @@ public interface MonitorService { /** * Dynamic conditional query * 动态条件查询 - * * @param specification Query conditions 查询条件 * @param pageRequest Pagination parameters 分页参数 * @return Search Result 查询结果 @@ -124,7 +115,6 @@ public interface MonitorService { /** * Unmanaged monitoring items in batches according to the monitoring ID list * 根据监控任务ID列表批量取消纳管监控项 - * * @param ids Monitoring ID List 监控任务ID列表 */ void cancelManageMonitors(HashSet ids); @@ -132,7 +122,6 @@ public interface MonitorService { /** * Start the managed monitoring items in batches according to the monitoring ID list * 根据监控任务ID列表批量启动纳管监控项 - * * @param ids Monitoring ID List 监控任务ID列表 */ void enableManageMonitors(HashSet ids); @@ -140,7 +129,6 @@ public interface MonitorService { /** * Query the monitoring category and its corresponding monitoring quantity * 查询监控类别及其对应的监控数量 - * * @return Monitoring Category and Monitoring Quantity Mapping 监控类别与监控数量映射 */ List getAllAppMonitorsCount(); @@ -148,7 +136,6 @@ public interface MonitorService { /** * Query monitoring * 查询监控 - * * @param monitorId Monitor ID 监控任务ID * @return Monitor information 监控信息 */ @@ -157,7 +144,6 @@ public interface MonitorService { /** * Update the status of the specified monitor * 更新指定监控的状态 - * * @param monitorId monitorId 监控任务ID * @param status monitor status 任务状态 */ @@ -166,7 +152,6 @@ public interface MonitorService { /** * Query the list of all monitoring information under the specified monitoring type * 查询指定监控类型下的所有监控信息列表 - * * @param app Monitor Type 监控类型 * @return Monitor Entity List 监控列表 */ @@ -174,7 +159,6 @@ public interface MonitorService { /** * 新增一个可选指标的监控 - * * @param metrics 用户指标 * @param monitor 监控提示 * @param params 配置参数 @@ -183,7 +167,6 @@ public interface MonitorService { /** * 根据App名称获取可监控指标，不传为获取全部指标 - * * @param app app name * @return metrics */ @@ -192,7 +175,6 @@ public interface MonitorService { /** * Export Monitoring Configuration * 导出监控配置 - * * @param ids 监控配置ID列表 * @param type 文件类型 * @param res response @@ -203,7 +185,6 @@ public interface MonitorService { /** * Import Monitoring Configuration * 导入监控配置 - * * @param file 配置文件 * @throws Exception This exception will be thrown if the export fails */ @@ -211,7 +192,6 @@ public interface MonitorService { /** * 根据id，批量复制monitor - * * @param ids monitor id */ void copyMonitors(List ids); @@ -219,7 +199,6 @@ public interface MonitorService { /** * update app collect job by app - * * @param job job content */ void updateAppCollectJob(Job job); diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/NoticeConfigService.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/NoticeConfigService.java similarity index 93% rename from manager/src/main/java/org/dromara/hertzbeat/manager/service/NoticeConfigService.java rename to manager/src/main/java/org/apache/hertzbeat/manager/service/NoticeConfigService.java index f5910cf6691..d0396a49bba 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/NoticeConfigService.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/NoticeConfigService.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service; +package org.apache.hertzbeat.manager.service; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; -import org.dromara.hertzbeat.common.entity.manager.NoticeRule; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; +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; @@ -29,15 +29,12 @@ /** * Message notification configuration interface * 消息通知配置接口 - * - * */ public interface NoticeConfigService { /** * Dynamic conditional query * 动态条件查询 - * * @param specification Query conditions 查询条件 * @return Search result 查询结果 */ @@ -46,7 +43,6 @@ public interface NoticeConfigService { /** * Dynamic conditional query * 动态条件查询 - * * @param specification Query conditions 查询条件 * @return Search result 查询结果 */ @@ -55,7 +51,6 @@ public interface NoticeConfigService { /** * Dynamic conditional query * 动态条件查询 - * * @param specification Query conditions 查询条件 * @return Search result 查询结果 */ @@ -64,7 +59,6 @@ public interface NoticeConfigService { /** * Add a notification recipient * 新增一个通知接收人 - * * @param noticeReceiver recipient information 接收人信息 */ void addReceiver(NoticeReceiver noticeReceiver); @@ -72,7 +66,6 @@ public interface NoticeConfigService { /** * Modify notification recipients * 修改通知接收人 - * * @param noticeReceiver recipient information 接收人信息 */ void editReceiver(NoticeReceiver noticeReceiver); @@ -80,7 +73,6 @@ public interface NoticeConfigService { /** * Delete recipient information based on recipient ID * 根据接收人ID删除接收人信息 - * * @param receiverId Recipient ID 接收人ID */ void deleteReceiver(Long receiverId); @@ -88,7 +80,6 @@ public interface NoticeConfigService { /** * Added notification policy * 新增通知策略 - * * @param noticeRule Notification strategy 通知策略 */ void addNoticeRule(NoticeRule noticeRule); @@ -96,7 +87,6 @@ public interface NoticeConfigService { /** * Modify Notification Policy * 修改通知策略 - * * @param noticeRule Notification strategy 通知策略 */ void editNoticeRule(NoticeRule noticeRule); @@ -104,7 +94,6 @@ public interface NoticeConfigService { /** * Delete the specified notification policy * 删除指定的通知策略 - * * @param ruleId Notification Policy ID 通知策略ID */ void deleteNoticeRule(Long ruleId); @@ -112,7 +101,6 @@ public interface NoticeConfigService { /** * According to the alarm information matching all notification policies, filter out the recipients who need to be notified * 根据告警信息与所有通知策略匹配，过滤出需要通知的接收人 - * * @param alert Alarm information 告警信息 * @return Receiver 接收人 */ @@ -121,7 +109,6 @@ public interface NoticeConfigService { /** * Query the recipient information according to the recipient ID * 根据接收人ID查询接收人信息 - * * @param id Receiver ID 接收人ID * @return Receiver 接收人 */ @@ -130,7 +117,6 @@ public interface NoticeConfigService { /** * Query the template information according to the template ID * 根据通知模板ID查询模板信息 - * * @param id Template ID * @return Template */ @@ -139,7 +125,6 @@ public interface NoticeConfigService { /** * Query recipient information based on recipient ID (primary key Id) * 根据接收人ID(主键Id)查询接收人信息 - * * @param receiverId Receiver ID (primary key ID) 接收人ID(主键ID) * @return Recipient Entity 接收人实体 */ @@ -148,7 +133,6 @@ public interface NoticeConfigService { /** * Query specific notification rules according to the rule ID (primary key ID) * 根据规则ID(主键ID)查询具体通知规则 - * * @param ruleId Rule ID 规则ID(主键ID) * @return Notification Rule Entity 通知规则实体 */ @@ -156,14 +140,12 @@ public interface NoticeConfigService { /** * Add a notification template - * * @param noticeTemplate template information */ void addNoticeTemplate(NoticeTemplate noticeTemplate); /** * Modify notification templates - * * @param noticeTemplate template information */ void editNoticeTemplate(NoticeTemplate noticeTemplate); @@ -171,7 +153,6 @@ public interface NoticeConfigService { /** * Delete template information based on Template ID * 根据通知模板ID删除通知模板信息 - * * @param templateId Template ID 接收人ID */ void deleteNoticeTemplate(Long templateId); @@ -180,7 +161,6 @@ public interface NoticeConfigService { /** * Query specific notification templates according to the template ID (primary key ID) * 根据模板ID(主键ID)查询具体通知规则 - * * @param templateId Template ID 模板ID(主键ID) * @return Notification Template Entity 通知模板实体 */ @@ -189,7 +169,6 @@ public interface NoticeConfigService { /** * Query specific notification templates according to the template type * 根据模板类型查询具体模版 - * * @param type Template type 模板类型 * @return Notification Template Entity 通知模板实体 */ @@ -198,7 +177,6 @@ public interface NoticeConfigService { /** * alert Send test message * 告警 发送测试消息 - * * @param noticeReceiver recipient information 接收人信息 * @return true send success | false send fail */ diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/NoticeDispatchService.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/NoticeDispatchService.java similarity index 94% rename from manager/src/main/java/org/dromara/hertzbeat/manager/service/NoticeDispatchService.java rename to manager/src/main/java/org/apache/hertzbeat/manager/service/NoticeDispatchService.java index d061968e6ef..10bf491bdf1 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/NoticeDispatchService.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/NoticeDispatchService.java @@ -15,12 +15,11 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service; +package org.apache.hertzbeat.manager.service; /** * 消息通知转发接口 * Message notification forwarding interface - * */ public interface NoticeDispatchService { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/ObjectStoreService.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/ObjectStoreService.java similarity index 86% rename from manager/src/main/java/org/dromara/hertzbeat/manager/service/ObjectStoreService.java rename to manager/src/main/java/org/apache/hertzbeat/manager/service/ObjectStoreService.java index a05922ce57d..761ac89d7bc 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/ObjectStoreService.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/ObjectStoreService.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service; +package org.apache.hertzbeat.manager.service; -import org.dromara.hertzbeat.manager.pojo.dto.FileDTO; -import org.dromara.hertzbeat.manager.pojo.dto.ObjectStoreDTO; +import org.apache.hertzbeat.manager.pojo.dto.FileDTO; +import org.apache.hertzbeat.manager.pojo.dto.ObjectStoreDTO; import java.io.InputStream; import java.util.List; @@ -26,14 +26,11 @@ /** * 文件存储服务 * File storage service - * - * Created by gcdd1993 on 2023/9/13 */ public interface ObjectStoreService { /** * 保存文件 - * * @param filePath 文件路径，例如：hertzbeat/111.json * @param is 文件流 */ @@ -41,7 +38,6 @@ public interface ObjectStoreService { /** * 读取文件 - * * @param filePath 文件路径，例如：hertzbeat/111.json * @return 文件 */ @@ -49,7 +45,6 @@ public interface ObjectStoreService { /** * 列举文件 - * * @param dir 文件目录 * @return 文件列表 */ diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/StatusPageService.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/StatusPageService.java similarity index 91% rename from manager/src/main/java/org/dromara/hertzbeat/manager/service/StatusPageService.java rename to manager/src/main/java/org/apache/hertzbeat/manager/service/StatusPageService.java index 15300462e33..96aa22156e4 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/StatusPageService.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/StatusPageService.java @@ -15,18 +15,17 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service; +package org.apache.hertzbeat.manager.service; -import org.dromara.hertzbeat.common.entity.manager.StatusPageComponent; -import org.dromara.hertzbeat.common.entity.manager.StatusPageIncident; -import org.dromara.hertzbeat.common.entity.manager.StatusPageOrg; -import org.dromara.hertzbeat.manager.pojo.dto.ComponentStatus; +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. - * */ public interface StatusPageService { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/TagService.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/TagService.java similarity index 89% rename from manager/src/main/java/org/dromara/hertzbeat/manager/service/TagService.java rename to manager/src/main/java/org/apache/hertzbeat/manager/service/TagService.java index b032c8ee346..27d83277928 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/TagService.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/TagService.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service; +package org.apache.hertzbeat.manager.service; -import org.dromara.hertzbeat.common.entity.manager.Monitor; -import org.dromara.hertzbeat.common.entity.manager.Tag; +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; @@ -30,27 +30,23 @@ /** * 标签服务 * tag service - * */ public interface TagService { /** * new tags - * * @param tags tag */ void addTags(List tags); /** * update tag - * * @param tag Tag */ void modifyTag(Tag tag); /** * get tag page list - * * @param specification 查询条件 * @param pageRequest 分页条件 * @return Tags @@ -59,14 +55,12 @@ public interface TagService { /** * delete tags - * * @param ids tag id list */ void deleteTags(HashSet ids); /** * list tags - * * @param ids tag id list * @return tag list */ @@ -74,7 +68,6 @@ public interface TagService { /** * remove monitor system tags - * * @param monitor monitor */ void deleteMonitorSystemTags(Monitor monitor); diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/AbstractGeneralConfigServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AbstractGeneralConfigServiceImpl.java similarity index 92% rename from manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/AbstractGeneralConfigServiceImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AbstractGeneralConfigServiceImpl.java index aaf3314c997..7f9265e1477 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/AbstractGeneralConfigServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AbstractGeneralConfigServiceImpl.java @@ -15,23 +15,20 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service.impl; +package org.apache.hertzbeat.manager.service.impl; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.entity.manager.GeneralConfig; -import org.dromara.hertzbeat.manager.dao.GeneralConfigDao; -import org.dromara.hertzbeat.manager.service.GeneralConfigService; +import org.apache.hertzbeat.common.entity.manager.GeneralConfig; +import org.apache.hertzbeat.manager.dao.GeneralConfigDao; +import org.apache.hertzbeat.manager.service.GeneralConfigService; import org.springframework.transaction.annotation.Transactional; /** * 提供通用配置Service的抽象实现，实现了增删查改等操作。 - * *

Abstract implementation of GeneralConfigService, providing CRUD operations for configurations.

- * - * */ @Slf4j abstract class AbstractGeneralConfigServiceImpl implements GeneralConfigService { @@ -40,9 +37,7 @@ abstract class AbstractGeneralConfigServiceImpl implements GeneralConfigServi /** * 构造方法，传入GeneralConfigDao、ObjectMapper和type。 - * *

Constructor, passing in GeneralConfigDao, ObjectMapper and type.

- * * @param generalConfigDao 配置Dao对象 * @param objectMapper JSON工具类对象 */ @@ -53,9 +48,7 @@ protected AbstractGeneralConfigServiceImpl(GeneralConfigDao generalConfigDao, Ob /** * 保存配置。 - * *

Save a configuration.

- * * @param config 需要保存的配置对象 */ @Transactional(rollbackFor = Exception.class) @@ -78,9 +71,7 @@ public void saveConfig(T config) { /** * 获取配置。 - * *

Get a configuration.

- * * @return 查询到的配置对象 */ @Override @@ -98,9 +89,7 @@ public T getConfig() { /** * 获取配置类型的TypeReference对象。 - * *

Get TypeReference object of configuration type.

- * * @return 配置类型的TypeReference对象 */ protected abstract TypeReference getTypeReference(); diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/AbstractImExportServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AbstractImExportServiceImpl.java similarity index 93% rename from manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/AbstractImExportServiceImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AbstractImExportServiceImpl.java index d2217862320..d92a7212969 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/AbstractImExportServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AbstractImExportServiceImpl.java @@ -13,21 +13,21 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service.impl; +package org.apache.hertzbeat.manager.service.impl; import cn.afterturn.easypoi.excel.annotation.*; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.manager.Monitor; -import org.dromara.hertzbeat.common.entity.manager.Param; -import org.dromara.hertzbeat.common.entity.manager.Tag; -import org.dromara.hertzbeat.manager.pojo.dto.MonitorDto; -import org.dromara.hertzbeat.manager.service.ImExportService; -import org.dromara.hertzbeat.manager.service.MonitorService; -import org.dromara.hertzbeat.manager.service.TagService; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.manager.Monitor; +import org.apache.hertzbeat.common.entity.manager.Param; +import org.apache.hertzbeat.common.entity.manager.Tag; +import org.apache.hertzbeat.manager.pojo.dto.MonitorDto; +import org.apache.hertzbeat.manager.service.ImExportService; +import org.apache.hertzbeat.manager.service.MonitorService; +import org.apache.hertzbeat.manager.service.TagService; import org.springframework.beans.BeanUtils; import org.springframework.context.annotation.Lazy; import org.springframework.util.CollectionUtils; @@ -44,7 +44,6 @@ /** * class AbstractImExportServiceImpl - * Created by gcdd1993 on 2023/3/31 */ @Slf4j abstract class AbstractImExportServiceImpl implements ImExportService { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/AppServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AppServiceImpl.java similarity index 95% rename from manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/AppServiceImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AppServiceImpl.java index 924712b182f..1fa88409a58 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/AppServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AppServiceImpl.java @@ -15,32 +15,32 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service.impl; +package org.apache.hertzbeat.manager.service.impl; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; -import org.dromara.hertzbeat.collector.util.CollectUtil; -import org.dromara.hertzbeat.common.entity.job.Configmap; -import org.dromara.hertzbeat.common.entity.job.Job; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.manager.Monitor; -import org.dromara.hertzbeat.common.entity.manager.Param; -import org.dromara.hertzbeat.common.entity.manager.ParamDefine; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.support.SpringContextHolder; -import org.dromara.hertzbeat.common.util.CommonUtil; -import org.dromara.hertzbeat.manager.dao.MonitorDao; -import org.dromara.hertzbeat.manager.dao.ParamDao; -import org.dromara.hertzbeat.manager.pojo.dto.Hierarchy; -import org.dromara.hertzbeat.manager.pojo.dto.ObjectStoreConfigChangeEvent; -import org.dromara.hertzbeat.manager.pojo.dto.ObjectStoreDTO; -import org.dromara.hertzbeat.manager.pojo.dto.TemplateConfig; -import org.dromara.hertzbeat.manager.service.AppService; -import org.dromara.hertzbeat.manager.service.MonitorService; -import org.dromara.hertzbeat.manager.service.ObjectStoreService; -import org.dromara.hertzbeat.warehouse.service.WarehouseService; +import org.apache.hertzbeat.collector.dispatch.DispatchConstants; +import org.apache.hertzbeat.collector.util.CollectUtil; +import org.apache.hertzbeat.common.entity.job.Configmap; +import org.apache.hertzbeat.common.entity.job.Job; +import org.apache.hertzbeat.common.entity.job.Metrics; +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.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.support.SpringContextHolder; +import org.apache.hertzbeat.common.util.CommonUtil; +import org.apache.hertzbeat.manager.dao.MonitorDao; +import org.apache.hertzbeat.manager.dao.ParamDao; +import org.apache.hertzbeat.manager.pojo.dto.Hierarchy; +import org.apache.hertzbeat.manager.pojo.dto.ObjectStoreConfigChangeEvent; +import org.apache.hertzbeat.manager.pojo.dto.ObjectStoreDTO; +import org.apache.hertzbeat.manager.pojo.dto.TemplateConfig; +import org.apache.hertzbeat.manager.service.AppService; +import org.apache.hertzbeat.manager.service.MonitorService; +import org.apache.hertzbeat.manager.service.ObjectStoreService; +import org.apache.hertzbeat.warehouse.service.WarehouseService; import org.springframework.boot.CommandLineRunner; import org.springframework.context.event.EventListener; import org.springframework.core.Ordered; @@ -68,8 +68,6 @@ * 监控类型管理实现 * temporarily stores the monitoring configuration and parameter configuration in memory and then stores it in the * 暂时将监控配置和参数配置存放内存 之后存入数据库 - * - * */ @Service @Order(value = Ordered.HIGHEST_PRECEDENCE) diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/CollectorServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/CollectorServiceImpl.java similarity index 84% rename from manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/CollectorServiceImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/service/impl/CollectorServiceImpl.java index e06002b4430..53a494d5c53 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/CollectorServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/CollectorServiceImpl.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service.impl; +package org.apache.hertzbeat.manager.service.impl; -import org.dromara.hertzbeat.common.entity.dto.CollectorSummary; -import org.dromara.hertzbeat.common.entity.manager.Collector; -import org.dromara.hertzbeat.common.entity.manager.CollectorMonitorBind; -import org.dromara.hertzbeat.common.support.exception.CommonException; -import org.dromara.hertzbeat.manager.dao.CollectorDao; -import org.dromara.hertzbeat.manager.dao.CollectorMonitorBindDao; -import org.dromara.hertzbeat.manager.scheduler.netty.ManageServer; -import org.dromara.hertzbeat.manager.scheduler.AssignJobs; -import org.dromara.hertzbeat.manager.scheduler.ConsistentHash; -import org.dromara.hertzbeat.manager.service.CollectorService; +import org.apache.hertzbeat.common.entity.dto.CollectorSummary; +import org.apache.hertzbeat.common.entity.manager.Collector; +import org.apache.hertzbeat.common.entity.manager.CollectorMonitorBind; +import org.apache.hertzbeat.common.support.exception.CommonException; +import org.apache.hertzbeat.manager.dao.CollectorDao; +import org.apache.hertzbeat.manager.dao.CollectorMonitorBindDao; +import org.apache.hertzbeat.manager.scheduler.AssignJobs; +import org.apache.hertzbeat.manager.scheduler.ConsistentHash; +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.PageImpl; @@ -40,7 +40,6 @@ /** * collector service impl - * */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/ExcelImExportServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ExcelImExportServiceImpl.java similarity index 99% rename from manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/ExcelImExportServiceImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ExcelImExportServiceImpl.java index 8d3b2a477d6..93653fe7a83 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/ExcelImExportServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ExcelImExportServiceImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service.impl; +package org.apache.hertzbeat.manager.service.impl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -34,9 +34,6 @@ /** * Configure the import and export EXCEL format * 配置导入导出 EXCEL格式 - * - * - * Created by zqr10159 on 2023/4/11 */ @Slf4j @RequiredArgsConstructor @@ -48,7 +45,6 @@ public class ExcelImExportServiceImpl extends AbstractImExportServiceImpl{ /** * Export file type * 导出文件类型 - * * @return 文件类型 */ @Override @@ -59,7 +55,6 @@ public String type() { /** * Get Export File Name * 获取导出文件名 - * * @return 文件名 */ @Override @@ -70,7 +65,6 @@ public String getFileName() { /** * Parsing an input stream into a form * 将输入流解析为表单 - * * @param is 输入流 * @return 表单 */ @@ -216,7 +210,6 @@ private Byte getCellValueAsByte(Cell cell) { /** * Export Configuration to Output Stream * 导出配置到输出流 - * * @param monitorList 配置列表 * @param os 输出流 */ diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/JsonImExportServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/JsonImExportServiceImpl.java similarity index 96% rename from manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/JsonImExportServiceImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/service/impl/JsonImExportServiceImpl.java index 33a7a1eefb2..ed2d6bbd249 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/JsonImExportServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/JsonImExportServiceImpl.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service.impl; +package org.apache.hertzbeat.manager.service.impl; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -29,9 +29,6 @@ /** * Configure the import and export JSON format * 配置导入导出 JSON格式 - * - * - * Created by gcdd1993 on 2023/3/31 */ @Slf4j @RequiredArgsConstructor diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/MailGeneralConfigServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MailGeneralConfigServiceImpl.java similarity index 94% rename from manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/MailGeneralConfigServiceImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MailGeneralConfigServiceImpl.java index d48d1498415..3b251fc1edb 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/MailGeneralConfigServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MailGeneralConfigServiceImpl.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service.impl; +package org.apache.hertzbeat.manager.service.impl; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import org.dromara.hertzbeat.manager.dao.GeneralConfigDao; -import org.dromara.hertzbeat.manager.pojo.dto.EmailNoticeSender; +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; @@ -30,8 +30,6 @@ * MailGeneralConfigServiceImpl类是通用邮件配置服务实现类，继承了AbstractGeneralConfigServiceImpl类。 * MailGeneralConfigServiceImpl class is the implementation of general email configuration service, * which inherits the AbstractGeneralConfigServiceImpl class. - * - * */ @Service @@ -44,7 +42,6 @@ public class MailGeneralConfigServiceImpl extends AbstractGeneralConfigServiceIm * through the default constructor or deserialization construction (setBeanProps). * The parameter generalConfigDao is used for dao layer operation data, * and objectMapper is used for object mapping. - * * @param generalConfigDao 数据操作的dao层，供创建该类实例所需 * dao layer operation data, needed to create an instance of this class * @param objectMapper 对象映射，供创建该类实例所需 @@ -62,7 +59,6 @@ public String type() { /** * 该方法用于获取NoticeSender类型的TypeReference，以供后续处理。 * This method is used to get the TypeReference of NoticeSender type for subsequent processing. - * * @return NoticeSender类型的TypeReference * a TypeReference of NoticeSender type */ diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/MailServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MailServiceImpl.java similarity index 90% rename from manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/MailServiceImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MailServiceImpl.java index 3bb2473e08b..507203799cb 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/MailServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MailServiceImpl.java @@ -15,20 +15,20 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service.impl; +package org.apache.hertzbeat.manager.service.impl; import freemarker.cache.StringTemplateLoader; import freemarker.template.Configuration; import freemarker.template.TemplateException; -import org.dromara.hertzbeat.alert.AlerterProperties; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; -import org.dromara.hertzbeat.common.support.event.SystemConfigChangeEvent; -import org.dromara.hertzbeat.common.util.ResourceBundleUtil; -import org.dromara.hertzbeat.manager.service.MailService; +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.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.dromara.hertzbeat.manager.service.NoticeConfigService; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Service; import org.springframework.ui.freemarker.FreeMarkerTemplateUtils; @@ -45,9 +45,6 @@ /** * Mailbox sending service interface implementation class * 邮箱发送服务接口实现类 - * - * - * @version 1.0 */ @Slf4j @Service diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/MonitorServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java similarity index 95% rename from manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/MonitorServiceImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java index 24dd07fffcb..ca2aa0f382c 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/MonitorServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java @@ -15,41 +15,41 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service.impl; +package org.apache.hertzbeat.manager.service.impl; import com.fasterxml.jackson.core.type.TypeReference; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.alert.dao.AlertDefineBindDao; -import org.dromara.hertzbeat.collector.dispatch.DispatchConstants; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.job.Configmap; -import org.dromara.hertzbeat.common.entity.job.Job; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.manager.Collector; -import org.dromara.hertzbeat.common.entity.manager.CollectorMonitorBind; -import org.dromara.hertzbeat.common.entity.manager.Monitor; -import org.dromara.hertzbeat.common.entity.manager.Param; -import org.dromara.hertzbeat.common.entity.manager.ParamDefine; -import org.dromara.hertzbeat.common.entity.manager.Tag; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.support.event.MonitorDeletedEvent; -import org.dromara.hertzbeat.common.util.*; -import org.dromara.hertzbeat.manager.dao.CollectorDao; -import org.dromara.hertzbeat.manager.dao.CollectorMonitorBindDao; -import org.dromara.hertzbeat.manager.dao.MonitorDao; -import org.dromara.hertzbeat.manager.dao.ParamDao; -import org.dromara.hertzbeat.manager.dao.TagMonitorBindDao; -import org.dromara.hertzbeat.manager.pojo.dto.AppCount; -import org.dromara.hertzbeat.manager.pojo.dto.MonitorDto; -import org.dromara.hertzbeat.manager.scheduler.CollectJobScheduling; -import org.dromara.hertzbeat.manager.service.AppService; -import org.dromara.hertzbeat.manager.service.ImExportService; -import org.dromara.hertzbeat.manager.service.MonitorService; -import org.dromara.hertzbeat.manager.service.TagService; -import org.dromara.hertzbeat.manager.support.exception.MonitorDatabaseException; -import org.dromara.hertzbeat.manager.support.exception.MonitorDetectException; -import org.dromara.hertzbeat.manager.support.exception.MonitorMetricsException; -import org.dromara.hertzbeat.warehouse.service.WarehouseService; +import org.apache.hertzbeat.alert.dao.AlertDefineBindDao; +import org.apache.hertzbeat.collector.dispatch.DispatchConstants; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.job.Configmap; +import org.apache.hertzbeat.common.entity.job.Job; +import org.apache.hertzbeat.common.entity.job.Metrics; +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.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.manager.pojo.dto.AppCount; +import org.apache.hertzbeat.manager.pojo.dto.MonitorDto; +import org.apache.hertzbeat.manager.scheduler.CollectJobScheduling; +import org.apache.hertzbeat.manager.service.AppService; +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.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; import org.springframework.data.domain.Page; @@ -72,7 +72,6 @@ /** * 监控管理服务实现 * Monitoring and management service implementation - * */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/NoticeConfigServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/NoticeConfigServiceImpl.java similarity index 93% rename from manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/NoticeConfigServiceImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/service/impl/NoticeConfigServiceImpl.java index d40031b5045..85aebd36890 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/NoticeConfigServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/NoticeConfigServiceImpl.java @@ -15,21 +15,21 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service.impl; +package org.apache.hertzbeat.manager.service.impl; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.cache.CacheFactory; -import org.dromara.hertzbeat.common.cache.CommonCacheService; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; -import org.dromara.hertzbeat.common.entity.manager.NoticeRule; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; -import org.dromara.hertzbeat.manager.component.alerter.DispatcherAlarm; -import org.dromara.hertzbeat.manager.dao.NoticeReceiverDao; -import org.dromara.hertzbeat.manager.dao.NoticeRuleDao; -import org.dromara.hertzbeat.manager.dao.NoticeTemplateDao; -import org.dromara.hertzbeat.manager.service.NoticeConfigService; +import org.apache.hertzbeat.common.cache.CacheFactory; +import org.apache.hertzbeat.common.cache.CommonCacheService; +import org.apache.hertzbeat.common.constants.CommonConstants; +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.apache.hertzbeat.manager.component.alerter.DispatcherAlarm; +import org.apache.hertzbeat.manager.dao.NoticeReceiverDao; +import org.apache.hertzbeat.manager.dao.NoticeRuleDao; +import org.apache.hertzbeat.manager.dao.NoticeTemplateDao; +import org.apache.hertzbeat.manager.service.NoticeConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.context.annotation.Lazy; @@ -52,7 +52,6 @@ /** * 消息通知配置实现 * Message notification configuration implementation - * */ @Service @Order(value = Ordered.HIGHEST_PRECEDENCE) diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/ObjectStoreConfigServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ObjectStoreConfigServiceImpl.java similarity index 93% rename from manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/ObjectStoreConfigServiceImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ObjectStoreConfigServiceImpl.java index 578905fbf4e..07fff43c4b1 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/ObjectStoreConfigServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ObjectStoreConfigServiceImpl.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service.impl; +package org.apache.hertzbeat.manager.service.impl; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.obs.services.ObsClient; import lombok.extern.slf4j.Slf4j; +import org.apache.hertzbeat.manager.dao.GeneralConfigDao; +import org.apache.hertzbeat.manager.pojo.dto.ObjectStoreConfigChangeEvent; +import org.apache.hertzbeat.manager.pojo.dto.ObjectStoreDTO; import org.apache.poi.ss.formula.functions.T; -import org.dromara.hertzbeat.manager.dao.GeneralConfigDao; -import org.dromara.hertzbeat.manager.pojo.dto.ObjectStoreConfigChangeEvent; -import org.dromara.hertzbeat.manager.pojo.dto.ObjectStoreDTO; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.context.ApplicationContext; @@ -39,8 +39,6 @@ /** * 文件存储配置服务 * File storage configuration service - * - * Created by gcdd1993 on 2023/9/13 */ @Order(Ordered.HIGHEST_PRECEDENCE) @Slf4j diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/ObsObjectStoreServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ObsObjectStoreServiceImpl.java similarity index 89% rename from manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/ObsObjectStoreServiceImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ObsObjectStoreServiceImpl.java index 3cbaafd98ee..f663e787b39 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/ObsObjectStoreServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ObsObjectStoreServiceImpl.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service.impl; +package org.apache.hertzbeat.manager.service.impl; import com.obs.services.ObsClient; import com.obs.services.model.ListObjectsRequest; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.constants.SignConstants; -import org.dromara.hertzbeat.manager.pojo.dto.FileDTO; -import org.dromara.hertzbeat.manager.pojo.dto.ObjectStoreDTO; -import org.dromara.hertzbeat.manager.service.ObjectStoreService; +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; @@ -33,8 +33,6 @@ /** * 华为云存储服务 * Huawei cloud storage service - * - * Created by gcdd1993 on 2023/9/13 */ @Slf4j public class ObsObjectStoreServiceImpl implements ObjectStoreService { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/StatusPageServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/StatusPageServiceImpl.java similarity index 94% rename from manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/StatusPageServiceImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/service/impl/StatusPageServiceImpl.java index 5dcb464113e..d40b4740d60 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/StatusPageServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/StatusPageServiceImpl.java @@ -15,20 +15,20 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service.impl; +package org.apache.hertzbeat.manager.service.impl; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.manager.StatusPageComponent; -import org.dromara.hertzbeat.common.entity.manager.StatusPageHistory; -import org.dromara.hertzbeat.common.entity.manager.StatusPageIncident; -import org.dromara.hertzbeat.common.entity.manager.StatusPageOrg; -import org.dromara.hertzbeat.manager.component.status.CalculateStatus; -import org.dromara.hertzbeat.manager.dao.StatusPageComponentDao; -import org.dromara.hertzbeat.manager.dao.StatusPageHistoryDao; -import org.dromara.hertzbeat.manager.dao.StatusPageIncidentDao; -import org.dromara.hertzbeat.manager.dao.StatusPageOrgDao; -import org.dromara.hertzbeat.manager.pojo.dto.ComponentStatus; -import org.dromara.hertzbeat.manager.service.StatusPageService; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.manager.StatusPageComponent; +import org.apache.hertzbeat.common.entity.manager.StatusPageHistory; +import org.apache.hertzbeat.common.entity.manager.StatusPageIncident; +import org.apache.hertzbeat.common.entity.manager.StatusPageOrg; +import org.apache.hertzbeat.manager.component.status.CalculateStatus; +import org.apache.hertzbeat.manager.dao.StatusPageComponentDao; +import org.apache.hertzbeat.manager.dao.StatusPageHistoryDao; +import org.apache.hertzbeat.manager.dao.StatusPageIncidentDao; +import org.apache.hertzbeat.manager.dao.StatusPageOrgDao; +import org.apache.hertzbeat.manager.pojo.dto.ComponentStatus; +import org.apache.hertzbeat.manager.service.StatusPageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; @@ -43,7 +43,6 @@ /** * status page service implement. - * */ @Service public class StatusPageServiceImpl implements StatusPageService { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/SystemGeneralConfigServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/SystemGeneralConfigServiceImpl.java similarity index 90% rename from manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/SystemGeneralConfigServiceImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/service/impl/SystemGeneralConfigServiceImpl.java index 1a87dd9ec41..5e1cbcdfd60 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/SystemGeneralConfigServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/SystemGeneralConfigServiceImpl.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service.impl; +package org.apache.hertzbeat.manager.service.impl; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.support.event.SystemConfigChangeEvent; -import org.dromara.hertzbeat.manager.dao.GeneralConfigDao; -import org.dromara.hertzbeat.manager.pojo.dto.SystemConfig; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.support.event.SystemConfigChangeEvent; +import org.apache.hertzbeat.manager.dao.GeneralConfigDao; +import org.apache.hertzbeat.manager.pojo.dto.SystemConfig; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service; diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/TagServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/TagServiceImpl.java similarity index 90% rename from manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/TagServiceImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/service/impl/TagServiceImpl.java index 03170071000..2648b1650eb 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/TagServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/TagServiceImpl.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service.impl; +package org.apache.hertzbeat.manager.service.impl; import org.apache.commons.collections.CollectionUtils; -import org.dromara.hertzbeat.common.entity.manager.Monitor; -import org.dromara.hertzbeat.common.entity.manager.Tag; -import org.dromara.hertzbeat.manager.dao.TagDao; -import org.dromara.hertzbeat.manager.service.TagService; +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; @@ -37,8 +37,6 @@ import java.util.stream.Collectors; /** - * - * */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/TemplateConfigServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/TemplateConfigServiceImpl.java similarity index 90% rename from manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/TemplateConfigServiceImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/service/impl/TemplateConfigServiceImpl.java index 7696a24fd75..9f3624c5ada 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/TemplateConfigServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/TemplateConfigServiceImpl.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service.impl; +package org.apache.hertzbeat.manager.service.impl; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import org.dromara.hertzbeat.manager.dao.GeneralConfigDao; -import org.dromara.hertzbeat.manager.pojo.dto.TemplateConfig; -import org.dromara.hertzbeat.manager.service.AppService; +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; diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/YamlImExportServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/YamlImExportServiceImpl.java similarity index 95% rename from manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/YamlImExportServiceImpl.java rename to manager/src/main/java/org/apache/hertzbeat/manager/service/impl/YamlImExportServiceImpl.java index b6cd3e926ce..661c9e6ec98 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/YamlImExportServiceImpl.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/YamlImExportServiceImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service.impl; +package org.apache.hertzbeat.manager.service.impl; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -31,9 +31,6 @@ /** * Configure the import and export Yaml format * 配置导入导出 Yaml格式 - * - * - * Created by zqr10159 on 2023/4/20 */ @Slf4j @Service @@ -45,7 +42,6 @@ public class YamlImExportServiceImpl extends AbstractImExportServiceImpl{ /** * Export file type * 导出文件类型 - * * @return 文件类型 */ @Override @@ -56,7 +52,6 @@ public String type() { /** * Get Export File Name * 获取导出文件名 - * * @return 文件名 */ @Override @@ -67,7 +62,6 @@ public String getFileName() { /** * Parsing an input stream into a form * 将输入流解析为表单 - * * @param is 输入流 * @return 表单 */ @@ -82,7 +76,6 @@ List parseImport(InputStream is) { /** * Export Configuration to Output Stream * 导出配置到输出流 - * * @param monitorList 配置列表 * @param os 输出流 */ diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/support/GlobalExceptionHandler.java b/manager/src/main/java/org/apache/hertzbeat/manager/support/GlobalExceptionHandler.java similarity index 94% rename from manager/src/main/java/org/dromara/hertzbeat/manager/support/GlobalExceptionHandler.java rename to manager/src/main/java/org/apache/hertzbeat/manager/support/GlobalExceptionHandler.java index a58483f6275..a0087094e45 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/support/GlobalExceptionHandler.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/support/GlobalExceptionHandler.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.support; +package org.apache.hertzbeat.manager.support; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.entity.dto.Message; -import org.dromara.hertzbeat.common.support.exception.CommonException; -import org.dromara.hertzbeat.manager.support.exception.AlertNoticeException; -import org.dromara.hertzbeat.manager.support.exception.MonitorDatabaseException; -import org.dromara.hertzbeat.manager.support.exception.MonitorDetectException; -import org.dromara.hertzbeat.manager.support.exception.MonitorMetricsException; +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.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; @@ -39,12 +39,10 @@ import javax.validation.ConstraintViolationException; import java.util.Objects; -import static org.dromara.hertzbeat.common.constants.CommonConstants.*; +import static org.apache.hertzbeat.common.constants.CommonConstants.*; /** * controller exception handler - * - * */ @RestControllerAdvice @Slf4j @@ -54,7 +52,6 @@ public class GlobalExceptionHandler { /** * 处理探测失败 - * * @param exception 探测异常 * @return response */ @@ -67,7 +64,6 @@ ResponseEntity> handleMonitorDetectException(MonitorDetectExceptio /** * 处理数据库操作异常 - * * @param exception 探测异常 * @return response */ @@ -80,7 +76,6 @@ ResponseEntity> handleMonitorDatabaseException(MonitorDatabaseExce /** * handle common exception - * * @param exception common * @return response */ @@ -93,7 +88,6 @@ ResponseEntity> handleCommonException(CommonException exception) { /** * 处理参数错误的失败 - * * @param exception 参数异常 * @return response */ @@ -113,7 +107,6 @@ ResponseEntity> handleAlertNoticeException(AlertNoticeException no /** * 处理请求参数错误的失败, 请求参数json映射body时出错 - * * @param exception 参数映射body异常 * @return response */ @@ -137,7 +130,6 @@ ResponseEntity> handleHttpMessageNotReadableException(HttpMessageN /** * handler the exception thrown for data input verify * valid注解校验框架校验异常统一处理 - * * @param e data input verify exception * @return response */ @@ -174,7 +166,6 @@ ResponseEntity> handleInputValidException(Exception e) { /** * handler the exception thrown for data input verify * valid注解校验框架校验异常统一处理 - * * @param e data input verify exception * @return response */ @@ -202,7 +193,6 @@ ResponseEntity> handleInputOtherValidException(ConstraintViolation /** * handler the exception thrown for datastore error - * * @param exception datastore exception * @return response */ @@ -220,7 +210,6 @@ ResponseEntity> handleDataAccessException(DataAccessException exce /** * handle Request method not supported - * * @param exception Request method not supported * @return response */ @@ -238,7 +227,6 @@ ResponseEntity> handleMethodNotSupportException(HttpRequestMethodN /** * 处理监控指标传参异常 - * * @param exception 指标参数异常 * @return response */ @@ -256,7 +244,6 @@ void ignoreNoResourceFoundException(Exception ex) throws Exception { /** * handler the exception thrown for unCatch and unKnown - * * @param exception UnknownException * @return response */ diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/support/exception/AlertNoticeException.java b/manager/src/main/java/org/apache/hertzbeat/manager/support/exception/AlertNoticeException.java similarity index 94% rename from manager/src/main/java/org/dromara/hertzbeat/manager/support/exception/AlertNoticeException.java rename to manager/src/main/java/org/apache/hertzbeat/manager/support/exception/AlertNoticeException.java index 0e2510ccb99..ccf540e78d7 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/support/exception/AlertNoticeException.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/support/exception/AlertNoticeException.java @@ -15,13 +15,11 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.support.exception; +package org.apache.hertzbeat.manager.support.exception; /** * alert notice send failed * 告警通知发送异常 - * - * */ public class AlertNoticeException extends RuntimeException { public AlertNoticeException(String message) { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/support/exception/IgnoreException.java b/manager/src/main/java/org/apache/hertzbeat/manager/support/exception/IgnoreException.java similarity index 93% rename from manager/src/main/java/org/dromara/hertzbeat/manager/support/exception/IgnoreException.java rename to manager/src/main/java/org/apache/hertzbeat/manager/support/exception/IgnoreException.java index 45d379d98aa..95e203da403 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/support/exception/IgnoreException.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/support/exception/IgnoreException.java @@ -15,12 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.support.exception; +package org.apache.hertzbeat.manager.support.exception; /** * normal ignore - * - * */ public class IgnoreException extends RuntimeException { public IgnoreException(String message) { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/support/exception/MonitorDatabaseException.java b/manager/src/main/java/org/apache/hertzbeat/manager/support/exception/MonitorDatabaseException.java similarity index 94% rename from manager/src/main/java/org/dromara/hertzbeat/manager/support/exception/MonitorDatabaseException.java rename to manager/src/main/java/org/apache/hertzbeat/manager/support/exception/MonitorDatabaseException.java index 2957ba5e026..81ed8635a3c 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/support/exception/MonitorDatabaseException.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/support/exception/MonitorDatabaseException.java @@ -15,12 +15,11 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.support.exception; +package org.apache.hertzbeat.manager.support.exception; /** * 数据库操作异常 * Database operation exception - * */ public class MonitorDatabaseException extends RuntimeException { public MonitorDatabaseException(String message) { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/support/exception/MonitorDetectException.java b/manager/src/main/java/org/apache/hertzbeat/manager/support/exception/MonitorDetectException.java similarity index 94% rename from manager/src/main/java/org/dromara/hertzbeat/manager/support/exception/MonitorDetectException.java rename to manager/src/main/java/org/apache/hertzbeat/manager/support/exception/MonitorDetectException.java index f3a533fd3f7..5b2fb7ea8d3 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/support/exception/MonitorDetectException.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/support/exception/MonitorDetectException.java @@ -15,12 +15,11 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.support.exception; +package org.apache.hertzbeat.manager.support.exception; /** * 探测失败异常 * Detection failure exception - * */ public class MonitorDetectException extends RuntimeException { diff --git a/manager/src/main/java/org/dromara/hertzbeat/manager/support/exception/MonitorMetricsException.java b/manager/src/main/java/org/apache/hertzbeat/manager/support/exception/MonitorMetricsException.java similarity index 94% rename from manager/src/main/java/org/dromara/hertzbeat/manager/support/exception/MonitorMetricsException.java rename to manager/src/main/java/org/apache/hertzbeat/manager/support/exception/MonitorMetricsException.java index d4973cdc0eb..98002cf2fed 100644 --- a/manager/src/main/java/org/dromara/hertzbeat/manager/support/exception/MonitorMetricsException.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/support/exception/MonitorMetricsException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.support.exception; +package org.apache.hertzbeat.manager.support.exception; /** * 描述：监控指标异常 diff --git a/manager/src/main/resources/application.yml b/manager/src/main/resources/application.yml index 8de2b111c8e..d85d45bc7c3 100644 --- a/manager/src/main/resources/application.yml +++ b/manager/src/main/resources/application.yml @@ -28,7 +28,7 @@ spring: static-locations: - classpath:/dist/ - classpath:../dist/ - # need to disable spring boot mongodb auto config, or default mongodb connection tried and failed.. + # need to disable spring boot mongodb auto config, or default mongodb connection tried and failed. autoconfigure: exclude: org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration, org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration freemarker: @@ -141,7 +141,7 @@ warehouse: rpc-port: 6667 username: root password: root - # org.dromara.hertzbeat.warehouse.config.IotDbVersion: V_0_13 || V_1_0 + # config.org.apache.hertzbeat.warehouse.IotDbVersion: V_0_13 || V_1_0 version: V_1_0 query-timeout-in-ms: -1 # 数据存储时间：默认'7776000000'（90天,单位为毫秒,-1代表永不过期） diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/AbstractSpringIntegrationTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/AbstractSpringIntegrationTest.java similarity index 96% rename from manager/src/test/java/org/dromara/hertzbeat/manager/AbstractSpringIntegrationTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/AbstractSpringIntegrationTest.java index 4028a57629a..e22c4a0d188 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/AbstractSpringIntegrationTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/AbstractSpringIntegrationTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager; +package org.apache.hertzbeat.manager; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/ManagerTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/ManagerTest.java similarity index 65% rename from manager/src/test/java/org/dromara/hertzbeat/manager/ManagerTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/ManagerTest.java index 5da3b9a7015..f50761afef4 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/ManagerTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/ManagerTest.java @@ -15,39 +15,39 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager; +package org.apache.hertzbeat.manager; -import org.dromara.hertzbeat.alert.AlerterProperties; -import org.dromara.hertzbeat.alert.AlerterWorkerPool; -import org.dromara.hertzbeat.alert.calculate.CalculateAlarm; -import org.dromara.hertzbeat.alert.controller.AlertDefineController; -import org.dromara.hertzbeat.alert.controller.AlertDefinesController; -import org.dromara.hertzbeat.alert.controller.AlertsController; -import org.dromara.hertzbeat.alert.service.impl.AlertDefineServiceImpl; -import org.dromara.hertzbeat.alert.service.impl.AlertServiceImpl; -import org.dromara.hertzbeat.collector.collect.database.JdbcSpiLoader; -import org.dromara.hertzbeat.collector.collect.http.promethus.PrometheusParseCreater; -import org.dromara.hertzbeat.collector.collect.strategy.CollectStrategyFactory; -import org.dromara.hertzbeat.collector.dispatch.CommonDispatcher; -import org.dromara.hertzbeat.collector.dispatch.DispatchProperties; -import org.dromara.hertzbeat.collector.dispatch.MetricsCollectorQueue; -import org.dromara.hertzbeat.collector.dispatch.WorkerPool; -import org.dromara.hertzbeat.collector.dispatch.entrance.internal.CollectJobService; -import org.dromara.hertzbeat.collector.dispatch.timer.TimerDispatcher; -import org.dromara.hertzbeat.collector.dispatch.unit.impl.DataSizeConvert; -import org.dromara.hertzbeat.common.config.AviatorConfiguration; -import org.dromara.hertzbeat.common.config.CommonConfig; -import org.dromara.hertzbeat.common.config.CommonProperties; -import org.dromara.hertzbeat.common.queue.impl.InMemoryCommonDataQueue; -import org.dromara.hertzbeat.common.service.TencentSmsClient; -import org.dromara.hertzbeat.common.support.SpringContextHolder; -import org.dromara.hertzbeat.warehouse.WarehouseWorkerPool; -import org.dromara.hertzbeat.warehouse.config.WarehouseProperties; -import org.dromara.hertzbeat.warehouse.controller.MetricsDataController; -import org.dromara.hertzbeat.warehouse.store.HistoryIotDbDataStorage; -import org.dromara.hertzbeat.warehouse.store.HistoryTdEngineDataStorage; -import org.dromara.hertzbeat.warehouse.store.RealTimeMemoryDataStorage; -import org.dromara.hertzbeat.warehouse.store.RealTimeRedisDataStorage; +import org.apache.hertzbeat.alert.AlerterProperties; +import org.apache.hertzbeat.alert.AlerterWorkerPool; +import org.apache.hertzbeat.alert.calculate.CalculateAlarm; +import org.apache.hertzbeat.alert.controller.AlertDefineController; +import org.apache.hertzbeat.alert.controller.AlertDefinesController; +import org.apache.hertzbeat.alert.controller.AlertsController; +import org.apache.hertzbeat.alert.service.impl.AlertDefineServiceImpl; +import org.apache.hertzbeat.alert.service.impl.AlertServiceImpl; +import org.apache.hertzbeat.collector.collect.database.JdbcSpiLoader; +import org.apache.hertzbeat.collector.collect.http.promethus.PrometheusParseCreater; +import org.apache.hertzbeat.collector.collect.strategy.CollectStrategyFactory; +import org.apache.hertzbeat.collector.dispatch.CommonDispatcher; +import org.apache.hertzbeat.collector.dispatch.DispatchProperties; +import org.apache.hertzbeat.collector.dispatch.MetricsCollectorQueue; +import org.apache.hertzbeat.collector.dispatch.WorkerPool; +import org.apache.hertzbeat.collector.dispatch.entrance.internal.CollectJobService; +import org.apache.hertzbeat.collector.dispatch.timer.TimerDispatcher; +import org.apache.hertzbeat.collector.dispatch.unit.impl.DataSizeConvert; +import org.apache.hertzbeat.common.config.AviatorConfiguration; +import org.apache.hertzbeat.common.config.CommonConfig; +import org.apache.hertzbeat.common.config.CommonProperties; +import org.apache.hertzbeat.common.queue.impl.InMemoryCommonDataQueue; +import org.apache.hertzbeat.common.service.TencentSmsClient; +import org.apache.hertzbeat.common.support.SpringContextHolder; +import org.apache.hertzbeat.warehouse.WarehouseWorkerPool; +import org.apache.hertzbeat.warehouse.config.WarehouseProperties; +import org.apache.hertzbeat.warehouse.controller.MetricsDataController; +import org.apache.hertzbeat.warehouse.store.HistoryIotDbDataStorage; +import org.apache.hertzbeat.warehouse.store.HistoryTdEngineDataStorage; +import org.apache.hertzbeat.warehouse.store.RealTimeMemoryDataStorage; +import org.apache.hertzbeat.warehouse.store.RealTimeRedisDataStorage; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.context.ApplicationContext; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/AlertNotifyHandlerTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/AlertNotifyHandlerTest.java similarity index 94% rename from manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/AlertNotifyHandlerTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/AlertNotifyHandlerTest.java index d57678f8bd2..86d62646621 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/AlertNotifyHandlerTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/AlertNotifyHandlerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter; +package org.apache.hertzbeat.manager.component.alerter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/DispatcherAlarmTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/DispatcherAlarmTest.java similarity index 95% rename from manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/DispatcherAlarmTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/DispatcherAlarmTest.java index 00603f5d32d..691e2053d72 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/DispatcherAlarmTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/DispatcherAlarmTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter; +package org.apache.hertzbeat.manager.component.alerter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImplTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImplTest.java similarity index 94% rename from manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImplTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImplTest.java index 94f69f039d4..0dbce85c2bb 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImplTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImplTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter.impl; +package org.apache.hertzbeat.manager.component.alerter.impl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImplTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImplTest.java similarity index 88% rename from manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImplTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImplTest.java index 8d0e6fd8d06..baccfcc2a9a 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImplTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/DingTalkRobotAlertNotifyHandlerImplTest.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter.impl; +package org.apache.hertzbeat.manager.component.alerter.impl; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; -import org.dromara.hertzbeat.manager.AbstractSpringIntegrationTest; +import org.apache.hertzbeat.common.entity.alerter.Alert; +import org.apache.hertzbeat.common.entity.manager.NoticeReceiver; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.manager.NoticeTemplate; +import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.springframework.util.StringUtils; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImplTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImplTest.java similarity index 88% rename from manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImplTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImplTest.java index 26e0cb0e3e1..410f40aca19 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImplTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/DiscordBotAlertNotifyHandlerImplTest.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter.impl; +package org.apache.hertzbeat.manager.component.alerter.impl; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; -import org.dromara.hertzbeat.manager.AbstractSpringIntegrationTest; +import org.apache.hertzbeat.common.entity.alerter.Alert; +import org.apache.hertzbeat.common.entity.manager.NoticeReceiver; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.manager.NoticeTemplate; +import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.springframework.util.StringUtils; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/EmailAlertNotifyHandlerImplTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/EmailAlertNotifyHandlerImplTest.java similarity index 94% rename from manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/EmailAlertNotifyHandlerImplTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/EmailAlertNotifyHandlerImplTest.java index 6a2fee780f7..1ed0f003daf 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/EmailAlertNotifyHandlerImplTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/EmailAlertNotifyHandlerImplTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter.impl; +package org.apache.hertzbeat.manager.component.alerter.impl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImplTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImplTest.java similarity index 88% rename from manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImplTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImplTest.java index d1849a52808..1f0d1457df9 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImplTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/FlyBookAlertNotifyHandlerImplTest.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter.impl; +package org.apache.hertzbeat.manager.component.alerter.impl; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; -import org.dromara.hertzbeat.manager.AbstractSpringIntegrationTest; +import org.apache.hertzbeat.common.entity.alerter.Alert; +import org.apache.hertzbeat.common.entity.manager.NoticeReceiver; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.manager.NoticeTemplate; +import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.springframework.util.StringUtils; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/HuaweiCloudSmnAlertNotifyHandlerImplTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/HuaweiCloudSmnAlertNotifyHandlerImplTest.java similarity index 90% rename from manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/HuaweiCloudSmnAlertNotifyHandlerImplTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/HuaweiCloudSmnAlertNotifyHandlerImplTest.java index 1c018a1980e..81e3525af1b 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/HuaweiCloudSmnAlertNotifyHandlerImplTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/HuaweiCloudSmnAlertNotifyHandlerImplTest.java @@ -13,14 +13,14 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter.impl; +package org.apache.hertzbeat.manager.component.alerter.impl; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; -import org.dromara.hertzbeat.manager.AbstractSpringIntegrationTest; +import org.apache.hertzbeat.common.constants.CommonConstants; +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.AbstractSpringIntegrationTest; import org.junit.jupiter.api.Test; import org.springframework.util.StringUtils; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/SlackAlertNotifyHandlerImplTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/SlackAlertNotifyHandlerImplTest.java similarity index 88% rename from manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/SlackAlertNotifyHandlerImplTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/SlackAlertNotifyHandlerImplTest.java index a30289b3130..ac47a177a7d 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/SlackAlertNotifyHandlerImplTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/SlackAlertNotifyHandlerImplTest.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter.impl; +package org.apache.hertzbeat.manager.component.alerter.impl; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; -import org.dromara.hertzbeat.manager.AbstractSpringIntegrationTest; +import org.apache.hertzbeat.common.entity.alerter.Alert; +import org.apache.hertzbeat.common.entity.manager.NoticeReceiver; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.manager.NoticeTemplate; +import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.springframework.util.StringUtils; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImplTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImplTest.java similarity index 88% rename from manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImplTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImplTest.java index 9860600e544..31daa690a9f 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImplTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImplTest.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter.impl; +package org.apache.hertzbeat.manager.component.alerter.impl; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; -import org.dromara.hertzbeat.manager.AbstractSpringIntegrationTest; +import org.apache.hertzbeat.common.entity.alerter.Alert; +import org.apache.hertzbeat.common.entity.manager.NoticeReceiver; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.manager.NoticeTemplate; +import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.springframework.util.StringUtils; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/WeChatAppAlertNotifyHandlerImplTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/WeChatAppAlertNotifyHandlerImplTest.java similarity index 87% rename from manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/WeChatAppAlertNotifyHandlerImplTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/WeChatAppAlertNotifyHandlerImplTest.java index 7fcde83ab15..c0207aa1f3d 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/WeChatAppAlertNotifyHandlerImplTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/WeChatAppAlertNotifyHandlerImplTest.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter.impl; +package org.apache.hertzbeat.manager.component.alerter.impl; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; -import org.dromara.hertzbeat.manager.AbstractSpringIntegrationTest; +import org.apache.hertzbeat.common.entity.alerter.Alert; +import org.apache.hertzbeat.common.entity.manager.NoticeReceiver; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.manager.NoticeTemplate; +import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest; import org.junit.jupiter.api.Test; import org.springframework.util.StringUtils; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImplTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImplTest.java similarity index 88% rename from manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImplTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImplTest.java index 433507fd09f..1919a8cb5f2 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImplTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/WeWorkRobotAlertNotifyHandlerImplTest.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter.impl; +package org.apache.hertzbeat.manager.component.alerter.impl; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; -import org.dromara.hertzbeat.manager.AbstractSpringIntegrationTest; +import org.apache.hertzbeat.common.entity.alerter.Alert; +import org.apache.hertzbeat.common.entity.manager.NoticeReceiver; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.entity.manager.NoticeTemplate; +import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.springframework.util.StringUtils; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/WebHookAlertNotifyHandlerImplTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/WebHookAlertNotifyHandlerImplTest.java similarity index 90% rename from manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/WebHookAlertNotifyHandlerImplTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/WebHookAlertNotifyHandlerImplTest.java index 1170fda1106..760b6ecdc10 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/component/alerter/impl/WebHookAlertNotifyHandlerImplTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/component/alerter/impl/WebHookAlertNotifyHandlerImplTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.component.alerter.impl; +package org.apache.hertzbeat.manager.component.alerter.impl; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.manager.AbstractSpringIntegrationTest; +import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/controller/AccountControllerTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/controller/AccountControllerTest.java similarity index 93% rename from manager/src/test/java/org/dromara/hertzbeat/manager/controller/AccountControllerTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/controller/AccountControllerTest.java index 64923c2ad66..3ee34d41835 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/controller/AccountControllerTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/controller/AccountControllerTest.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.controller; +package org.apache.hertzbeat.manager.controller; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.util.JsonUtil; -import org.dromara.hertzbeat.manager.pojo.dto.LoginDto; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.util.JsonUtil; +import org.apache.hertzbeat.manager.pojo.dto.LoginDto; import com.usthe.sureness.util.JsonWebTokenUtil; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/controller/AppControllerTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/controller/AppControllerTest.java similarity index 93% rename from manager/src/test/java/org/dromara/hertzbeat/manager/controller/AppControllerTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/controller/AppControllerTest.java index 42b3c25dea3..ad108c46cf3 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/controller/AppControllerTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/controller/AppControllerTest.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.controller; +package org.apache.hertzbeat.manager.controller; -import org.dromara.hertzbeat.common.entity.job.Job; -import org.dromara.hertzbeat.common.entity.manager.ParamDefine; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.manager.pojo.dto.Hierarchy; -import org.dromara.hertzbeat.manager.service.impl.AppServiceImpl; +import org.apache.hertzbeat.common.entity.job.Job; +import org.apache.hertzbeat.common.entity.manager.ParamDefine; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.manager.pojo.dto.Hierarchy; +import org.apache.hertzbeat.manager.service.impl.AppServiceImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/controller/I18nControllerTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/controller/I18nControllerTest.java similarity index 92% rename from manager/src/test/java/org/dromara/hertzbeat/manager/controller/I18nControllerTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/controller/I18nControllerTest.java index c380b650793..cbe6ecf28f2 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/controller/I18nControllerTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/controller/I18nControllerTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.controller; +package org.apache.hertzbeat.manager.controller; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.manager.service.impl.AppServiceImpl; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.manager.service.impl.AppServiceImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/controller/MonitorControllerTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/controller/MonitorControllerTest.java similarity index 94% rename from manager/src/test/java/org/dromara/hertzbeat/manager/controller/MonitorControllerTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/controller/MonitorControllerTest.java index 2c5d806bf84..9055e149d88 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/controller/MonitorControllerTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/controller/MonitorControllerTest.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.controller; - -import org.dromara.hertzbeat.common.entity.manager.Monitor; -import org.dromara.hertzbeat.common.entity.manager.Param; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.util.JsonUtil; -import org.dromara.hertzbeat.manager.pojo.dto.MonitorDto; -import org.dromara.hertzbeat.manager.service.impl.MonitorServiceImpl; +package org.apache.hertzbeat.manager.controller; + +import org.apache.hertzbeat.common.entity.manager.Monitor; +import org.apache.hertzbeat.common.entity.manager.Param; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.util.JsonUtil; +import org.apache.hertzbeat.manager.pojo.dto.MonitorDto; +import org.apache.hertzbeat.manager.service.impl.MonitorServiceImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/controller/MonitorsControllerTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/controller/MonitorsControllerTest.java similarity index 94% rename from manager/src/test/java/org/dromara/hertzbeat/manager/controller/MonitorsControllerTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/controller/MonitorsControllerTest.java index cb87ecd07cf..5128a4b51f2 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/controller/MonitorsControllerTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/controller/MonitorsControllerTest.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.controller; +package org.apache.hertzbeat.manager.controller; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.util.JsonUtil; -import org.dromara.hertzbeat.manager.service.impl.MonitorServiceImpl; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.util.JsonUtil; +import org.apache.hertzbeat.manager.service.impl.MonitorServiceImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/controller/NoticeConfigControllerTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/controller/NoticeConfigControllerTest.java similarity index 95% rename from manager/src/test/java/org/dromara/hertzbeat/manager/controller/NoticeConfigControllerTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/controller/NoticeConfigControllerTest.java index fa23a8c9c55..98c02039ff1 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/controller/NoticeConfigControllerTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/controller/NoticeConfigControllerTest.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.controller; - -import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; -import org.dromara.hertzbeat.common.entity.manager.TagItem; -import org.dromara.hertzbeat.common.entity.manager.NoticeRule; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.util.JsonUtil; -import org.dromara.hertzbeat.manager.service.impl.NoticeConfigServiceImpl; +package org.apache.hertzbeat.manager.controller; + +import org.apache.hertzbeat.common.entity.manager.NoticeReceiver; +import org.apache.hertzbeat.common.entity.manager.NoticeTemplate; +import org.apache.hertzbeat.common.entity.manager.TagItem; +import org.apache.hertzbeat.common.entity.manager.NoticeRule; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.util.JsonUtil; +import org.apache.hertzbeat.manager.service.impl.NoticeConfigServiceImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/controller/SummaryControllerTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/controller/SummaryControllerTest.java similarity index 91% rename from manager/src/test/java/org/dromara/hertzbeat/manager/controller/SummaryControllerTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/controller/SummaryControllerTest.java index fe957c9b09f..e573bc386c2 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/controller/SummaryControllerTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/controller/SummaryControllerTest.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.controller; +package org.apache.hertzbeat.manager.controller; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.manager.pojo.dto.AppCount; -import org.dromara.hertzbeat.manager.service.impl.MonitorServiceImpl; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.manager.pojo.dto.AppCount; +import org.apache.hertzbeat.manager.service.impl.MonitorServiceImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/controller/TagControllerTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/controller/TagControllerTest.java similarity index 93% rename from manager/src/test/java/org/dromara/hertzbeat/manager/controller/TagControllerTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/controller/TagControllerTest.java index 12b1e9ec3a9..6449ad37393 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/controller/TagControllerTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/controller/TagControllerTest.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.controller; +package org.apache.hertzbeat.manager.controller; -import org.dromara.hertzbeat.common.entity.manager.Tag; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.util.JsonUtil; -import org.dromara.hertzbeat.manager.service.impl.TagServiceImpl; +import org.apache.hertzbeat.common.entity.manager.Tag; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.common.util.JsonUtil; +import org.apache.hertzbeat.manager.service.impl.TagServiceImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/dao/MonitorDaoTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/dao/MonitorDaoTest.java similarity index 94% rename from manager/src/test/java/org/dromara/hertzbeat/manager/dao/MonitorDaoTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/dao/MonitorDaoTest.java index 9d851d58d9f..3520c65c2d7 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/dao/MonitorDaoTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/dao/MonitorDaoTest.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.dao; +package org.apache.hertzbeat.manager.dao; -import org.dromara.hertzbeat.common.entity.manager.Monitor; -import org.dromara.hertzbeat.manager.AbstractSpringIntegrationTest; -import org.dromara.hertzbeat.manager.pojo.dto.AppCount; +import org.apache.hertzbeat.common.entity.manager.Monitor; +import org.apache.hertzbeat.manager.pojo.dto.AppCount; +import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/dao/NoticeRuleDaoTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/dao/NoticeRuleDaoTest.java similarity index 94% rename from manager/src/test/java/org/dromara/hertzbeat/manager/dao/NoticeRuleDaoTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/dao/NoticeRuleDaoTest.java index 49c578a19b0..a7dd46615fc 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/dao/NoticeRuleDaoTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/dao/NoticeRuleDaoTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.dao; +package org.apache.hertzbeat.manager.dao; -import org.dromara.hertzbeat.common.entity.manager.NoticeRule; -import org.dromara.hertzbeat.manager.AbstractSpringIntegrationTest; +import org.apache.hertzbeat.common.entity.manager.NoticeRule; +import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/dao/ParamDaoTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/dao/ParamDaoTest.java similarity index 95% rename from manager/src/test/java/org/dromara/hertzbeat/manager/dao/ParamDaoTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/dao/ParamDaoTest.java index 2a0b9a7e0d0..1535b010185 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/dao/ParamDaoTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/dao/ParamDaoTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.dao; +package org.apache.hertzbeat.manager.dao; -import org.dromara.hertzbeat.common.entity.manager.Param; -import org.dromara.hertzbeat.manager.AbstractSpringIntegrationTest; +import org.apache.hertzbeat.common.entity.manager.Param; +import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/dao/ParamDefineDaoTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/dao/ParamDefineDaoTest.java similarity index 93% rename from manager/src/test/java/org/dromara/hertzbeat/manager/dao/ParamDefineDaoTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/dao/ParamDefineDaoTest.java index 799361989c6..d660b9964a6 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/dao/ParamDefineDaoTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/dao/ParamDefineDaoTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.dao; +package org.apache.hertzbeat.manager.dao; -import org.dromara.hertzbeat.common.entity.manager.ParamDefine; -import org.dromara.hertzbeat.manager.AbstractSpringIntegrationTest; +import org.apache.hertzbeat.common.entity.manager.ParamDefine; +import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/dao/TagDaoTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/dao/TagDaoTest.java similarity index 93% rename from manager/src/test/java/org/dromara/hertzbeat/manager/dao/TagDaoTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/dao/TagDaoTest.java index 1ca6518da86..b93f852f418 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/dao/TagDaoTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/dao/TagDaoTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.dao; +package org.apache.hertzbeat.manager.dao; -import org.dromara.hertzbeat.common.entity.manager.Tag; -import org.dromara.hertzbeat.manager.AbstractSpringIntegrationTest; +import org.apache.hertzbeat.common.entity.manager.Tag; +import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/service/AppServiceTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/service/AppServiceTest.java similarity index 87% rename from manager/src/test/java/org/dromara/hertzbeat/manager/service/AppServiceTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/service/AppServiceTest.java index 21ec0ff0010..d6efd37b93d 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/service/AppServiceTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/service/AppServiceTest.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service; +package org.apache.hertzbeat.manager.service; -import org.dromara.hertzbeat.common.entity.manager.Monitor; -import org.dromara.hertzbeat.manager.dao.MonitorDao; -import org.dromara.hertzbeat.manager.service.impl.AppServiceImpl; -import org.dromara.hertzbeat.manager.service.impl.ObjectStoreConfigServiceImpl; -import org.dromara.hertzbeat.warehouse.service.WarehouseService; +import org.apache.hertzbeat.common.entity.manager.Monitor; +import org.apache.hertzbeat.manager.dao.MonitorDao; +import org.apache.hertzbeat.manager.service.impl.AppServiceImpl; +import org.apache.hertzbeat.manager.service.impl.ObjectStoreConfigServiceImpl; +import org.apache.hertzbeat.warehouse.service.WarehouseService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/service/MailServiceTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/service/MailServiceTest.java similarity index 87% rename from manager/src/test/java/org/dromara/hertzbeat/manager/service/MailServiceTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/service/MailServiceTest.java index a655f85a6ac..cbbcced2053 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/service/MailServiceTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/service/MailServiceTest.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service; +package org.apache.hertzbeat.manager.service; import freemarker.template.TemplateException; -import org.dromara.hertzbeat.alert.AlerterProperties; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; -import org.dromara.hertzbeat.manager.service.impl.MailServiceImpl; +import org.apache.hertzbeat.alert.AlerterProperties; +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.manager.service.impl.MailServiceImpl; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/service/MonitorServiceTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/service/MonitorServiceTest.java similarity index 95% rename from manager/src/test/java/org/dromara/hertzbeat/manager/service/MonitorServiceTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/service/MonitorServiceTest.java index a630d08b7c0..d1efb4b687a 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/service/MonitorServiceTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/service/MonitorServiceTest.java @@ -15,29 +15,29 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service; - -import org.dromara.hertzbeat.alert.dao.AlertDefineBindDao; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.job.Job; -import org.dromara.hertzbeat.common.entity.job.Metrics; -import org.dromara.hertzbeat.common.entity.manager.Monitor; -import org.dromara.hertzbeat.common.entity.manager.Param; -import org.dromara.hertzbeat.common.entity.manager.ParamDefine; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.manager.dao.CollectorDao; -import org.dromara.hertzbeat.manager.dao.CollectorMonitorBindDao; -import org.dromara.hertzbeat.manager.dao.MonitorDao; -import org.dromara.hertzbeat.manager.dao.ParamDao; -import org.dromara.hertzbeat.manager.dao.TagMonitorBindDao; -import org.dromara.hertzbeat.manager.pojo.dto.AppCount; -import org.dromara.hertzbeat.manager.pojo.dto.MonitorDto; -import org.dromara.hertzbeat.manager.scheduler.CollectJobScheduling; -import org.dromara.hertzbeat.manager.service.impl.MonitorServiceImpl; -import org.dromara.hertzbeat.manager.support.exception.MonitorDatabaseException; -import org.dromara.hertzbeat.manager.support.exception.MonitorDetectException; -import org.dromara.hertzbeat.manager.support.exception.MonitorMetricsException; +package org.apache.hertzbeat.manager.service; + +import org.apache.hertzbeat.alert.dao.AlertDefineBindDao; +import org.apache.hertzbeat.common.entity.alerter.Alert; +import org.apache.hertzbeat.common.entity.job.Job; +import org.apache.hertzbeat.common.entity.job.Metrics; +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.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.constants.CommonConstants; +import org.apache.hertzbeat.manager.dao.CollectorDao; +import org.apache.hertzbeat.manager.dao.MonitorDao; +import org.apache.hertzbeat.manager.pojo.dto.AppCount; +import org.apache.hertzbeat.manager.pojo.dto.MonitorDto; +import org.apache.hertzbeat.manager.dao.CollectorMonitorBindDao; +import org.apache.hertzbeat.manager.dao.ParamDao; +import org.apache.hertzbeat.manager.dao.TagMonitorBindDao; +import org.apache.hertzbeat.manager.scheduler.CollectJobScheduling; +import org.apache.hertzbeat.manager.service.impl.MonitorServiceImpl; +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.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/service/NoticeConfigServiceTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/service/NoticeConfigServiceTest.java similarity index 91% rename from manager/src/test/java/org/dromara/hertzbeat/manager/service/NoticeConfigServiceTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/service/NoticeConfigServiceTest.java index 04033391bdf..04026277363 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/service/NoticeConfigServiceTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/service/NoticeConfigServiceTest.java @@ -15,20 +15,20 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service; +package org.apache.hertzbeat.manager.service; import com.google.common.collect.Lists; +import org.apache.hertzbeat.manager.dao.NoticeReceiverDao; +import org.apache.hertzbeat.manager.dao.NoticeRuleDao; +import org.apache.hertzbeat.manager.dao.NoticeTemplateDao; import org.assertj.core.util.Maps; -import org.dromara.hertzbeat.common.entity.alerter.Alert; -import org.dromara.hertzbeat.common.entity.manager.NoticeReceiver; -import org.dromara.hertzbeat.common.entity.manager.NoticeRule; -import org.dromara.hertzbeat.common.entity.manager.NoticeTemplate; -import org.dromara.hertzbeat.common.entity.manager.TagItem; -import org.dromara.hertzbeat.manager.component.alerter.DispatcherAlarm; -import org.dromara.hertzbeat.manager.dao.NoticeReceiverDao; -import org.dromara.hertzbeat.manager.dao.NoticeRuleDao; -import org.dromara.hertzbeat.manager.dao.NoticeTemplateDao; -import org.dromara.hertzbeat.manager.service.impl.NoticeConfigServiceImpl; +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.apache.hertzbeat.common.entity.manager.TagItem; +import org.apache.hertzbeat.manager.component.alerter.DispatcherAlarm; +import org.apache.hertzbeat.manager.service.impl.NoticeConfigServiceImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/manager/src/test/java/org/dromara/hertzbeat/manager/service/TagServiceTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/service/TagServiceTest.java similarity index 92% rename from manager/src/test/java/org/dromara/hertzbeat/manager/service/TagServiceTest.java rename to manager/src/test/java/org/apache/hertzbeat/manager/service/TagServiceTest.java index 81266915829..d428eadca95 100644 --- a/manager/src/test/java/org/dromara/hertzbeat/manager/service/TagServiceTest.java +++ b/manager/src/test/java/org/apache/hertzbeat/manager/service/TagServiceTest.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.dromara.hertzbeat.manager.service; +package org.apache.hertzbeat.manager.service; -import org.dromara.hertzbeat.common.entity.manager.Tag; -import org.dromara.hertzbeat.manager.dao.TagDao; -import org.dromara.hertzbeat.manager.service.impl.TagServiceImpl; +import org.apache.hertzbeat.common.entity.manager.Tag; +import org.apache.hertzbeat.manager.dao.TagDao; +import org.apache.hertzbeat.manager.service.impl.TagServiceImpl; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; diff --git a/pom.xml b/pom.xml index c12de33cef4..b920c95115b 100644 --- a/pom.xml +++ b/pom.xml @@ -26,10 +26,58 @@ 3.2.3 - org.dromara.hertzbeat + org.apache.hertzbeat hertzbeat pom 2.0-SNAPSHOT + + https://hertzbeat.apache.org/ + + + HertzBeat, a real-time monitoring system with agentless, performance cluster, prometheus-compatible, + custom monitoring and status page building capabilities. + + + + Apache Software Foundation + https://www.apache.org + + + + + The Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + + + + + scm:git:git://github.com/apache/incubator-hertzbeat.git + scm:git:https://gitbox.apache.org/repos/asf/incubator-hertzbeat.git + scm:git:git@github.com:apache/incubator-hertzbeat.git + HEAD + + + + GitHub + https://github.com/apache/incubator-hertzbeat/issues + + + + + HertzBeat Developer List + dev@hertzbeat.apache.org + dev-subscribe@hertzbeat.apache.org + dev-unsubscribe@hertzbeat.apache.org + + + HertzBeat Commits List + commits@hertzbeat.apache.org + commits-subscribe@hertzbeat.apache.org + commits-unsubscribe@hertzbeat.apache.org + + + + manager alerter @@ -92,37 +140,37 @@ - org.dromara.hertzbeat + org.apache.hertzbeat hertzbeat-common ${hertzbeat.version} - org.dromara.hertzbeat + org.apache.hertzbeat hertzbeat-warehouse ${hertzbeat.version} - org.dromara.hertzbeat + org.apache.hertzbeat hertzbeat-alerter ${hertzbeat.version} - org.dromara.hertzbeat + org.apache.hertzbeat hertzbeat-collector ${hertzbeat.version} - org.dromara.hertzbeat + org.apache.hertzbeat hertzbeat-remoting ${hertzbeat.version} - org.dromara.hertzbeat + org.apache.hertzbeat hertzbeat-push ${hertzbeat.version} diff --git a/push/pom.xml b/push/pom.xml index 54b3233ee7d..d5e257ac4bd 100644 --- a/push/pom.xml +++ b/push/pom.xml @@ -20,7 +20,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> hertzbeat - org.dromara.hertzbeat + org.apache.hertzbeat 2.0-SNAPSHOT 4.0.0 @@ -35,7 +35,7 @@ - org.dromara.hertzbeat + org.apache.hertzbeat hertzbeat-common diff --git a/push/src/main/java/org/dromara/hertzbeat/push/config/PushAutoConfiguration.java b/push/src/main/java/org/apache/hertzbeat/push/config/PushAutoConfiguration.java similarity index 89% rename from push/src/main/java/org/dromara/hertzbeat/push/config/PushAutoConfiguration.java rename to push/src/main/java/org/apache/hertzbeat/push/config/PushAutoConfiguration.java index 94d5c0552dc..d087c5adc98 100644 --- a/push/src/main/java/org/dromara/hertzbeat/push/config/PushAutoConfiguration.java +++ b/push/src/main/java/org/apache/hertzbeat/push/config/PushAutoConfiguration.java @@ -15,15 +15,13 @@ * limitations under the License. */ -package org.dromara.hertzbeat.push.config; +package org.apache.hertzbeat.push.config; import org.springframework.context.annotation.ComponentScan; /** * push configuration - * - * */ -@ComponentScan(basePackages = "org.dromara.hertzbeat.push") +@ComponentScan(basePackages = "org.apache.hertzbeat.push") public class PushAutoConfiguration { } diff --git a/push/src/main/java/org/dromara/hertzbeat/push/controller/PushController.java b/push/src/main/java/org/apache/hertzbeat/push/controller/PushController.java similarity index 91% rename from push/src/main/java/org/dromara/hertzbeat/push/controller/PushController.java rename to push/src/main/java/org/apache/hertzbeat/push/controller/PushController.java index 3a6d8ae0e8b..adc59a47d64 100644 --- a/push/src/main/java/org/dromara/hertzbeat/push/controller/PushController.java +++ b/push/src/main/java/org/apache/hertzbeat/push/controller/PushController.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.dromara.hertzbeat.push.controller; +package org.apache.hertzbeat.push.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import org.dromara.hertzbeat.common.entity.dto.Message; -import org.dromara.hertzbeat.common.entity.push.PushMetricsDto; -import org.dromara.hertzbeat.push.service.PushService; +import org.apache.hertzbeat.common.entity.dto.Message; +import org.apache.hertzbeat.common.entity.push.PushMetricsDto; +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.*; @@ -31,8 +31,6 @@ /** * push controller - * - * */ @Tag(name = "Metrics Push API | 监控数据推送API") @RestController diff --git a/push/src/main/java/org/dromara/hertzbeat/push/controller/PushGatewayController.java b/push/src/main/java/org/apache/hertzbeat/push/controller/PushGatewayController.java similarity index 88% rename from push/src/main/java/org/dromara/hertzbeat/push/controller/PushGatewayController.java rename to push/src/main/java/org/apache/hertzbeat/push/controller/PushGatewayController.java index cb0af93f106..4e281b05a1d 100644 --- a/push/src/main/java/org/dromara/hertzbeat/push/controller/PushGatewayController.java +++ b/push/src/main/java/org/apache/hertzbeat/push/controller/PushGatewayController.java @@ -1,10 +1,10 @@ -package org.dromara.hertzbeat.push.controller; +package org.apache.hertzbeat.push.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; -import org.dromara.hertzbeat.common.entity.dto.Message; -import org.dromara.hertzbeat.push.service.PushGatewayService; +import org.apache.hertzbeat.common.entity.dto.Message; +import org.apache.hertzbeat.push.service.PushGatewayService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; @@ -16,8 +16,6 @@ /** * push gateway controller - * - * */ @Tag(name = "Metrics Push Gateway API | 监控数据推送网关API") @RestController diff --git a/push/src/main/java/org/dromara/hertzbeat/push/dao/PushMetricsDao.java b/push/src/main/java/org/apache/hertzbeat/push/dao/PushMetricsDao.java similarity index 91% rename from push/src/main/java/org/dromara/hertzbeat/push/dao/PushMetricsDao.java rename to push/src/main/java/org/apache/hertzbeat/push/dao/PushMetricsDao.java index 0ab1fa20953..b575ce66d2d 100644 --- a/push/src/main/java/org/dromara/hertzbeat/push/dao/PushMetricsDao.java +++ b/push/src/main/java/org/apache/hertzbeat/push/dao/PushMetricsDao.java @@ -15,16 +15,14 @@ * limitations under the License. */ -package org.dromara.hertzbeat.push.dao; +package org.apache.hertzbeat.push.dao; -import org.dromara.hertzbeat.common.entity.push.PushMetrics; +import org.apache.hertzbeat.common.entity.push.PushMetrics; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.transaction.annotation.Transactional; /** * push metrics dao - * - * */ public interface PushMetricsDao extends JpaRepository { diff --git a/push/src/main/java/org/dromara/hertzbeat/push/dao/PushMonitorDao.java b/push/src/main/java/org/apache/hertzbeat/push/dao/PushMonitorDao.java similarity index 90% rename from push/src/main/java/org/dromara/hertzbeat/push/dao/PushMonitorDao.java rename to push/src/main/java/org/apache/hertzbeat/push/dao/PushMonitorDao.java index ea2ae67f4ca..b0f2870e98a 100644 --- a/push/src/main/java/org/dromara/hertzbeat/push/dao/PushMonitorDao.java +++ b/push/src/main/java/org/apache/hertzbeat/push/dao/PushMonitorDao.java @@ -15,15 +15,13 @@ * limitations under the License. */ -package org.dromara.hertzbeat.push.dao; +package org.apache.hertzbeat.push.dao; -import org.dromara.hertzbeat.common.entity.manager.Monitor; +import org.apache.hertzbeat.common.entity.manager.Monitor; import org.springframework.data.jpa.repository.JpaRepository; /** * push monitor dao - * - * */ public interface PushMonitorDao extends JpaRepository { } diff --git a/push/src/main/java/org/dromara/hertzbeat/push/service/PushGatewayService.java b/push/src/main/java/org/apache/hertzbeat/push/service/PushGatewayService.java similarity index 84% rename from push/src/main/java/org/dromara/hertzbeat/push/service/PushGatewayService.java rename to push/src/main/java/org/apache/hertzbeat/push/service/PushGatewayService.java index bdfc6a41439..a0eab9fec01 100644 --- a/push/src/main/java/org/dromara/hertzbeat/push/service/PushGatewayService.java +++ b/push/src/main/java/org/apache/hertzbeat/push/service/PushGatewayService.java @@ -1,4 +1,4 @@ -package org.dromara.hertzbeat.push.service; +package org.apache.hertzbeat.push.service; import org.springframework.stereotype.Service; @@ -7,8 +7,6 @@ /** * push gateway metrics - * - * */ @Service diff --git a/push/src/main/java/org/dromara/hertzbeat/push/service/PushService.java b/push/src/main/java/org/apache/hertzbeat/push/service/PushService.java similarity index 90% rename from push/src/main/java/org/dromara/hertzbeat/push/service/PushService.java rename to push/src/main/java/org/apache/hertzbeat/push/service/PushService.java index 0ed4f81ba32..b1661c2043b 100644 --- a/push/src/main/java/org/dromara/hertzbeat/push/service/PushService.java +++ b/push/src/main/java/org/apache/hertzbeat/push/service/PushService.java @@ -15,15 +15,13 @@ * limitations under the License. */ -package org.dromara.hertzbeat.push.service; +package org.apache.hertzbeat.push.service; -import org.dromara.hertzbeat.common.entity.push.PushMetricsDto; +import org.apache.hertzbeat.common.entity.push.PushMetricsDto; import org.springframework.stereotype.Service; /** * push metrics - * - * */ @Service public interface PushService { diff --git a/push/src/main/java/org/dromara/hertzbeat/push/service/impl/PushGatewayServiceImpl.java b/push/src/main/java/org/apache/hertzbeat/push/service/impl/PushGatewayServiceImpl.java similarity index 66% rename from push/src/main/java/org/dromara/hertzbeat/push/service/impl/PushGatewayServiceImpl.java rename to push/src/main/java/org/apache/hertzbeat/push/service/impl/PushGatewayServiceImpl.java index 00700b57fdc..4d63fcfa0d5 100644 --- a/push/src/main/java/org/dromara/hertzbeat/push/service/impl/PushGatewayServiceImpl.java +++ b/push/src/main/java/org/apache/hertzbeat/push/service/impl/PushGatewayServiceImpl.java @@ -1,9 +1,9 @@ -package org.dromara.hertzbeat.push.service.impl; +package org.apache.hertzbeat.push.service.impl; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.util.prometheus.Metric; -import org.dromara.hertzbeat.common.util.prometheus.PrometheusUtil; -import org.dromara.hertzbeat.push.service.PushGatewayService; +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; @@ -12,8 +12,6 @@ /** * push gateway service impl - * - * */ @Slf4j diff --git a/push/src/main/java/org/dromara/hertzbeat/push/service/impl/PushServiceImpl.java b/push/src/main/java/org/apache/hertzbeat/push/service/impl/PushServiceImpl.java similarity index 91% rename from push/src/main/java/org/dromara/hertzbeat/push/service/impl/PushServiceImpl.java rename to push/src/main/java/org/apache/hertzbeat/push/service/impl/PushServiceImpl.java index 4a293f607f8..5349997b410 100644 --- a/push/src/main/java/org/dromara/hertzbeat/push/service/impl/PushServiceImpl.java +++ b/push/src/main/java/org/apache/hertzbeat/push/service/impl/PushServiceImpl.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package org.dromara.hertzbeat.push.service.impl; +package org.apache.hertzbeat.push.service.impl; import com.fasterxml.jackson.core.type.TypeReference; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.entity.manager.Monitor; -import org.dromara.hertzbeat.common.entity.push.PushMetrics; -import org.dromara.hertzbeat.common.entity.push.PushMetricsDto; -import org.dromara.hertzbeat.common.util.JsonUtil; -import org.dromara.hertzbeat.push.dao.PushMetricsDao; -import org.dromara.hertzbeat.push.dao.PushMonitorDao; -import org.dromara.hertzbeat.push.service.PushService; +import org.apache.hertzbeat.common.entity.manager.Monitor; +import org.apache.hertzbeat.common.entity.push.PushMetrics; +import org.apache.hertzbeat.common.entity.push.PushMetricsDto; +import org.apache.hertzbeat.common.util.JsonUtil; +import org.apache.hertzbeat.push.dao.PushMetricsDao; +import org.apache.hertzbeat.push.dao.PushMonitorDao; +import org.apache.hertzbeat.push.service.PushService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -34,8 +34,6 @@ /** * push service impl - * - * */ @Slf4j @Service diff --git a/push/src/main/resources/META-INF/spring.factories b/push/src/main/resources/META-INF/spring.factories index b4ea0b6db63..f95f2645b66 100644 --- a/push/src/main/resources/META-INF/spring.factories +++ b/push/src/main/resources/META-INF/spring.factories @@ -14,4 +14,4 @@ # limitations under the License. org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.dromara.hertzbeat.push.config.PushAutoConfiguration \ No newline at end of file +org.apache.hertzbeat.push.config.PushAutoConfiguration \ No newline at end of file diff --git a/remoting/pom.xml b/remoting/pom.xml index 2f6676b2fb7..eeda5bbd3a1 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -20,7 +20,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.dromara.hertzbeat + org.apache.hertzbeat hertzbeat 2.0-SNAPSHOT @@ -38,7 +38,7 @@ netty-all - org.dromara.hertzbeat + org.apache.hertzbeat hertzbeat-common diff --git a/remoting/src/main/java/org/dromara/hertzbeat/remoting/RemotingClient.java b/remoting/src/main/java/org/apache/hertzbeat/remoting/RemotingClient.java similarity index 90% rename from remoting/src/main/java/org/dromara/hertzbeat/remoting/RemotingClient.java rename to remoting/src/main/java/org/apache/hertzbeat/remoting/RemotingClient.java index f33cdf6b4c0..cba073d68f6 100644 --- a/remoting/src/main/java/org/dromara/hertzbeat/remoting/RemotingClient.java +++ b/remoting/src/main/java/org/apache/hertzbeat/remoting/RemotingClient.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.remoting; +package org.apache.hertzbeat.remoting; -import org.dromara.hertzbeat.common.entity.message.ClusterMsg; -import org.dromara.hertzbeat.remoting.netty.NettyRemotingProcessor; +import org.apache.hertzbeat.common.entity.message.ClusterMsg; +import org.apache.hertzbeat.remoting.netty.NettyRemotingProcessor; /** * remoting client interface diff --git a/remoting/src/main/java/org/dromara/hertzbeat/remoting/RemotingServer.java b/remoting/src/main/java/org/apache/hertzbeat/remoting/RemotingServer.java similarity index 89% rename from remoting/src/main/java/org/dromara/hertzbeat/remoting/RemotingServer.java rename to remoting/src/main/java/org/apache/hertzbeat/remoting/RemotingServer.java index ec7fee4f9e7..6da740eb2e3 100644 --- a/remoting/src/main/java/org/dromara/hertzbeat/remoting/RemotingServer.java +++ b/remoting/src/main/java/org/apache/hertzbeat/remoting/RemotingServer.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.dromara.hertzbeat.remoting; +package org.apache.hertzbeat.remoting; import io.netty.channel.Channel; -import org.dromara.hertzbeat.common.entity.message.ClusterMsg; -import org.dromara.hertzbeat.remoting.netty.NettyHook; -import org.dromara.hertzbeat.remoting.netty.NettyRemotingProcessor; +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; diff --git a/remoting/src/main/java/org/dromara/hertzbeat/remoting/RemotingService.java b/remoting/src/main/java/org/apache/hertzbeat/remoting/RemotingService.java similarity index 96% rename from remoting/src/main/java/org/dromara/hertzbeat/remoting/RemotingService.java rename to remoting/src/main/java/org/apache/hertzbeat/remoting/RemotingService.java index 67a5542c4d9..b71538a1738 100644 --- a/remoting/src/main/java/org/dromara/hertzbeat/remoting/RemotingService.java +++ b/remoting/src/main/java/org/apache/hertzbeat/remoting/RemotingService.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.remoting; +package org.apache.hertzbeat.remoting; /** * remoting service interface diff --git a/remoting/src/main/java/org/dromara/hertzbeat/remoting/event/NettyEventListener.java b/remoting/src/main/java/org/apache/hertzbeat/remoting/event/NettyEventListener.java similarity index 96% rename from remoting/src/main/java/org/dromara/hertzbeat/remoting/event/NettyEventListener.java rename to remoting/src/main/java/org/apache/hertzbeat/remoting/event/NettyEventListener.java index c8b26d8b8ac..6c425c9a752 100644 --- a/remoting/src/main/java/org/dromara/hertzbeat/remoting/event/NettyEventListener.java +++ b/remoting/src/main/java/org/apache/hertzbeat/remoting/event/NettyEventListener.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.remoting.event; +package org.apache.hertzbeat.remoting.event; import io.netty.channel.Channel; diff --git a/remoting/src/main/java/org/dromara/hertzbeat/remoting/netty/NettyClientConfig.java b/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyClientConfig.java similarity index 95% rename from remoting/src/main/java/org/dromara/hertzbeat/remoting/netty/NettyClientConfig.java rename to remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyClientConfig.java index 2b442ccc1ff..3056cac513e 100644 --- a/remoting/src/main/java/org/dromara/hertzbeat/remoting/netty/NettyClientConfig.java +++ b/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyClientConfig.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.remoting.netty; +package org.apache.hertzbeat.remoting.netty; import lombok.Data; diff --git a/remoting/src/main/java/org/dromara/hertzbeat/remoting/netty/NettyHook.java b/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyHook.java similarity index 90% rename from remoting/src/main/java/org/dromara/hertzbeat/remoting/netty/NettyHook.java rename to remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyHook.java index cf9d52e2800..27d149b5cbe 100644 --- a/remoting/src/main/java/org/dromara/hertzbeat/remoting/netty/NettyHook.java +++ b/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyHook.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.remoting.netty; +package org.apache.hertzbeat.remoting.netty; import io.netty.channel.ChannelHandlerContext; -import org.dromara.hertzbeat.common.entity.message.ClusterMsg; +import org.apache.hertzbeat.common.entity.message.ClusterMsg; /** * hook interface, handle something before request processor diff --git a/remoting/src/main/java/org/dromara/hertzbeat/remoting/netty/NettyRemotingAbstract.java b/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyRemotingAbstract.java similarity index 95% rename from remoting/src/main/java/org/dromara/hertzbeat/remoting/netty/NettyRemotingAbstract.java rename to remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyRemotingAbstract.java index 0ca50be18f3..4aa2d3e1bf3 100644 --- a/remoting/src/main/java/org/dromara/hertzbeat/remoting/netty/NettyRemotingAbstract.java +++ b/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyRemotingAbstract.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.remoting.netty; +package org.apache.hertzbeat.remoting.netty; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; @@ -23,10 +23,10 @@ import io.netty.handler.timeout.IdleState; import io.netty.handler.timeout.IdleStateEvent; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.entity.message.ClusterMsg; -import org.dromara.hertzbeat.common.util.NetworkUtil; -import org.dromara.hertzbeat.remoting.RemotingService; -import org.dromara.hertzbeat.remoting.event.NettyEventListener; +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; diff --git a/remoting/src/main/java/org/dromara/hertzbeat/remoting/netty/NettyRemotingClient.java b/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyRemotingClient.java similarity index 96% rename from remoting/src/main/java/org/dromara/hertzbeat/remoting/netty/NettyRemotingClient.java rename to remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyRemotingClient.java index 7b3f10aa563..1fbc1288596 100644 --- a/remoting/src/main/java/org/dromara/hertzbeat/remoting/netty/NettyRemotingClient.java +++ b/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyRemotingClient.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.remoting.netty; +package org.apache.hertzbeat.remoting.netty; import com.google.common.util.concurrent.ThreadFactoryBuilder; import io.netty.bootstrap.Bootstrap; @@ -36,10 +36,10 @@ import io.netty.handler.codec.protobuf.ProtobufVarint32FrameDecoder; import io.netty.handler.codec.protobuf.ProtobufVarint32LengthFieldPrepender; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.entity.message.ClusterMsg; -import org.dromara.hertzbeat.common.support.CommonThreadPool; -import org.dromara.hertzbeat.remoting.RemotingClient; -import org.dromara.hertzbeat.remoting.event.NettyEventListener; +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; diff --git a/remoting/src/main/java/org/dromara/hertzbeat/remoting/netty/NettyRemotingProcessor.java b/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyRemotingProcessor.java similarity index 91% rename from remoting/src/main/java/org/dromara/hertzbeat/remoting/netty/NettyRemotingProcessor.java rename to remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyRemotingProcessor.java index 15f12d85876..8f4ca831e80 100644 --- a/remoting/src/main/java/org/dromara/hertzbeat/remoting/netty/NettyRemotingProcessor.java +++ b/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyRemotingProcessor.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.remoting.netty; +package org.apache.hertzbeat.remoting.netty; import io.netty.channel.ChannelHandlerContext; -import org.dromara.hertzbeat.common.entity.message.ClusterMsg; +import org.apache.hertzbeat.common.entity.message.ClusterMsg; /** * netty remoting processor diff --git a/remoting/src/main/java/org/dromara/hertzbeat/remoting/netty/NettyRemotingServer.java b/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyRemotingServer.java similarity index 96% rename from remoting/src/main/java/org/dromara/hertzbeat/remoting/netty/NettyRemotingServer.java rename to remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyRemotingServer.java index 257cb77c4ca..2ea7a3b1854 100644 --- a/remoting/src/main/java/org/dromara/hertzbeat/remoting/netty/NettyRemotingServer.java +++ b/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyRemotingServer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.remoting.netty; +package org.apache.hertzbeat.remoting.netty; import com.google.common.util.concurrent.ThreadFactoryBuilder; import io.netty.bootstrap.ServerBootstrap; @@ -42,10 +42,10 @@ import io.netty.handler.logging.LoggingHandler; import io.netty.handler.timeout.IdleStateHandler; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.entity.message.ClusterMsg; -import org.dromara.hertzbeat.common.support.CommonThreadPool; -import org.dromara.hertzbeat.remoting.RemotingServer; -import org.dromara.hertzbeat.remoting.event.NettyEventListener; +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; diff --git a/remoting/src/main/java/org/dromara/hertzbeat/remoting/netty/NettyServerConfig.java b/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyServerConfig.java similarity index 95% rename from remoting/src/main/java/org/dromara/hertzbeat/remoting/netty/NettyServerConfig.java rename to remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyServerConfig.java index 369117b372e..115bee2b831 100644 --- a/remoting/src/main/java/org/dromara/hertzbeat/remoting/netty/NettyServerConfig.java +++ b/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/NettyServerConfig.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.remoting.netty; +package org.apache.hertzbeat.remoting.netty; import lombok.Data; diff --git a/remoting/src/main/java/org/dromara/hertzbeat/remoting/netty/ResponseFuture.java b/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/ResponseFuture.java similarity index 92% rename from remoting/src/main/java/org/dromara/hertzbeat/remoting/netty/ResponseFuture.java rename to remoting/src/main/java/org/apache/hertzbeat/remoting/netty/ResponseFuture.java index 4a8bacbf908..6a0d47004a5 100644 --- a/remoting/src/main/java/org/dromara/hertzbeat/remoting/netty/ResponseFuture.java +++ b/remoting/src/main/java/org/apache/hertzbeat/remoting/netty/ResponseFuture.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.remoting.netty; +package org.apache.hertzbeat.remoting.netty; -import org.dromara.hertzbeat.common.entity.message.ClusterMsg; +import org.apache.hertzbeat.common.entity.message.ClusterMsg; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/remoting/src/test/java/org/dromara/hertzbeat/remoting/RemotingServiceTest.java b/remoting/src/test/java/org/apache/hertzbeat/remoting/RemotingServiceTest.java similarity index 92% rename from remoting/src/test/java/org/dromara/hertzbeat/remoting/RemotingServiceTest.java rename to remoting/src/test/java/org/apache/hertzbeat/remoting/RemotingServiceTest.java index b949f821222..27041454834 100644 --- a/remoting/src/test/java/org/dromara/hertzbeat/remoting/RemotingServiceTest.java +++ b/remoting/src/test/java/org/apache/hertzbeat/remoting/RemotingServiceTest.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.dromara.hertzbeat.remoting; +package org.apache.hertzbeat.remoting; +import org.apache.hertzbeat.remoting.netty.NettyClientConfig; +import org.apache.hertzbeat.remoting.netty.NettyRemotingClient; +import org.apache.hertzbeat.remoting.netty.NettyRemotingServer; +import org.apache.hertzbeat.remoting.netty.NettyServerConfig; import org.assertj.core.util.Lists; -import org.dromara.hertzbeat.common.entity.message.ClusterMsg; -import org.dromara.hertzbeat.common.support.CommonThreadPool; -import org.dromara.hertzbeat.remoting.netty.NettyClientConfig; -import org.dromara.hertzbeat.remoting.netty.NettyRemotingClient; -import org.dromara.hertzbeat.remoting.netty.NettyRemotingServer; -import org.dromara.hertzbeat.remoting.netty.NettyServerConfig; +import org.apache.hertzbeat.common.entity.message.ClusterMsg; +import org.apache.hertzbeat.common.support.CommonThreadPool; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; diff --git a/script/application.yml b/script/application.yml index 280f13b7caf..548ffbcf07e 100644 --- a/script/application.yml +++ b/script/application.yml @@ -123,7 +123,7 @@ warehouse: rpc-port: 6667 username: root password: root - # org.dromara.hertzbeat.warehouse.config.IotDbVersion: V_0_13 || V_1_0 + # org.apache.hertzbeat.warehouse.config.IotDbVersion: V_0_13 || V_1_0 version: V_1_0 query-timeout-in-ms: -1 # 数据存储时间：默认'7776000000'（90天,单位为毫秒,-1代表永不过期） diff --git a/script/docker-compose/hertzbeat-mysql-iotdb/conf/application.yml b/script/docker-compose/hertzbeat-mysql-iotdb/conf/application.yml index a340a83ee4e..66c9bb0d935 100644 --- a/script/docker-compose/hertzbeat-mysql-iotdb/conf/application.yml +++ b/script/docker-compose/hertzbeat-mysql-iotdb/conf/application.yml @@ -107,7 +107,7 @@ warehouse: rpc-port: 6667 username: root password: root - # org.dromara.hertzbeat.warehouse.config.IotDbVersion: V_0_13 || V_1_0 + # org.apache.hertzbeat.warehouse.config.IotDbVersion: V_0_13 || V_1_0 # 如果你使用docker-compose-1.0.yaml, 不要忘记修i该version为V_1_0 version: V_1_0 query-timeout-in-ms: -1 diff --git a/script/docker-compose/hertzbeat-postgresql-iotdb/conf/application.yml b/script/docker-compose/hertzbeat-postgresql-iotdb/conf/application.yml index 10808dff6f8..eb4889d905e 100644 --- a/script/docker-compose/hertzbeat-postgresql-iotdb/conf/application.yml +++ b/script/docker-compose/hertzbeat-postgresql-iotdb/conf/application.yml @@ -111,7 +111,7 @@ warehouse: rpc-port: 6667 username: root password: root - # org.dromara.hertzbeat.warehouse.config.IotDbVersion: V_0_13 || V_1_0 + # org.apache.hertzbeat.warehouse.config.IotDbVersion: V_0_13 || V_1_0 # 如果你使用docker-compose-1.0.yaml, 不要忘记修i该version为V_1_0 version: V_1_0 query-timeout-in-ms: -1 diff --git a/script/helm/hertzbeat/templates/manager/configmap.yaml b/script/helm/hertzbeat/templates/manager/configmap.yaml index 91e7f24cb45..623e312288f 100644 --- a/script/helm/hertzbeat/templates/manager/configmap.yaml +++ b/script/helm/hertzbeat/templates/manager/configmap.yaml @@ -120,7 +120,7 @@ data: rpc-port: 6667 username: root password: root - # org.dromara.hertzbeat.warehouse.config.IotDbVersion: V_0_13 || V_1_0 + # org.apache.hertzbeat.warehouse.config.IotDbVersion: V_0_13 || V_1_0 version: V_1_0 query-timeout-in-ms: -1 # 数据存储时间：默认'7776000000'（90天,单位为毫秒,-1代表永不过期） diff --git a/warehouse/README.md b/warehouse/README.md deleted file mode 100644 index 579d16d41b0..00000000000 --- a/warehouse/README.md +++ /dev/null @@ -1,4 +0,0 @@ -### Warehouse - -Data management of collection index results, data placement, query, calculation and statistics. -采集指标结果数据管理，数据落盘，查询，计算统计。 diff --git a/warehouse/pom.xml b/warehouse/pom.xml index 82cc06850ed..3a45e2df628 100644 --- a/warehouse/pom.xml +++ b/warehouse/pom.xml @@ -20,7 +20,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> hertzbeat - org.dromara.hertzbeat + org.apache.hertzbeat 2.0-SNAPSHOT @@ -39,7 +39,7 @@ - org.dromara.hertzbeat + org.apache.hertzbeat hertzbeat-common provided diff --git a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/WarehouseWorkerPool.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/WarehouseWorkerPool.java similarity index 98% rename from warehouse/src/main/java/org/dromara/hertzbeat/warehouse/WarehouseWorkerPool.java rename to warehouse/src/main/java/org/apache/hertzbeat/warehouse/WarehouseWorkerPool.java index 2e104a95a7b..d189f0fe54e 100644 --- a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/WarehouseWorkerPool.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/WarehouseWorkerPool.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.warehouse; +package org.apache.hertzbeat.warehouse; import com.google.common.util.concurrent.ThreadFactoryBuilder; import lombok.extern.slf4j.Slf4j; @@ -30,7 +30,6 @@ /** * warehouse 工作线程池 * warehouse worker thread pool - * */ @Component @Slf4j diff --git a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/config/IotDbVersion.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/config/IotDbVersion.java similarity index 94% rename from warehouse/src/main/java/org/dromara/hertzbeat/warehouse/config/IotDbVersion.java rename to warehouse/src/main/java/org/apache/hertzbeat/warehouse/config/IotDbVersion.java index 9b5c33e9b35..0a356e809d2 100644 --- a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/config/IotDbVersion.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/config/IotDbVersion.java @@ -15,13 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.warehouse.config; +package org.apache.hertzbeat.warehouse.config; /** * IoTDB user version - * - * - * */ public enum IotDbVersion { /** diff --git a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/config/WarehouseAutoConfiguration.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/config/WarehouseAutoConfiguration.java similarity index 88% rename from warehouse/src/main/java/org/dromara/hertzbeat/warehouse/config/WarehouseAutoConfiguration.java rename to warehouse/src/main/java/org/apache/hertzbeat/warehouse/config/WarehouseAutoConfiguration.java index d293c279538..184ec9ef7aa 100644 --- a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/config/WarehouseAutoConfiguration.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/config/WarehouseAutoConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.warehouse.config; +package org.apache.hertzbeat.warehouse.config; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.ComponentScan; @@ -23,9 +23,8 @@ /** * WarehouseAutoConfiguration class * @version 2.1 - * Created by Musk.Chen on 2023/1/14 */ -@ComponentScan(basePackages = "org.dromara.hertzbeat.warehouse") +@ComponentScan(basePackages = "org.apache.hertzbeat.warehouse") @EnableConfigurationProperties(WarehouseProperties.class) public class WarehouseAutoConfiguration { } diff --git a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/config/WarehouseProperties.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/config/WarehouseProperties.java similarity index 99% rename from warehouse/src/main/java/org/dromara/hertzbeat/warehouse/config/WarehouseProperties.java rename to warehouse/src/main/java/org/apache/hertzbeat/warehouse/config/WarehouseProperties.java index ba265f59e7b..1d841ea86cb 100644 --- a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/config/WarehouseProperties.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/config/WarehouseProperties.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.warehouse.config; +package org.apache.hertzbeat.warehouse.config; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -25,7 +25,6 @@ /** * 数据仓储配置属性 * Data warehousing configuration properties - * */ @ConfigurationProperties(prefix = "warehouse") public class WarehouseProperties { diff --git a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/controller/MetricsDataController.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/controller/MetricsDataController.java similarity index 91% rename from warehouse/src/main/java/org/dromara/hertzbeat/warehouse/controller/MetricsDataController.java rename to warehouse/src/main/java/org/apache/hertzbeat/warehouse/controller/MetricsDataController.java index 47929cd8a7b..4de7bbfa3dd 100644 --- a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/controller/MetricsDataController.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/controller/MetricsDataController.java @@ -15,20 +15,20 @@ * limitations under the License. */ -package org.dromara.hertzbeat.warehouse.controller; +package org.apache.hertzbeat.warehouse.controller; -import org.dromara.hertzbeat.common.entity.dto.Field; -import org.dromara.hertzbeat.common.entity.dto.Message; -import org.dromara.hertzbeat.common.entity.dto.MetricsData; -import org.dromara.hertzbeat.common.entity.dto.MetricsHistoryData; -import org.dromara.hertzbeat.common.entity.dto.Value; -import org.dromara.hertzbeat.common.entity.dto.ValueRow; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.warehouse.store.AbstractHistoryDataStorage; -import org.dromara.hertzbeat.warehouse.store.AbstractRealTimeDataStorage; -import org.dromara.hertzbeat.warehouse.store.HistoryJpaDatabaseDataStorage; -import org.dromara.hertzbeat.warehouse.store.RealTimeMemoryDataStorage; +import org.apache.hertzbeat.common.entity.dto.Field; +import org.apache.hertzbeat.common.entity.dto.Message; +import org.apache.hertzbeat.common.entity.dto.MetricsData; +import org.apache.hertzbeat.common.entity.dto.MetricsHistoryData; +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; @@ -45,13 +45,12 @@ import java.util.Map; import java.util.stream.Collectors; -import static org.dromara.hertzbeat.common.constants.CommonConstants.FAIL_CODE; +import static org.apache.hertzbeat.common.constants.CommonConstants.FAIL_CODE; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; /** * 指标数据查询接口 * Indicator data query interface - * */ @RestController @RequestMapping(produces = {APPLICATION_JSON_VALUE}) diff --git a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/dao/HistoryDao.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/dao/HistoryDao.java similarity index 94% rename from warehouse/src/main/java/org/dromara/hertzbeat/warehouse/dao/HistoryDao.java rename to warehouse/src/main/java/org/apache/hertzbeat/warehouse/dao/HistoryDao.java index 79ad6d1e0e2..7fb60c2f637 100644 --- a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/dao/HistoryDao.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/dao/HistoryDao.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.warehouse.dao; +package org.apache.hertzbeat.warehouse.dao; -import org.dromara.hertzbeat.common.entity.warehouse.History; +import org.apache.hertzbeat.common.entity.warehouse.History; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Modifying; @@ -28,8 +28,6 @@ /** * history entity dao - * - * */ public interface HistoryDao extends JpaRepository, JpaSpecificationExecutor { diff --git a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/service/WarehouseService.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/service/WarehouseService.java similarity index 90% rename from warehouse/src/main/java/org/dromara/hertzbeat/warehouse/service/WarehouseService.java rename to warehouse/src/main/java/org/apache/hertzbeat/warehouse/service/WarehouseService.java index a00f6145db7..1505916c01b 100644 --- a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/service/WarehouseService.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/service/WarehouseService.java @@ -15,16 +15,14 @@ * limitations under the License. */ -package org.dromara.hertzbeat.warehouse.service; +package org.apache.hertzbeat.warehouse.service; -import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.entity.message.CollectRep; import java.util.List; /** * service for warehouse - * - * */ public interface WarehouseService { diff --git a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/service/WarehouseServiceImpl.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/service/WarehouseServiceImpl.java similarity index 89% rename from warehouse/src/main/java/org/dromara/hertzbeat/warehouse/service/WarehouseServiceImpl.java rename to warehouse/src/main/java/org/apache/hertzbeat/warehouse/service/WarehouseServiceImpl.java index ae96fcb5427..a1a641e793e 100644 --- a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/service/WarehouseServiceImpl.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/service/WarehouseServiceImpl.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.dromara.hertzbeat.warehouse.service; +package org.apache.hertzbeat.warehouse.service; import lombok.extern.slf4j.Slf4j; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.warehouse.store.AbstractRealTimeDataStorage; -import org.dromara.hertzbeat.warehouse.store.RealTimeMemoryDataStorage; +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; @@ -28,7 +28,6 @@ /** * warehouse service impl - * */ @Service @Slf4j diff --git a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/AbstractHistoryDataStorage.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/AbstractHistoryDataStorage.java similarity index 93% rename from warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/AbstractHistoryDataStorage.java rename to warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/AbstractHistoryDataStorage.java index 22ac5a2a486..9de2316119a 100644 --- a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/AbstractHistoryDataStorage.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/AbstractHistoryDataStorage.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.warehouse.store; +package org.apache.hertzbeat.warehouse.store; -import org.dromara.hertzbeat.common.entity.dto.Value; -import org.dromara.hertzbeat.common.entity.message.CollectRep; +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; @@ -27,7 +27,6 @@ /** * data storage abstract class - * */ @Slf4j public abstract class AbstractHistoryDataStorage implements DisposableBean { diff --git a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/AbstractRealTimeDataStorage.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/AbstractRealTimeDataStorage.java similarity index 94% rename from warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/AbstractRealTimeDataStorage.java rename to warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/AbstractRealTimeDataStorage.java index 6fb6a1bea1f..29740416532 100644 --- a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/AbstractRealTimeDataStorage.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/AbstractRealTimeDataStorage.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.warehouse.store; +package org.apache.hertzbeat.warehouse.store; -import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.entity.message.CollectRep; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.DisposableBean; import org.springframework.lang.NonNull; @@ -27,7 +27,6 @@ /** * 实时数据存储抽象类 * Real-time data storage abstract class - * */ @Slf4j public abstract class AbstractRealTimeDataStorage implements DisposableBean { diff --git a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/DataStorageDispatch.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/DataStorageDispatch.java similarity index 94% rename from warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/DataStorageDispatch.java rename to warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/DataStorageDispatch.java index a7d669f6f4f..41474d63828 100644 --- a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/DataStorageDispatch.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/DataStorageDispatch.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.dromara.hertzbeat.warehouse.store; +package org.apache.hertzbeat.warehouse.store; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.queue.CommonDataQueue; -import org.dromara.hertzbeat.warehouse.WarehouseWorkerPool; +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; @@ -27,9 +27,6 @@ /** * dispatch storage metrics data - * - * - * */ @Slf4j @Component diff --git a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryGrepTimeDbDataStorage.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryGrepTimeDbDataStorage.java similarity index 97% rename from warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryGrepTimeDbDataStorage.java rename to warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryGrepTimeDbDataStorage.java index a1c7de17f61..9bea786f3b7 100644 --- a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryGrepTimeDbDataStorage.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryGrepTimeDbDataStorage.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.dromara.hertzbeat.warehouse.store; +package org.apache.hertzbeat.warehouse.store; import io.greptime.models.*; import lombok.extern.slf4j.Slf4j; import org.apache.arrow.flight.FlightRuntimeException; -import org.dromara.hertzbeat.common.entity.dto.Value; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.util.JsonUtil; -import org.dromara.hertzbeat.common.util.TimePeriodUtil; -import org.dromara.hertzbeat.warehouse.config.WarehouseProperties; +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; @@ -43,8 +43,6 @@ /** * greptimeDB data storage - * - * */ @Component @ConditionalOnProperty(prefix = "warehouse.store.greptime", diff --git a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryInfluxdbDataStorage.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryInfluxdbDataStorage.java similarity index 97% rename from warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryInfluxdbDataStorage.java rename to warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryInfluxdbDataStorage.java index e7f7bf5dcd5..0aaceb3bda0 100644 --- a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryInfluxdbDataStorage.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryInfluxdbDataStorage.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.dromara.hertzbeat.warehouse.store; +package org.apache.hertzbeat.warehouse.store; import lombok.extern.slf4j.Slf4j; import okhttp3.OkHttpClient; import org.apache.http.ssl.SSLContexts; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.dto.Value; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.util.JsonUtil; -import org.dromara.hertzbeat.warehouse.config.WarehouseProperties; +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.influxdb.InfluxDB; import org.influxdb.InfluxDBFactory; import org.influxdb.dto.BatchPoints; @@ -44,7 +44,6 @@ /** * HistoryInfluxdbDataStorage class - * */ @Component @ConditionalOnProperty(prefix = "warehouse.store.influxdb", diff --git a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryIotDbDataStorage.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryIotDbDataStorage.java similarity index 98% rename from warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryIotDbDataStorage.java rename to warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryIotDbDataStorage.java index 3d6901a60a7..9c4d2ca4efb 100644 --- a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryIotDbDataStorage.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryIotDbDataStorage.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.dromara.hertzbeat.warehouse.store; +package org.apache.hertzbeat.warehouse.store; -import org.dromara.hertzbeat.common.entity.dto.Value; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.util.JsonUtil; -import org.dromara.hertzbeat.warehouse.config.IotDbVersion; -import org.dromara.hertzbeat.warehouse.config.WarehouseProperties; +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; @@ -41,9 +41,6 @@ /** * IoTDB data storage - * - * - * */ @Component @ConditionalOnProperty(prefix = "warehouse.store.iot-db", diff --git a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryJpaDatabaseDataStorage.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryJpaDatabaseDataStorage.java similarity index 96% rename from warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryJpaDatabaseDataStorage.java rename to warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryJpaDatabaseDataStorage.java index b87b2b02572..40ee235de9a 100644 --- a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryJpaDatabaseDataStorage.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryJpaDatabaseDataStorage.java @@ -15,20 +15,20 @@ * limitations under the License. */ -package org.dromara.hertzbeat.warehouse.store; +package org.apache.hertzbeat.warehouse.store; import com.google.common.util.concurrent.ThreadFactoryBuilder; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.dto.Value; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.entity.warehouse.History; -import org.dromara.hertzbeat.common.util.JsonUtil; -import org.dromara.hertzbeat.common.util.TimePeriodUtil; -import org.dromara.hertzbeat.warehouse.config.WarehouseProperties; -import org.dromara.hertzbeat.warehouse.dao.HistoryDao; +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.entity.warehouse.History; +import org.apache.hertzbeat.common.util.JsonUtil; +import org.apache.hertzbeat.common.util.TimePeriodUtil; +import org.apache.hertzbeat.warehouse.config.WarehouseProperties; +import org.apache.hertzbeat.warehouse.dao.HistoryDao; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; @@ -48,8 +48,6 @@ /** * data storage by mysql/h2 - jpa - * - * */ @Component @ConditionalOnProperty(prefix = "warehouse.store.jpa", diff --git a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryTdEngineDataStorage.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryTdEngineDataStorage.java similarity index 98% rename from warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryTdEngineDataStorage.java rename to warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryTdEngineDataStorage.java index 5c8579f0675..e24cdd2b95b 100644 --- a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryTdEngineDataStorage.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryTdEngineDataStorage.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.dromara.hertzbeat.warehouse.store; +package org.apache.hertzbeat.warehouse.store; -import org.dromara.hertzbeat.common.entity.dto.Value; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.util.JsonUtil; -import org.dromara.hertzbeat.warehouse.config.WarehouseProperties; +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; @@ -41,8 +41,6 @@ /** * tdengine data storage - * - * */ @Primary @Component diff --git a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryVictoriaMetricsDataStorage.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryVictoriaMetricsDataStorage.java similarity index 98% rename from warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryVictoriaMetricsDataStorage.java rename to warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryVictoriaMetricsDataStorage.java index a9fb4fc8dc2..e104ad90640 100644 --- a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryVictoriaMetricsDataStorage.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/HistoryVictoriaMetricsDataStorage.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.warehouse.store; +package org.apache.hertzbeat.warehouse.store; import com.fasterxml.jackson.databind.JsonNode; import lombok.AllArgsConstructor; @@ -25,13 +25,13 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.math.NumberUtils; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.common.entity.dto.Value; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.util.CommonUtil; -import org.dromara.hertzbeat.common.util.JsonUtil; -import org.dromara.hertzbeat.common.util.TimePeriodUtil; -import org.dromara.hertzbeat.warehouse.config.WarehouseProperties; +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.CommonUtil; +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.context.annotation.Primary; import org.springframework.http.*; @@ -52,7 +52,6 @@ /** * tdengine data storage - * */ @Primary @Component diff --git a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/MetricsDataRedisCodec.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/MetricsDataRedisCodec.java similarity index 94% rename from warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/MetricsDataRedisCodec.java rename to warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/MetricsDataRedisCodec.java index 870e9a1388a..f6c229f9ce2 100644 --- a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/MetricsDataRedisCodec.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/MetricsDataRedisCodec.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.dromara.hertzbeat.warehouse.store; +package org.apache.hertzbeat.warehouse.store; -import org.dromara.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.common.entity.message.CollectRep; import io.lettuce.core.codec.RedisCodec; import lombok.extern.slf4j.Slf4j; @@ -27,7 +27,6 @@ /** * MetricsData redis 序列化 * MetricsData redis serialization - * */ @Slf4j public class MetricsDataRedisCodec implements RedisCodec { diff --git a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/RealTimeMemoryDataStorage.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/RealTimeMemoryDataStorage.java similarity index 95% rename from warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/RealTimeMemoryDataStorage.java rename to warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/RealTimeMemoryDataStorage.java index 1e741a2bf39..a2a9a37dc6e 100644 --- a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/RealTimeMemoryDataStorage.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/RealTimeMemoryDataStorage.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.warehouse.store; +package org.apache.hertzbeat.warehouse.store; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.warehouse.config.WarehouseProperties; +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; @@ -32,7 +32,6 @@ /** * 存储采集实时数据 - memory * Store and collect real-time data - memory - * */ @Component @ConditionalOnProperty(prefix = "warehouse.store.memory", diff --git a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/RealTimeRedisDataStorage.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/RealTimeRedisDataStorage.java similarity index 96% rename from warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/RealTimeRedisDataStorage.java rename to warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/RealTimeRedisDataStorage.java index fb214196968..864e0602bc6 100644 --- a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/RealTimeRedisDataStorage.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/RealTimeRedisDataStorage.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.dromara.hertzbeat.warehouse.store; +package org.apache.hertzbeat.warehouse.store; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.warehouse.config.WarehouseProperties; +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; @@ -39,7 +39,6 @@ /** * redis存储采集实时数据 * redis storage collects real-time data - * */ @Primary @Component diff --git a/warehouse/src/main/resources/META-INF/spring.factories b/warehouse/src/main/resources/META-INF/spring.factories index 07b6fe472f9..64179dd3ecc 100644 --- a/warehouse/src/main/resources/META-INF/spring.factories +++ b/warehouse/src/main/resources/META-INF/spring.factories @@ -14,4 +14,4 @@ # limitations under the License. org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.dromara.hertzbeat.warehouse.config.WarehouseAutoConfiguration \ No newline at end of file +org.apache.hertzbeat.warehouse.config.WarehouseAutoConfiguration \ No newline at end of file diff --git a/warehouse/src/test/java/org/dromara/hertzbeat/warehouse/WarehouseWorkerPoolTest.java b/warehouse/src/test/java/org/apache/hertzbeat/warehouse/WarehouseWorkerPoolTest.java similarity index 97% rename from warehouse/src/test/java/org/dromara/hertzbeat/warehouse/WarehouseWorkerPoolTest.java rename to warehouse/src/test/java/org/apache/hertzbeat/warehouse/WarehouseWorkerPoolTest.java index 7e83afd8e94..44c4f897db9 100644 --- a/warehouse/src/test/java/org/dromara/hertzbeat/warehouse/WarehouseWorkerPoolTest.java +++ b/warehouse/src/test/java/org/apache/hertzbeat/warehouse/WarehouseWorkerPoolTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.warehouse; +package org.apache.hertzbeat.warehouse; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/warehouse/src/test/java/org/dromara/hertzbeat/warehouse/controller/MetricsDataControllerTest.java b/warehouse/src/test/java/org/apache/hertzbeat/warehouse/controller/MetricsDataControllerTest.java similarity index 95% rename from warehouse/src/test/java/org/dromara/hertzbeat/warehouse/controller/MetricsDataControllerTest.java rename to warehouse/src/test/java/org/apache/hertzbeat/warehouse/controller/MetricsDataControllerTest.java index faaba2e5b9d..e6355089fa4 100644 --- a/warehouse/src/test/java/org/dromara/hertzbeat/warehouse/controller/MetricsDataControllerTest.java +++ b/warehouse/src/test/java/org/apache/hertzbeat/warehouse/controller/MetricsDataControllerTest.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.dromara.hertzbeat.warehouse.controller; +package org.apache.hertzbeat.warehouse.controller; import jakarta.servlet.ServletException; -import org.dromara.hertzbeat.common.entity.dto.Value; -import org.dromara.hertzbeat.common.entity.message.CollectRep; -import org.dromara.hertzbeat.common.constants.CommonConstants; -import org.dromara.hertzbeat.warehouse.store.AbstractHistoryDataStorage; -import org.dromara.hertzbeat.warehouse.store.AbstractRealTimeDataStorage; +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.warehouse.store.AbstractHistoryDataStorage; +import org.apache.hertzbeat.warehouse.store.AbstractRealTimeDataStorage; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/warehouse/src/test/java/org/dromara/hertzbeat/warehouse/store/HistoryTdEngineDataStorageTest.java b/warehouse/src/test/java/org/apache/hertzbeat/warehouse/store/HistoryTdEngineDataStorageTest.java similarity index 96% rename from warehouse/src/test/java/org/dromara/hertzbeat/warehouse/store/HistoryTdEngineDataStorageTest.java rename to warehouse/src/test/java/org/apache/hertzbeat/warehouse/store/HistoryTdEngineDataStorageTest.java index 3eb72f979cf..4869faab0f2 100644 --- a/warehouse/src/test/java/org/dromara/hertzbeat/warehouse/store/HistoryTdEngineDataStorageTest.java +++ b/warehouse/src/test/java/org/apache/hertzbeat/warehouse/store/HistoryTdEngineDataStorageTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.warehouse.store; +package org.apache.hertzbeat.warehouse.store; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/warehouse/src/test/java/org/dromara/hertzbeat/warehouse/store/MetricsDataRedisCodecTest.java b/warehouse/src/test/java/org/apache/hertzbeat/warehouse/store/MetricsDataRedisCodecTest.java similarity index 96% rename from warehouse/src/test/java/org/dromara/hertzbeat/warehouse/store/MetricsDataRedisCodecTest.java rename to warehouse/src/test/java/org/apache/hertzbeat/warehouse/store/MetricsDataRedisCodecTest.java index 081e716cf12..81bef4e6be0 100644 --- a/warehouse/src/test/java/org/dromara/hertzbeat/warehouse/store/MetricsDataRedisCodecTest.java +++ b/warehouse/src/test/java/org/apache/hertzbeat/warehouse/store/MetricsDataRedisCodecTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.warehouse.store; +package org.apache.hertzbeat.warehouse.store; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/warehouse/src/test/java/org/dromara/hertzbeat/warehouse/store/RealTimeMemoryDataStorageTest.java b/warehouse/src/test/java/org/apache/hertzbeat/warehouse/store/RealTimeMemoryDataStorageTest.java similarity index 95% rename from warehouse/src/test/java/org/dromara/hertzbeat/warehouse/store/RealTimeMemoryDataStorageTest.java rename to warehouse/src/test/java/org/apache/hertzbeat/warehouse/store/RealTimeMemoryDataStorageTest.java index 25ef237a4f1..bd32658a59e 100644 --- a/warehouse/src/test/java/org/dromara/hertzbeat/warehouse/store/RealTimeMemoryDataStorageTest.java +++ b/warehouse/src/test/java/org/apache/hertzbeat/warehouse/store/RealTimeMemoryDataStorageTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.warehouse.store; +package org.apache.hertzbeat.warehouse.store; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/warehouse/src/test/java/org/dromara/hertzbeat/warehouse/store/RealTimeRedisDataStorageTest.java b/warehouse/src/test/java/org/apache/hertzbeat/warehouse/store/RealTimeRedisDataStorageTest.java similarity index 95% rename from warehouse/src/test/java/org/dromara/hertzbeat/warehouse/store/RealTimeRedisDataStorageTest.java rename to warehouse/src/test/java/org/apache/hertzbeat/warehouse/store/RealTimeRedisDataStorageTest.java index 446d77ba50e..f5140f58a7b 100644 --- a/warehouse/src/test/java/org/dromara/hertzbeat/warehouse/store/RealTimeRedisDataStorageTest.java +++ b/warehouse/src/test/java/org/apache/hertzbeat/warehouse/store/RealTimeRedisDataStorageTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.dromara.hertzbeat.warehouse.store; +package org.apache.hertzbeat.warehouse.store; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/web-app/src/app/core/README.md b/web-app/src/app/core/README.md deleted file mode 100644 index 2d98e129afc..00000000000 --- a/web-app/src/app/core/README.md +++ /dev/null @@ -1,5 +0,0 @@ -### CoreModule - -**应** 仅只留 `providers` 属性。 - -**作用：** 一些通用服务，例如：用户消息、HTTP数据访问。 diff --git a/web-app/src/app/layout/README.md b/web-app/src/app/layout/README.md deleted file mode 100644 index e1a767adaf4..00000000000 --- a/web-app/src/app/layout/README.md +++ /dev/null @@ -1,3 +0,0 @@ -### layout 页面整体布局 - -**作用：** 规范统一类似功能页面的统一样式布局。 diff --git a/web-app/src/app/layout/basic/README.md b/web-app/src/app/layout/basic/README.md deleted file mode 100644 index 6af2e7f4e92..00000000000 --- a/web-app/src/app/layout/basic/README.md +++ /dev/null @@ -1 +0,0 @@ -[Document](https://ng-alain.com/theme/default) diff --git a/web-app/src/app/layout/blank/README.md b/web-app/src/app/layout/blank/README.md deleted file mode 100644 index a1496d01b0d..00000000000 --- a/web-app/src/app/layout/blank/README.md +++ /dev/null @@ -1 +0,0 @@ -[Document](https://ng-alain.com/theme/blank) diff --git a/web-app/src/app/shared/index.ts b/web-app/src/app/shared/index.ts index 61f3707320d..5e81ae63842 100644 --- a/web-app/src/app/shared/index.ts +++ b/web-app/src/app/shared/index.ts @@ -1,8 +1,3 @@ -// Components - -// Utils -export * from './utils/yuan'; - // Module export * from './shared.module'; export * from './json-schema/json-schema.module'; diff --git a/web-app/src/app/shared/json-schema/README.md b/web-app/src/app/shared/json-schema/README.md deleted file mode 100644 index fd66568adc3..00000000000 --- a/web-app/src/app/shared/json-schema/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# 建议统一在 `widgets` 目录下自定义小部件 - -> 注：@delon/form 本身提供 nz-zorro-antd 数据录入组件的全部实现，以及若干第三方组件的代码，可从[widgets-third](https://github.com/ng-alain/delon/tree/master/packages/form/widgets-third)中获取并放置 `widgets` 目录下注册即可。 diff --git a/web-app/src/app/shared/utils/yuan.ts b/web-app/src/app/shared/utils/yuan.ts deleted file mode 100644 index 27a4c875420..00000000000 --- a/web-app/src/app/shared/utils/yuan.ts +++ /dev/null @@ -1,12 +0,0 @@ -/** - * 转化成RMB元字符串 - * - * @param value 值 - * @param digits 当数字类型时，允许指定小数点后数字的个数，默认2位小数 - */ -export function yuan(value: number | string, digits: number = 2): string { - if (typeof value === 'number') { - value = value.toFixed(digits); - } - return `¥ ${value}`; -}