Refactor module service injection with grouping support

- Added `ModuleServiceHolder` to support separate module grouping.
- Updated `ModuleServiceInjector` to group services by module using `@ModuleService` annotations.
- Injected grouped services dynamically into module holders or default holder.

Author: tuplle

application-engine/src/main/groovy/com/netgrif/application/engine/integration/modules/ModuleServiceHolder.groovy

@@ -0,0 +1,4 @@
+package com.netgrif.application.engine.integration.modules
+
+class ModuleServiceHolder {
+}

application-engine/src/main/groovy/com/netgrif/application/engine/integration/modules/ModuleServiceInjector.groovy

@@ -15,16 +15,47 @@ import org.springframework.stereotype.Component
 class ModuleServiceInjector implements ApplicationEngineFinishRunner {
 
     private static final Logger log = LoggerFactory.getLogger(ModuleServiceInjector.class)
+    private final String DEFAULT_KEY = "default"
 
     @Override
     void run(ApplicationArguments args) throws Exception {
         def injectableBeans = ApplicationContextProvider.getAppContext().getBeansWithAnnotation(ModuleService.class)
         if (!injectableBeans.isEmpty()) {
             MetaClass holderMetaClass = ModuleHolder.metaClass
-            injectableBeans.forEach((key, value) -> {
-                log.debug("Injecting module service {} into action delegate make it available under module.{}", key, key)
-                holderMetaClass[key] = value
-            })
+            def groupedServices = groupServicesByModule(injectableBeans)
+            groupedServices.each { entry ->
+                if (entry.key == DEFAULT_KEY) {
+                    entry.value.each { serviceEntry ->
+                        log.info("Injecting module service {} into action delegate making it available under module.{}", serviceEntry.key, serviceEntry.key)
+                        holderMetaClass[serviceEntry.key] = serviceEntry.value
+                    }
+                } else {
+                    MetaClass moduleServiceHolderMetaClass = ModuleServiceHolder.metaClass
+                    entry.value.each { serviceEntry ->
+                        log.info("Injecting module service {} into module holder {} into action delegate making it available under module.{}.{}", serviceEntry.key, entry.key, entry.key, serviceEntry.key)
+                        moduleServiceHolderMetaClass[serviceEntry.key] = serviceEntry.value
+                    }
+                    holderMetaClass[entry.key] = new ModuleServiceHolder()
+                }
+            }
         }
     }
+
+    private Map<String, Map<String, Object>> groupServicesByModule(Map<String, Object> services) {
+        Map<String, Map<String, Object>> grouped = [(DEFAULT_KEY): [:]]
+        services.each { entry ->
+            ModuleService[] annotations = entry.value.getClass().getAnnotationsByType(ModuleService.class)
+            if (annotations.length == 0) throw new IllegalStateException("Module Service bean must have @ModuleService annotations")
+            ModuleService annotation = annotations[0]
+            if (annotation.value().isBlank()) {
+                grouped[(DEFAULT_KEY)].put(entry.key, entry.value)
+            } else {
+                String moduleName = annotation.value()
+                if (!grouped.containsKey(moduleName)) grouped.put(moduleName, [:])
+                grouped[moduleName].put(entry.key, entry.value)
+            }
+        }
+        return grouped
+    }
+
 }

application-engine/src/main/java/com/netgrif/application/engine/integration/modules/ModuleService.java

@@ -1,9 +1,18 @@
 package com.netgrif.application.engine.integration.modules;
 
+import org.springframework.core.annotation.AliasFor;
+
 import java.lang.annotation.*;
 
 @Documented
 @Target({ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface ModuleService {
+
+    @AliasFor("module")
+    String value() default "";
+
+    @AliasFor("value")
+    String module() default "";
+
 }