refactor: 优化

Author: zhou-hao

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/Authentication.java

@@ -17,7 +17,6 @@
 
 package org.hswebframework.web.authorization;
 
-import org.hswebframework.web.authorization.annotation.Logical;
 import org.springframework.util.StringUtils;
 import reactor.core.publisher.Mono;
 

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/simple/SimpleAuthentication.java

@@ -21,6 +21,7 @@
 import lombok.Setter;
 import org.hswebframework.web.authorization.*;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.*;
 import java.util.function.BiPredicate;
@@ -32,6 +33,7 @@
 @Setter
 public class SimpleAuthentication implements Authentication {
 
+    @Serial
     private static final long serialVersionUID = -2898863220255336528L;
 
     private User user;

hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/configuration/AutoDDLProcessor.java

@@ -11,7 +11,6 @@
 import org.hswebframework.ezorm.rdb.operator.builder.fragments.ddl.CreateTableSqlBuilder;
 import org.hswebframework.web.api.crud.entity.EntityFactory;
 import org.hswebframework.web.crud.annotation.DDL;
-import org.hswebframework.web.crud.entity.factory.MapperEntityFactory;
 import org.hswebframework.web.crud.events.EntityDDLEvent;
 import org.hswebframework.web.event.GenericsPayloadApplicationEvent;
 import org.springframework.beans.factory.InitializingBean;
@@ -26,7 +25,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 @Getter
 @Setter
@@ -86,9 +84,9 @@ public void afterPropertiesSet() {
                                  .autoLoad(false)
                                  .commit()
                                  .reactive()
-                                 .subscribeOn(Schedulers.boundedElastic()),
-                             8,8)
-                    .doOnError((err) -> log.error(err.getMessage(), err))
+                                 .subscribeOn(Schedulers.boundedElastic())
+                                 .doOnError((err) -> log.error("execute ddl {} failed", meta.getName(), err)),
+                             8, 8)
                     .then()
                     .block(Duration.ofMinutes(5));
             } else {
@@ -121,7 +119,7 @@ public void afterPropertiesSet() {
                 SqlRequest request = schema.findFeatureNow(CreateTableSqlBuilder.ID).build(metadata);
                 log.info("DDL SQL for {} \n{}", entity, request.toNativeSql());
                 schema.addTable(metadata);
-            }else {
+            } else {
                 table.merge(metadata);
             }
 

hsweb-core/src/main/java/org/hswebframework/web/bean/ClassDescription.java

@@ -2,13 +2,10 @@
 
 import lombok.Getter;
 import org.hswebframework.web.dict.EnumDict;
+import org.springframework.util.ReflectionUtils;
 
 import java.lang.reflect.Field;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
+import java.util.*;
 
 @Getter
 public class ClassDescription {
@@ -26,20 +23,24 @@ public class ClassDescription {
 
     public ClassDescription(Class<?> type) {
         this.type = type;
+
         collectionType = Collection.class.isAssignableFrom(type);
         enumDict = EnumDict.class.isAssignableFrom(type);
         arrayType = type.isArray();
         enumType = type.isEnum();
-        fieldSize = type.getDeclaredFields().length;
+
         number = Number.class.isAssignableFrom(type);
         if (enumType) {
             enums = type.getEnumConstants();
         } else {
             enums = null;
         }
-        fields = Arrays
-            .stream(type.getDeclaredFields())
-            .collect(Collectors.toMap(Field::getName, f -> f, (a, b) -> b));
+        Map<String, Field> f = new HashMap<>();
+        ReflectionUtils.doWithFields(type, field -> {
+            f.put(field.getName(), field);
+        });
+        fields = Collections.unmodifiableMap(f);
+        fieldSize = fields.size();
     }
 
 }

hsweb-core/src/main/java/org/hswebframework/web/proxy/Proxy.java

@@ -31,7 +31,7 @@ public class Proxy<I> extends URLClassLoader {
     @Getter
     private final String classFullName;
 
-    private final Set<ClassLoader> loaders = new HashSet<>();
+    private final Set<ClassLoader> loaders = new LinkedHashSet<>();
     private Class<I> targetClass;
 
     @SneakyThrows

hsweb-core/src/test/java/org/hswebframework/web/bean/FastBeanCopierTest.java

@@ -38,6 +38,7 @@ public void testExtendableToExtendable() {
         Assert.assertEquals(source.getExtension("color"), e.getExtension("color"));
 
     }
+
     @Test
     public void testToExtendable() {
         Source source = new Source();
@@ -67,13 +68,14 @@ public void testFromExtendable() {
         Source source = new Source();
         ExtendableEntity e = FastBeanCopier.copy(source, new ExtendableEntity());
         e.setName("test");
-        e.setExtension("age",123);
+        e.setExtension("age", 123);
         FastBeanCopier.copy(e, source);
         Assert.assertEquals(e.getName(), source.getName());
         Assert.assertEquals(e.getExtension("age"), source.getAge());
 
 
     }
+
     @Test
     public void testMapToExtendable() {
         Source source = new Source();
@@ -219,7 +221,7 @@ protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundE
                         return clazz;
                     }
                 } catch (Throwable ignore) {
-                  //  ignore.printStackTrace();
+                     //ignore.printStackTrace();
                 }
                 return super.loadClass(name, resolve);
             }
@@ -305,4 +307,34 @@ public interface ProxyTest {
         void setName(String name);
     }
 
+    @Test
+    public void testExtendsExtendable() {
+        ExtendableExtends ext = new ExtendableExtends();
+        ext.setId("test");
+        ext.setName("hehe");
+        ext.setExtension("ext1", "haha");
+        Map<String, Object> map = FastBeanCopier.copy(ext, new HashMap<>());
+        Assert.assertNotNull(map.get("id"));
+        Assert.assertNotNull(map.get("name"));
+        Assert.assertNotNull(map.get("ext1"));
+
+        ExtendableExtends ext2 = FastBeanCopier.copy(map, new ExtendableExtends());
+        Assert.assertEquals(ext.getId(),ext2.getId());
+        Assert.assertEquals(ext.getName(),ext2.getName());
+        Assert.assertEquals(ext.getExtensions(),ext2.getExtensions());
+
+
+    }
+
+    @Getter
+    @Setter
+    public static class ExtendableSuper extends DefaultExtendable {
+        private String id;
+    }
+
+    @Getter
+    @Setter
+    public static class ExtendableExtends extends ExtendableSuper {
+        private String name;
+    }
 }