Refactor code and packages

- Relocate ModuleDescriptor, ModuleDescriptorFactory to grails.plugins - Relocate AbstractModuleDescriptor to grails.plugins.descriptors
rainboyan · Mar 9, 2023 · 1d63ab9 · 1d63ab9
1 parent c9f2b04
commit 1d63ab9
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 12 deletions.
diff --git a/src/main/groovy/grails/plugins/DynamicPlugin.groovy b/src/main/groovy/grails/plugins/DynamicPlugin.groovy
@@ -15,8 +15,8 @@
  */
 package grails.plugins
 
-import grails.plugins.module.ModuleDescriptor
-import org.rainboyan.plugins.ModuleDescriptorFactory
+import grails.plugins.ModuleDescriptor
+import grails.plugins.ModuleDescriptorFactory
 import org.springframework.beans.factory.NoSuchBeanDefinitionException
 
 /**

diff --git a/...ails/plugins/module/ModuleDescriptor.java → ...oovy/grails/plugins/ModuleDescriptor.java b/...ails/plugins/module/ModuleDescriptor.java → ...oovy/grails/plugins/ModuleDescriptor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package grails.plugins.module;
+package grails.plugins;
 
 import java.util.Map;
 

diff --git a/...oyan/plugins/ModuleDescriptorFactory.java → ...ails/plugins/ModuleDescriptorFactory.java b/...oyan/plugins/ModuleDescriptorFactory.java → ...ails/plugins/ModuleDescriptorFactory.java
@@ -13,12 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.rainboyan.plugins;
+package grails.plugins;
 
 import org.springframework.context.ApplicationContextAware;
 
 import grails.plugins.exceptions.PluginException;
-import grails.plugins.module.ModuleDescriptor;
 
 /**
  * ModuleDescriptorFactory, register {@link ModuleDescriptor}

diff --git a/...gins/module/AbstractModuleDescriptor.java → ...descriptors/AbstractModuleDescriptor.java b/...gins/module/AbstractModuleDescriptor.java → ...descriptors/AbstractModuleDescriptor.java
@@ -13,14 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package grails.plugins.module;
+package grails.plugins.descriptors;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
 
 import grails.plugins.GrailsPlugin;
+import grails.plugins.ModuleDescriptor;
 import grails.plugins.exceptions.PluginException;
 
 /**

diff --git a/src/main/groovy/grails/plugins/module/ModuleType.java b/src/main/groovy/grails/plugins/module/ModuleType.java
@@ -20,6 +20,8 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import grails.plugins.ModuleDescriptor;
+
 /**
  * Indicates that the module type on {@link ModuleDescriptor}.
  *

diff --git a/src/main/groovy/org/rainboyan/plugins/DefaultDynamicModulesManager.java b/src/main/groovy/org/rainboyan/plugins/DefaultDynamicModulesManager.java
@@ -29,8 +29,8 @@
 
 import grails.plugins.GrailsPlugin;
 import grails.plugins.GrailsPluginManager;
+import grails.plugins.ModuleDescriptor;
 import grails.plugins.PluginManagerAware;
-import grails.plugins.module.ModuleDescriptor;
 
 /**
  * DynamicModulesManager

diff --git a/src/main/groovy/org/rainboyan/plugins/DefaultModuleDescriptorFactory.java b/src/main/groovy/org/rainboyan/plugins/DefaultModuleDescriptorFactory.java
@@ -24,7 +24,8 @@
 import org.springframework.context.ApplicationContext;
 
 import grails.plugins.exceptions.PluginException;
-import grails.plugins.module.ModuleDescriptor;
+import grails.plugins.ModuleDescriptor;
+import grails.plugins.ModuleDescriptorFactory;
 
 /**
  * Default implementation of {@link ModuleDescriptorFactory}

diff --git a/src/main/groovy/org/rainboyan/plugins/DynamicModulesApplicationListener.groovy b/src/main/groovy/org/rainboyan/plugins/DynamicModulesApplicationListener.groovy
@@ -23,7 +23,8 @@ import org.springframework.context.event.ContextRefreshedEvent
 import grails.plugins.DynamicPlugin
 import grails.plugins.GrailsPlugin
 import grails.plugins.GrailsPluginManager
-import grails.plugins.module.ModuleDescriptor
+import grails.plugins.ModuleDescriptor
+import grails.plugins.ModuleDescriptorFactory
 import grails.plugins.module.ModuleType
 import grails.util.GrailsNameUtils
 

diff --git a/src/main/groovy/org/rainboyan/plugins/DynamicModulesManager.java b/src/main/groovy/org/rainboyan/plugins/DynamicModulesManager.java
@@ -20,7 +20,7 @@
 import java.util.function.Predicate;
 
 import grails.plugins.GrailsPlugin;
-import grails.plugins.module.ModuleDescriptor;
+import grails.plugins.ModuleDescriptor;
 
 /**
  * DynamicModulesManager

diff --git a/src/main/groovy/org/rainboyan/plugins/support/GrailsPluginExtension.groovy b/src/main/groovy/org/rainboyan/plugins/support/GrailsPluginExtension.groovy
@@ -24,7 +24,7 @@ import org.springframework.beans.BeanWrapperImpl
 import org.springframework.context.ApplicationContext
 
 import grails.plugins.GrailsPlugin
-import grails.plugins.module.ModuleDescriptor
+import grails.plugins.ModuleDescriptor
 import grails.util.GrailsClassUtils
 import grails.util.GrailsMetaClassUtils
 

diff --git a/src/main/groovy/org/rainboyan/plugins/support/GrailsPluginManagerExtension.groovy b/src/main/groovy/org/rainboyan/plugins/support/GrailsPluginManagerExtension.groovy
@@ -22,7 +22,7 @@ import org.rainboyan.plugins.DynamicModulesManager
 import org.springframework.context.ApplicationContext
 
 import grails.plugins.*
-import grails.plugins.module.ModuleDescriptor
+import grails.plugins.ModuleDescriptor
 import grails.util.GrailsMetaClassUtils
 
 @CompileStatic