[ISSUE #2992]Recheck all checkstyle and open checkstyle during buildi…

…ng (#3293) * Re-check code style for nacos-config module. * Re-check code style for other module. * Open checkstyle plugin check during build
alibaba · Jul 10, 2020 · 95f3bfb · 95f3bfb
1 parent 5d65653
commit 95f3bfb
Show file tree

Hide file tree

Showing 22 changed files with 56 additions and 104 deletions.
diff --git a/client/src/test/java/com/alibaba/nacos/client/ConfigTest.java b/client/src/test/java/com/alibaba/nacos/client/ConfigTest.java
@@ -27,7 +27,6 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
-import java.util.Objects;
 import java.util.Properties;
 import java.util.Scanner;
 

diff --git a/config/src/main/java/com/alibaba/nacos/config/server/filter/CurcuitFilter.java b/config/src/main/java/com/alibaba/nacos/config/server/filter/CurcuitFilter.java
@@ -18,8 +18,8 @@
 
 import com.alibaba.nacos.common.utils.ExceptionUtil;
 import com.alibaba.nacos.config.server.constant.Constants;
-import com.alibaba.nacos.config.server.model.event.RaftDBErrorEvent;
-import com.alibaba.nacos.config.server.model.event.RaftDBErrorRecoverEvent;
+import com.alibaba.nacos.config.server.model.event.RaftDbErrorEvent;
+import com.alibaba.nacos.config.server.model.event.RaftDbErrorRecoverEvent;
 import com.alibaba.nacos.consistency.cp.CPProtocol;
 import com.alibaba.nacos.consistency.cp.MetadataKey;
 import com.alibaba.nacos.core.cluster.Member;
@@ -125,18 +125,18 @@ private void registerSubscribe() {
  public void onEvent(Event event) {
  // @JustForTest
  // This event only happens in the case of unit tests
- if (event instanceof RaftDBErrorRecoverEvent) {
+ if (event instanceof RaftDbErrorRecoverEvent) {
  isDowngrading = false;
  return;
  }
- if (event instanceof RaftDBErrorEvent) {
+ if (event instanceof RaftDbErrorEvent) {
  isDowngrading = true;
  }
  }
 
  @Override
  public boolean canNotify(Event event) {
- return (event instanceof RaftDBErrorEvent) || (event instanceof RaftDBErrorRecoverEvent);
+ return (event instanceof RaftDbErrorEvent) || (event instanceof RaftDbErrorRecoverEvent);
  }
  });
  }

diff --git a/config/src/main/java/com/alibaba/nacos/config/server/model/SameConfigPolicy.java b/config/src/main/java/com/alibaba/nacos/config/server/model/SameConfigPolicy.java
@@ -20,22 +20,21 @@
  * SameConfigPolicy.
  *
  * @author klw
- * @date 2019/5/21 10:55
  */
 public enum SameConfigPolicy {
 
  /**
- * @Description: abort import on duplicate
+ * Abort import on duplicate.
  */
  ABORT,
 
  /**
- * @Description: skipping on duplicate
+ * Skipping on duplicate.
  */
  SKIP,
 
  /**
- * @Description: overwrite on duplicate
+ * Overwrite on duplicate.
  */
  OVERWRITE
 

diff --git a/.../server/model/event/RaftDBErrorEvent.java → .../server/model/event/RaftDbErrorEvent.java b/.../server/model/event/RaftDBErrorEvent.java → .../server/model/event/RaftDbErrorEvent.java
@@ -23,17 +23,16 @@
  *
  * @author <a href="mailto:[email protected]">liaochuntao</a>
  */
-@SuppressWarnings("PMD.ClassNamingShouldBeCamelRule")
-public class RaftDBErrorEvent implements SlowEvent {
+public class RaftDbErrorEvent implements SlowEvent {
 
  private static final long serialVersionUID = 101591819161802336L;
 
  private Throwable ex;
 
- public RaftDBErrorEvent() {
+ public RaftDbErrorEvent() {
  }
 
- public RaftDBErrorEvent(Throwable ex) {
+ public RaftDbErrorEvent(Throwable ex) {
  this.ex = ex;
  }
 

diff --git a/.../model/event/RaftDBErrorRecoverEvent.java → .../model/event/RaftDbErrorRecoverEvent.java b/.../model/event/RaftDBErrorRecoverEvent.java → .../model/event/RaftDbErrorRecoverEvent.java
@@ -24,8 +24,7 @@
  *
  * @author <a href="mailto:[email protected]">liaochuntao</a>
  */
-@SuppressWarnings("PMD.ClassNamingShouldBeCamelRule")
 @JustForTest
-public class RaftDBErrorRecoverEvent implements Event {
+public class RaftDbErrorRecoverEvent implements Event {
 
 }
diff --git a/config/src/main/java/com/alibaba/nacos/config/server/monitor/PrintMemoryTask.java b/config/src/main/java/com/alibaba/nacos/config/server/monitor/PrintMemoryTask.java
@@ -22,6 +22,8 @@
 import static com.alibaba.nacos.config.server.utils.LogUtil.MEMORY_LOG;
 
 /**
+ * Print memory task.
+ *
  * @author zongtanghu
  */
 public class PrintMemoryTask implements Runnable {

diff --git a/...g/src/main/java/com/alibaba/nacos/config/server/service/datasource/DataSourceService.java b/...g/src/main/java/com/alibaba/nacos/config/server/service/datasource/DataSourceService.java
@@ -66,9 +66,9 @@ public interface DataSourceService {
  /**
  * Get current db url.
  *
- * @return
+ * @return database url
  */
- String getCurrentDBUrl();
+ String getCurrentDbUrl();
 
  /**
  * Get heath information.

diff --git a/...java/com/alibaba/nacos/config/server/service/datasource/ExternalDataSourceProperties.java b/...java/com/alibaba/nacos/config/server/service/datasource/ExternalDataSourceProperties.java
@@ -117,13 +117,13 @@ List<HikariDataSource> build(Environment environment, Callback<HikariDataSource>
  return dataSources;
  }
 
- interface Callback<DataSource> {
+ interface Callback<D> {
 
  /**
  * Perform custom logic.
  *
- * @param dataSource dataSource.
+ * @param datasource dataSource.
  */
- void accept(DataSource dataSource);
+ void accept(D datasource);
  }
 }
diff --git a/...ava/com/alibaba/nacos/config/server/service/datasource/ExternalDataSourceServiceImpl.java b/...ava/com/alibaba/nacos/config/server/service/datasource/ExternalDataSourceServiceImpl.java
@@ -175,7 +175,7 @@ public TransactionTemplate getTransactionTemplate() {
  }
 
  @Override
- public String getCurrentDBUrl() {
+ public String getCurrentDbUrl() {
  DataSource ds = this.jt.getDataSource();
  if (ds == null) {
  return StringUtils.EMPTY;

diff --git a/...n/java/com/alibaba/nacos/config/server/service/datasource/LocalDataSourceServiceImpl.java b/...n/java/com/alibaba/nacos/config/server/service/datasource/LocalDataSourceServiceImpl.java
@@ -186,7 +186,7 @@ public TransactionTemplate getTransactionTemplate() {
  }
 
  @Override
- public String getCurrentDBUrl() {
+ public String getCurrentDbUrl() {
  return "jdbc:derby:" + ApplicationUtils.getNacosHome() + File.separator + derbyBaseDir + ";create=true";
  }
 

diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/dump/task/DumpTask.java b/config/src/main/java/com/alibaba/nacos/config/server/service/dump/task/DumpTask.java
@@ -69,7 +69,6 @@ public void merge(AbstractTask task) {
 
  final String tag;
 
-
  public String getGroupKey() {
  return groupKey;
  }

diff --git a/...ibaba/nacos/config/server/service/repository/embedded/DistributedDatabaseOperateImpl.java b/...ibaba/nacos/config/server/service/repository/embedded/DistributedDatabaseOperateImpl.java
@@ -31,7 +31,7 @@
 import com.alibaba.nacos.config.server.exception.NJdbcException;
 import com.alibaba.nacos.config.server.model.event.ConfigDumpEvent;
 import com.alibaba.nacos.config.server.model.event.DerbyLoadEvent;
-import com.alibaba.nacos.config.server.model.event.RaftDBErrorEvent;
+import com.alibaba.nacos.config.server.model.event.RaftDbErrorEvent;
 import com.alibaba.nacos.config.server.service.datasource.DynamicDataSource;
 import com.alibaba.nacos.config.server.service.datasource.LocalDataSourceServiceImpl;
 import com.alibaba.nacos.config.server.service.dump.DumpConfigHandler;
@@ -186,19 +186,19 @@ protected void init() throws Exception {
  this.transactionTemplate = dataSourceService.getTransactionTemplate();
 
  // Registers a Derby Raft state machine failure event for node degradation processing
- NotifyCenter.registerToSharePublisher(RaftDBErrorEvent.class);
+ NotifyCenter.registerToSharePublisher(RaftDbErrorEvent.class);
  // Register the snapshot load event
  NotifyCenter.registerToSharePublisher(DerbyLoadEvent.class);
 
- NotifyCenter.registerSubscribe(new Subscribe<RaftDBErrorEvent>() {
+ NotifyCenter.registerSubscribe(new Subscribe<RaftDbErrorEvent>() {
  @Override
- public void onEvent(RaftDBErrorEvent event) {
+ public void onEvent(RaftDbErrorEvent event) {
  dataSourceService.setHealthStatus("DOWN");
  }
 
  @Override
  public Class<? extends Event> subscribeType() {
- return RaftDBErrorEvent.class;
+ return RaftDbErrorEvent.class;
  }
  });
 
@@ -549,7 +549,7 @@ public Response onApply(Log log) {
  @Override
  public void onError(Throwable throwable) {
  // Trigger reversion strategy
- NotifyCenter.publishEvent(new RaftDBErrorEvent(throwable));
+ NotifyCenter.publishEvent(new RaftDbErrorEvent(throwable));
  }
 
  @Override

diff --git a/...ba/nacos/config/server/service/repository/embedded/EmbeddedStoragePersistServiceImpl.java b/...ba/nacos/config/server/service/repository/embedded/EmbeddedStoragePersistServiceImpl.java
@@ -174,7 +174,7 @@ public TransactionTemplate getTransactionTemplate() {
 
  @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
  public String getCurrentDBUrl() {
- return this.dataSourceService.getCurrentDBUrl();
+ return this.dataSourceService.getCurrentDbUrl();
  }
 
  public DatabaseOperate getDatabaseOperate() {

diff --git a/...aba/nacos/config/server/service/repository/extrnal/ExternalStoragePersistServiceImpl.java b/...aba/nacos/config/server/service/repository/extrnal/ExternalStoragePersistServiceImpl.java
@@ -166,7 +166,7 @@ public TransactionTemplate getTransactionTemplate() {
 
  @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
  public String getCurrentDBUrl() {
- return this.dataSourceService.getCurrentDBUrl();
+ return this.dataSourceService.getCurrentDbUrl();
  }
 
  @Override

diff --git a/example/src/main/java/com/alibaba/nacos/example/App.java b/example/src/main/java/com/alibaba/nacos/example/App.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.alibaba.nacos.example;
 
 import java.util.Properties;
@@ -22,7 +23,7 @@
 import com.alibaba.nacos.api.naming.NamingService;
 
 /**
- * Hello world!
+ * Hello world.
  *
  * @author xxc
  */

diff --git a/example/src/main/java/com/alibaba/nacos/example/ConfigExample.java b/example/src/main/java/com/alibaba/nacos/example/ConfigExample.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.alibaba.nacos.example;
 
 import java.util.Properties;
@@ -24,7 +25,7 @@
 import com.alibaba.nacos.api.exception.NacosException;
 
 /**
- * Config service example
+ * Config service example.
  *
  * @author Nacos
  */

diff --git a/example/src/main/java/com/alibaba/nacos/example/NamingExample.java b/example/src/main/java/com/alibaba/nacos/example/NamingExample.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.alibaba.nacos.example;
 
 import java.util.Properties;
@@ -25,6 +26,8 @@
 import com.alibaba.nacos.api.naming.listener.NamingEvent;
 
 /**
+ * Nacos naming example.
+ *
  * @author nkorange
  */
 public class NamingExample {
@@ -50,8 +53,8 @@ public static void main(String[] args) throws NacosException {
  naming.subscribe("nacos.test.3", new EventListener() {
  @Override
  public void onEvent(Event event) {
- System.out.println(((NamingEvent)event).getServiceName());
- System.out.println(((NamingEvent)event).getInstances());
+ System.out.println(((NamingEvent) event).getServiceName());
+ System.out.println(((NamingEvent) event).getInstances());
  }
  });
  }

diff --git a/example/src/test/java/com/alibaba/nacos/example/AppTest.java b/example/src/test/java/com/alibaba/nacos/example/AppTest.java
diff --git a/istio/src/main/java/com/alibaba/nacos/istio/mcp/CollectionTypes.java b/istio/src/main/java/com/alibaba/nacos/istio/mcp/CollectionTypes.java
@@ -16,7 +16,6 @@
 
 package com.alibaba.nacos.istio.mcp;
 
-
 /**
  * The collection types supported by Nacos.
  *

diff --git a/style/NacosCheckStyle.xml b/style/NacosCheckStyle.xml
@@ -20,7 +20,7 @@
 
 <module name="Checker">
  <property name="charset" value="UTF-8"/>
- <property name="severity" value="warning"/>
+ <property name="severity" value="error"/>
  <property name="fileExtensions" value="java, properties, xml"/>
 
  <module name="FileTabCharacter">
@@ -94,7 +94,7 @@
  <property name="minLineCount" value="2"/>
  <property name="allowedAnnotations"
  value="Override, Test, Before, After, BeforeClass, AfterClass, Parameterized, Parameters, Bean"/>
- <property name="ignoreMethodNamesRegex" value="^set[A-Z].*|^get[A-Z].*"/>
+ <property name="ignoreMethodNamesRegex" value="^set[A-Z].*|^get[A-Z].*|main"/>
  <property name="tokens" value="METHOD_DEF, ANNOTATION_FIELD_DEF"/>
  </module>
  <module name="SingleLineJavadoc">