按照Alibaba Java Coding Guidelines插件扫描结果，修改代码规范

lizhengjun1982 · Nov 8, 2017 · 3e330ec · 3e330ec
1 parent ad725a4
commit 3e330ec
Show file tree

Hide file tree

Showing 140 changed files with 841 additions and 569 deletions.
diff --git a/...g-api/zheng-api-common/src/main/java/com/zheng/api/common/constant/ApiResultConstant.java b/...g-api/zheng-api-common/src/main/java/com/zheng/api/common/constant/ApiResultConstant.java
@@ -6,6 +6,9 @@
  */
 public enum ApiResultConstant {
 
+    /**
+     * 成功
+     */
     SUCCESS(1, "success");
 
     public int code;

diff --git a/zheng-api/zheng-api-rpc-api/src/main/java/com/zheng/api/rpc/api/ApiService.java b/zheng-api/zheng-api-rpc-api/src/main/java/com/zheng/api/rpc/api/ApiService.java
@@ -6,6 +6,11 @@
  */
 public interface ApiService {
 
+    /**
+     * hello
+     * @param name
+     * @return
+     */
     String hello(String name);
 
 }
diff --git a/zheng-api/zheng-api-rpc-api/src/main/java/com/zheng/api/rpc/api/ApiServiceMock.java b/zheng-api/zheng-api-rpc-api/src/main/java/com/zheng/api/rpc/api/ApiServiceMock.java
@@ -9,11 +9,11 @@
  */
 public class ApiServiceMock implements ApiService {
 
-    private static Logger _log = LoggerFactory.getLogger(ApiServiceMock.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ApiServiceMock.class);
 
     @Override
     public String hello(String name) {
-        _log.info("ApiServiceMock => hello");
+        LOGGER.info("ApiServiceMock => hello");
         return null;
     }
 

diff --git a/.../zheng-api-rpc-service/src/main/java/com/zheng/api/rpc/ZhengApiRpcServiceApplication.java b/.../zheng-api-rpc-service/src/main/java/com/zheng/api/rpc/ZhengApiRpcServiceApplication.java
@@ -10,12 +10,11 @@
  */
 public class ZhengApiRpcServiceApplication {
 
-	private static Logger _log = LoggerFactory.getLogger(ZhengApiRpcServiceApplication.class);
-
-	public static void main(String[] args) {
-		_log.info(">>>>> zheng-api-rpc-service 正在启动 <<<<<");
-		new ClassPathXmlApplicationContext("classpath:META-INF/spring/*.xml");
-		_log.info(">>>>> zheng-api-rpc-service 启动完成 <<<<<");
-	}
+    private static final Logger LOGGER = LoggerFactory.getLogger(ZhengApiRpcServiceApplication.class);
 
+    public static void main(String[] args) {
+        LOGGER.info(">>>>> zheng-api-rpc-service 正在启动 <<<<<");
+        new ClassPathXmlApplicationContext("classpath:META-INF/spring/*.xml");
+        LOGGER.info(">>>>> zheng-api-rpc-service 启动完成 <<<<<");
+    }
 }
diff --git a/...pi/zheng-api-rpc-service/src/main/java/com/zheng/api/rpc/service/impl/ApiServiceImpl.java b/...pi/zheng-api-rpc-service/src/main/java/com/zheng/api/rpc/service/impl/ApiServiceImpl.java
@@ -1,50 +1,17 @@
 package com.zheng.api.rpc.service.impl;
 
 import com.zheng.api.rpc.api.ApiService;
-import com.zheng.cms.rpc.api.*;
-import com.zheng.upms.rpc.api.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * 实现ApiService接口
  * Created by shuzheng on 2017/2/19.
  */
 public class ApiServiceImpl implements ApiService {
 
-    private static Logger _log = LoggerFactory.getLogger(ApiServiceImpl.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ApiServiceImpl.class);
 
-//    @Autowired
-//    private UpmsSystemService upmsSystemService;
-//
-//    @Autowired
-//    private UpmsOrganizationService upmsOrganizationService;
-//
-//    @Autowired
-//    private UpmsUserService upmsUserService;
-//
-//    @Autowired
-//    private UpmsRoleService upmsRoleService;
-//
-//    @Autowired
-//    private UpmsPermissionService upmsPermissionService;
-//
-//    @Autowired
-//    private UpmsApiService upmsApiService;
-//
-//    @Autowired
-//    private CmsArticleService cmsArticleService;
-//
-//    @Autowired
-//    private CmsCategoryService cmsCategoryService;
-//
-//    @Autowired
-//    private CmsCommentService cmsCommentService;
-//
-//    @Autowired
-//    private CmsTagService cmsTagService;
-//
     @Override
     public String hello(String name) {
         return "hello," + name + "!";

diff --git a/zheng-api/zheng-api-server/src/main/java/com/zheng/api/server/controller/TestController.java b/zheng-api/zheng-api-server/src/main/java/com/zheng/api/server/controller/TestController.java
@@ -21,7 +21,7 @@
 @Api(value = "test", description = "test")
 public class TestController extends BaseController {
 
-	private static Logger _log = LoggerFactory.getLogger(TestController.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(TestController.class);
 
 	@Autowired
 	private ApiService apiService;

diff --git a/.../zheng-api-server/src/main/java/com/zheng/api/server/jms/DefaultMessageQueueListener.java b/.../zheng-api-server/src/main/java/com/zheng/api/server/jms/DefaultMessageQueueListener.java
@@ -15,25 +15,27 @@
  */
 public class DefaultMessageQueueListener implements MessageListener {
 
-	private static Logger _log = LoggerFactory.getLogger(DefaultMessageQueueListener.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultMessageQueueListener.class);
 
-	@Autowired
-	ThreadPoolTaskExecutor threadPoolTaskExecutor;
+    @Autowired
+    ThreadPoolTaskExecutor threadPoolTaskExecutor;
 
-	public void onMessage(final Message message) {
-		// 使用线程池多线程处理
-		threadPoolTaskExecutor.execute(new Runnable() {
-			public void run() {
-				if (message instanceof TextMessage) {
-					TextMessage textMessage = (TextMessage) message;
-					try {
-						_log.info("消费：{}", textMessage.getText());
-					} catch (Exception e){
-						e.printStackTrace();
-					}
-				}
-			}
-		});
-	}
+    @Override
+    public void onMessage(final Message message) {
+        // 使用线程池多线程处理
+        threadPoolTaskExecutor.execute(new Runnable() {
+            @Override
+            public void run() {
+                if (message instanceof TextMessage) {
+                    TextMessage textMessage = (TextMessage) message;
+                    try {
+                        LOGGER.info("消费：{}", textMessage.getText());
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        });
+    }
 
 }
diff --git a/zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/ManageController.java b/zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/ManageController.java
@@ -18,7 +18,7 @@
 @Api(value = "后台控制器", description = "后台管理")
 public class ManageController extends BaseController {
 
-	private static Logger _log = LoggerFactory.getLogger(ManageController.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(ManageController.class);
 
 	/**
 	 * 后台首页

diff --git a/...g-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsArticleController.java b/...g-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsArticleController.java
@@ -37,7 +37,7 @@
 @RequestMapping("/manage/article")
 public class CmsArticleController extends BaseController {
 
-	private static Logger _log = LoggerFactory.getLogger(CmsArticleController.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(CmsArticleController.class);
 
 	@Autowired
 	private CmsArticleService cmsArticleService;
@@ -67,7 +67,7 @@ public Object list(
 		}
 		List<CmsArticle> rows = cmsArticleService.selectByExampleForOffsetPage(cmsArticleExample, offset, limit);
 		long total = cmsArticleService.countByExample(cmsArticleExample);
-		Map<String, Object> result = new HashMap<>();
+		Map<String, Object> result = new HashMap<>(2);
 		result.put("rows", rows);
 		result.put("total", total);
 		return result;

diff --git a/...-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsCategoryController.java b/...-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsCategoryController.java
@@ -34,7 +34,7 @@
 @RequestMapping("/manage/category")
 public class CmsCategoryController extends BaseController {
 
-	private static Logger _log = LoggerFactory.getLogger(CmsCategoryController.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(CmsCategoryController.class);
 
 	@Autowired
 	private CmsCategoryService cmsCategoryService;
@@ -61,7 +61,7 @@ public Object list(
 		}
 		List<CmsCategory> rows = cmsCategoryService.selectByExampleForOffsetPage(cmsCategoryExample, offset, limit);
 		long total = cmsCategoryService.countByExample(cmsCategoryExample);
-		Map<String, Object> result = new HashMap<>();
+		Map<String, Object> result = new HashMap<>(2);
 		result.put("rows", rows);
 		result.put("total", total);
 		return result;

diff --git a/...g-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsCommentController.java b/...g-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsCommentController.java
@@ -30,7 +30,7 @@
 @RequestMapping("/manage/comment")
 public class CmsCommentController extends BaseController {
 
-	private static Logger _log = LoggerFactory.getLogger(CmsCommentController.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(CmsCommentController.class);
 
 	@Autowired
 	private CmsCommentService cmsCommentService;
@@ -57,7 +57,7 @@ public Object list(
 		}
 		List<CmsComment> rows = cmsCommentService.selectByExampleWithBLOBsForOffsetPage(cmsCommentExample, offset, limit);
 		long total = cmsCommentService.countByExample(cmsCommentExample);
-		Map<String, Object> result = new HashMap<>();
+		Map<String, Object> result = new HashMap<>(2);
 		result.put("rows", rows);
 		result.put("total", total);
 		return result;

diff --git a/...heng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsMenuController.java b/...heng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsMenuController.java
@@ -34,7 +34,7 @@
 @RequestMapping("/manage/menu")
 public class CmsMenuController extends BaseController {
 
-	private static Logger _log = LoggerFactory.getLogger(CmsMenuController.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(CmsMenuController.class);
 
 	@Autowired
 	private CmsMenuService cmsMenuService;
@@ -61,7 +61,7 @@ public Object list(
 		}
 		List<CmsMenu> rows = cmsMenuService.selectByExampleForOffsetPage(cmsMenuExample, offset, limit);
 		long total = cmsMenuService.countByExample(cmsMenuExample);
-		Map<String, Object> result = new HashMap<>();
+		Map<String, Object> result = new HashMap<>(2);
 		result.put("rows", rows);
 		result.put("total", total);
 		return result;

diff --git a/...heng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsPageController.java b/...heng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsPageController.java
@@ -34,7 +34,7 @@
 @RequestMapping("/manage/page")
 public class CmsPageController extends BaseController {
 
-	private static Logger _log = LoggerFactory.getLogger(CmsPageController.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(CmsPageController.class);
 
 	@Autowired
 	private CmsPageService cmsPageService;
@@ -61,7 +61,7 @@ public Object list(
 		}
 		List<CmsPage> rows = cmsPageService.selectByExampleForOffsetPage(cmsPageExample, offset, limit);
 		long total = cmsPageService.countByExample(cmsPageExample);
-		Map<String, Object> result = new HashMap<>();
+		Map<String, Object> result = new HashMap<>(2);
 		result.put("rows", rows);
 		result.put("total", total);
 		return result;

diff --git a/...g-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsSettingController.java b/...g-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsSettingController.java
@@ -35,7 +35,7 @@
 @RequestMapping("/manage/setting")
 public class CmsSettingController extends BaseController {
 
-	private static Logger _log = LoggerFactory.getLogger(CmsSettingController.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(CmsSettingController.class);
 
 	@Autowired
 	private CmsSettingService cmsSettingService;
@@ -62,7 +62,7 @@ public Object list(
 		}
 		List<CmsSetting> rows = cmsSettingService.selectByExampleForOffsetPage(cmsSettingExample, offset, limit);
 		long total = cmsSettingService.countByExample(cmsSettingExample);
-		Map<String, Object> result = new HashMap<>();
+		Map<String, Object> result = new HashMap<>(2);
 		result.put("rows", rows);
 		result.put("total", total);
 		return result;

diff --git a/...zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsTagController.java b/...zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsTagController.java
@@ -34,7 +34,7 @@
 @RequestMapping("/manage/tag")
 public class CmsTagController extends BaseController {
 
-	private static Logger _log = LoggerFactory.getLogger(CmsTagController.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(CmsTagController.class);
 
 	@Autowired
 	private CmsTagService cmsTagService;
@@ -61,7 +61,7 @@ public Object list(
 		}
 		List<CmsTag> rows = cmsTagService.selectByExampleForOffsetPage(cmsTagExample, offset, limit);
 		long total = cmsTagService.countByExample(cmsTagExample);
-		Map<String, Object> result = new HashMap<>();
+		Map<String, Object> result = new HashMap<>(2);
 		result.put("rows", rows);
 		result.put("total", total);
 		return result;

diff --git a/...eng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsTopicController.java b/...eng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsTopicController.java
@@ -34,7 +34,7 @@
 @RequestMapping("/manage/topic")
 public class CmsTopicController extends BaseController {
 
-	private static Logger _log = LoggerFactory.getLogger(CmsTopicController.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(CmsTopicController.class);
 
 	@Autowired
 	private CmsTopicService cmsTopicService;
@@ -61,7 +61,7 @@ public Object list(
 		}
 		List<CmsTopic> rows = cmsTopicService.selectByExampleForOffsetPage(cmsTopicExample, offset, limit);
 		long total = cmsTopicService.countByExample(cmsTopicExample);
-		Map<String, Object> result = new HashMap<>();
+		Map<String, Object> result = new HashMap<>(2);
 		result.put("rows", rows);
 		result.put("total", total);
 		return result;

diff --git a/.../admin/Interceptor/ManageInterceptor.java → .../admin/interceptor/ManageInterceptor.java b/.../admin/Interceptor/ManageInterceptor.java → .../admin/interceptor/ManageInterceptor.java
@@ -1,4 +1,4 @@
-package com.zheng.cms.admin.Interceptor;
+package com.zheng.cms.admin.interceptor;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,7 +14,7 @@
  */
 public class ManageInterceptor extends HandlerInterceptorAdapter {
 
-	private static Logger _log = LoggerFactory.getLogger(ManageInterceptor.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(ManageInterceptor.class);
 
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {

diff --git a/...ms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/jms/DefaultMessageQueueListener.java b/...ms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/jms/DefaultMessageQueueListener.java
@@ -15,19 +15,21 @@
  */
 public class DefaultMessageQueueListener implements MessageListener {
 
-	private static Logger _log = LoggerFactory.getLogger(DefaultMessageQueueListener.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(DefaultMessageQueueListener.class);
 
 	@Autowired
 	ThreadPoolTaskExecutor threadPoolTaskExecutor;
 
-	public void onMessage(final Message message) {
+	@Override
+    public void onMessage(final Message message) {
 		// 使用线程池多线程处理
 		threadPoolTaskExecutor.execute(new Runnable() {
-			public void run() {
+			@Override
+            public void run() {
 				if (message instanceof TextMessage) {
 					TextMessage textMessage = (TextMessage) message;
 					try {
-						_log.info("消费消息：{}", textMessage.getText());
+						LOGGER.info("消费消息：{}", textMessage.getText());
 					} catch (Exception e){
 						e.printStackTrace();
 					}

diff --git a/zheng-cms/zheng-cms-admin/src/main/resources/springMVC-servlet.xml b/zheng-cms/zheng-cms-admin/src/main/resources/springMVC-servlet.xml
@@ -19,7 +19,7 @@
             <!-- 非拦截路径 -->
             <mvc:exclude-mapping path="/manage/login"/>
             <!-- 拦截器对象 -->
-            <bean id="manageInterceptor" class="com.zheng.cms.admin.Interceptor.ManageInterceptor"/>
+            <bean id="manageInterceptor" class="com.zheng.cms.admin.interceptor.ManageInterceptor"/>
         </mvc:interceptor>
     </mvc:interceptors>
 

diff --git a/...g-cms/zheng-cms-common/src/main/java/com/zheng/cms/common/constant/CmsResultConstant.java b/...g-cms/zheng-cms-common/src/main/java/com/zheng/cms/common/constant/CmsResultConstant.java
@@ -6,11 +6,29 @@
  */
 public enum CmsResultConstant {
 
+    /**
+     * 失败
+     */
     FAILED(0, "failed"),
+
+    /**
+     * 成功
+     */
     SUCCESS(1, "success"),
 
+    /**
+     * 文件类型不支持
+     */
     FILE_TYPE_ERROR(20001, "File type not supported!"),
+
+    /**
+     * 无效长度
+     */
     INVALID_LENGTH(20002, "Invalid length"),
+
+    /**
+     * 无效参数
+     */
     INVALID_PARAMETER(20003, "Invalid parameter");
 
     public int code;