uses entreset instead of key
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/5c9bad84 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/5c9bad84 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/5c9bad84 Branch: refs/heads/master Commit: 5c9bad84f7d58b8d3c418befe62d3fa5e526bb8d Parents: d1135d3 Author: Otavio Santana <[email protected]> Authored: Tue Dec 4 12:48:21 2018 -0200 Committer: Otavio Santana <[email protected]> Committed: Tue Dec 4 12:48:21 2018 -0200 ---------------------------------------------------------------------- .../openejb/assembler/classic/Assembler.java | 7 +++-- .../org/apache/openejb/config/AutoConfig.java | 18 ++++++------- .../apache/openejb/config/DeploymentLoader.java | 28 ++++++++++---------- .../openejb/core/managed/SimplePassivater.java | 4 +-- .../core/security/jaas/SQLLoginModule.java | 8 +++--- .../openejb/core/stateful/SimplePassivater.java | 4 +-- .../openejb/resource/AutoConnectionTracker.java | 6 ++--- .../openejb/ivm/naming/IvmContextTest.java | 4 +-- 8 files changed, 39 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/5c9bad84/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java index f10ce76..a0cf0fb 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java @@ -611,10 +611,9 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A containerInfos.add(serviceInfo); } - final Set<String> apps = appContainers.keySet(); - for (final String app : apps) { - final List<ContainerInfo> containerInfos = appContainers.get(app); - final ClassLoader classLoader = appClassLoaders.get(app); + for (final Entry<String, List<ContainerInfo>> stringListEntry : appContainers.entrySet()) { + final List<ContainerInfo> containerInfos = stringListEntry.getValue(); + final ClassLoader classLoader = appClassLoaders.get(stringListEntry.getKey()); final ClassLoader oldCl = Thread.currentThread().getContextClassLoader(); http://git-wip-us.apache.org/repos/asf/tomee/blob/5c9bad84/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 4c8e877..54f0f59 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 @@ -2287,19 +2287,19 @@ public class AutoConfig implements DynamicDeployer, JndiConstants { for (final String s : resourceAdapterIds) { logger.debug(appId + " module contains resource adapter id: " + s); } - for (final String s : resourceIdsByType.keySet()) { - for (final String value : resourceIdsByType.get(s)) { - logger.debug(appId + " module contains resource type: " + s + " --> " + value); + for (final Map.Entry<String, List<String>> stringListEntry : resourceIdsByType.entrySet()) { + for (final String value : stringListEntry.getValue()) { + logger.debug(appId + " module contains resource type: " + stringListEntry.getKey() + " --> " + value); } } - for (final String s : resourceEnvIdsByType.keySet()) { - for (final String value : resourceEnvIdsByType.get(s)) { - logger.debug(appId + " module contains resource env type: " + s + " --> " + value); + for (final Map.Entry<String, List<String>> stringListEntry : resourceEnvIdsByType.entrySet()) { + for (final String value : stringListEntry.getValue()) { + logger.debug(appId + " module contains resource env type: " + stringListEntry.getKey() + " --> " + value); } } - for (final String s : containerIdsByType.keySet()) { - for (final String value : containerIdsByType.get(s)) { - logger.debug(appId + " module contains container type: " + s + " --> " + value); + for (final Map.Entry<String, List<String>> stringListEntry : containerIdsByType.entrySet()) { + for (final String value : stringListEntry.getValue()) { + logger.debug(appId + " module contains container type: " + stringListEntry.getKey() + " --> " + value); } } } http://git-wip-us.apache.org/repos/asf/tomee/blob/5c9bad84/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java b/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java index a66be39..1611740 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java @@ -561,9 +561,9 @@ public class DeploymentLoader implements DeploymentFilterable { } // EJB modules - for (final String moduleName : ejbModules.keySet()) { + for (final Map.Entry<String, URL> stringURLEntry : ejbModules.entrySet()) { try { - URL ejbUrl = ejbModules.get(moduleName); + URL ejbUrl = stringURLEntry.getValue(); // we should try to use a reference to the temp classloader if (ClassLoaderUtil.isUrlCached(appModule.getJarLocation(), ejbUrl)) { try { @@ -579,14 +579,14 @@ public class DeploymentLoader implements DeploymentFilterable { final EjbModule ejbModule = createEjbModule(ejbUrl, absolutePath, appClassLoader); appModule.getEjbModules().add(ejbModule); } catch (final OpenEJBException e) { - logger.error("Unable to load EJBs from EAR: " + appId + ", module: " + moduleName + ". Exception: " + e.getMessage(), e); + logger.error("Unable to load EJBs from EAR: " + appId + ", module: " + stringURLEntry.getKey() + ". Exception: " + e.getMessage(), e); } } // Application Client Modules - for (final String moduleName : clientModules.keySet()) { + for (final Map.Entry<String, URL> stringURLEntry : clientModules.entrySet()) { try { - URL clientUrl = clientModules.get(moduleName); + URL clientUrl = stringURLEntry.getValue(); // we should try to use a reference to the temp classloader if (ClassLoaderUtil.isUrlCached(appModule.getJarLocation(), clientUrl)) { try { @@ -603,14 +603,14 @@ public class DeploymentLoader implements DeploymentFilterable { appModule.getClientModules().add(clientModule); } catch (final Exception e) { - logger.error("Unable to load App Client from EAR: " + appId + ", module: " + moduleName + ". Exception: " + e.getMessage(), e); + logger.error("Unable to load App Client from EAR: " + appId + ", module: " + stringURLEntry.getKey() + ". Exception: " + e.getMessage(), e); } } // Resource modules - for (final String moduleName : resouceModules.keySet()) { + for (final Map.Entry<String, URL> stringURLEntry : resouceModules.entrySet()) { try { - URL rarUrl = resouceModules.get(moduleName); + URL rarUrl = stringURLEntry.getValue(); // we should try to use a reference to the temp classloader if (ClassLoaderUtil.isUrlCached(appModule.getJarLocation(), rarUrl)) { try { @@ -620,22 +620,22 @@ public class DeploymentLoader implements DeploymentFilterable { // no-op } } - final ConnectorModule connectorModule = createConnectorModule(appId, URLs.toFilePath(rarUrl), appClassLoader, moduleName); + final ConnectorModule connectorModule = createConnectorModule(appId, URLs.toFilePath(rarUrl), appClassLoader, stringURLEntry.getKey()); if (connectorModule != null) { appModule.getConnectorModules().add(connectorModule); } } catch (final OpenEJBException e) { - logger.error("Unable to load RAR: " + appId + ", module: " + moduleName + ". Exception: " + e.getMessage(), e); + logger.error("Unable to load RAR: " + appId + ", module: " + stringURLEntry.getKey() + ". Exception: " + e.getMessage(), e); } } // Web modules - for (final String moduleName : webModules.keySet()) { + for (final Map.Entry<String, URL> stringURLEntry : webModules.entrySet()) { try { - final URL warUrl = webModules.get(moduleName); - addWebModule(appModule, warUrl, appClassLoader, webContextRoots.get(moduleName), null); + final URL warUrl = stringURLEntry.getValue(); + addWebModule(appModule, warUrl, appClassLoader, webContextRoots.get(stringURLEntry.getKey()), null); } catch (final OpenEJBException e) { - logger.error("Unable to load WAR: " + appId + ", module: " + moduleName + ". Exception: " + e.getMessage(), e); + logger.error("Unable to load WAR: " + appId + ", module: " + stringURLEntry.getKey() + ". Exception: " + e.getMessage(), e); } } http://git-wip-us.apache.org/repos/asf/tomee/blob/5c9bad84/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimplePassivater.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimplePassivater.java b/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimplePassivater.java index aa84b03..c6424f9 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimplePassivater.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimplePassivater.java @@ -97,8 +97,8 @@ public class SimplePassivater implements PassivationStrategy { @Override public void passivate(final Map hash) throws SystemException { - for (final Object id : hash.keySet()) { - passivate(id, hash.get(id)); + for (final Object o : hash.entrySet()) { + passivate(((Map.Entry) o).getKey(), ((Map.Entry) o).getValue()); } } http://git-wip-us.apache.org/repos/asf/tomee/blob/5c9bad84/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/SQLLoginModule.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/SQLLoginModule.java b/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/SQLLoginModule.java index af61231..0551ad3 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/SQLLoginModule.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/SQLLoginModule.java @@ -102,13 +102,13 @@ public class SQLLoginModule implements LoginModule { this.subject = subject; this.handler = callbackHandler; - for (final Object key : options.keySet()) { - final Option option = Option.findByName((String) key); + for (final Object o : options.entrySet()) { + final Option option = Option.findByName((String) ((Map.Entry) o).getKey()); if (option != null) { - final String value = (String) options.get(key); + final String value = (String) ((Map.Entry) o).getValue(); optionsMap.put(option, value.trim()); } else { - log.warning("Ignoring option: {0}. Not supported.", key); + log.warning("Ignoring option: {0}. Not supported.", ((Map.Entry) o).getKey()); } } http://git-wip-us.apache.org/repos/asf/tomee/blob/5c9bad84/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimplePassivater.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimplePassivater.java b/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimplePassivater.java index e49766f..21a45a3 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimplePassivater.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimplePassivater.java @@ -101,8 +101,8 @@ public class SimplePassivater implements PassivationStrategy { @Override public void passivate(final Map hash) throws SystemException { - for (final Object id : hash.keySet()) { - passivate(id, hash.get(id)); + for (final Object o : hash.entrySet()) { + passivate(((Map.Entry) o).getKey(), ((Map.Entry) o).getValue()); } } http://git-wip-us.apache.org/repos/asf/tomee/blob/5c9bad84/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java index abbfe8a..4f735c1 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java @@ -133,14 +133,14 @@ public class AutoConnectionTracker implements ConnectionTracker { final Map<ManagedConnectionInfo, Map<ConnectionInfo, Object>> txConnections = (Map<ManagedConnectionInfo, Map<ConnectionInfo, Object>>) registry.getResource(KEY); if (txConnections != null && txConnections.size() > 0) { - for (final ManagedConnectionInfo managedConnectionInfo : txConnections.keySet()) { + for (final Map.Entry<ManagedConnectionInfo, Map<ConnectionInfo, Object>> managedConnectionInfoMapEntry : txConnections.entrySet()) { final StringBuilder sb = new StringBuilder(); - final Collection<ConnectionInfo> connectionInfos = txConnections.get(managedConnectionInfo).keySet(); + final Collection<ConnectionInfo> connectionInfos = managedConnectionInfoMapEntry.getValue().keySet(); for (final ConnectionInfo connectionInfo : connectionInfos) { sb.append("\n ").append("Connection handle opened at ").append(stackTraceToString(connectionInfo.getTrace().getStackTrace())); } - logger.warning("Transaction complete, but connection still has handles associated: " + managedConnectionInfo + "\nAbandoned connection information: " + sb); + logger.warning("Transaction complete, but connection still has handles associated: " + managedConnectionInfoMapEntry.getKey() + "\nAbandoned connection information: " + sb); } } } http://git-wip-us.apache.org/repos/asf/tomee/blob/5c9bad84/container/openejb-core/src/test/java/org/apache/openejb/ivm/naming/IvmContextTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/ivm/naming/IvmContextTest.java b/container/openejb-core/src/test/java/org/apache/openejb/ivm/naming/IvmContextTest.java index 243020a..805326a 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/ivm/naming/IvmContextTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/ivm/naming/IvmContextTest.java @@ -329,8 +329,8 @@ public class IvmContextTest { } writer.println(); - for (Context subContext : subContexts.keySet()) { - hasErrors |= listContext(subContext, subContexts.get(subContext), writer); + for (Map.Entry<Context, String> contextStringEntry : subContexts.entrySet()) { + hasErrors |= listContext(contextStringEntry.getKey(), contextStringEntry.getValue(), writer); } return hasErrors;
