This is an automated email from the ASF dual-hosted git repository.
gongchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
The following commit(s) were added to refs/heads/master by this push:
new 228ace029 [improve] checkstyle include testSource (#2036)
228ace029 is described below
commit 228ace0296049832e8ec6db4bf0670351fc3f9e2
Author: crossoverJie <[email protected]>
AuthorDate: Mon May 27 11:11:21 2024 +0800
[improve] checkstyle include testSource (#2036)
---
.../apache/hertzbeat/alert/util/DateUtilTest.java | 8 ++---
.../collect/icmp/IcmpCollectImplTest.java | 1 -
.../hertzbeat/common/cache/CaffeineCacheTest.java | 5 ++-
.../apache/hertzbeat/common/util/AesUtilTest.java | 2 +-
.../hertzbeat/common/util/Base64UtilTest.java | 3 +-
.../apache/hertzbeat/common/util/JsonUtilTest.java | 6 ++--
pom.xml | 3 ++
script/checkstyle/suppressions.xml | 42 ++++++++++++++++++++++
.../controller/MetricsDataControllerTest.java | 2 --
9 files changed, 56 insertions(+), 16 deletions(-)
diff --git
a/alerter/src/test/java/org/apache/hertzbeat/alert/util/DateUtilTest.java
b/alerter/src/test/java/org/apache/hertzbeat/alert/util/DateUtilTest.java
index df4cff237..0c2c2a9fa 100644
--- a/alerter/src/test/java/org/apache/hertzbeat/alert/util/DateUtilTest.java
+++ b/alerter/src/test/java/org/apache/hertzbeat/alert/util/DateUtilTest.java
@@ -17,11 +17,11 @@
package org.apache.hertzbeat.alert.util;
-import org.junit.jupiter.api.Test;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Optional;
-
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
/**
* Test case for {@link DateUtil}
diff --git
a/collector/src/test/java/org/apache/hertzbeat/collector/collect/icmp/IcmpCollectImplTest.java
b/collector/src/test/java/org/apache/hertzbeat/collector/collect/icmp/IcmpCollectImplTest.java
index a786d887a..90e393c2d 100644
---
a/collector/src/test/java/org/apache/hertzbeat/collector/collect/icmp/IcmpCollectImplTest.java
+++
b/collector/src/test/java/org/apache/hertzbeat/collector/collect/icmp/IcmpCollectImplTest.java
@@ -21,7 +21,6 @@ import static
org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
-
import java.io.IOException;
import java.net.InetAddress;
import java.net.UnknownHostException;
diff --git
a/common/src/test/java/org/apache/hertzbeat/common/cache/CaffeineCacheTest.java
b/common/src/test/java/org/apache/hertzbeat/common/cache/CaffeineCacheTest.java
index 5de3d78d5..8d0b11e55 100644
---
a/common/src/test/java/org/apache/hertzbeat/common/cache/CaffeineCacheTest.java
+++
b/common/src/test/java/org/apache/hertzbeat/common/cache/CaffeineCacheTest.java
@@ -17,14 +17,13 @@
package org.apache.hertzbeat.common.cache;
+import java.time.Duration;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import java.time.Duration;
-
/**
- * Test case for {@link CaffeineCacheServiceImpl
+ * Test case for {@link CaffeineCacheServiceImpl}
*/
class CaffeineCacheTest {
private CommonCacheService<String, String> cacheService;
diff --git
a/common/src/test/java/org/apache/hertzbeat/common/util/AesUtilTest.java
b/common/src/test/java/org/apache/hertzbeat/common/util/AesUtilTest.java
index 7feb9f726..7cc65dfa6 100644
--- a/common/src/test/java/org/apache/hertzbeat/common/util/AesUtilTest.java
+++ b/common/src/test/java/org/apache/hertzbeat/common/util/AesUtilTest.java
@@ -17,7 +17,6 @@
package org.apache.hertzbeat.common.util;
-import org.junit.jupiter.api.Test;
import static org.apache.hertzbeat.common.util.AesUtil.aesDecode;
import static org.apache.hertzbeat.common.util.AesUtil.aesEncode;
import static org.apache.hertzbeat.common.util.AesUtil.isCiphertext;
@@ -25,6 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
/**
* Test case for {@link AesUtil}
diff --git
a/common/src/test/java/org/apache/hertzbeat/common/util/Base64UtilTest.java
b/common/src/test/java/org/apache/hertzbeat/common/util/Base64UtilTest.java
index 3df1e307f..1d653a878 100644
--- a/common/src/test/java/org/apache/hertzbeat/common/util/Base64UtilTest.java
+++ b/common/src/test/java/org/apache/hertzbeat/common/util/Base64UtilTest.java
@@ -17,11 +17,10 @@
package org.apache.hertzbeat.common.util;
-import org.junit.jupiter.api.Test;
-
import static org.apache.hertzbeat.common.util.Base64Util.isBase64;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
/**
* Test case for {@link Base64Util}
diff --git
a/common/src/test/java/org/apache/hertzbeat/common/util/JsonUtilTest.java
b/common/src/test/java/org/apache/hertzbeat/common/util/JsonUtilTest.java
index 330c09880..628a10e10 100644
--- a/common/src/test/java/org/apache/hertzbeat/common/util/JsonUtilTest.java
+++ b/common/src/test/java/org/apache/hertzbeat/common/util/JsonUtilTest.java
@@ -17,14 +17,14 @@
package org.apache.hertzbeat.common.util;
+import static org.apache.hertzbeat.common.util.JsonUtil.isJsonStr;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import com.fasterxml.jackson.core.type.TypeReference;
import java.util.ArrayList;
import java.util.List;
import org.apache.hertzbeat.common.entity.manager.TagItem;
import org.junit.jupiter.api.Test;
-import static org.apache.hertzbeat.common.util.JsonUtil.isJsonStr;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
/**
* Test case for {@link JsonUtil}
diff --git a/pom.xml b/pom.xml
index b3d51af75..60a476dda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -444,6 +444,8 @@
<version>3.3.0</version>
<configuration>
<configLocation>./script/checkstyle/checkstyle.xml</configLocation>
+
<suppressionsLocation>./script/checkstyle/suppressions.xml</suppressionsLocation>
+
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
<linkXRef>false</linkXRef>
@@ -458,6 +460,7 @@
</execution>
</executions>
</plugin>
+
</plugins>
</build>
</project>
diff --git a/script/checkstyle/suppressions.xml
b/script/checkstyle/suppressions.xml
new file mode 100644
index 000000000..2a14e5ce4
--- /dev/null
+++ b/script/checkstyle/suppressions.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!--
+
+ 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.
+
+-->
+<!DOCTYPE suppressions PUBLIC
+ "-//Puppy Crawl//DTD Suppressions 1.1//EN"
+ "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd";>
+
+<suppressions>
+ <suppress checks="JavadocPackage" files=".*[\\/]src[\\/]test[\\/].*"/>
+ <suppress checks="JavadocPackage" files=".*[\\/]maven-archetypes[\\/].*"/>
+ <suppress checks="JavadocPackage" files=".*[\\/]examples[\\/].*"/>
+
+ <!-- suppress javadoc check for impl classes and package-info.java -->
+ <suppress checks="JavadocType" files=".*Impl\.java$" />
+ <suppress checks="JavadocStyle" files=".+[\\/]package-info\.java$" />
+
+ <!-- suppress all checks in the generated directories -->
+ <suppress checks=".*" files=".+[\\/]generated[\\/].+\.java"/>
+ <suppress checks=".*" files=".+[\\/]generated-sources[\\/].+\.java"/>
+ <suppress checks=".*" files=".+[\\/]generated-test-sources[\\/].+\.java"/>
+
+ <!-- suppress most all checks expect below-->
+ <suppress checks="^(?!.*(UnusedImports|IllegalImport)).*$"
files=".*[\\/]src[\\/]test[\\/].*"/>
+</suppressions>
diff --git
a/warehouse/src/test/java/org/apache/hertzbeat/warehouse/controller/MetricsDataControllerTest.java
b/warehouse/src/test/java/org/apache/hertzbeat/warehouse/controller/MetricsDataControllerTest.java
index 8db64e1cf..995986b5e 100644
---
a/warehouse/src/test/java/org/apache/hertzbeat/warehouse/controller/MetricsDataControllerTest.java
+++
b/warehouse/src/test/java/org/apache/hertzbeat/warehouse/controller/MetricsDataControllerTest.java
@@ -27,11 +27,9 @@ import static
org.springframework.test.web.servlet.result.MockMvcResultMatchers.
import jakarta.servlet.ServletException;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
-
import org.apache.hertzbeat.common.constants.CommonConstants;
import org.apache.hertzbeat.common.entity.dto.Value;
import org.apache.hertzbeat.common.entity.message.CollectRep;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
