✨ refactor modules

ccoderJava · ccoderJava · commit 9b8ae92a93bb · 2025-06-11T23:12:51.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -3,41 +3,29 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          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>
         <groupId>io.github.dianpoint</groupId>
         <artifactId>summer-build</artifactId>
         <version>0.1.0-SNAPSHOT</version>
     </parent>
 
 
-    <properties>
-        <revision>0.1.0-SNAPSHOT</revision>
-    </properties>
 
-    <groupId>com.dianpoint.summer</groupId>
+    <groupId>io.github.dianpoint</groupId>
     <artifactId>summer</artifactId>
     <version>${revision}</version>
     <packaging>pom</packaging>
 
 
-    <modules>
-        <module>summer-beans</module>
-        <module>summer-validator</module>
-        <module>summer-engines</module>
-        <module>summer-java-core</module>
-        <module>summer-parent</module>
-    </modules>
-
 
     <name>Summer</name>
     <description>Summer Projects for Java</description>
     <url>https://github.com/dianpoint/summer</url>
 
 
     <organization>
-        <name>Microsphere</name>
-        <url>https://github.com/microsphere-projects</url>
+        <name>DianPoint</name>
+        <url>https://github.com/dianpoint</url>
     </organization>
 
     <licenses>
@@ -67,6 +55,18 @@
         <developerConnection>scm:git:ssh://${project.scm.url}</developerConnection>
     </scm>
 
+    <properties>
+        <revision>0.1.0-SNAPSHOT</revision>
+    </properties>
+
+    <modules>
+        <module>summer-beans</module>
+        <module>summer-validator</module>
+        <module>summer-engines</module>
+        <module>summer-java-core</module>
+        <module>summer-parent</module>
+    </modules>
+
     <distributionManagement>
         <snapshotRepository>
             <id>ossrh</id>
diff --git a/summer-beans/pom.xml b/summer-beans/pom.xml
@@ -4,13 +4,13 @@
          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>
-        <groupId>com.dianpoint.summer</groupId>
+        <groupId>io.github.dianpoint</groupId>
         <artifactId>summer-parent</artifactId>
         <version>{revision}</version>
         <relativePath>../summer-parent/pom.xml</relativePath>
     </parent>
 
-    <groupId>com.dianpoint.summer</groupId>
+    <groupId>io.github.dianpoint</groupId>
     <artifactId>summer-beans</artifactId>
     <version>${revision}</version>
     <packaging>jar</packaging>
@@ -66,7 +66,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.dianpoint.summer</groupId>
+            <groupId>io.github.dianpoint</groupId>
             <artifactId>summer-validator</artifactId>
             <scope>test</scope>
         </dependency>
diff --git a/summer-beans/src/main/java/com/dianpoint/summer/beans/factory/xml/XmlBeanDefinitionReader.java b/summer-beans/src/main/java/com/dianpoint/summer/beans/factory/xml/XmlBeanDefinitionReader.java
@@ -1,6 +1,7 @@
 package com.dianpoint.summer.beans.factory.xml;
 
-import com.dianpoint.summer.beans.*;
+import com.dianpoint.summer.beans.PropertyValue;
+import com.dianpoint.summer.beans.PropertyValues;
 import com.dianpoint.summer.beans.factory.config.BeanDefinition;
 import com.dianpoint.summer.beans.factory.config.ConstructorArgumentValue;
 import com.dianpoint.summer.beans.factory.config.ConstructorArgumentValues;
diff --git a/summer-beans/src/test/java/com/dianpoint/summer/test/aop/proxy/SomeServiceProxy.java b/summer-beans/src/test/java/com/dianpoint/summer/test/aop/proxy/SomeServiceProxy.java
@@ -2,8 +2,6 @@
 
 import com.dianpoint.summer.aop.ProxyFactoryBean;
 import com.dianpoint.summer.beans.BeansException;
-import com.dianpoint.summer.beans.factory.BeanFactory;
-import com.dianpoint.summer.beans.factory.FactoryBean;
 import com.dianpoint.summer.context.ClassPathXmlApplicationContext;
 import org.junit.Test;
 
diff --git a/summer-beans/src/test/resources/beans.xml b/summer-beans/src/test/resources/beans.xml
@@ -22,7 +22,7 @@
     <!--    </bean>-->
 
     <!-- 添加代理实现SomeServiceImpl中的action方法 -->
-    <bean id="someService" class="com.dianpoint.summer.test.aop.proxy.SomeServiceImpl"/>
+    <bean id="someService" class="proxy.aop.test.com.dianpoint.summer.core.SomeServiceImpl"/>
     <bean id="proxyAction" class="com.dianpoint.summer.aop.ProxyFactoryBean">
         <property type="java.lang.Object" name="target" ref="someService"/>
     </bean>
diff --git a/summer-beans/src/test/resources/xml/beanAutowire.xml b/summer-beans/src/test/resources/xml/beanAutowire.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans>
-    <bean id="baseService" class="com.dianpoint.summer.test.xml.beans.BaseService">
+    <bean id="baseService" class="beans.xml.test.com.dianpoint.summer.core.BaseService">
         <!-- 构造器方式注入  -->
     </bean>
 
-    <bean id="autowiredService" class="com.dianpoint.summer.test.xml.beans.AutowiredService">
+    <bean id="autowiredService" class="beans.xml.test.com.dianpoint.summer.core.AutowiredService">
         <!-- 构造器方式注入  -->
     </bean>
 </beans>
diff --git a/summer-beans/src/test/resources/xml/beanDependency.xml b/summer-beans/src/test/resources/xml/beanDependency.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans>
-    <bean id="circularDependencyEndService" class="com.dianpoint.summer.test.xml.beans.CircularDependencyEndService">
+    <bean id="circularDependencyEndService" class="beans.xml.test.com.dianpoint.summer.core.CircularDependencyEndService">
         <constructor-arg type="String" name="remark" value="这是循环依赖的End"/>
         <!-- 属性对象注入  -->
-        <property type="com.dianpoint.summer.test.xml.beans.CircularDependencyStartService" name="circularDependencyStartService"
+        <property type="beans.xml.test.com.dianpoint.summer.core.CircularDependencyStartService" name="circularDependencyStartService"
                   ref="circularDependencyStartService"/>
     </bean>
-    <bean id="circularDependencyStartService" class="com.dianpoint.summer.test.xml.beans.CircularDependencyStartService">
+    <bean id="circularDependencyStartService" class="beans.xml.test.com.dianpoint.summer.core.CircularDependencyStartService">
         <constructor-arg type="String" name="remark" value="这是循环依赖的Start"/>
         <!-- 属性对象注入  -->
-        <property type="com.dianpoint.summer.test.xml.beans.CircularDependencyEndService" name="circularDependencyEndService"
+        <property type="beans.xml.test.com.dianpoint.summer.core.CircularDependencyEndService" name="circularDependencyEndService"
                   ref="circularDependencyEndService"/>
     </bean>
 
diff --git a/summer-beans/src/test/resources/xml/beanElement.xml b/summer-beans/src/test/resources/xml/beanElement.xml
@@ -18,7 +18,7 @@
 <!--    </beans>-->
 
 
-    <bean id="propertiesBean" class="com.dianpoint.summer.test.xml.beans.PropertiesTestBean">
+    <bean id="propertiesBean" class="beans.xml.test.com.dianpoint.summer.core.PropertiesTestBean">
         <!-- 默认为string -->
         <property name="username" value="propertiesBean"/>
         <property name="age" type="java.lang.Integer" value='30'/>
@@ -36,7 +36,7 @@
 
 
 
-    <bean id="propertiesBeanRef" class="com.dianpoint.summer.test.xml.beans.PropertiesTestBean">
+    <bean id="propertiesBeanRef" class="beans.xml.test.com.dianpoint.summer.core.PropertiesTestBean">
         <!-- 把theFool赋值给username -->
         <!-- 把theFool赋值给password -->
         <property type="String" name="username" ref="theFool"/>
diff --git a/summer-engines/pom.xml b/summer-engines/pom.xml
@@ -4,13 +4,13 @@
          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>
-        <groupId>com.dianpoint.summer</groupId>
+        <groupId>io.github.dianpoint</groupId>
         <artifactId>summer-parent</artifactId>
         <version>${revision}</version>
         <relativePath>../summer-parent/pom.xml</relativePath>
     </parent>
 
-    <groupId>com.dianpoint.summer</groupId>
+    <groupId>io.github.dianpoint</groupId>
     <artifactId>summer-engines</artifactId>
     <version>${revision}</version>
     <packaging>jar</packaging>
diff --git a/summer-engines/src/main/java/com/dianpoint/summer/engines/batch/scheduler/DistributedTaskScheduler.java b/summer-engines/src/main/java/com/dianpoint/summer/engines/batch/scheduler/DistributedTaskScheduler.java
@@ -4,7 +4,6 @@
 import com.dianpoint.summer.engines.batch.entity.SubTask;
 import com.dianpoint.summer.engines.batch.service.TaskProcessor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.task.TaskExecutor;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/summer-java-core/pom.xml b/summer-java-core/pom.xml
@@ -4,13 +4,13 @@
          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>
-        <groupId>com.dianpoint.summer</groupId>
+        <groupId>io.github.dianpoint</groupId>
         <artifactId>summer-parent</artifactId>
         <version>${revision}</version>
         <relativePath>../summer-parent/pom.xml</relativePath>
     </parent>
 
-    <groupId>com.dianpoint.summer</groupId>
+    <groupId>io.github.dianpoint</groupId>
     <artifactId>summer-java-core</artifactId>
     <version>${revision}</version>
     <packaging>jar</packaging>
diff --git a/summer-parent/pom.xml b/summer-parent/pom.xml
@@ -4,14 +4,14 @@
          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>
-        <groupId>com.dianpoint.summer</groupId>
+        <groupId>io.github.dianpoint</groupId>
         <artifactId>summer</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
 
-    <groupId>com.dianpoint</groupId>
+    <groupId>io.github.dianpoint</groupId>
     <artifactId>summer-parent</artifactId>
     <version>${revision}</version>
     <packaging>pom</packaging>
@@ -21,9 +21,6 @@
 
     <properties>
 
-        <revision>0.1.0-SNAPSHOT</revision>
-
-
         <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
         <jsr305.version>3.0.2</jsr305.version>
         <apache.commons.logging.version>1.3.2</apache.commons.logging.version>
@@ -96,6 +93,28 @@
                 <version>3.24.2</version>
                 <scope>test</scope>
             </dependency>
+
+            <dependency>
+                <groupId>io.github.dianpoint</groupId>
+                <artifactId>summer-beans</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.github.dianpoint</groupId>
+                <artifactId>summer-engines</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.github.dianpoint</groupId>
+                <artifactId>summer-java-core</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.github.dianpoint</groupId>
+                <artifactId>summer-validator</artifactId>
+                <version>${revision}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/summer-validator/pom.xml b/summer-validator/pom.xml
@@ -4,13 +4,13 @@
          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>
-        <groupId>com.dianpoint.summer</groupId>
+        <groupId>io.github.dianpoint</groupId>
         <artifactId>summer-parent</artifactId>
         <version>${revision}</version>
         <relativePath>../summer-parent/pom.xml</relativePath>
     </parent>
 
-    <groupId>com.dianpoint.summer</groupId>
+    <groupId>io.github.dianpoint</groupId>
     <artifactId>summer-validator</artifactId>
     <version>${revision}</version>
     <packaging>jar</packaging>
diff --git a/summer-validator/src/main/java/com/dianpoint/summer/validator/Validators.java b/summer-validator/src/main/java/com/dianpoint/summer/validator/Validators.java
@@ -7,7 +7,6 @@
 import com.dianpoint.summer.validator.validator.collection.DefaultCollectionValidator;
 
 import java.util.Collection;
-import java.util.List;
 import java.util.Objects;
 import java.util.function.Predicate;
 
diff --git a/summer-validator/src/main/java/com/dianpoint/summer/validator/annotations/NotNull.java b/summer-validator/src/main/java/com/dianpoint/summer/validator/annotations/NotNull.java
@@ -1,10 +1,5 @@
 package com.dianpoint.summer.validator.annotations;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
 /**
  * @author: congccoder
  * @email: congccoder@gmail.com | <a href="https://github.com/ccoderJava">github-homepage</a>
diff --git a/summer-validator/src/main/java/com/dianpoint/summer/validator/annotations/Pattern.java b/summer-validator/src/main/java/com/dianpoint/summer/validator/annotations/Pattern.java
@@ -1,10 +1,5 @@
 package com.dianpoint.summer.validator.annotations;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
 /**
  * @author: congccoder
  * @email: congccoder@gmail.com | <a href="https://github.com/ccoderJava">github-homepage</a>
diff --git a/summer-validator/src/main/java/com/dianpoint/summer/validator/processor/AnnotationProcessorRegister.java b/summer-validator/src/main/java/com/dianpoint/summer/validator/processor/AnnotationProcessorRegister.java
@@ -1,10 +1,6 @@
 package com.dianpoint.summer.validator.processor;
 
 import com.dianpoint.summer.validator.annotations.HandlesAnnotation;
-import com.dianpoint.summer.validator.annotations.NotNull;
-import com.dianpoint.summer.validator.annotations.Pattern;
-import com.dianpoint.summer.validator.constraintvalidators.NotNullProcessor;
-import com.dianpoint.summer.validator.constraintvalidators.PatternProcessor;
 import com.dianpoint.summer.validator.utils.ClassScanner;
 
 import java.lang.annotation.Annotation;
diff --git a/summer-validator/src/main/java/com/dianpoint/summer/validator/validator/AnnotationValidatorAdapter.java b/summer-validator/src/main/java/com/dianpoint/summer/validator/validator/AnnotationValidatorAdapter.java
@@ -5,7 +5,6 @@
 import com.dianpoint.summer.validator.ValidationRule;
 import com.dianpoint.summer.validator.utils.AnnotationProcessingUtils;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.function.Predicate;
 
diff --git a/summer-validator/src/main/java/com/dianpoint/summer/validator/validator/collection/DefaultCollectionValidator.java b/summer-validator/src/main/java/com/dianpoint/summer/validator/validator/collection/DefaultCollectionValidator.java
@@ -7,7 +7,6 @@
 import com.dianpoint.summer.validator.validator.Validator;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Predicate;
