From 35ad482eb37488808f37a4c261b68bebcf3dc155 Mon Sep 17 00:00:00 2001
From: zhouhao <zh.sqy@qq.com>
Date: Mon, 30 Dec 2024 17:27:39 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...sibleEntity.java => ExtendableEntity.java} |  8 +++---
 ...ityTest.java => ExtendableEntityTest.java} |  8 +++---
 .../web/crud/entity/TestEntity.java           |  7 ++---
 ...opier.java => ExtendableToBeanCopier.java} |  7 +++--
 ...Copier.java => ExtendableToMapCopier.java} |  6 ++---
 ...ensibleUtils.java => ExtendableUtils.java} |  8 +++---
 .../web/bean/FastBeanCopier.java              | 26 +++++++++----------
 ...Copier.java => MapToExtendableCopier.java} |  6 ++---
 .../web/bean/FastBeanCopierTest.java          | 19 +++++++-------
 9 files changed, 45 insertions(+), 50 deletions(-)
 rename hsweb-commons/hsweb-commons-api/src/main/java/org/hswebframework/web/api/crud/entity/{ExtensibleEntity.java => ExtendableEntity.java} (85%)
 rename hsweb-commons/hsweb-commons-api/src/test/java/org/hswebframework/web/api/crud/entity/{ExtensibleEntityTest.java => ExtendableEntityTest.java} (72%)
 rename hsweb-core/src/main/java/org/hswebframework/web/bean/{ExtensibleToBeanCopier.java => ExtendableToBeanCopier.java} (64%)
 rename hsweb-core/src/main/java/org/hswebframework/web/bean/{ExtensibleToMapCopier.java => ExtendableToMapCopier.java} (74%)
 rename hsweb-core/src/main/java/org/hswebframework/web/bean/{ExtensibleUtils.java => ExtendableUtils.java} (85%)
 rename hsweb-core/src/main/java/org/hswebframework/web/bean/{MapToExtensibleCopier.java => MapToExtendableCopier.java} (64%)

diff --git a/hsweb-commons/hsweb-commons-api/src/main/java/org/hswebframework/web/api/crud/entity/ExtensibleEntity.java b/hsweb-commons/hsweb-commons-api/src/main/java/org/hswebframework/web/api/crud/entity/ExtendableEntity.java
similarity index 85%
rename from hsweb-commons/hsweb-commons-api/src/main/java/org/hswebframework/web/api/crud/entity/ExtensibleEntity.java
rename to hsweb-commons/hsweb-commons-api/src/main/java/org/hswebframework/web/api/crud/entity/ExtendableEntity.java
index 0c751d264..146c99b18 100644
--- a/hsweb-commons/hsweb-commons-api/src/main/java/org/hswebframework/web/api/crud/entity/ExtensibleEntity.java
+++ b/hsweb-commons/hsweb-commons-api/src/main/java/org/hswebframework/web/api/crud/entity/ExtendableEntity.java
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
 import lombok.Setter;
-import org.hswebframework.ezorm.core.Extensible;
+import org.hswebframework.ezorm.core.Extendable;
 
 import java.util.Collections;
 import java.util.Map;
@@ -15,7 +15,7 @@ import java.util.Map;
  * <p>
  * <ul>
  *     <li>
- *         实体类继承此类,或者实现{@link Extensible}接口.
+ *         实体类继承此类,或者实现{@link Extendable}接口.
  *     </li>
  *     <li>
  *         使用{@link org.hswebframework.web.crud.configuration.TableMetadataCustomizer}自定义表结构
@@ -32,12 +32,12 @@ import java.util.Map;
  */
 @Getter
 @Setter
-public class ExtensibleEntity<PK> extends GenericEntity<PK> implements Extensible {
+public class ExtendableEntity<PK> extends GenericEntity<PK> implements Extendable {
 
     private Map<String, Object> extensions;
 
     /**
-     * 默认不序列化扩展属性,会由{@link ExtensibleEntity#extensions()},{@link JsonAnyGetter}平铺到json中.
+     * 默认不序列化扩展属性,会由{@link ExtendableEntity#extensions()},{@link JsonAnyGetter}平铺到json中.
      *
      * @return 扩展属性
      */
diff --git a/hsweb-commons/hsweb-commons-api/src/test/java/org/hswebframework/web/api/crud/entity/ExtensibleEntityTest.java b/hsweb-commons/hsweb-commons-api/src/test/java/org/hswebframework/web/api/crud/entity/ExtendableEntityTest.java
similarity index 72%
rename from hsweb-commons/hsweb-commons-api/src/test/java/org/hswebframework/web/api/crud/entity/ExtensibleEntityTest.java
rename to hsweb-commons/hsweb-commons-api/src/test/java/org/hswebframework/web/api/crud/entity/ExtendableEntityTest.java
index 4960595a7..82634d3f8 100644
--- a/hsweb-commons/hsweb-commons-api/src/test/java/org/hswebframework/web/api/crud/entity/ExtensibleEntityTest.java
+++ b/hsweb-commons/hsweb-commons-api/src/test/java/org/hswebframework/web/api/crud/entity/ExtendableEntityTest.java
@@ -6,22 +6,22 @@ import org.junit.Test;
 
 import static org.junit.Assert.*;
 
-public class ExtensibleEntityTest {
+public class ExtendableEntityTest {
 
 
     @Test
     @SneakyThrows
     public void testJson() {
-        ExtensibleEntity<String> entity = new ExtensibleEntity<>();
+        ExtendableEntity<String> entity = new ExtendableEntity<>();
         entity.setId("test");
         entity.setExtension("extName", "test");
 
         ObjectMapper mapper = new ObjectMapper();
 
-        String json = mapper.writerFor(ExtensibleEntity.class).writeValueAsString(entity);
+        String json = mapper.writerFor(ExtendableEntity.class).writeValueAsString(entity);
 
         System.out.println(json);
-        ExtensibleEntity<String> decoded = mapper.readerFor(ExtensibleEntity.class).readValue(json);
+        ExtendableEntity<String> decoded = mapper.readerFor(ExtendableEntity.class).readValue(json);
         assertNotNull(decoded.getId());
 
         assertEquals(entity.getId(), decoded.getId());
diff --git a/hsweb-commons/hsweb-commons-crud/src/test/java/org/hswebframework/web/crud/entity/TestEntity.java b/hsweb-commons/hsweb-commons-crud/src/test/java/org/hswebframework/web/crud/entity/TestEntity.java
index ad82e7f77..ee36be473 100644
--- a/hsweb-commons/hsweb-commons-crud/src/test/java/org/hswebframework/web/crud/entity/TestEntity.java
+++ b/hsweb-commons/hsweb-commons-crud/src/test/java/org/hswebframework/web/crud/entity/TestEntity.java
@@ -4,13 +4,10 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.hswebframework.web.api.crud.entity.ExtensibleEntity;
-import org.hswebframework.web.api.crud.entity.GenericEntity;
+import org.hswebframework.web.api.crud.entity.ExtendableEntity;
 import org.hswebframework.web.crud.annotation.EnableEntityEvent;
-import org.hswebframework.web.crud.generator.Generators;
 
 import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
 import javax.persistence.Table;
 
 @Getter
@@ -19,7 +16,7 @@ import javax.persistence.Table;
 @AllArgsConstructor(staticName = "of")
 @NoArgsConstructor
 @EnableEntityEvent
-public class TestEntity extends ExtensibleEntity<String> {
+public class TestEntity extends ExtendableEntity<String> {
 
     @Column(length = 32)
     private String name;
diff --git a/hsweb-core/src/main/java/org/hswebframework/web/bean/ExtensibleToBeanCopier.java b/hsweb-core/src/main/java/org/hswebframework/web/bean/ExtendableToBeanCopier.java
similarity index 64%
rename from hsweb-core/src/main/java/org/hswebframework/web/bean/ExtensibleToBeanCopier.java
rename to hsweb-core/src/main/java/org/hswebframework/web/bean/ExtendableToBeanCopier.java
index 587958b61..d154f328d 100644
--- a/hsweb-core/src/main/java/org/hswebframework/web/bean/ExtensibleToBeanCopier.java
+++ b/hsweb-core/src/main/java/org/hswebframework/web/bean/ExtendableToBeanCopier.java
@@ -1,20 +1,19 @@
 package org.hswebframework.web.bean;
 
 import lombok.AllArgsConstructor;
-import org.hswebframework.ezorm.core.Extensible;
+import org.hswebframework.ezorm.core.Extendable;
 
-import java.util.Map;
 import java.util.Set;
 
 @AllArgsConstructor
-class ExtensibleToBeanCopier implements Copier {
+class ExtendableToBeanCopier implements Copier {
 
     private final Copier copier;
 
     @Override
     public void copy(Object source, Object target, Set<String> ignore, Converter converter) {
         copier.copy(source, target, ignore, converter);
-        FastBeanCopier.copy(((Extensible) source).extensions(), target);
+        FastBeanCopier.copy(((Extendable) source).extensions(), target);
     }
 
 
diff --git a/hsweb-core/src/main/java/org/hswebframework/web/bean/ExtensibleToMapCopier.java b/hsweb-core/src/main/java/org/hswebframework/web/bean/ExtendableToMapCopier.java
similarity index 74%
rename from hsweb-core/src/main/java/org/hswebframework/web/bean/ExtensibleToMapCopier.java
rename to hsweb-core/src/main/java/org/hswebframework/web/bean/ExtendableToMapCopier.java
index 77f3b91cf..f2dd5ddbc 100644
--- a/hsweb-core/src/main/java/org/hswebframework/web/bean/ExtensibleToMapCopier.java
+++ b/hsweb-core/src/main/java/org/hswebframework/web/bean/ExtendableToMapCopier.java
@@ -1,20 +1,20 @@
 package org.hswebframework.web.bean;
 
 import lombok.AllArgsConstructor;
-import org.hswebframework.ezorm.core.Extensible;
+import org.hswebframework.ezorm.core.Extendable;
 
 import java.util.Map;
 import java.util.Set;
 
 @AllArgsConstructor
-class ExtensibleToMapCopier implements Copier {
+class ExtendableToMapCopier implements Copier {
 
     private final Copier copier;
 
     @Override
     public void copy(Object source, Object target, Set<String> ignore, Converter converter) {
         copier.copy(source, target, ignore, converter);
-        ExtensibleUtils.copyToMap((Extensible) source, ignore, (Map<String, Object>) target);
+        ExtendableUtils.copyToMap((Extendable) source, ignore, (Map<String, Object>) target);
         //移除map中的extensions
         ((Map<?, ?>) target).remove("extensions");
     }
diff --git a/hsweb-core/src/main/java/org/hswebframework/web/bean/ExtensibleUtils.java b/hsweb-core/src/main/java/org/hswebframework/web/bean/ExtendableUtils.java
similarity index 85%
rename from hsweb-core/src/main/java/org/hswebframework/web/bean/ExtensibleUtils.java
rename to hsweb-core/src/main/java/org/hswebframework/web/bean/ExtendableUtils.java
index 0acff4a2b..e61659cfa 100644
--- a/hsweb-core/src/main/java/org/hswebframework/web/bean/ExtensibleUtils.java
+++ b/hsweb-core/src/main/java/org/hswebframework/web/bean/ExtendableUtils.java
@@ -2,16 +2,16 @@ package org.hswebframework.web.bean;
 
 import com.google.common.collect.Maps;
 import org.apache.commons.collections4.CollectionUtils;
-import org.hswebframework.ezorm.core.Extensible;
+import org.hswebframework.ezorm.core.Extendable;
 
 import java.util.Map;
 import java.util.Set;
 
-public class ExtensibleUtils {
+public class ExtendableUtils {
 
     public static void copyFromMap(Map<String, Object> source,
                                    Set<String> ignore,
-                                   Extensible target) {
+                                   Extendable target) {
         ClassDescription def = ClassDescriptions.getDescription(target.getClass());
 
         for (Map.Entry<String, Object> entry : source.entrySet()) {
@@ -23,7 +23,7 @@ public class ExtensibleUtils {
 
     }
 
-    public static void copyToMap(Extensible target,
+    public static void copyToMap(Extendable target,
                                  Set<String> ignore,
                                  Map<String, Object> source) {
         if (CollectionUtils.isNotEmpty(ignore)) {
diff --git a/hsweb-core/src/main/java/org/hswebframework/web/bean/FastBeanCopier.java b/hsweb-core/src/main/java/org/hswebframework/web/bean/FastBeanCopier.java
index 3675fee53..43cd9e57d 100644
--- a/hsweb-core/src/main/java/org/hswebframework/web/bean/FastBeanCopier.java
+++ b/hsweb-core/src/main/java/org/hswebframework/web/bean/FastBeanCopier.java
@@ -8,7 +8,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtilsBean;
 import org.apache.commons.beanutils.ConvertUtilsBean;
 import org.apache.commons.beanutils.PropertyUtilsBean;
-import org.hswebframework.ezorm.core.Extensible;
+import org.hswebframework.ezorm.core.Extendable;
 import org.hswebframework.utils.time.DateFormatter;
 import org.hswebframework.web.dict.EnumDict;
 import org.hswebframework.web.proxy.Proxy;
@@ -180,8 +180,8 @@ public final class FastBeanCopier {
         if (tartName.startsWith("package ")) {
             tartName = tartName.substring("package ".length());
         }
-        boolean targetIsExtensible = Extensible.class.isAssignableFrom(target);
-        boolean sourceIsExtensible = Extensible.class.isAssignableFrom(source);
+        boolean targetIsExtendable = Extendable.class.isAssignableFrom(target);
+        boolean sourceIsExtendable = Extendable.class.isAssignableFrom(source);
         boolean targetIsMap = Map.class.isAssignableFrom(target);
         boolean sourceIsMap = Map.class.isAssignableFrom(source);
 
@@ -201,12 +201,12 @@ public final class FastBeanCopier {
                 .create(Copier.class, new Class[]{source, target})
                 .addMethod(method);
             Copier copier = proxy.newInstance();
-            if (sourceIsExtensible && targetIsMap) {
-                copier = new ExtensibleToMapCopier(copier);
-            } else if (sourceIsMap && targetIsExtensible) {
-                copier = new MapToExtensibleCopier(copier);
-            }else if(sourceIsExtensible){
-                copier = new ExtensibleToBeanCopier(copier);
+            if (sourceIsExtendable && targetIsMap) {
+                copier = new ExtendableToMapCopier(copier);
+            } else if (sourceIsMap && targetIsExtendable) {
+                copier = new MapToExtendableCopier(copier);
+            }else if(sourceIsExtendable){
+                copier = new ExtendableToBeanCopier(copier);
             }
             return copier;
         } catch (Exception e) {
@@ -246,8 +246,8 @@ public final class FastBeanCopier {
 
         Map<String, ClassProperty> targetProperties = null;
 
-        boolean targetIsExtensible = Extensible.class.isAssignableFrom(target);
-        boolean sourceIsExtensible = Extensible.class.isAssignableFrom(source);
+        boolean targetIsExtendable = Extendable.class.isAssignableFrom(target);
+        boolean sourceIsExtendable = Extendable.class.isAssignableFrom(source);
         boolean targetIsMap = Map.class.isAssignableFrom(target);
         boolean sourceIsMap = Map.class.isAssignableFrom(source);
         //源类型为Map
@@ -273,12 +273,12 @@ public final class FastBeanCopier {
             ClassProperty targetProperty = targetProperties.get(sourceProperty.getName());
             if (targetProperty == null) {
                 //复制到拓展对象
-                if (targetIsExtensible && !sourceIsExtensible && !sourceIsMap) {
+                if (targetIsExtendable && !sourceIsExtendable && !sourceIsMap) {
                     code.append("if(!ignore.contains(\"").append(sourceProperty.getName()).append("\")){\n\t");
                     if (!sourceProperty.isPrimitive()) {
                         code.append("if($$__source.").append(sourceProperty.getReadMethod()).append("!=null){\n");
                     }
-                    code.append("\t\t((org.hswebframework.ezorm.core.Extensible)$$__target).setExtension(")
+                    code.append("\t\t((org.hswebframework.ezorm.core.Extendable)$$__target).setExtension(")
                         .append("\"").append(sourceProperty.name).append("\",")
                         .append("$$__source.").append(sourceProperty.getReadMethod())
                         .append(");");
diff --git a/hsweb-core/src/main/java/org/hswebframework/web/bean/MapToExtensibleCopier.java b/hsweb-core/src/main/java/org/hswebframework/web/bean/MapToExtendableCopier.java
similarity index 64%
rename from hsweb-core/src/main/java/org/hswebframework/web/bean/MapToExtensibleCopier.java
rename to hsweb-core/src/main/java/org/hswebframework/web/bean/MapToExtendableCopier.java
index 4fedc4915..9bbab361b 100644
--- a/hsweb-core/src/main/java/org/hswebframework/web/bean/MapToExtensibleCopier.java
+++ b/hsweb-core/src/main/java/org/hswebframework/web/bean/MapToExtendableCopier.java
@@ -1,13 +1,13 @@
 package org.hswebframework.web.bean;
 
 import lombok.AllArgsConstructor;
-import org.hswebframework.ezorm.core.Extensible;
+import org.hswebframework.ezorm.core.Extendable;
 
 import java.util.Map;
 import java.util.Set;
 
 @AllArgsConstructor
-class MapToExtensibleCopier implements Copier {
+class MapToExtendableCopier implements Copier {
 
     private final Copier copier;
 
@@ -15,7 +15,7 @@ class MapToExtensibleCopier implements Copier {
     public void copy(Object source, Object target, Set<String> ignore, Converter converter) {
         copier.copy(source, target, ignore, converter);
 
-        ExtensibleUtils.copyFromMap((Map<String, Object>) source, ignore, (Extensible) target);
+        ExtendableUtils.copyFromMap((Map<String, Object>) source, ignore, (Extendable) target);
     }
 
 
diff --git a/hsweb-core/src/test/java/org/hswebframework/web/bean/FastBeanCopierTest.java b/hsweb-core/src/test/java/org/hswebframework/web/bean/FastBeanCopierTest.java
index 93a8fa0b5..9f9150081 100644
--- a/hsweb-core/src/test/java/org/hswebframework/web/bean/FastBeanCopierTest.java
+++ b/hsweb-core/src/test/java/org/hswebframework/web/bean/FastBeanCopierTest.java
@@ -4,8 +4,7 @@ import com.google.common.collect.ImmutableMap;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.SneakyThrows;
-import org.hswebframework.ezorm.core.DefaultExtensible;
-import org.hswebframework.ezorm.core.Extensible;
+import org.hswebframework.ezorm.core.DefaultExtendable;
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.util.ClassUtils;
@@ -27,12 +26,12 @@ public class FastBeanCopierTest {
 
 
     @Test
-    public void testToExtensible() {
+    public void testToExtendable() {
         Source source = new Source();
         source.setName("test");
         source.setAge(123);
         source.setColor(Color.RED);
-        ExtensibleEntity e = FastBeanCopier.copy(source, new ExtensibleEntity());
+        ExtendableEntity e = FastBeanCopier.copy(source, new ExtendableEntity());
 
         Assert.assertEquals(source.getName(), e.getName());
         Assert.assertEquals(source.getAge(), e.getExtension("age"));
@@ -41,7 +40,7 @@ public class FastBeanCopierTest {
         Map<String, Object> map = FastBeanCopier.copy(e, new HashMap<>());
         System.out.println(map);
 
-        ExtensibleEntity t = FastBeanCopier.copy(map, new ExtensibleEntity());
+        ExtendableEntity t = FastBeanCopier.copy(map, new ExtendableEntity());
         Assert.assertEquals(e.getName(), t.getName());
 
         System.out.println(e.extensions());
@@ -51,9 +50,9 @@ public class FastBeanCopierTest {
     }
 
     @Test
-    public void testFromExtensible() {
+    public void testFromExtendable() {
         Source source = new Source();
-        ExtensibleEntity e = FastBeanCopier.copy(source, new ExtensibleEntity());
+        ExtendableEntity e = FastBeanCopier.copy(source, new ExtendableEntity());
         e.setName("test");
         e.setExtension("age",123);
         FastBeanCopier.copy(e, source);
@@ -63,13 +62,13 @@ public class FastBeanCopierTest {
 
     }
     @Test
-    public void testMapToExtensible() {
+    public void testMapToExtendable() {
         Source source = new Source();
         source.setName("test");
         source.setAge(123);
         source.setColor(Color.RED);
         Map<String, Object> map = FastBeanCopier.copy(source, new HashMap<>());
-        ExtensibleEntity e = FastBeanCopier.copy(map, new ExtensibleEntity());
+        ExtendableEntity e = FastBeanCopier.copy(map, new ExtendableEntity());
         Assert.assertEquals(source.getName(), e.getName());
         Assert.assertEquals(source.getAge(), e.getExtension("age"));
         Assert.assertEquals(source.getColor(), e.getExtension("color"));
@@ -78,7 +77,7 @@ public class FastBeanCopierTest {
 
     @Getter
     @Setter
-    public static class ExtensibleEntity extends DefaultExtensible {
+    public static class ExtendableEntity extends DefaultExtendable {
 
         private String name;