code format

xlorne · xlorne · commit d0cc75d853a7 · 2022-09-11T14:24:46.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
diff --git a/springboot-example/pom.xml b/springboot-example/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
diff --git a/springboot-example/src/main/java/com/codingapi/springboot/example/ui/controller/OpenController.java b/springboot-example/src/main/java/com/codingapi/springboot/example/ui/controller/OpenController.java
@@ -40,9 +40,8 @@ public MultiResponse<DemoEntity> findAll(PageRequest pageRequest) {
     }
 
 
-
     @GetMapping("/test-list")
-    public List<IdKey> test1() throws SQLException{
+    public List<IdKey> test1() throws SQLException {
         return idKeyDao.findAll();
     }
 
diff --git a/springboot-starter-data-fast/pom.xml b/springboot-starter-data-fast/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>springboot-parent</artifactId>
diff --git a/springboot-starter-id-generator/pom.xml b/springboot-starter-id-generator/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>springboot-parent</artifactId>
diff --git a/springboot-starter-id-generator/src/main/java/com/codingapi/springboot/generator/AutoConfiguration.java b/springboot-starter-id-generator/src/main/java/com/codingapi/springboot/generator/AutoConfiguration.java
@@ -18,8 +18,8 @@ public GeneratorProperties generatorProperties() {
 
     @Bean(initMethod = "init")
     @ConditionalOnMissingBean
-    public IdKeyDao idKeyDao(GeneratorProperties generatorProperties){
-        IdKeyDao keyDao =  new IdKeyDao(generatorProperties.getJdbcUrl());
+    public IdKeyDao idKeyDao(GeneratorProperties generatorProperties) {
+        IdKeyDao keyDao = new IdKeyDao(generatorProperties.getJdbcUrl());
         GeneratorContext.getInstance().init(keyDao);
         return keyDao;
     }
diff --git a/springboot-starter-id-generator/src/main/java/com/codingapi/springboot/generator/GeneratorContext.java b/springboot-starter-id-generator/src/main/java/com/codingapi/springboot/generator/GeneratorContext.java
@@ -4,11 +4,12 @@
 
 public class GeneratorContext {
 
+    private static GeneratorContext instance;
+    private IdGenerateContext idGenerateContext;
+
     private GeneratorContext() {
     }
 
-    private static GeneratorContext instance;
-
     public static GeneratorContext getInstance() {
         if (instance == null) {
             synchronized (GeneratorContext.class) {
@@ -20,13 +21,11 @@ public static GeneratorContext getInstance() {
         return instance;
     }
 
-    private IdGenerateContext idGenerateContext;
-
     long generateId(Class<?> clazz) {
         return idGenerateContext.generateId(clazz);
     }
 
-    void init(IdKeyDao idKeyDao){
+    void init(IdKeyDao idKeyDao) {
         idGenerateContext = new IdGenerateContext(idKeyDao);
     }
 
diff --git a/springboot-starter-id-generator/src/main/java/com/codingapi/springboot/generator/IdGenerateContext.java b/springboot-starter-id-generator/src/main/java/com/codingapi/springboot/generator/IdGenerateContext.java
@@ -11,12 +11,12 @@ public IdGenerateContext(IdKeyDao keyDao) {
         this.keyDao = keyDao;
     }
 
-    public synchronized long generateId(Class<?> clazz)  {
-        IdKey idKey =  keyDao.getByKey(clazz.getName());
-        if(idKey==null){
+    public synchronized long generateId(Class<?> clazz) {
+        IdKey idKey = keyDao.getByKey(clazz.getName());
+        if (idKey == null) {
             idKey = new IdKey(clazz.getName());
             keyDao.save(idKey);
-        }else{
+        } else {
             keyDao.updateMaxId(idKey);
         }
         return idKey.getId();
diff --git a/springboot-starter-id-generator/src/main/java/com/codingapi/springboot/generator/dao/DbHelper.java b/springboot-starter-id-generator/src/main/java/com/codingapi/springboot/generator/dao/DbHelper.java
@@ -12,43 +12,18 @@ public class DbHelper<T> {
     private final QueryRunner queryRunner;
 
 
-    interface IExecute {
-        default void execute(Connection connection, QueryRunner queryRunner) throws SQLException {
-        }
-    }
-
-    interface IUpdateAndQuery<T> {
-        default T updateAndQuery(Connection connection, QueryRunner queryRunner) throws SQLException {
-            return null;
-        }
-    }
-
-    interface IUpdate {
-        default int update(Connection connection, QueryRunner queryRunner) throws SQLException {
-            return 0;
-        }
-    }
-
-    interface IQuery<T> {
-        default T query(Connection connection, QueryRunner queryRunner) throws SQLException {
-            return null;
-        }
-    }
-
     public DbHelper(String jdbcUrl) {
         this.dataSource = new JdbcDataSource();
         this.queryRunner = new QueryRunner();
         this.dataSource.setURL(jdbcUrl);
     }
 
-
     public void execute(IExecute execute) throws SQLException {
         Connection connection = dataSource.getConnection();
         execute.execute(connection, queryRunner);
         connection.close();
     }
 
-
     public T updateAndQuery(IUpdateAndQuery<T> execute) throws SQLException {
         Connection connection = dataSource.getConnection();
         connection.setAutoCommit(false);
@@ -74,4 +49,29 @@ public T query(IQuery<T> execute) throws SQLException {
         return res;
     }
 
+
+    interface IExecute {
+        default void execute(Connection connection, QueryRunner queryRunner) throws SQLException {
+        }
+    }
+
+
+    interface IUpdateAndQuery<T> {
+        default T updateAndQuery(Connection connection, QueryRunner queryRunner) throws SQLException {
+            return null;
+        }
+    }
+
+    interface IUpdate {
+        default int update(Connection connection, QueryRunner queryRunner) throws SQLException {
+            return 0;
+        }
+    }
+
+    interface IQuery<T> {
+        default T query(Connection connection, QueryRunner queryRunner) throws SQLException {
+            return null;
+        }
+    }
+
 }
diff --git a/springboot-starter-id-generator/src/main/java/com/codingapi/springboot/generator/dao/IdKeyDao.java b/springboot-starter-id-generator/src/main/java/com/codingapi/springboot/generator/dao/IdKeyDao.java
@@ -48,19 +48,17 @@ public int update(Connection connection, QueryRunner queryRunner) throws SQLExce
     }
 
 
-
     @SneakyThrows
     public IdKey getByKey(String key) {
         return dbHelper.query(new DbHelper.IQuery<List<IdKey>>() {
             @Override
             public List<IdKey> query(Connection connection, QueryRunner queryRunner) throws SQLException {
-                return queryRunner.query(connection, "SELECT * FROM ID_GENERATOR WHERE TAG = ?", handler,key);
+                return queryRunner.query(connection, "SELECT * FROM ID_GENERATOR WHERE TAG = ?", handler, key);
             }
         }).stream().findFirst().orElse(null);
     }
 
 
-
     @SneakyThrows
     public IdKey updateMaxId(IdKey generator) {
         return dbHelper.updateAndQuery(new DbHelper.IUpdateAndQuery<List<IdKey>>() {
diff --git a/springboot-starter-security-jwt/pom.xml b/springboot-starter-security-jwt/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
diff --git a/springboot-starter-security-jwt/src/main/java/com/codingapi/springboot/security/dto/request/LoginRequestContext.java b/springboot-starter-security-jwt/src/main/java/com/codingapi/springboot/security/dto/request/LoginRequestContext.java
@@ -2,9 +2,8 @@
 
 public class LoginRequestContext {
 
-    private final ThreadLocal<LoginRequest> threadLocal = new ThreadLocal<>();
-
     private static LoginRequestContext context = new LoginRequestContext();
+    private final ThreadLocal<LoginRequest> threadLocal = new ThreadLocal<>();
 
     private LoginRequestContext() {
 
diff --git a/springboot-starter-security-jwt/src/main/java/com/codingapi/springboot/security/filter/MyAuthenticationFilter.java b/springboot-starter-security-jwt/src/main/java/com/codingapi/springboot/security/filter/MyAuthenticationFilter.java
@@ -1,10 +1,10 @@
 package com.codingapi.springboot.security.filter;
 
 import com.alibaba.fastjson.JSONObject;
+import com.codingapi.springboot.framework.dto.response.Response;
 import com.codingapi.springboot.security.exception.TokenExpiredException;
 import com.codingapi.springboot.security.jwt.Jwt;
 import com.codingapi.springboot.security.jwt.Token;
-import com.codingapi.springboot.framework.dto.response.Response;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.springframework.security.authentication.AuthenticationManager;
diff --git a/springboot-starter-security-jwt/src/main/java/com/codingapi/springboot/security/filter/MyLoginFilter.java b/springboot-starter-security-jwt/src/main/java/com/codingapi/springboot/security/filter/MyLoginFilter.java
@@ -1,14 +1,14 @@
 package com.codingapi.springboot.security.filter;
 
 import com.alibaba.fastjson.JSONObject;
+import com.codingapi.springboot.framework.dto.response.Response;
+import com.codingapi.springboot.framework.dto.response.SingleResponse;
 import com.codingapi.springboot.security.dto.request.LoginRequest;
 import com.codingapi.springboot.security.dto.request.LoginRequestContext;
 import com.codingapi.springboot.security.dto.response.LoginResponse;
 import com.codingapi.springboot.security.jwt.Jwt;
 import com.codingapi.springboot.security.jwt.Token;
 import com.codingapi.springboot.security.properties.SecurityJwtProperties;
-import com.codingapi.springboot.framework.dto.response.Response;
-import com.codingapi.springboot.framework.dto.response.SingleResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.springframework.security.authentication.AuthenticationManager;
diff --git a/springboot-starter/pom.xml b/springboot-starter/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/crypto/AESUtils.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/crypto/AESUtils.java
@@ -7,19 +7,17 @@
 
 public class AESUtils {
 
+    private final static AESUtils instance = new AESUtils();
+    private AES aes;
+
     private AESUtils() {
         Security.addProvider(new BouncyCastleProvider());
     }
 
-    private final static AESUtils instance = new AESUtils();
-
     public static AESUtils getInstance() {
         return instance;
     }
 
-
-    private AES aes;
-
     void init(AES aes) {
         this.aes = aes;
     }
diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/PageRequest.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/PageRequest.java
@@ -7,11 +7,9 @@
 
 public class PageRequest extends org.springframework.data.domain.PageRequest {
 
+    public final static String CURRENT_FIX_VALUE = "CURRENT_FIX_VALUE";
     private int current;
     private int pageSize;
-
-    public final static String CURRENT_FIX_VALUE = "CURRENT_FIX_VALUE";
-
     private org.springframework.data.domain.PageRequest pageRequest;
 
     public PageRequest(int current, int pageSize, Sort sort) {
@@ -25,6 +23,26 @@ public PageRequest() {
         this(0, 20, Sort.unsorted());
     }
 
+    public static org.springframework.data.domain.PageRequest of(int page, int size) {
+        return org.springframework.data.domain.PageRequest.of(page, size);
+    }
+
+    public static org.springframework.data.domain.PageRequest of(int page, int size, Sort sort) {
+        return org.springframework.data.domain.PageRequest.of(page, size, sort);
+    }
+
+    public static org.springframework.data.domain.PageRequest of(int page, int size, Sort.Direction direction, String... properties) {
+        return org.springframework.data.domain.PageRequest.of(page, size, direction, properties);
+    }
+
+    public static org.springframework.data.domain.PageRequest ofSize(int pageSize) {
+        return org.springframework.data.domain.PageRequest.ofSize(pageSize);
+    }
+
+    public static Pageable unpaged() {
+        return Pageable.unpaged();
+    }
+
     private void initPage() {
         int fixValue = 0;
         try {
@@ -53,22 +71,6 @@ public void setPageSize(int pageSize) {
         this.initPage();
     }
 
-    public static org.springframework.data.domain.PageRequest of(int page, int size) {
-        return org.springframework.data.domain.PageRequest.of(page, size);
-    }
-
-    public static org.springframework.data.domain.PageRequest of(int page, int size, Sort sort) {
-        return org.springframework.data.domain.PageRequest.of(page, size, sort);
-    }
-
-    public static org.springframework.data.domain.PageRequest of(int page, int size, Sort.Direction direction, String... properties) {
-        return org.springframework.data.domain.PageRequest.of(page, size, direction, properties);
-    }
-
-    public static org.springframework.data.domain.PageRequest ofSize(int pageSize) {
-        return org.springframework.data.domain.PageRequest.ofSize(pageSize);
-    }
-
     @Override
     public Sort getSort() {
         return pageRequest.getSort();
@@ -139,10 +141,6 @@ public Pageable previousOrFirst() {
         return pageRequest.previousOrFirst();
     }
 
-    public static Pageable unpaged() {
-        return Pageable.unpaged();
-    }
-
     @Override
     public boolean isPaged() {
         return pageRequest.isPaged();
diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/response/MultiResponse.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/response/MultiResponse.java
@@ -16,13 +16,6 @@ public class MultiResponse<T> extends Response {
 
     private Content<T> data;
 
-    @Setter
-    @Getter
-    public static class Content<T> {
-        private long total;
-        private Collection<T> list;
-    }
-
     public MultiResponse() {
         this.data = new Content<>();
     }
@@ -35,19 +28,16 @@ public static <T> MultiResponse<T> of(Collection<T> data, long total) {
         return multiResponse;
     }
 
-
     public static <T> MultiResponse<T> of(Page<T> page) {
         return of(page.getContent(), page.getTotalElements());
     }
 
-
     public static <T> MultiResponse<T> empty() {
         MultiResponse<T> multiResponse = new MultiResponse<>();
         multiResponse.setSuccess(true);
         return multiResponse;
     }
 
-
     public static <T> MultiResponse<T> of(Collection<T> data) {
         MultiResponse<T> multiResponse = new MultiResponse<>();
         multiResponse.setSuccess(true);
@@ -60,5 +50,12 @@ public static <T> MultiResponse<T> of(Collection<T> data) {
         return multiResponse;
     }
 
+    @Setter
+    @Getter
+    public static class Content<T> {
+        private long total;
+        private Collection<T> list;
+    }
+
 
 }
diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/event/DomainEventContext.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/event/DomainEventContext.java
diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/event/SpringEventConfiguration.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/event/SpringEventConfiguration.java
diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/exception/MessageContext.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/exception/MessageContext.java
diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/handler/ApplicationHandlerUtils.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/handler/ApplicationHandlerUtils.java
diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/properties/BootProperties.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/properties/BootProperties.java
diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/registrar/RegisterBeanScanner.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/registrar/RegisterBeanScanner.java
diff --git a/springboot-starter/src/test/java/com/codingapi/springboot/framework/FrameworkApplicationTests.java b/springboot-starter/src/test/java/com/codingapi/springboot/framework/FrameworkApplicationTests.java

Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,8 @@ public MultiResponse<DemoEntity> findAll(PageRequest pageRequest) {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`
`43`		`-`
`44`	`43`	`@GetMapping("/test-list")`
`45`		`- public List<IdKey> test1() throws SQLException{`
	`44`	`+ public List<IdKey> test1() throws SQLException {`
`46`	`45`	`return idKeyDao.findAll();`
`47`	`46`	`}`
`48`	`47`
Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,12 @@`
`4`	`4`
`5`	`5`	`public class GeneratorContext {`
`6`	`6`
	`7`	`+ private static GeneratorContext instance;`
	`8`	`+ private IdGenerateContext idGenerateContext;`
	`9`	`+`
`7`	`10`	`private GeneratorContext() {`
`8`	`11`	`}`
`9`	`12`
`10`		`- private static GeneratorContext instance;`
`11`		`-`
`12`	`13`	`public static GeneratorContext getInstance() {`
`13`	`14`	`if (instance == null) {`
`14`	`15`	`synchronized (GeneratorContext.class) {`
`@@ -20,13 +21,11 @@ public static GeneratorContext getInstance() {`
`20`	`21`	`return instance;`
`21`	`22`	`}`
`22`	`23`
`23`		`- private IdGenerateContext idGenerateContext;`
`24`		`-`
`25`	`24`	`long generateId(Class<?> clazz) {`
`26`	`25`	`return idGenerateContext.generateId(clazz);`
`27`	`26`	`}`
`28`	`27`
`29`		`- void init(IdKeyDao idKeyDao){`
	`28`	`+ void init(IdKeyDao idKeyDao) {`
`30`	`29`	`idGenerateContext = new IdGenerateContext(idKeyDao);`
`31`	`30`	`}`
`32`	`31`
Original file line number	Diff line number	Diff line change
`@@ -48,19 +48,17 @@ public int update(Connection connection, QueryRunner queryRunner) throws SQLExce`
`48`	`48`	`}`
`49`	`49`
`50`	`50`
`51`		`-`
`52`	`51`	`@SneakyThrows`
`53`	`52`	`public IdKey getByKey(String key) {`
`54`	`53`	`return dbHelper.query(new DbHelper.IQuery<List<IdKey>>() {`
`55`	`54`	`@Override`
`56`	`55`	`public List<IdKey> query(Connection connection, QueryRunner queryRunner) throws SQLException {`
`57`		`- return queryRunner.query(connection, "SELECT * FROM ID_GENERATOR WHERE TAG = ?", handler,key);`
	`56`	`+ return queryRunner.query(connection, "SELECT * FROM ID_GENERATOR WHERE TAG = ?", handler, key);`
`58`	`57`	`}`
`59`	`58`	`}).stream().findFirst().orElse(null);`
`60`	`59`	`}`
`61`	`60`
`62`	`61`
`63`		`-`
`64`	`62`	`@SneakyThrows`
`65`	`63`	`public IdKey updateMaxId(IdKey generator) {`
`66`	`64`	`return dbHelper.updateAndQuery(new DbHelper.IUpdateAndQuery<List<IdKey>>() {`