Skip to content

Commit

Permalink
Improved: Import ‘ComponentDef’ and ‘DependsOnInfo’ inner-classes
Browse files Browse the repository at this point in the history 
(OFBIZ-11264)

This allows to use shorter name when using an variable or parameter of
those types.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1869180 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
@mthl
mthl committed Oct 30, 2019
1 parent 34d3042 commit c9788a0
Showing 1 changed file with 14 additions and 12 deletions.
26 changes: 14 additions & 12 deletions framework/base/src/main/java/org/apache/ofbiz/base/container/ComponentContainer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,10 @@
import java.util.stream.Collectors;

import org.apache.ofbiz.base.component.ComponentConfig;
import org.apache.ofbiz.base.component.ComponentConfig.DependsOnInfo;
import org.apache.ofbiz.base.component.ComponentException;
import org.apache.ofbiz.base.component.ComponentLoaderConfig;
import org.apache.ofbiz.base.component.ComponentLoaderConfig.ComponentDef;
import org.apache.ofbiz.base.start.Start;
import org.apache.ofbiz.base.start.StartupCommand;
import org.apache.ofbiz.base.util.Debug;
Expand All @@ -61,7 +63,7 @@ public class ComponentContainer implements Container {
private String name;
private final AtomicBoolean loaded = new AtomicBoolean(false);
private final List<Classpath> componentsClassPath = new ArrayList<>();
private static Map<String, List<ComponentConfig.DependsOnInfo>> toBeLoadedComponents = new ConcurrentHashMap<>();
private static Map<String, List<DependsOnInfo>> toBeLoadedComponents = new ConcurrentHashMap<>();

@Override
public void init(List<StartupCommand> ofbizCommands, String name, String configFile) throws ContainerException {
Expand All @@ -72,7 +74,7 @@ public void init(List<StartupCommand> ofbizCommands, String name, String configF

// load the components from framework/base/config/component-load.xml (root components)
try {
for (ComponentLoaderConfig.ComponentDef def: ComponentLoaderConfig.getRootComponents()) {
for (ComponentDef def: ComponentLoaderConfig.getRootComponents()) {
loadComponent(Start.getInstance().getConfig().ofbizHome, def);
}
} catch (IOException | ComponentException e) {
Expand Down Expand Up @@ -117,7 +119,7 @@ private static void loadClassPathForAllComponents(List<Classpath> componentsClas
* @throws IOException when component directory loading fails.
* @throws ComponentException when retrieving component configuration files fails.
*/
private void loadComponent(Path dir, ComponentLoaderConfig.ComponentDef component)
private void loadComponent(Path dir, ComponentDef component)
throws IOException, ComponentException {
Path location = component.location.isAbsolute() ? component.location : dir.resolve(component.location);
switch (component.type) {
Expand Down Expand Up @@ -172,8 +174,8 @@ private void loadComponentsInDirectoryUsingLoadFile(Path directoryPath, Path com
URL configUrl = null;
try {
configUrl = componentLoadFile.toUri().toURL();
List<ComponentLoaderConfig.ComponentDef> componentsToLoad = ComponentLoaderConfig.getComponentsFromConfig(configUrl);
for (ComponentLoaderConfig.ComponentDef def: componentsToLoad) {
List<ComponentDef> componentsToLoad = ComponentLoaderConfig.getComponentsFromConfig(configUrl);
for (ComponentDef def: componentsToLoad) {
loadComponent(directoryPath, def);
}
} catch (MalformedURLException e) {
Expand Down Expand Up @@ -228,10 +230,10 @@ private void loadComponentWithDependency() throws IOException, ComponentExceptio
if (UtilValidate.isEmpty(toBeLoadedComponents)) {
return;
} else {
for (Map.Entry<String, List<ComponentConfig.DependsOnInfo>> entries : toBeLoadedComponents.entrySet()) {
for (Map.Entry<String, List<DependsOnInfo>> entries : toBeLoadedComponents.entrySet()) {
ComponentConfig config = retrieveComponentConfig(entries.getKey(), null);
if (config.enabled()) {
List<ComponentConfig.DependsOnInfo> dependencyList = checkDependencyForComponent(config);
List<DependsOnInfo> dependencyList = checkDependencyForComponent(config);
if (UtilValidate.isNotEmpty(dependencyList)) {
toBeLoadedComponents.replace(config.getComponentName(), dependencyList);
String msg = "Not loading component [" + config.getComponentName() + "] because it's dependent Component is not loaded [ " + dependencyList + "]";
Expand Down Expand Up @@ -280,7 +282,7 @@ private static ComponentConfig retrieveComponentConfig(String name, Path locatio
*/
private void loadSingleComponent(ComponentConfig config) throws IOException, ComponentException {
if (config.enabled()) {
List<ComponentConfig.DependsOnInfo> dependencyList = checkDependencyForComponent(config);
List<DependsOnInfo> dependencyList = checkDependencyForComponent(config);
if (UtilValidate.isEmpty(dependencyList)) {
componentsClassPath.add(buildClasspathFromComponentConfig(config));
Debug.logInfo("Added class path for component : [" + config.getComponentName() + "]", module);
Expand All @@ -299,11 +301,11 @@ private void loadSingleComponent(ComponentConfig config) throws IOException, Com
* @throws ComponentException
*
*/
private List<ComponentConfig.DependsOnInfo> checkDependencyForComponent(ComponentConfig config) throws IOException, ComponentException {
List<ComponentConfig.DependsOnInfo> dependencyList = new ArrayList<>(config.getDependsOn());
private List<DependsOnInfo> checkDependencyForComponent(ComponentConfig config) throws IOException, ComponentException {
List<DependsOnInfo> dependencyList = new ArrayList<>(config.getDependsOn());
if (UtilValidate.isNotEmpty(dependencyList)) {
Set<ComponentConfig.DependsOnInfo> resolvedDependencyList = new HashSet<>();
for (ComponentConfig.DependsOnInfo dependency : dependencyList) {
Set<DependsOnInfo> resolvedDependencyList = new HashSet<>();
for (DependsOnInfo dependency : dependencyList) {
Debug.logInfo("Component : " + config.getComponentName() + " is Dependent on " + dependency.componentName, module);
ComponentConfig componentConfig = ComponentConfig.getComponentConfig(String.valueOf(dependency.componentName));
Classpath dependentComponentClasspath = buildClasspathFromComponentConfig(componentConfig);
Expand Down

0 comments on commit c9788a0

Please sign in to comment.