TOMEE-2151 PMD/checkstyle
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/16502ebf Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/16502ebf Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/16502ebf Branch: refs/heads/tomee-1.7.x Commit: 16502ebf9608bfb5544db2578da59cdbf10a4ca2 Parents: 7fa1fc0 Author: Jonathan Gallimore <[email protected]> Authored: Mon Dec 4 14:17:21 2017 +0000 Committer: Jonathan Gallimore <[email protected]> Committed: Mon Dec 4 14:17:21 2017 +0000 ---------------------------------------------------------------------- .../java/org/apache/openejb/config/AppInfoBuilder.java | 11 ++++------- .../main/java/org/apache/openejb/config/AutoConfig.java | 1 - 2 files changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/16502ebf/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java index 192a344..7b10eaa 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java @@ -368,17 +368,14 @@ class AppInfoBuilder { } private void buildAppContainers(final AppModule module, final AppInfo info) throws OpenEJBException { - final List<ContainerInfo> containerInfos = getContainerInfos(module); - if (containerInfos == null) return; - + final List<ContainerInfo> containerInfos = ContainerUtils.getContainerInfos(module, configFactory); + if (containerInfos == null) { + return; + } info.containers.addAll(containerInfos); } - private List<ContainerInfo> getContainerInfos(AppModule module) throws OpenEJBException { - return ContainerUtils.getContainerInfos(module, configFactory); - } - private void buildClientModules(final AppModule appModule, final AppInfo appInfo, final JndiEncInfoBuilder jndiEncInfoBuilder) throws OpenEJBException { for (final ClientModule clientModule : appModule.getClientModules()) { final ApplicationClient applicationClient = clientModule.getApplicationClient(); http://git-wip-us.apache.org/repos/asf/tomee/blob/16502ebf/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java index a4505d6..0c73a5d 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java @@ -22,7 +22,6 @@ import org.apache.openejb.OpenEJBException; import org.apache.openejb.assembler.classic.ContainerInfo; import org.apache.openejb.assembler.classic.MdbContainerInfo; import org.apache.openejb.assembler.classic.ResourceInfo; -import org.apache.openejb.config.sys.Container; import org.apache.openejb.config.sys.Resource; import org.apache.openejb.jee.ActivationConfig; import org.apache.openejb.jee.ActivationConfigProperty;
