[UPDATE] 提升代码质量

Signed-off-by: Alan Yeh <[email protected]>
central-x · Nov 30, 2023 · a678e51 · a678e51
1 parent 89c75c6
commit a678e51
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 22 deletions.
diff --git a/...rters/central-starter-cache/src/main/java/central/starter/cache/StarterConfiguration.java b/...rters/central-starter-cache/src/main/java/central/starter/cache/StarterConfiguration.java
@@ -29,6 +29,7 @@
 import lombok.Setter;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.*;
+import org.springframework.core.Ordered;
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.type.AnnotationMetadata;
 
@@ -49,9 +50,12 @@ public class StarterConfiguration implements ImportAware {
     private AnnotationMetadata importMetadata;
 
     @Bean
-    public CacheAdvisor cacheAdvisor(){
+    public CacheAdvisor cacheAdvisor() {
         var attributes = AnnotationAttributes.fromMap(importMetadata.getAnnotationAttributes(EnableCaching.class.getName(), false));
-
-        return new CacheAdvisor(attributes.getNumber("order"));
+        if (attributes != null) {
+            return new CacheAdvisor(attributes.getNumber("order"));
+        } else {
+            return new CacheAdvisor(Ordered.HIGHEST_PRECEDENCE);
+        }
     }
 }
diff --git a/...s/central-starter-logging/src/main/java/central/starter/logging/StarterConfiguration.java b/...s/central-starter-logging/src/main/java/central/starter/logging/StarterConfiguration.java
@@ -29,6 +29,7 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ImportAware;
+import org.springframework.core.Ordered;
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.type.AnnotationMetadata;
 
@@ -47,8 +48,11 @@ public class StarterConfiguration implements ImportAware {
     @Bean
     public LogAdvisor logAdvisor() {
         var attributes = AnnotationAttributes.fromMap(importMetadata.getAnnotationAttributes(EnableLogPoint.class.getName(), false));
-
-        return new LogAdvisor(attributes.getNumber("order"));
+        if (attributes != null) {
+            return new LogAdvisor(attributes.getNumber("order"));
+        } else {
+            return new LogAdvisor(Ordered.LOWEST_PRECEDENCE);
+        }
     }
 
 }
diff --git a/central-starters/central-starter-logging/src/main/resources/logback-http.xml b/central-starters/central-starter-logging/src/main/resources/logback-http.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- Http Appender 需要的属性 -->
-    <springProperty scope="context" name="COLLECTOR_SERVER" source="central.logging.http.server" defaultValue="http://127.0.0.1:3400/logging"/>
+    <springProperty scope="context" name="COLLECTOR_SERVER" source="central.logging.http.server" defaultValue="http://central-logging/logging"/>
     <springProperty scope="context" name="COLLECTOR_PATH" source="central.logging.http.path" defaultValue="central"/>
 
     <!-- 日志需要的属性 -->

diff --git a/central-stdlib/src/main/java/central/net/http/executor/java/JavaResponse.java b/central-stdlib/src/main/java/central/net/http/executor/java/JavaResponse.java
@@ -60,7 +60,7 @@ public HttpStatus getStatus() {
     }
 
     @Override
-    public ResponseBody getBody() {
+    public Body getBody() {
         return new ResponseBody(this.headers, this.response.body());
     }
 

diff --git a/central-stdlib/src/main/java/central/sql/proxy/Mapper.java b/central-stdlib/src/main/java/central/sql/proxy/Mapper.java
@@ -97,7 +97,7 @@ public interface Mapper<E extends Entity> {
      * @param conditions 参数条件，如果条件为空，将清空表
      * @return 受影响的数据量
      */
-    long deleteBy(@Nonnull Conditions<? extends E> conditions);
+    long deleteBy(@Nullable Conditions<? extends E> conditions);
 
     /**
      * 清空表
@@ -156,7 +156,7 @@ public interface Mapper<E extends Entity> {
      * @return 数据实体
      */
     @Nullable
-    E findById(@Nullable String id, Columns<? extends E> columns);
+    E findById(@Nullable String id, @Nullable Columns<? extends E> columns);
 
     /**
      * 根据主键查询
@@ -179,7 +179,7 @@ public interface Mapper<E extends Entity> {
      * @return 数据实体列表
      */
     @Nonnull
-    List<E> findByIds(@Nullable List<String> ids, Columns<? extends E> columns);
+    List<E> findByIds(@Nullable List<String> ids, @Nullable Columns<? extends E> columns);
 
     /**
      * 根据条件获取第一条数据
@@ -189,7 +189,7 @@ public interface Mapper<E extends Entity> {
      * @return 实体数据
      */
     @Nullable
-    E findFirstBy(@Nonnull Conditions<? extends E> conditions, @Nullable Orders<? extends E> orders);
+    E findFirstBy(@Nullable Conditions<? extends E> conditions, @Nullable Orders<? extends E> orders);
 
     /**
      * 根据条件获取第一条数据
@@ -200,7 +200,7 @@ public interface Mapper<E extends Entity> {
      * @return 实体数据
      */
     @Nullable
-    E findFirstBy(@Nullable Columns<? extends E> columns, @Nonnull Conditions<? extends E> conditions, @Nullable Orders<E> orders);
+    E findFirstBy(@Nullable Columns<? extends E> columns, @Nullable Conditions<? extends E> conditions, @Nullable Orders<E> orders);
 
     /**
      * 根据条件获取第一条数据
@@ -209,7 +209,7 @@ public interface Mapper<E extends Entity> {
      * @return 实体数据
      */
     @Nullable
-    E findFirstBy(@Nonnull Conditions<? extends E> conditions);
+    E findFirstBy(@Nullable Conditions<? extends E> conditions);
 
     /**
      * 根据条件获取第一条数据
@@ -219,7 +219,7 @@ public interface Mapper<E extends Entity> {
      * @return 实体数据
      */
     @Nullable
-    E findFirstBy(@Nullable Columns<? extends E> columns, @Nonnull Conditions<? extends E> conditions);
+    E findFirstBy(@Nullable Columns<? extends E> columns, @Nullable Conditions<? extends E> conditions);
 
     /**
      * 根据条件获取实体列表
@@ -231,7 +231,7 @@ public interface Mapper<E extends Entity> {
      * @return 实体列表
      */
     @Nonnull
-    List<E> findBy(@Nullable Long first, @Nullable Long offset, @Nonnull Conditions<? extends E> conditions, @Nullable Orders<? extends E> orders);
+    List<E> findBy(@Nullable Long first, @Nullable Long offset, @Nullable Conditions<? extends E> conditions, @Nullable Orders<? extends E> orders);
 
     /**
      * 根据条件获取实体列表
@@ -244,7 +244,7 @@ public interface Mapper<E extends Entity> {
      * @return 实体列表
      */
     @Nonnull
-    List<E> findBy(@Nullable Long first, @Nullable Long offset, @Nullable Columns<? extends E> columns, @Nonnull Conditions<? extends E> conditions, @Nullable Orders<? extends E> orders);
+    List<E> findBy(@Nullable Long first, @Nullable Long offset, @Nullable Columns<? extends E> columns, @Nullable Conditions<? extends E> conditions, @Nullable Orders<? extends E> orders);
 
     /**
      * 根据条件获取实体列表
@@ -254,7 +254,7 @@ public interface Mapper<E extends Entity> {
      * @return 实体列表
      */
     @Nonnull
-    List<E> findBy(@Nonnull Conditions<? extends E> conditions, @Nullable Orders<? extends E> orders);
+    List<E> findBy(@Nullable Conditions<? extends E> conditions, @Nullable Orders<? extends E> orders);
 
     /**
      * 根据条件获取实体列表
@@ -265,7 +265,7 @@ public interface Mapper<E extends Entity> {
      * @return 实体列表
      */
     @Nonnull
-    List<E> findBy(@Nullable Columns<? extends E> columns, @Nonnull Conditions<? extends E> conditions, @Nullable Orders<? extends E> orders);
+    List<E> findBy(@Nullable Columns<? extends E> columns, @Nullable Conditions<? extends E> conditions, @Nullable Orders<? extends E> orders);
 
 
     /**
@@ -275,7 +275,7 @@ public interface Mapper<E extends Entity> {
      * @return 实体列表
      */
     @Nonnull
-    List<E> findBy(@Nonnull Conditions<? extends E> conditions);
+    List<E> findBy(@Nullable Conditions<? extends E> conditions);
 
     /**
      * 根据条件获取实体列表
@@ -285,7 +285,7 @@ public interface Mapper<E extends Entity> {
      * @return 实体列表
      */
     @Nonnull
-    List<E> findBy(@Nullable Columns<? extends E> columns, @Nonnull Conditions<? extends E> conditions);
+    List<E> findBy(@Nullable Columns<? extends E> columns, @Nullable Conditions<? extends E> conditions);
 
     /**
      * 获取所有数据
@@ -324,7 +324,7 @@ public interface Mapper<E extends Entity> {
      * @return 分页结果
      */
     @Nonnull
-    Page<E> findPageBy(@Nonnull Long pageIndex, @Nonnull Long pageSize, @Nonnull Conditions<? extends E> conditions, @Nonnull Orders<? extends E> orders);
+    Page<E> findPageBy(@Nonnull Long pageIndex, @Nonnull Long pageSize, @Nullable Conditions<? extends E> conditions, @Nullable Orders<? extends E> orders);
 
     /**
      * 根据条件分页查询数据
@@ -337,7 +337,7 @@ public interface Mapper<E extends Entity> {
      * @return 分页结果
      */
     @Nonnull
-    Page<E> findPageBy(@Nonnull Long pageIndex, @Nonnull Long pageSize, @Nullable Columns<? extends E> columns, @Nonnull Conditions<? extends E> conditions, @Nonnull Orders<? extends E> orders);
+    Page<E> findPageBy(@Nonnull Long pageIndex, @Nonnull Long pageSize, @Nullable Columns<? extends E> columns, @Nullable Conditions<? extends E> conditions, @Nullable Orders<? extends E> orders);
 
     /**
      * 询查表的数据量