etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 73610315d3 into b7d4df0a11

This commit is contained in:
Suyang(Dawson) Chen 2026-07-04 14:36:10 +00:00 committed by GitHub
parent b7d4df0a11 73610315d3
commit 834796dbd5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionSet.java
View File

@ -22,6 +22,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
import java.util.EmptyStackException;
import java.util.HashMap;
import java.util.HashSet;
@ -61,6 +62,9 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet {
String root;
Map<String, ModuleDefinition> modules;
Map<String, ApplicationContext> contexts = new HashMap<String, ApplicationContext>();
Map<String, Set<Resource>> configResourcesMap = new HashMap<String, Set<Resource>>();
ApplicationContext rootContext = null;
Set<String> excludes = new HashSet<String>();
Properties configProperties = null;
@ -310,24 +314,35 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet {
@Override
public Resource[] getConfigResources(String name) {
Set<Resource> resources = new LinkedHashSet<Resource>();
ModuleDefinition original = null;
ModuleDefinition def = original = modules.get(name);
if (def == null)
ModuleDefinition def = modules.get(name);
if (def == null) {
return new Resource[] {};
}
Set<Resource> resources = new LinkedHashSet<>();
resources.addAll(def.getContextLocations());
while (def != null) {
resources.addAll(def.getInheritableContextLocations());
def = modules.get(def.getParentName());
resources.addAll(collectInheritedResources(def));
resources.addAll(def.getOverrideContextLocations());
return resources.toArray(Resource[]::new);
}
private Set<Resource> collectInheritedResources(final ModuleDefinition def) {
if (def == null) {
return Collections.emptySet();
}
resources.addAll(original.getOverrideContextLocations());
if (configResourcesMap.containsKey(def.getName())) {
return configResourcesMap.get(def.getName());
}
return resources.toArray(new Resource[resources.size()]);
final Set<Resource> inheritableResources = new LinkedHashSet<>(def.getInheritableContextLocations());
inheritableResources.addAll(collectInheritedResources(modules.get(def.getParentName())));
configResourcesMap.put(def.getName(), inheritableResources);
return inheritableResources;
}
@Override