[bugfix] fix AlertTemplateUtilTest test exception and update code sty…

…le (#1969)

Signed-off-by: yuluo-yx <yuluo08290126@gmail.com>
Co-authored-by: tomsun28 <tomsun28@outlook.com>

alerter/src/main/java/org/apache/hertzbeat/alert/AlerterProperties.java

@@ -112,8 +112,5 @@ public static class KafkaProperties {
             private String groupId;
 
         }
-
     }
-
-
 }

alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertDefineImExportService.java

@@ -21,7 +21,6 @@
 import java.io.OutputStream;
 import java.util.List;
 
-
 /**
  * Configuration Import Export
  */

alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineAbstractImExportServiceImpl.java

@@ -17,7 +17,6 @@
 
 package org.apache.hertzbeat.alert.service.impl;
 
-
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import cn.afterturn.easypoi.excel.annotation.ExcelTarget;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineExcelImExportServiceImpl.java

@@ -39,7 +39,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
-
 /**
  * Configure the import and export EXCEL format
  */
@@ -263,6 +262,4 @@ void writeOs(List<ExportAlertDefineDTO> exportAlertDefineList, OutputStream os)
             throw new RuntimeException(e);
         }
     }
-
-
 }

alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineJsonImExportServiceImpl.java

@@ -17,7 +17,6 @@
 
 package org.apache.hertzbeat.alert.service.impl;
 
-
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
@@ -28,7 +27,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-
 /**
  * Configure the import and export JSON format
  */

alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineYamlImExportServiceImpl.java

@@ -17,7 +17,6 @@
 
 package org.apache.hertzbeat.alert.service.impl;
 
-
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
@@ -28,7 +27,6 @@
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.Yaml;
 
-
 /**
  * Configure the import and export Yaml format
  */
@@ -39,7 +37,6 @@ public class AlertDefineYamlImExportServiceImpl extends AlertDefineAbstractImExp
     public static final String TYPE = "YAML";
     public static final String FILE_SUFFIX = ".yaml";
 
-
     @Override
     public String type() {
         return TYPE;

alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertServiceImpl.java

@@ -158,7 +158,4 @@ private Alert buildAlertData(AlertReport alertReport){
                 .gmtUpdate(dateTime)
                 .build();
     }
-
-
-
 }

alerter/src/main/java/org/apache/hertzbeat/alert/util/AlertTemplateUtil.java

@@ -38,6 +38,10 @@ public static String render(String template, Map<String, Object> replaceData) {
         if (template == null) {
             return null;  
         }
+        if (replaceData == null) {
+            log.warn("The replaceData is null.");
+            return template;
+        }
         try {
             Matcher matcher = PATTERN.matcher(template);
             StringBuilder builder = new StringBuilder();

alerter/src/main/java/org/apache/hertzbeat/alert/util/DateUtil.java

@@ -29,7 +29,8 @@ public class DateUtil {
 
     private static final String[] DATE_FORMATS = {
             "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'",
-            "yyyy-MM-dd HH:mm:ss"};
+            "yyyy-MM-dd HH:mm:ss"
+    };
 
     /**
      * convert date to timestamp

alerter/src/main/resources/META-INF/spring.factories

@@ -14,4 +14,4 @@
 # limitations under the License.
 
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.hertzbeat.alert.config.AlerterAutoConfiguration
+org.apache.hertzbeat.alert.config.AlerterAutoConfiguration

alerter/src/test/java/org/apache/hertzbeat/alert/AlerterWorkerPoolTest.java

@@ -23,7 +23,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-
 /**
  * Test case for {@link AlerterWorkerPool}
  */
@@ -53,4 +52,4 @@ void executeJob() throws InterruptedException {
 
         assertEquals(NUMBER_OF_THREADS, counter.get());
     }
-}
+}

alerter/src/test/java/org/apache/hertzbeat/alert/service/AlertDefineServiceTest.java

@@ -187,4 +187,4 @@ void getBindAlertDefineMonitors() {
         when(alertDefineBindDao.getAlertDefineBindsByAlertDefineIdEquals(id)).thenReturn(alertDefineMonitorBinds);
         assertDoesNotThrow(() -> alertDefineService.getBindAlertDefineMonitors(id));
     }
-}
+}

alerter/src/test/java/org/apache/hertzbeat/alert/service/AlertServiceTest.java

@@ -56,4 +56,4 @@ void getAlertsSummary() {
     @Test
     void addNewAlertReport() {
     }
-}
+}