From c475a6ec4a26079d4529c83edc3d5d5676454bc4 Mon Sep 17 00:00:00 2001
From: godotg <jaysunxiao@gmail.com>
Date: Mon, 1 Jul 2024 13:59:40 +0800
Subject: [PATCH] ref[version]: use "orm" as root element in xml, "config" is
 not used anymore and use "orm" instead

---
 .../main/java/com/zfoo/orm/cache/version/EnhanceUtils.java    | 3 ++-
 orm/src/main/java/com/zfoo/orm/schema/NamespaceHandler.java   | 2 +-
 orm/src/main/resources/orm-1.0.xsd                            | 2 +-
 orm/src/test/resources/application.xml                        | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/orm/src/main/java/com/zfoo/orm/cache/version/EnhanceUtils.java b/orm/src/main/java/com/zfoo/orm/cache/version/EnhanceUtils.java
index 2b6e9b01..7047033e 100644
--- a/orm/src/main/java/com/zfoo/orm/cache/version/EnhanceUtils.java
+++ b/orm/src/main/java/com/zfoo/orm/cache/version/EnhanceUtils.java
@@ -13,6 +13,7 @@
 package com.zfoo.orm.cache.version;
 
 import com.zfoo.orm.model.IEntity;
+import com.zfoo.orm.schema.NamespaceHandler;
 import com.zfoo.protocol.util.StringUtils;
 import com.zfoo.protocol.util.UuidUtils;
 import javassist.*;
@@ -50,7 +51,7 @@ public abstract class EnhanceUtils {
         Method setVersionMethod = cacheVersion.getSetVersionMethod();
 
         // 定义类名称
-        CtClass enhanceClazz = classPool.makeClass(EnhanceUtils.class.getName() + UuidUtils.getLocalIntId());
+        CtClass enhanceClazz = classPool.makeClass(EnhanceUtils.class.getName() + StringUtils.capitalize(NamespaceHandler.ORM) + UuidUtils.getLocalIntId());
         enhanceClazz.addInterface(classPool.get(IVersion.class.getName()));
 
         // 定义类实现的接口方法name
diff --git a/orm/src/main/java/com/zfoo/orm/schema/NamespaceHandler.java b/orm/src/main/java/com/zfoo/orm/schema/NamespaceHandler.java
index f19768c9..538ad62f 100644
--- a/orm/src/main/java/com/zfoo/orm/schema/NamespaceHandler.java
+++ b/orm/src/main/java/com/zfoo/orm/schema/NamespaceHandler.java
@@ -20,7 +20,7 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
  */
 public class NamespaceHandler extends NamespaceHandlerSupport {
 
-    private final String ORM = "config";
+    public static final String ORM = "orm";
 
     @Override
     public void init() {
diff --git a/orm/src/main/resources/orm-1.0.xsd b/orm/src/main/resources/orm-1.0.xsd
index aacbd30b..d23e5203 100644
--- a/orm/src/main/resources/orm-1.0.xsd
+++ b/orm/src/main/resources/orm-1.0.xsd
@@ -9,7 +9,7 @@
             elementFormDefault="qualified"
             attributeFormDefault="unqualified">
 
-    <xsd:element name="config">
+    <xsd:element name="orm">
         <xsd:complexType>
             <xsd:sequence>
                 <xsd:choice minOccurs="0" maxOccurs="1">
diff --git a/orm/src/test/resources/application.xml b/orm/src/test/resources/application.xml
index fb060985..a6ae42de 100644
--- a/orm/src/test/resources/application.xml
+++ b/orm/src/test/resources/application.xml
@@ -19,7 +19,7 @@
 
     <context:component-scan base-package="com.zfoo.orm"/>
 
-    <orm:config id="config" entity-package="com.zfoo.orm.**.entity">
+    <orm:orm id="ormManager" entity-package="com.zfoo.orm.**.entity">
 
         <orm:host database="${mongodb.database}" user="${mongodb.user}" password="${mongodb.password}">
             <orm:address name="${mongodb.address.name}" url="${mongodb.address.url}"/>
@@ -39,6 +39,6 @@
             <orm:persister strategy="cron30s" type="cron" config="0/30 * * * * ?"/>
             <orm:persister strategy="time30s" type="time" config="30000"/>
         </orm:persisters>
-    </orm:config>
+    </orm:orm>
 
 </beans>