apache · tomsun28 · May 16, 2024 · May 15, 2024
diff --git a/...a/org/apache/hertzbeat/manager/component/alerter/impl/AbstractAlertNotifyHandlerImpl.java b/...a/org/apache/hertzbeat/manager/component/alerter/impl/AbstractAlertNotifyHandlerImpl.java
@@ -43,6  43,7 @@
 import org.springframework.web.client.RestTemplate;
 
 /**
  * Abstract alert notify handler implementation.
  */
 @Slf4j
 abstract class AbstractAlertNotifyHandlerImpl implements AlertNotifyHandler {
@@ -128,5  129,3 @@ public void onEvent(SystemConfigChangeEvent event) {
         this.bundle = ResourceBundleUtil.getBundle("alerter");
     }
 }
-
-
diff --git a/...ava/org/apache/hertzbeat/manager/component/alerter/impl/GotifyAlertNotifyHandlerImpl.java b/...ava/org/apache/hertzbeat/manager/component/alerter/impl/GotifyAlertNotifyHandlerImpl.java
@@ -92,7  92,6 @@ private static class GotifyWebHookDto {
         private String message;
         private Extras extras;
 
-
         @Data
         public static class Extras {
             @JsonProperty("client::display")
@@ -104,6  103,5 @@ public static class ClientDisplay {
             private String contentType;
         }
 
-
     }
 }
diff --git a/...org/apache/hertzbeat/manager/component/alerter/impl/ServerChanAlertNotifyHandlerImpl.java b/...org/apache/hertzbeat/manager/component/alerter/impl/ServerChanAlertNotifyHandlerImpl.java
@@ -94,5  94,4 @@ private static class ServerChanWebHookDto {
 
     }
 
-
 }
diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/controller/I18nController.java b/manager/src/main/java/org/apache/hertzbeat/manager/controller/I18nController.java
@@ -32,8  32,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * Internationalization I 18 N
- * 国际化I18N
  * Internationalization I18N
  */
 @Tag(name = "I18N International Resource API")
 @RestController

diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/controller/MonitorsController.java b/manager/src/main/java/org/apache/hertzbeat/manager/controller/MonitorsController.java
@@ -50,7  50,6 @@
 
 /**
  * Monitor and manage batch API
- * 监控管理批量API
  */
 @Tag(name = "Monitor Manage Batch API")
 @RestController

diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/controller/NoticeConfigController.java b/manager/src/main/java/org/apache/hertzbeat/manager/controller/NoticeConfigController.java
@@ -44,7  44,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-
 /**
  * Message Notification Configuration API
  */

diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/controller/StatusPageController.java b/manager/src/main/java/org/apache/hertzbeat/manager/controller/StatusPageController.java
@@ -47,7  47,6 @@
 @RequestMapping(value = "/api/status/page", produces = {APPLICATION_JSON_VALUE})
 public class StatusPageController {
 
-
     @Autowired
     private StatusPageService statusPageService;
 

diff --git a/...ger/src/main/java/org/apache/hertzbeat/manager/controller/StatusPagePublicController.java b/...ger/src/main/java/org/apache/hertzbeat/manager/controller/StatusPagePublicController.java
@@ -42,7  42,6 @@
 @RequestMapping(value = "/api/status/page/public", produces = {APPLICATION_JSON_VALUE})
 public class StatusPagePublicController {
 
-
     @Autowired
     private StatusPageService statusPageService;
 

diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/dao/CollectorDao.java b/manager/src/main/java/org/apache/hertzbeat/manager/dao/CollectorDao.java
@@ -23,7  23,6 @@
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
 
-
 /**
  * Collector repository
  */

diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/dao/CollectorMonitorBindDao.java b/manager/src/main/java/org/apache/hertzbeat/manager/dao/CollectorMonitorBindDao.java
@@ -25,13  25,11 @@
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
 
-
 /**
  * CollectorMonitorBind repository
  */
 public interface CollectorMonitorBindDao extends JpaRepository<CollectorMonitorBind, Long>, JpaSpecificationExecutor<CollectorMonitorBind> {
 
-
     /**
      * find monitors by collector
      * @param collector collector

diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/dao/MonitorDao.java b/manager/src/main/java/org/apache/hertzbeat/manager/dao/MonitorDao.java
@@ -33,7  33,6 @@
  */
 public interface MonitorDao extends JpaRepository<Monitor, Long>, JpaSpecificationExecutor<Monitor> {
 
-
     /**
      * Delete monitor based on monitor ID list
      * @param monitorIds Monitoring ID List

diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/dao/NoticeTemplateDao.java b/manager/src/main/java/org/apache/hertzbeat/manager/dao/NoticeTemplateDao.java
@@ -25,6  25,5 @@
  * Query all enabled notification policies
  */
 public interface NoticeTemplateDao extends JpaRepository<NoticeTemplate, Long>, JpaSpecificationExecutor<NoticeTemplate> {
-
 
 }
diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/EmailNoticeSender.java b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/EmailNoticeSender.java
@@ -26,7  26,6 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-
 /**
  * Email account configuration dto
  */

diff --git a/...ger/src/main/java/org/apache/hertzbeat/manager/pojo/dto/ObjectStoreConfigChangeEvent.java b/...ger/src/main/java/org/apache/hertzbeat/manager/pojo/dto/ObjectStoreConfigChangeEvent.java
@@ -22,6  22,7 @@
 import org.springframework.context.ApplicationEvent;
 
 /**
  * Object store configuration change event.
  */
 @Getter
 public class ObjectStoreConfigChangeEvent extends ApplicationEvent {

diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/RefreshTokenResponse.java b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/RefreshTokenResponse.java
@@ -23,7  23,6 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-
 /**
  * Refresh Token Response
  */

diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/TemplateConfig.java b/manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/TemplateConfig.java
@@ -39,7  39,6 @@ public class TemplateConfig {
      */
     private Map<String, AppTemplate> apps;
 
-
     /**
      * app template
      */

diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/GeneralConfigService.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/GeneralConfigService.java
@@ -19,12  19,11 @@
 
 /**
  * <p>ConfigService interface provides CRUD operations for configurations.</p>
- * @param <T> 配置类型
  * @param <T> configuration type.
  * @version 1.0
  */
 public interface GeneralConfigService<T> {
-
-
 
     /**
      * config type: email, sms
      * @return type string

diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/MonitorService.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/MonitorService.java
@@ -37,7  37,6 @@
  */
 public interface MonitorService {
 
-
     /**
      * Monitoring Availability Probes
      * @param monitor   Monitoring entity information
@@ -180,7  179,6 @@ public interface MonitorService {
      */
     void copyMonitors(List<Long> ids);
 
-
     /**
      * update app collect job by app
      * @param job job content

diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/NoticeConfigService.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/NoticeConfigService.java
@@ -140,7  140,6 @@ public interface NoticeConfigService {
      */
     void deleteNoticeTemplate(Long templateId);
 
-
     /**
      * Query specific notification templates according to the template ID (primary key ID)
      * @param templateId Template ID
@@ -162,5  161,4 @@ public interface NoticeConfigService {
      */
     boolean sendTestMsg(NoticeReceiver noticeReceiver);
 
-
 }
diff --git a/...src/main/java/org/apache/hertzbeat/manager/service/impl/MailGeneralConfigServiceImpl.java b/...src/main/java/org/apache/hertzbeat/manager/service/impl/MailGeneralConfigServiceImpl.java
@@ -24,7  24,6 @@
 import org.apache.hertzbeat.manager.pojo.dto.EmailNoticeSender;
 import org.springframework.stereotype.Service;
 
-
 /**
  * MailGeneralConfigServiceImpl class is the implementation of general email configuration service,
  * which inherits the AbstractGeneralConfigServiceImpl class.

diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/SystemSecretServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/SystemSecretServiceImpl.java
@@ -29,8  29,7 @@
  */
 @Service
 public class SystemSecretServiceImpl extends AbstractGeneralConfigServiceImpl<SystemSecret> {
-
-
 
     /**
      *
      * <p>Constructor, passing in GeneralConfigDao, ObjectMapper and type.</p>

diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/TagServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/TagServiceImpl.java
@@ -36,6  36,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Tag service implementation.
  */
 @Service
 @Transactional(rollbackFor = Exception.class)

diff --git a/...er/src/main/java/org/apache/hertzbeat/manager/service/impl/TemplateConfigServiceImpl.java b/...er/src/main/java/org/apache/hertzbeat/manager/service/impl/TemplateConfigServiceImpl.java
@@ -34,8  34,7 @@ public class TemplateConfigServiceImpl extends AbstractGeneralConfigServiceImpl<
 
     @Resource
     private AppService appService;
-
-
 
     /**
      *
      * <p>Constructor, passing in GeneralConfigDao, ObjectMapper and type.</p>
@@ -59,7  58,6 @@ public String type() {
         return "template";
     }
 
-
     @Override
     protected TypeReference<TemplateConfig> getTypeReference() {
         return new TypeReference<>() {

diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/YamlImExportServiceImpl.java b/manager/src/main/java/org/apache/hertzbeat/manager/service/impl/YamlImExportServiceImpl.java
@@ -36,7  36,6 @@ public class YamlImExportServiceImpl extends AbstractImExportServiceImpl{
     public static final String TYPE = "YAML";
     public static final String FILE_SUFFIX = ".yaml";
 
-
     /**
      * Export file type
      * @return file type
@@ -72,7  71,6 @@ List<ExportMonitorDTO> parseImport(InputStream is) {
      * Export Configuration to Output Stream
      * @param monitorList configuration list
      * @param os          output stream
-     *
      */
     @Override
     void writeOs(List<ExportMonitorDTO> monitorList, OutputStream os) {

diff --git a/manager/src/main/java/org/apache/hertzbeat/manager/support/GlobalExceptionHandler.java b/manager/src/main/java/org/apache/hertzbeat/manager/support/GlobalExceptionHandler.java
@@ -127,7  127,6 @@ ResponseEntity<Message<Void>> handleHttpMessageNotReadableException(HttpMessageN
         }
     }
 
-
     /**
      * handler the exception thrown for data input verify
      * @param e data input verify exception
@@ -187,7  186,6 @@ ResponseEntity<Message<Void>> handleInputOtherValidException(ConstraintViolation
         return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(message);
     }
 
-
     /**
      * handler the exception thrown for datastore error
      * @param exception datastore exception

diff --git a/manager/src/test/java/org/apache/hertzbeat/manager/ManagerTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/ManagerTest.java
@@ -55,7  55,7 @@
 import org.springframework.context.ApplicationContext;
 
 /**
- *
  * Manager Test
  * @version 2.1
  */
 class ManagerTest extends AbstractSpringIntegrationTest {

diff --git a/.../src/test/java/org/apache/hertzbeat/manager/component/alerter/AlertNotifyHandlerTest.java b/.../src/test/java/org/apache/hertzbeat/manager/component/alerter/AlertNotifyHandlerTest.java
@@ -36,4  36,4 @@ void send() {
     @Test
     void type() {
     }
-}
 }
diff --git a/...ger/src/test/java/org/apache/hertzbeat/manager/component/alerter/DispatcherAlarmTest.java b/...ger/src/test/java/org/apache/hertzbeat/manager/component/alerter/DispatcherAlarmTest.java
@@ -36,4  36,4 @@ void afterPropertiesSet() {
     @Test
     void sendNoticeMsg() {
     }
-}
 }
diff --git a/...java/org/apache/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImplTest.java b/...java/org/apache/hertzbeat/manager/component/alerter/impl/DbAlertStoreHandlerImplTest.java
@@ -32,4  32,4 @@ void setUp() {
     @Test
     void store() {
     }
-}
 }
diff --git a/.../org/apache/hertzbeat/manager/component/alerter/impl/EmailAlertNotifyHandlerImplTest.java b/.../org/apache/hertzbeat/manager/component/alerter/impl/EmailAlertNotifyHandlerImplTest.java
@@ -36,4  36,5 @@ void send() {
     @Test
     void type() {
     }
-}
 
 }
diff --git a/...he/hertzbeat/manager/component/alerter/impl/HuaweiCloudSmnAlertNotifyHandlerImplTest.java b/...he/hertzbeat/manager/component/alerter/impl/HuaweiCloudSmnAlertNotifyHandlerImplTest.java
@@ -27,7  27,7 @@
 import org.springframework.util.StringUtils;
 
 /**
- *
  * Test case for {@link HuaweiCloudSmnAlertNotifyHandlerImpl}
  */
 @Slf4j
 class HuaweiCloudSmnAlertNotifyHandlerImplTest extends AbstractSpringIntegrationTest {

diff --git a/.../org/apache/hertzbeat/manager/component/alerter/impl/SlackAlertNotifyHandlerImplTest.java b/.../org/apache/hertzbeat/manager/component/alerter/impl/SlackAlertNotifyHandlerImplTest.java
@@ -30,7  30,6 @@
 
 /**
  * Test case for {@link SlackAlertNotifyHandlerImpl}
- *
  * @version 2.1
  */
 @Slf4j

diff --git a/...pache/hertzbeat/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImplTest.java b/...pache/hertzbeat/manager/component/alerter/impl/TelegramBotAlertNotifyHandlerImplTest.java
@@ -30,7  30,7 @@
 import org.springframework.util.StringUtils;
 
 /**
- *
  * Test case for {@link TelegramBotAlertNotifyHandlerImpl}
  * @version 2.1
  */
 @Slf4j

diff --git a/.../apache/hertzbeat/manager/component/alerter/impl/WeChatAppAlertNotifyHandlerImplTest.java b/.../apache/hertzbeat/manager/component/alerter/impl/WeChatAppAlertNotifyHandlerImplTest.java
@@ -31,16  31,13 @@
 
 /**
  * unit test case for WeChatAppAlertNotifyHandlerImpl
- *
  */
 @Slf4j
 public class WeChatAppAlertNotifyHandlerImplTest extends AbstractSpringIntegrationTest {
 
-
     @Resource
     private WeWorkAppAlertNotifyHandlerImpl weChatAppAlertNotifyHandler;
 
-
     @Test
     public void send() {
         String corpId = System.getenv("CORP_ID");
@@ -75,5  72,4 @@ public void send() {
         weChatAppAlertNotifyHandler.send(receiver, noticeTemplate, alert);
     }
 
-
 }
diff --git a/...rg/apache/hertzbeat/manager/component/alerter/impl/WebHookAlertNotifyHandlerImplTest.java b/...rg/apache/hertzbeat/manager/component/alerter/impl/WebHookAlertNotifyHandlerImplTest.java
@@ -39,4  39,4 @@ void send() {
     @Test
     void type() {
     }
-}
 }
diff --git a/manager/src/test/java/org/apache/hertzbeat/manager/controller/AppControllerTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/controller/AppControllerTest.java
@@ -125,8  125,5 @@ void queryAppsHierarchy() throws Exception {
                     .andExpect(jsonPath("$.code").value((int) CommonConstants.SUCCESS_CODE))
                     .andExpect(jsonPath("$.data[0].category").value("os"))
                     .andReturn();
-
-
-
     }
-}
 }
diff --git a/manager/src/test/java/org/apache/hertzbeat/manager/controller/I18nControllerTest.java b/manager/src/test/java/org/apache/hertzbeat/manager/controller/I18nControllerTest.java
@@ -62,4  62,4 @@ void queryI18n() throws Exception {
                 .andExpect(jsonPath("$.code").value((int) CommonConstants.SUCCESS_CODE))
                 .andReturn();
     }
-}
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -94,5 94,4 @@ private static class ServerChanWebHookDto {

		}


		}
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,7 44,6 @@ @@
     import org.springframework.web.bind.annotation.RequestParam;
     import org.springframework.web.bind.annotation.RestController;
     /**
      * Message Notification Configuration API
      */
@@ Expand Down @@