🎨 规范代码格式化风格

chenlei65368 · Oct 26, 2020 · 45bcd49 · 45bcd49
1 parent 286ce0f
commit 45bcd49
Show file tree

Hide file tree

Showing 137 changed files with 1,329 additions and 1,500 deletions.
diff --git a/demo-activiti/src/main/java/com/xkcoding/activiti/config/SecurityConfiguration.java b/demo-activiti/src/main/java/com/xkcoding/activiti/config/SecurityConfiguration.java
@@ -42,10 +42,7 @@ protected UserDetailsService myUserDetailsService() {
         for (String[] user : usersGroupsAndRoles) {
             List<String> authoritiesStrings = Arrays.asList(Arrays.copyOfRange(user, 2, user.length));
             log.info("> Registering new user: " + user[0] + " with the following Authorities[" + authoritiesStrings + "]");
-            inMemoryUserDetailsManager.createUser(new User(user[0], passwordEncoder().encode(user[1]), authoritiesStrings
-                    .stream()
-                    .map(SimpleGrantedAuthority::new)
-                    .collect(Collectors.toList())));
+            inMemoryUserDetailsManager.createUser(new User(user[0], passwordEncoder().encode(user[1]), authoritiesStrings.stream().map(SimpleGrantedAuthority::new).collect(Collectors.toList())));
         }
 
 

diff --git a/demo-actuator/src/main/java/com/xkcoding/actuator/SpringBootDemoActuatorApplication.java b/demo-actuator/src/main/java/com/xkcoding/actuator/SpringBootDemoActuatorApplication.java
@@ -14,7 +14,7 @@
 @SpringBootApplication
 public class SpringBootDemoActuatorApplication {
 
-	public static void main(String[] args) {
-		SpringApplication.run(SpringBootDemoActuatorApplication.class, args);
-	}
+    public static void main(String[] args) {
+        SpringApplication.run(SpringBootDemoActuatorApplication.class, args);
+    }
 }
diff --git a/...-actuator/src/test/java/com/xkcoding/actuator/SpringBootDemoActuatorApplicationTests.java b/...-actuator/src/test/java/com/xkcoding/actuator/SpringBootDemoActuatorApplicationTests.java
@@ -9,8 +9,8 @@
 @SpringBootTest
 public class SpringBootDemoActuatorApplicationTests {
 
-	@Test
-	public void contextLoads() {
-	}
+    @Test
+    public void contextLoads() {
+    }
 
 }
diff --git a/...-client/src/main/java/com/xkcoding/admin/client/SpringBootDemoAdminClientApplication.java b/...-client/src/main/java/com/xkcoding/admin/client/SpringBootDemoAdminClientApplication.java
@@ -14,7 +14,7 @@
 @SpringBootApplication
 public class SpringBootDemoAdminClientApplication {
 
-	public static void main(String[] args) {
-		SpringApplication.run(SpringBootDemoAdminClientApplication.class, args);
-	}
+    public static void main(String[] args) {
+        SpringApplication.run(SpringBootDemoAdminClientApplication.class, args);
+    }
 }
diff --git a/...dmin/admin-client/src/main/java/com/xkcoding/admin/client/controller/IndexController.java b/...dmin/admin-client/src/main/java/com/xkcoding/admin/client/controller/IndexController.java
@@ -13,8 +13,8 @@
  */
 @RestController
 public class IndexController {
-	@GetMapping(value = {"", "/"})
-	public String index() {
-		return "This is a Spring Boot Admin Client.";
-	}
+    @GetMapping(value = {"", "/"})
+    public String index() {
+        return "This is a Spring Boot Admin Client.";
+    }
 }
diff --git a/...nt/src/test/java/com/xkcoding/admin/client/SpringBootDemoAdminClientApplicationTests.java b/...nt/src/test/java/com/xkcoding/admin/client/SpringBootDemoAdminClientApplicationTests.java
@@ -9,8 +9,8 @@
 @SpringBootTest
 public class SpringBootDemoAdminClientApplicationTests {
 
-	@Test
-	public void contextLoads() {
-	}
+    @Test
+    public void contextLoads() {
+    }
 
 }
diff --git a/...-server/src/main/java/com/xkcoding/admin/server/SpringBootDemoAdminServerApplication.java b/...-server/src/main/java/com/xkcoding/admin/server/SpringBootDemoAdminServerApplication.java
@@ -16,7 +16,7 @@
 @SpringBootApplication
 public class SpringBootDemoAdminServerApplication {
 
-	public static void main(String[] args) {
-		SpringApplication.run(SpringBootDemoAdminServerApplication.class, args);
-	}
+    public static void main(String[] args) {
+        SpringApplication.run(SpringBootDemoAdminServerApplication.class, args);
+    }
 }
diff --git a/...er/src/test/java/com/xkcoding/admin/server/SpringBootDemoAdminServerApplicationTests.java b/...er/src/test/java/com/xkcoding/admin/server/SpringBootDemoAdminServerApplicationTests.java
@@ -9,8 +9,8 @@
 @SpringBootTest
 public class SpringBootDemoAdminServerApplicationTests {
 
-	@Test
-	public void contextLoads() {
-	}
+    @Test
+    public void contextLoads() {
+    }
 
 }
diff --git a/demo-codegen/src/main/java/com/xkcoding/codegen/utils/CodeGenUtil.java b/demo-codegen/src/main/java/com/xkcoding/codegen/utils/CodeGenUtil.java
@@ -179,9 +179,7 @@ public void generatorCode(GenConfig genConfig, Entity table, List<Entity> column
 
             try {
                 //添加到zip
-                zip.putNextEntry(new ZipEntry(Objects.requireNonNull(getFileName(template, tableEntity.getCaseClassName(), map
-                        .get("package")
-                        .toString(), map.get("moduleName").toString()))));
+                zip.putNextEntry(new ZipEntry(Objects.requireNonNull(getFileName(template, tableEntity.getCaseClassName(), map.get("package").toString(), map.get("moduleName").toString()))));
                 IoUtil.write(zip, StandardCharsets.UTF_8, false, sw.toString());
                 IoUtil.close(sw);
                 zip.closeEntry();

diff --git a/...datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceHolder.java b/...datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceHolder.java
@@ -78,6 +78,7 @@ public synchronized void clearExpiredDatasource() {
 
     /**
      * 清除动态数据源
+     *
      * @param id 数据源id
      */
     public synchronized void removeDatasource(Long id) {

diff --git a/...asource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceScheduler.java b/...asource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceScheduler.java
@@ -37,7 +37,7 @@ private void shutdown() {
         }
     }
 
-    public void schedule(Runnable task,long delay){
+    public void schedule(Runnable task, long delay) {
         this.scheduler.scheduleAtFixedRate(task, delay, delay, TimeUnit.MILLISECONDS);
     }
 

diff --git a/...atasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DynamicDataSource.java b/...atasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DynamicDataSource.java
@@ -35,6 +35,7 @@ public Connection getConnection() throws SQLException {
 
     /**
      * 初始化数据源
+     *
      * @param id 数据源id
      * @return 数据源
      */

diff --git a/...search-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/common/Result.java b/...search-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/common/Result.java
@@ -54,7 +54,6 @@ private Result(int errcode, String errmsg, T data) {
     }
 
 
-
     /**
      * 返回成功
      *
@@ -70,15 +69,12 @@ public static <T> Result<T> success() {
      * 返回成功-携带数据
      *
      * @param data 响应数据
-     * @param <T> 泛型标记
+     * @param <T>  泛型标记
      * @return 响应信息 {@code Result}
      */
     public static <T> Result<T> success(@Nullable T data) {
         return new Result<>(ResultCode.SUCCESS, data);
     }
 
 
-
-
-
 }
diff --git a/...est-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/PersonService.java b/...est-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/PersonService.java
@@ -17,51 +17,51 @@ public interface PersonService {
     /**
      * create Index
      *
-     * @author fxbin
      * @param index elasticsearch index name
+     * @author fxbin
      */
     void createIndex(String index);
 
     /**
      * delete Index
      *
-     * @author fxbin
      * @param index elasticsearch index name
+     * @author fxbin
      */
     void deleteIndex(String index);
 
     /**
      * insert document source
      *
-     * @author fxbin
      * @param index elasticsearch index name
-     * @param list data source
+     * @param list  data source
+     * @author fxbin
      */
     void insert(String index, List<Person> list);
 
     /**
      * update document source
      *
-     * @author fxbin
      * @param index elasticsearch index name
-     * @param list data source
+     * @param list  data source
+     * @author fxbin
      */
     void update(String index, List<Person> list);
 
     /**
      * delete document source
      *
-     * @author fxbin
      * @param person delete data source and allow null object
+     * @author fxbin
      */
     void delete(String index, @Nullable Person person);
 
     /**
      * search all doc records
      *
-     * @author fxbin
      * @param index elasticsearch index name
      * @return person list
+     * @author fxbin
      */
     List<Person> searchList(String index);
 

diff --git a/...level-client/src/main/java/com/xkcoding/elasticsearch/service/impl/PersonServiceImpl.java b/...level-client/src/main/java/com/xkcoding/elasticsearch/service/impl/PersonServiceImpl.java
@@ -2,8 +2,8 @@
 
 import cn.hutool.core.bean.BeanUtil;
 import com.xkcoding.elasticsearch.model.Person;
-import com.xkcoding.elasticsearch.service.base.BaseElasticsearchService;
 import com.xkcoding.elasticsearch.service.PersonService;
+import com.xkcoding.elasticsearch.service.base.BaseElasticsearchService;
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.search.SearchHit;

diff --git a/...src/test/java/com/xkcoding/elasticsearch/SpringBootDemoElasticsearchApplicationTests.java b/...src/test/java/com/xkcoding/elasticsearch/SpringBootDemoElasticsearchApplicationTests.java
@@ -9,8 +9,8 @@
 @SpringBootTest
 public class SpringBootDemoElasticsearchApplicationTests {
 
-	@Test
-	public void contextLoads() {
-	}
+    @Test
+    public void contextLoads() {
+    }
 
 }
diff --git a/...asticsearch/src/test/java/com/xkcoding/elasticsearch/repository/PersonRepositoryTest.java b/...asticsearch/src/test/java/com/xkcoding/elasticsearch/repository/PersonRepositoryTest.java
@@ -92,8 +92,7 @@ public void delete() {
      */
     @Test
     public void select() {
-        repo.findAll(Sort.by(Sort.Direction.DESC, "birthday"))
-                .forEach(person -> log.info("{} 生日: {}", person.getName(), DateUtil.formatDateTime(person.getBirthday())));
+        repo.findAll(Sort.by(Sort.Direction.DESC, "birthday")).forEach(person -> log.info("{} 生日: {}", person.getName(), DateUtil.formatDateTime(person.getBirthday())));
     }
 
     /**
@@ -167,8 +166,8 @@ public void advanceAgg() {
 
         // 1. 添加一个新的聚合，聚合类型为terms，聚合名称为country，聚合字段为age
         queryBuilder.addAggregation(AggregationBuilders.terms("country").field("country")
-                // 2. 在国家聚合桶内进行嵌套聚合，求平均年龄
-                .subAggregation(AggregationBuilders.avg("avg").field("age")));
+            // 2. 在国家聚合桶内进行嵌套聚合，求平均年龄
+            .subAggregation(AggregationBuilders.avg("avg").field("age")));
 
         log.info("【queryBuilder】= {}", JSONUtil.toJsonStr(queryBuilder.build()));
 

diff --git a/demo-email/src/test/java/com/xkcoding/email/SpringBootDemoEmailApplicationTests.java b/demo-email/src/test/java/com/xkcoding/email/SpringBootDemoEmailApplicationTests.java
@@ -9,8 +9,8 @@
 @SpringBootTest
 public class SpringBootDemoEmailApplicationTests {
 
-	@Test
-	public void contextLoads() {
-	}
+    @Test
+    public void contextLoads() {
+    }
 
 }
diff --git a/...c/main/java/com/xkcoding/exception/handler/SpringBootDemoExceptionHandlerApplication.java b/...c/main/java/com/xkcoding/exception/handler/SpringBootDemoExceptionHandlerApplication.java
@@ -14,7 +14,7 @@
 @SpringBootApplication
 public class SpringBootDemoExceptionHandlerApplication {
 
-	public static void main(String[] args) {
-		SpringApplication.run(SpringBootDemoExceptionHandlerApplication.class, args);
-	}
+    public static void main(String[] args) {
+        SpringApplication.run(SpringBootDemoExceptionHandlerApplication.class, args);
+    }
 }
diff --git a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/constant/Status.java b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/constant/Status.java
@@ -12,26 +12,26 @@
  */
 @Getter
 public enum Status {
-	/**
-	 * 操作成功
-	 */
-	OK(200, "操作成功"),
+    /**
+     * 操作成功
+     */
+    OK(200, "操作成功"),
 
-	/**
-	 * 未知异常
-	 */
-	UNKNOWN_ERROR(500, "服务器出错啦");
-	/**
-	 * 状态码
-	 */
-	private Integer code;
-	/**
-	 * 内容
-	 */
-	private String message;
+    /**
+     * 未知异常
+     */
+    UNKNOWN_ERROR(500, "服务器出错啦");
+    /**
+     * 状态码
+     */
+    private Integer code;
+    /**
+     * 内容
+     */
+    private String message;
 
-	Status(Integer code, String message) {
-		this.code = code;
-		this.message = message;
-	}
+    Status(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
 }
diff --git a/...ption-handler/src/main/java/com/xkcoding/exception/handler/controller/TestController.java b/...ption-handler/src/main/java/com/xkcoding/exception/handler/controller/TestController.java
@@ -20,14 +20,14 @@
 @Controller
 public class TestController {
 
-	@GetMapping("/json")
-	@ResponseBody
-	public ApiResponse jsonException() {
-		throw new JsonException(Status.UNKNOWN_ERROR);
-	}
+    @GetMapping("/json")
+    @ResponseBody
+    public ApiResponse jsonException() {
+        throw new JsonException(Status.UNKNOWN_ERROR);
+    }
 
-	@GetMapping("/page")
-	public ModelAndView pageException() {
-		throw new PageException(Status.UNKNOWN_ERROR);
-	}
+    @GetMapping("/page")
+    public ModelAndView pageException() {
+        throw new PageException(Status.UNKNOWN_ERROR);
+    }
 }
diff --git a/...ception-handler/src/main/java/com/xkcoding/exception/handler/exception/BaseException.java b/...ception-handler/src/main/java/com/xkcoding/exception/handler/exception/BaseException.java
@@ -15,18 +15,18 @@
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class BaseException extends RuntimeException {
-	private Integer code;
-	private String message;
+    private Integer code;
+    private String message;
 
-	public BaseException(Status status) {
-		super(status.getMessage());
-		this.code = status.getCode();
-		this.message = status.getMessage();
-	}
+    public BaseException(Status status) {
+        super(status.getMessage());
+        this.code = status.getCode();
+        this.message = status.getMessage();
+    }
 
-	public BaseException(Integer code, String message) {
-		super(message);
-		this.code = code;
-		this.message = message;
-	}
+    public BaseException(Integer code, String message) {
+        super(message);
+        this.code = code;
+        this.message = message;
+    }
 }