You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2018/12/27 08:13:21 UTC
[1/7] tomee git commit: Use foreach instead of manual interaction by
index. Available in Java 5 and newer.
Repository: tomee
Updated Branches:
refs/heads/master f519c3c40 -> df8d80edc
Use foreach instead of manual interaction by index. Available in Java 5 and newer.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/59c77e56
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/59c77e56
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/59c77e56
Branch: refs/heads/master
Commit: 59c77e567b584ecd212db3f4e0622eace4439666
Parents: 761c283
Author: Otavio Santana <ot...@gmail.com>
Authored: Thu Dec 20 08:14:00 2018 -0200
Committer: Otavio Santana <ot...@gmail.com>
Committed: Thu Dec 20 08:14:00 2018 -0200
----------------------------------------------------------------------
.../java/org/apache/openejb/MethodSpec.java | 4 +-
.../main/java/org/apache/openejb/OpenEJB.java | 12 +++---
.../org/apache/openejb/config/AppValidator.java | 40 ++++++++++----------
.../config/OpenEJBDeploymentManager.java | 3 +-
.../apache/openejb/config/SunConversion.java | 4 +-
.../openejb/config/rules/CheckMethods.java | 40 ++++++++++----------
.../openejb/core/NoSuchObjectException.java | 8 ++--
.../apache/openejb/core/cmp/cmp2/CmrSet.java | 3 +-
.../openejb/core/cmp/cmp2/SetValuedCmr.java | 4 +-
.../core/entity/EntityEjbHomeHandler.java | 4 +-
.../security/jaas/PropertiesLoginModule.java | 4 +-
.../jaas/UsernamePasswordCallbackHandler.java | 3 +-
.../TransactionRolledbackException.java | 8 ++--
.../math/stat/descriptive/moment/Variance.java | 4 +-
.../java/org/apache/openejb/util/Base64.java | 16 ++++----
.../openejb/util/IntrospectionSupport.java | 23 +++++------
.../org/apache/openejb/util/URISupport.java | 14 +++----
.../org/apache/openejb/DependencyVisitor.java | 4 +-
18 files changed, 96 insertions(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/59c77e56/container/openejb-core/src/main/java/org/apache/openejb/MethodSpec.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/MethodSpec.java b/container/openejb-core/src/main/java/org/apache/openejb/MethodSpec.java
index 1a40702..295c7fe 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/MethodSpec.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/MethodSpec.java
@@ -76,8 +76,8 @@ public class MethodSpec implements Comparable, Serializable {
int result = 17;
result = 37 * result + methodIntf.hashCode();
result = 37 * result + methodName.hashCode();
- for (int i = 0; i < parameterTypes.length; i++) {
- result = 37 * result + parameterTypes[i].hashCode();
+ for (String parameterType : parameterTypes) {
+ result = 37 * result + parameterType.hashCode();
}
return result;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/59c77e56/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java b/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java
index ccc1d7f..6bd5d88 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java
@@ -172,9 +172,9 @@ public final class OpenEJB {
if (containerSystem.containers().length > 0) {
final Container[] c = containerSystem.containers();
logger.debug("startup.debugContainersType");
- for (int i = 0; i < c.length; i++) {
+ for (Container container : c) {
String entry = " ";
- switch (c[i].getContainerType()) {
+ switch (container.getContainerType()) {
case BMP_ENTITY:
entry += "BMP ENTITY ";
break;
@@ -191,7 +191,7 @@ public final class OpenEJB {
entry += "MESSAGE ";
break;
}
- entry += c[i].getContainerID();
+ entry += container.getContainerID();
logger.debug("startup.debugEntry", entry);
}
}
@@ -200,9 +200,9 @@ public final class OpenEJB {
if (containerSystem.deployments().length > 0) {
logger.debug("startup.debugDeploymentsType");
final BeanContext[] d = containerSystem.deployments();
- for (int i = 0; i < d.length; i++) {
+ for (BeanContext beanContext : d) {
String entry = " ";
- switch (d[i].getComponentType()) {
+ switch (beanContext.getComponentType()) {
case BMP_ENTITY:
entry += "BMP_ENTITY ";
break;
@@ -225,7 +225,7 @@ public final class OpenEJB {
entry += "MESSAGE ";
break;
}
- entry += d[i].getDeploymentID();
+ entry += beanContext.getDeploymentID();
logger.debug("startup.debugEntry", entry);
}
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/59c77e56/container/openejb-core/src/main/java/org/apache/openejb/config/AppValidator.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AppValidator.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AppValidator.java
index 9bb664f..f462e99 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/AppValidator.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AppValidator.java
@@ -98,8 +98,8 @@ public class AppValidator {
Thread.currentThread().setContextClassLoader(appModule.getClassLoader()); // be sure to not mix classloaders
try {
final ValidationRule[] rules = getValidationRules();
- for (int i = 0; i < rules.length; i++) {
- rules[i].validate(appModule);
+ for (ValidationRule rule : rules) {
+ rule.validate(appModule);
}
} catch (final DefinitionException de) {
throw de;
@@ -164,22 +164,22 @@ public class AppValidator {
}
protected void printValidationExceptions(final ValidationException[] exceptions) {
- for (int i = 0; i < exceptions.length; i++) {
+ for (ValidationException exception : exceptions) {
System.out.print(" ");
- System.out.print(exceptions[i].getPrefix());
+ System.out.print(exception.getPrefix());
System.out.print(" ... ");
- if (!(exceptions[i] instanceof ValidationError)) {
- System.out.print(exceptions[i].getComponentName());
+ if (!(exception instanceof ValidationError)) {
+ System.out.print(exception.getComponentName());
System.out.print(": ");
}
if (level > 2) {
- System.out.println(exceptions[i].getMessage(1));
+ System.out.println(exception.getMessage(1));
System.out.println();
System.out.print('\t');
- System.out.println(exceptions[i].getMessage(level));
+ System.out.println(exception.getMessage(level));
System.out.println();
} else {
- System.out.println(exceptions[i].getMessage(level));
+ System.out.println(exception.getMessage(level));
}
}
if (printCount && exceptions.length > 0) {
@@ -211,23 +211,23 @@ public class AppValidator {
}
protected void printValidationExceptionsXML(final ValidationException[] exceptions) {
- for (int i = 0; i < exceptions.length; i++) {
+ for (ValidationException exception : exceptions) {
System.out.print(" <");
- System.out.print(exceptions[i].getPrefix());
+ System.out.print(exception.getPrefix());
System.out.println(">");
- if (!(exceptions[i] instanceof ValidationError)) {
+ if (!(exception instanceof ValidationError)) {
System.out.print(" <ejb-name>");
- System.out.print(exceptions[i].getComponentName());
+ System.out.print(exception.getComponentName());
System.out.println("</ejb-name>");
}
System.out.print(" <summary>");
- System.out.print(exceptions[i].getMessage(1));
+ System.out.print(exception.getMessage(1));
System.out.println("</summary>");
System.out.println(" <description><![CDATA[");
- System.out.println(exceptions[i].getMessage(3));
+ System.out.println(exception.getMessage(3));
System.out.println("]]></description>");
System.out.print(" </");
- System.out.print(exceptions[i].getPrefix());
+ System.out.print(exception.getPrefix());
System.out.println(">");
}
}
@@ -235,13 +235,13 @@ public class AppValidator {
public void displayResults(final ValidationResults[] sets) {
if (printXml) {
System.out.println("<results>");
- for (int i = 0; i < sets.length; i++) {
- printResultsXML(sets[i]);
+ for (ValidationResults set : sets) {
+ printResultsXML(set);
}
System.out.println("</results>");
} else {
- for (int i = 0; i < sets.length; i++) {
- printResults(sets[i]);
+ for (ValidationResults set : sets) {
+ printResults(set);
}
for (int i = 0; i < sets.length; i++) {
if (sets[i].hasErrors() || sets[i].hasFailures()) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/59c77e56/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEJBDeploymentManager.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEJBDeploymentManager.java b/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEJBDeploymentManager.java
index 47d2075..87671a6 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEJBDeploymentManager.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEJBDeploymentManager.java
@@ -95,8 +95,7 @@ public class OpenEJBDeploymentManager implements DeploymentManager {
// target.* - known targets available on the server
// target.*.description - known targets available on the server
final SortedMap<String, Target> targets = new TreeMap<>();
- for (final Iterator<Map.Entry<Object, Object>> iterator = properties.entrySet().iterator(); iterator.hasNext(); ) {
- final Map.Entry entry = iterator.next();
+ for (final Map.Entry entry : properties.entrySet()) {
final String key = (String) entry.getKey();
final String targetName = (String) entry.getValue();
if (key.startsWith("target.") && !key.endsWith(".description")) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/59c77e56/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java b/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java
index 2511d2b..1589b4c 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java
@@ -1171,9 +1171,9 @@ public class SunConversion implements DynamicDeployer {
boolean inWitespace = false;
StringBuilder currentSymbol = new StringBuilder();
- for (int i = 0; i < bits.size(); i++) {
+ for (Object bit1 : bits) {
final TokenType tokenType;
- final String bit = (String) bits.get(i);
+ final String bit = (String) bit1;
switch (bit.charAt(0)) {
case ' ':
case '\t':
http://git-wip-us.apache.org/repos/asf/tomee/blob/59c77e56/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckMethods.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckMethods.java b/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckMethods.java
index eb541ea..b89ca7e 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckMethods.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckMethods.java
@@ -94,13 +94,13 @@ public class CheckMethods extends ValidationBase {
final Method[] interfaceMethods = intrface.getMethods();
- for (int i = 0; i < interfaceMethods.length; i++) {
- if (interfaceMethods[i].getDeclaringClass() == EJBLocalObject.class) {
+ for (Method interfaceMethod : interfaceMethods) {
+ if (interfaceMethod.getDeclaringClass() == EJBLocalObject.class) {
continue;
}
- final String name = interfaceMethods[i].getName();
+ final String name = interfaceMethod.getName();
try {
- final Class[] params = interfaceMethods[i].getParameterTypes();
+ final Class[] params = interfaceMethod.getParameterTypes();
beanClass.getMethod(name, params);
} catch (final NoSuchMethodException nsme) {
final List<Method> differentArgs = new ArrayList<>();
@@ -115,13 +115,13 @@ public class CheckMethods extends ValidationBase {
}
if (differentArgs.size() > 0) {
- fail(b, "no.busines.method.args", interfaceMethods[i].getName(), interfaceMethods[i].toString(), "local", intrface.getName(), beanClass.getName(), differentArgs.size());
+ fail(b, "no.busines.method.args", interfaceMethod.getName(), interfaceMethod.toString(), "local", intrface.getName(), beanClass.getName(), differentArgs.size());
}
if (differentCase.size() > 0) {
- fail(b, "no.busines.method.case", interfaceMethods[i].getName(), interfaceMethods[i].toString(), "local", intrface.getName(), beanClass.getName(), differentCase.size());
+ fail(b, "no.busines.method.case", interfaceMethod.getName(), interfaceMethod.toString(), "local", intrface.getName(), beanClass.getName(), differentCase.size());
}
if (differentArgs.size() == 0 && differentCase.size() == 0) {
- fail(b, "no.busines.method", interfaceMethods[i].getName(), interfaceMethods[i].toString(), "local", intrface.getName(), beanClass.getName());
+ fail(b, "no.busines.method", interfaceMethod.getName(), interfaceMethod.toString(), "local", intrface.getName(), beanClass.getName());
}
}
}
@@ -145,13 +145,13 @@ public class CheckMethods extends ValidationBase {
final Method[] interfaceMethods = intrface.getMethods();
- for (int i = 0; i < interfaceMethods.length; i++) {
- if (interfaceMethods[i].getDeclaringClass() == EJBObject.class) {
+ for (Method interfaceMethod : interfaceMethods) {
+ if (interfaceMethod.getDeclaringClass() == EJBObject.class) {
continue;
}
- final String name = interfaceMethods[i].getName();
+ final String name = interfaceMethod.getName();
try {
- final Class[] params = interfaceMethods[i].getParameterTypes();
+ final Class[] params = interfaceMethod.getParameterTypes();
beanClass.getMethod(name, params);
} catch (final NoSuchMethodException nsme) {
final List<Method> differentArgs = new ArrayList<>();
@@ -166,13 +166,13 @@ public class CheckMethods extends ValidationBase {
}
if (differentArgs.size() > 0) {
- fail(b, "no.busines.method.args", interfaceMethods[i].getName(), interfaceMethods[i].toString(), "remote", intrface.getName(), beanClass.getName(), differentArgs.size());
+ fail(b, "no.busines.method.args", interfaceMethod.getName(), interfaceMethod.toString(), "remote", intrface.getName(), beanClass.getName(), differentArgs.size());
}
if (differentCase.size() > 0) {
- fail(b, "no.busines.method.case", interfaceMethods[i].getName(), interfaceMethods[i].toString(), "remote", intrface.getName(), beanClass.getName(), differentCase.size());
+ fail(b, "no.busines.method.case", interfaceMethod.getName(), interfaceMethod.toString(), "remote", intrface.getName(), beanClass.getName(), differentCase.size());
}
if (differentArgs.size() == 0 && differentCase.size() == 0) {
- fail(b, "no.busines.method", interfaceMethods[i].getName(), interfaceMethods[i].toString(), "remote", intrface.getName(), beanClass.getName());
+ fail(b, "no.busines.method", interfaceMethod.getName(), interfaceMethod.toString(), "remote", intrface.getName(), beanClass.getName());
}
}
}
@@ -229,12 +229,12 @@ public class CheckMethods extends ValidationBase {
final Method[] homeMethods = home.getMethods();
- for (int i = 0; i < homeMethods.length; i++) {
- if (!homeMethods[i].getName().startsWith("create")) {
+ for (Method homeMethod : homeMethods) {
+ if (!homeMethod.getName().startsWith("create")) {
continue;
}
- final Method create = homeMethods[i];
+ final Method create = homeMethod;
final StringBuilder ejbCreateName = new StringBuilder(create.getName());
ejbCreateName.replace(0, 1, "ejbC");
@@ -279,11 +279,11 @@ public class CheckMethods extends ValidationBase {
final Method[] homeMethods = home.getMethods();
final Method[] beanMethods = bean.getMethods();
- for (int i = 0; i < homeMethods.length; i++) {
- if (!homeMethods[i].getName().startsWith("create")) {
+ for (Method homeMethod : homeMethods) {
+ if (!homeMethod.getName().startsWith("create")) {
continue;
}
- final Method create = homeMethods[i];
+ final Method create = homeMethod;
final StringBuilder ejbPostCreateName = new StringBuilder(create.getName());
ejbPostCreateName.replace(0, 1, "ejbPostC");
try {
http://git-wip-us.apache.org/repos/asf/tomee/blob/59c77e56/container/openejb-core/src/main/java/org/apache/openejb/core/NoSuchObjectException.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/NoSuchObjectException.java b/container/openejb-core/src/main/java/org/apache/openejb/core/NoSuchObjectException.java
index a962fd4..7ff96a7 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/NoSuchObjectException.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/NoSuchObjectException.java
@@ -101,8 +101,8 @@ public class NoSuchObjectException extends java.rmi.NoSuchObjectException {
// Don't use getStackTrace() as it calls clone()
// Get stackTrace, in case stackTrace is reassigned
final StackTraceElement[] stack = getStackTrace();
- for (int i = 0; i < stack.length; i++) {
- err.println("\tat " + stack[i]);
+ for (StackTraceElement stackTraceElement : stack) {
+ err.println("\tat " + stackTraceElement);
}
StackTraceElement[] parentStack = stack;
@@ -134,8 +134,8 @@ public class NoSuchObjectException extends java.rmi.NoSuchObjectException {
// Don't use getStackTrace() as it calls clone()
// Get stackTrace, in case stackTrace is reassigned
final StackTraceElement[] stack = getStackTrace();
- for (int i = 0; i < stack.length; i++) {
- err.println("\tat " + stack[i]);
+ for (StackTraceElement stackTraceElement : stack) {
+ err.println("\tat " + stackTraceElement);
}
StackTraceElement[] parentStack = stack;
http://git-wip-us.apache.org/repos/asf/tomee/blob/59c77e56/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrSet.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrSet.java b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrSet.java
index 20a3249..87dca1a 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrSet.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrSet.java
@@ -90,8 +90,7 @@ public class CmrSet<Bean extends EntityBean, Proxy extends EJBLocalObject> exten
public boolean addAll(final Collection c) {
final Set<Bean> entityBeans = getEntityBeans(c, relatedLocal);
boolean changed = false;
- for (final Iterator<Bean> iterator = entityBeans.iterator(); iterator.hasNext(); ) {
- final Bean bean = iterator.next();
+ for (final Bean bean : entityBeans) {
changed = add(bean) || changed;
}
return changed;
http://git-wip-us.apache.org/repos/asf/tomee/blob/59c77e56/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/SetValuedCmr.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/SetValuedCmr.java b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/SetValuedCmr.java
index b317a47..cbd2abd 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/SetValuedCmr.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/SetValuedCmr.java
@@ -108,8 +108,8 @@ public class SetValuedCmr<Bean extends EntityBean, Proxy extends EJBLocalObject>
}
relatedBeans.clear();
- for (final Iterator iterator = new ArrayList(newProxies).iterator(); iterator.hasNext(); ) {
- final Proxy newProxy = (Proxy) iterator.next();
+ for (Object o : new ArrayList(newProxies)) {
+ final Proxy newProxy = (Proxy) o;
final Bean newBean = Cmp2Util.<Bean>getEntityBean(newProxy);
if (newProxy != null) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/59c77e56/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbHomeHandler.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbHomeHandler.java b/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbHomeHandler.java
index 62daa13..3b93ac2 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbHomeHandler.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbHomeHandler.java
@@ -71,8 +71,8 @@ public class EntityEjbHomeHandler extends EjbHomeProxyHandler {
if (retValue instanceof Collection) {
final Object[] proxyInfos = ((Collection) retValue).toArray();
final Vector proxies = new Vector();
- for (int i = 0; i < proxyInfos.length; i++) {
- final ProxyInfo proxyInfo = (ProxyInfo) proxyInfos[i];
+ for (Object proxyInfo1 : proxyInfos) {
+ final ProxyInfo proxyInfo = (ProxyInfo) proxyInfo1;
proxies.addElement(createProxy(proxyInfo.getPrimaryKey(), getMainInterface()));
}
return proxies;
http://git-wip-us.apache.org/repos/asf/tomee/blob/59c77e56/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/PropertiesLoginModule.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/PropertiesLoginModule.java b/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/PropertiesLoginModule.java
index a906d11..ce6e1ae 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/PropertiesLoginModule.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/PropertiesLoginModule.java
@@ -133,8 +133,8 @@ public class PropertiesLoginModule implements LoginModule {
for (final Enumeration enumeration = groups.keys(); enumeration.hasMoreElements(); ) {
final String name = (String) enumeration.nextElement();
final String[] userList = String.valueOf(groups.getProperty(name)).split(",");
- for (int i = 0; i < userList.length; i++) {
- if (user.equals(userList[i])) {
+ for (String s : userList) {
+ if (user.equals(s)) {
principals.add(new GroupPrincipal(name));
break;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/59c77e56/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/UsernamePasswordCallbackHandler.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/UsernamePasswordCallbackHandler.java b/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/UsernamePasswordCallbackHandler.java
index 9c8358e..992195e 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/UsernamePasswordCallbackHandler.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/UsernamePasswordCallbackHandler.java
@@ -38,8 +38,7 @@ public class UsernamePasswordCallbackHandler implements CallbackHandler {
}
public void handle(final Callback[] callbacks) throws IOException, UnsupportedCallbackException {
- for (int i = 0; i < callbacks.length; i++) {
- final Callback callback = callbacks[i];
+ for (final Callback callback : callbacks) {
if (callback instanceof PasswordCallback) {
final PasswordCallback passwordCallback = (PasswordCallback) callback;
if (password == null) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/59c77e56/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionRolledbackException.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionRolledbackException.java b/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionRolledbackException.java
index bd29af5..46991cb 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionRolledbackException.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionRolledbackException.java
@@ -112,8 +112,8 @@ public class TransactionRolledbackException extends javax.transaction.Transactio
// Don't use getStackTrace() as it calls clone()
// Get stackTrace, in case stackTrace is reassigned
final StackTraceElement[] stack = getStackTrace();
- for (int i = 0; i < stack.length; i++) {
- err.println("\tat " + stack[i]);
+ for (StackTraceElement stackTraceElement : stack) {
+ err.println("\tat " + stackTraceElement);
}
StackTraceElement[] parentStack = stack;
@@ -146,8 +146,8 @@ public class TransactionRolledbackException extends javax.transaction.Transactio
// Don't use getStackTrace() as it calls clone()
// Get stackTrace, in case stackTrace is reassigned
final StackTraceElement[] stack = getStackTrace();
- for (int i = 0; i < stack.length; i++) {
- err.println("\tat " + stack[i]);
+ for (StackTraceElement stackTraceElement : stack) {
+ err.println("\tat " + stackTraceElement);
}
StackTraceElement[] parentStack = stack;
http://git-wip-us.apache.org/repos/asf/tomee/blob/59c77e56/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Variance.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Variance.java b/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Variance.java
index e4a34a7..3d21e9f 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Variance.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Variance.java
@@ -510,8 +510,8 @@ public class Variance extends AbstractStorelessUnivariateStatistic implements Se
}
double sumWts = 0;
- for (int i = 0; i < weights.length; i++) {
- sumWts += weights[i];
+ for (double weight : weights) {
+ sumWts += weight;
}
if (isBiasCorrected) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/59c77e56/container/openejb-core/src/main/java/org/apache/openejb/util/Base64.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/Base64.java b/container/openejb-core/src/main/java/org/apache/openejb/util/Base64.java
index abce7c8..b8f25d7 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/Base64.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/Base64.java
@@ -179,8 +179,8 @@ public class Base64 {
// return false;
return true;
}
- for (int i = 0; i < length; i++) {
- if (!isBase64(arrayOctect[i])) {
+ for (byte b : arrayOctect) {
+ if (!isBase64(b)) {
return false;
}
}
@@ -462,15 +462,15 @@ public class Base64 {
final byte[] groomedData = new byte[data.length];
int bytesCopied = 0;
- for (int i = 0; i < data.length; i++) {
- switch (data[i]) {
+ for (byte datum : data) {
+ switch (datum) {
case (byte) ' ':
case (byte) '\n':
case (byte) '\r':
case (byte) '\t':
break;
default:
- groomedData[bytesCopied++] = data[i];
+ groomedData[bytesCopied++] = datum;
}
}
@@ -494,9 +494,9 @@ public class Base64 {
final byte[] groomedData = new byte[data.length];
int bytesCopied = 0;
- for (int i = 0; i < data.length; i++) {
- if (isBase64(data[i])) {
- groomedData[bytesCopied++] = data[i];
+ for (byte datum : data) {
+ if (isBase64(datum)) {
+ groomedData[bytesCopied++] = datum;
}
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/59c77e56/container/openejb-core/src/main/java/org/apache/openejb/util/IntrospectionSupport.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/IntrospectionSupport.java b/container/openejb-core/src/main/java/org/apache/openejb/util/IntrospectionSupport.java
index 6815e41..b126a51 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/IntrospectionSupport.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/IntrospectionSupport.java
@@ -52,13 +52,12 @@ public class IntrospectionSupport {
final Class clazz = target.getClass();
final Method[] methods = clazz.getMethods();
- for (int i = 0; i < methods.length; i++) {
- final Method method = methods[i];
+ for (final Method method : methods) {
String name = method.getName();
final Class type = method.getReturnType();
final Class[] params = method.getParameterTypes();
if (name.startsWith("get") && params.length == 0 && type != null
- && isSettableType(type)) {
+ && isSettableType(type)) {
try {
@@ -73,7 +72,7 @@ public class IntrospectionSupport {
}
name = name.substring(3, 4).toLowerCase()
- + name.substring(4);
+ + name.substring(4);
props.put(optionPrefix + name, strValue);
rc = true;
@@ -206,11 +205,10 @@ public class IntrospectionSupport {
// Build the method name.
name = "set" + name.substring(0, 1).toUpperCase() + name.substring(1);
final Method[] methods = clazz.getMethods();
- for (int i = 0; i < methods.length; i++) {
- final Method method = methods[i];
+ for (final Method method : methods) {
final Class[] params = method.getParameterTypes();
if (method.getName().equals(name) && params.length == 1
- && isSettableType(params[0])) {
+ && isSettableType(params[0])) {
return method;
}
}
@@ -241,8 +239,8 @@ public class IntrospectionSupport {
buffer.append(" {");
final Set entrySet = map.entrySet();
boolean first = true;
- for (final Iterator iter = entrySet.iterator(); iter.hasNext(); ) {
- final Map.Entry entry = (Map.Entry) iter.next();
+ for (Object o : entrySet) {
+ final Entry entry = (Entry) o;
if (first) {
first = false;
} else {
@@ -277,11 +275,10 @@ public class IntrospectionSupport {
}
final Field[] fields = startClass.getDeclaredFields();
- for (int i = 0; i < fields.length; i++) {
- final Field field = fields[i];
+ for (final Field field : fields) {
if (Modifier.isStatic(field.getModifiers())
- || Modifier.isTransient(field.getModifiers())
- || Modifier.isPrivate(field.getModifiers())) {
+ || Modifier.isTransient(field.getModifiers())
+ || Modifier.isPrivate(field.getModifiers())) {
continue;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/59c77e56/container/openejb-core/src/main/java/org/apache/openejb/util/URISupport.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/URISupport.java b/container/openejb-core/src/main/java/org/apache/openejb/util/URISupport.java
index 829327b..b23cddf 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/URISupport.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/URISupport.java
@@ -171,14 +171,14 @@ public class URISupport {
final Map<String, String> rc = new LinkedHashMap<>();
if (uri != null) {
final String[] parameters = uri.split("&");
- for (int i = 0; i < parameters.length; i++) {
- final int p = parameters[i].indexOf('=');
+ for (String parameter : parameters) {
+ final int p = parameter.indexOf('=');
if (p >= 0) {
- final String name = URLDecoder.decode(parameters[i].substring(0, p), "UTF-8");
- final String value = URLDecoder.decode(parameters[i].substring(p + 1), "UTF-8");
+ final String name = URLDecoder.decode(parameter.substring(0, p), "UTF-8");
+ final String value = URLDecoder.decode(parameter.substring(p + 1), "UTF-8");
rc.put(name, value);
} else {
- rc.put(parameters[i], null);
+ rc.put(parameter, null);
}
}
}
@@ -313,14 +313,14 @@ public class URISupport {
if (options.size() > 0) {
final StringBuilder rc = new StringBuilder();
boolean first = true;
- for (final Iterator iter = options.keySet().iterator(); iter.hasNext(); ) {
+ for (Object o : options.keySet()) {
if (first) {
first = false;
} else {
rc.append("&");
}
- final String key = (String) iter.next();
+ final String key = (String) o;
final String value = (String) options.get(key);
rc.append(URLEncoder.encode(key, "UTF-8"));
rc.append("=");
http://git-wip-us.apache.org/repos/asf/tomee/blob/59c77e56/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java b/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java
index d6abf86..d1eadb7 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java
@@ -369,8 +369,8 @@ public class DependencyVisitor extends EmptyVisitor {
private void addMethodDesc(final String desc) {
addType(Type.getReturnType(desc));
final Type[] types = Type.getArgumentTypes(desc);
- for (int i = 0; i < types.length; i++) {
- addType(types[i]);
+ for (Type type : types) {
+ addType(type);
}
}
[2/7] tomee git commit: Simplicity with Map operations with new
operations
Posted by jl...@apache.org.
Simplicity with Map operations with new operations
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/cb67f0e5
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/cb67f0e5
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/cb67f0e5
Branch: refs/heads/master
Commit: cb67f0e51aa2efb6e6959dd3d49fd2f322ed491a
Parents: 59c77e5
Author: Otavio Santana <ot...@gmail.com>
Authored: Thu Dec 20 08:17:22 2018 -0200
Committer: Otavio Santana <ot...@gmail.com>
Committed: Thu Dec 20 08:17:22 2018 -0200
----------------------------------------------------------------------
.../org/apache/openejb/ClassLoaderUtil.java | 12 ++------
.../openejb/assembler/classic/Assembler.java | 12 ++------
.../openejb/assembler/classic/EjbResolver.java | 6 +---
.../java/org/apache/openejb/cdi/CdiScanner.java | 12 ++------
.../openejb/config/AnnotationDeployer.java | 12 ++------
.../org/apache/openejb/config/AutoConfig.java | 30 ++++----------------
.../openejb/config/WebappAggregatedArchive.java | 6 +---
.../openejb/core/CoreContainerSystem.java | 6 +---
.../webservices/PortAddressRegistryImpl.java | 18 ++----------
.../openejb/resource/AutoConnectionTracker.java | 12 ++------
.../org/apache/openejb/util/LinkResolver.java | 6 +---
.../java/org/apache/openejb/util/UrlCache.java | 6 +---
.../openejb/web/LightweightWebAppBuilder.java | 12 ++------
.../org/apache/openejb/DependencyVisitor.java | 6 +---
.../apache/openejb/jee/AssemblyDescriptor.java | 6 +---
.../main/java/org/apache/openejb/jee/Beans.java | 6 +---
16 files changed, 28 insertions(+), 140 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/cb67f0e5/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java b/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
index 642ceab..d11d26a 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
@@ -103,18 +103,10 @@ public class ClassLoaderUtil {
}
private static URLClassLoader cacheClassLoader(final String appId, final URLClassLoader classLoader) {
- List<ClassLoader> classLoaders = classLoadersByApp.get(appId);
- if (classLoaders == null) {
- classLoaders = new ArrayList<>(2);
- classLoadersByApp.put(appId, classLoaders);
- }
+ List<ClassLoader> classLoaders = classLoadersByApp.computeIfAbsent(appId, k -> new ArrayList<>(2));
classLoaders.add(classLoader);
- Set<String> apps = appsByClassLoader.get(classLoader);
- if (apps == null) {
- apps = new LinkedHashSet<>(1);
- appsByClassLoader.put(classLoader, apps);
- }
+ Set<String> apps = appsByClassLoader.computeIfAbsent(classLoader, k -> new LinkedHashSet<>(1));
apps.add(appId);
return classLoader;
http://git-wip-us.apache.org/repos/asf/tomee/blob/cb67f0e5/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 b7b2c3a..808725e 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
@@ -602,11 +602,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
final Map<String, List<ContainerInfo>> appContainers = new HashMap<>();
for (final ContainerInfo serviceInfo : containerSystemInfo.containers) {
- List<ContainerInfo> containerInfos = appContainers.get(serviceInfo.originAppName);
- if (containerInfos == null) {
- containerInfos = new ArrayList<>();
- appContainers.put(serviceInfo.originAppName, containerInfos);
- }
+ List<ContainerInfo> containerInfos = appContainers.computeIfAbsent(serviceInfo.originAppName, k -> new ArrayList<>());
containerInfos.add(serviceInfo);
}
@@ -3783,11 +3779,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
instrumentation.addTransformer(classFileTransformer);
if (unitId != null) {
- List<ClassFileTransformer> transformers = this.transformers.get(unitId);
- if (transformers == null) {
- transformers = new ArrayList<>(1);
- this.transformers.put(unitId, transformers);
- }
+ List<ClassFileTransformer> transformers = this.transformers.computeIfAbsent(unitId, k -> new ArrayList<>(1));
transformers.add(classFileTransformer);
}
} else if (!logged.getAndSet(true)) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/cb67f0e5/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java
index 51377cb..bf6dacc 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java
@@ -125,11 +125,7 @@ public class EjbResolver {
}
private void addInterfaces(final Interfaces interfaces) {
- List<Interfaces> similar = this.interfaces.get(interfaces);
- if (similar == null) {
- similar = new ArrayList<>();
- this.interfaces.put(interfaces, similar);
- }
+ List<Interfaces> similar = this.interfaces.computeIfAbsent(interfaces, k -> new ArrayList<>());
similar.add(interfaces);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/cb67f0e5/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
index 882e3d1..e6947b0 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
@@ -220,11 +220,7 @@ public class CdiScanner implements BdaScannerService {
}
private void addClasses(BeanArchiveService.BeanArchiveInformation bdaInfo, final Collection<String> list, final ClassLoader loader) {
- Set<Class<?>> classes = beanClassesPerBda.get(bdaInfo);
- if (classes == null) {
- classes = new HashSet<>();
- beanClassesPerBda.put(bdaInfo, classes);
- }
+ Set<Class<?>> classes = beanClassesPerBda.computeIfAbsent(bdaInfo, k -> new HashSet<>());
for (final String s : list) {
final Class<?> load = load(s, loader);
@@ -234,11 +230,7 @@ public class CdiScanner implements BdaScannerService {
}
}
private void addClasses(BeanArchiveService.BeanArchiveInformation bdaInfo, final Collection<Class<?>> list) {
- Set<Class<?>> classes = beanClassesPerBda.get(bdaInfo);
- if (classes == null) {
- classes = new HashSet<>();
- beanClassesPerBda.put(bdaInfo, classes);
- }
+ Set<Class<?>> classes = beanClassesPerBda.computeIfAbsent(bdaInfo, k -> new HashSet<>());
classes.addAll(list);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/cb67f0e5/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
index 79b5ed8..1edd22b 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
@@ -5191,11 +5191,7 @@ public class AnnotationDeployer implements DynamicDeployer {
final Map<String, List<MethodAttribute>> declarations = new HashMap<>();
final List<ConcurrentMethod> methods = bean.getConcurrentMethod();
for (final ConcurrentMethod method : methods) {
- List<MethodAttribute> list = declarations.get(method.getMethod().getMethodName());
- if (list == null) {
- list = new ArrayList<>();
- declarations.put(method.getMethod().getMethodName(), list);
- }
+ List<MethodAttribute> list = declarations.computeIfAbsent(method.getMethod().getMethodName(), k -> new ArrayList<>());
list.add(new MethodAttribute(null, bean.getEjbName(), method.getMethod()));
}
return declarations;
@@ -5810,11 +5806,7 @@ public class AnnotationDeployer implements DynamicDeployer {
}
}
- Set<String> list = classes.get(url);
- if (list == null) {
- list = new HashSet<>();
- classes.put(url, list);
- }
+ Set<String> list = classes.computeIfAbsent(url, k -> new HashSet<>());
// saving class url
// first try the file approach (if the same class is in several classloaders it avoids weird errors)
http://git-wip-us.apache.org/repos/asf/tomee/blob/cb67f0e5/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 0add1df..00be44a 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
@@ -2429,11 +2429,7 @@ public class AutoConfig implements DynamicDeployer, JndiConstants {
final MdbContainerInfo mdbContainerInfo = MdbContainerInfo.class.cast(containerInfo);
final String messageListenerInterface = mdbContainerInfo.properties.getProperty("MessageListenerInterface");
if (messageListenerInterface != null) {
- List<String> containerIds = containerIdsByType.get(messageListenerInterface);
- if (containerIds == null) {
- containerIds = new ArrayList<>();
- containerIdsByType.put(messageListenerInterface, containerIds);
- }
+ List<String> containerIds = containerIdsByType.computeIfAbsent(messageListenerInterface, k -> new ArrayList<>());
containerIds.add(containerInfo.id);
}
}
@@ -2466,11 +2462,7 @@ public class AutoConfig implements DynamicDeployer, JndiConstants {
resourceId = connectorModule.getModuleId() + "-" + type;
}
- List<String> resourceIds = resourceIdsByType.get(type);
- if (resourceIds == null) {
- resourceIds = new ArrayList<>();
- resourceIdsByType.put(type, resourceIds);
- }
+ List<String> resourceIds = resourceIdsByType.computeIfAbsent(type, k -> new ArrayList<>());
resourceIds.add(resourceId);
}
}
@@ -2489,11 +2481,7 @@ public class AutoConfig implements DynamicDeployer, JndiConstants {
containerId = connectorModule.getModuleId() + "-" + type;
}
- List<String> containerIds = containerIdsByType.get(type);
- if (containerIds == null) {
- containerIds = new ArrayList<>();
- containerIdsByType.put(type, containerIds);
- }
+ List<String> containerIds = containerIdsByType.computeIfAbsent(type, k -> new ArrayList<>());
containerIds.add(containerId);
}
}
@@ -2510,11 +2498,7 @@ public class AutoConfig implements DynamicDeployer, JndiConstants {
resourceEnvId = connectorModule.getModuleId() + "-" + type;
}
- List<String> resourceEnvIds = resourceEnvIdsByType.get(type);
- if (resourceEnvIds == null) {
- resourceEnvIds = new ArrayList<>();
- resourceEnvIdsByType.put(type, resourceEnvIds);
- }
+ List<String> resourceEnvIds = resourceEnvIdsByType.computeIfAbsent(type, k -> new ArrayList<>());
resourceEnvIds.add(resourceEnvId);
}
}
@@ -2524,11 +2508,7 @@ public class AutoConfig implements DynamicDeployer, JndiConstants {
if (type != null) {
final String[] types = type.trim().split(",");
for (final String t : types) {
- List<String> ids = resourceIdsByType.get(t);
- if (ids == null) {
- ids = new ArrayList<>();
- resourceIdsByType.put(t, ids);
- }
+ List<String> ids = resourceIdsByType.computeIfAbsent(t, k -> new ArrayList<>());
ids.add(r.getId());
if (r.getJndi() != null) {
ids.add(r.getJndi());
http://git-wip-us.apache.org/repos/asf/tomee/blob/cb67f0e5/container/openejb-core/src/main/java/org/apache/openejb/config/WebappAggregatedArchive.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/WebappAggregatedArchive.java b/container/openejb-core/src/main/java/org/apache/openejb/config/WebappAggregatedArchive.java
index 2e0a90b..cd7fd0a 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/WebappAggregatedArchive.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/WebappAggregatedArchive.java
@@ -58,11 +58,7 @@ public class WebappAggregatedArchive implements Archive, ScanConstants {
final Class<?> aClass = module.getClassLoader().loadClass(clazz);
loaded.add(aClass);
final URL jar = jarLocation(aClass).toURI().toURL();
- List<String> list = map.get(jar);
- if (list == null) {
- list = new ArrayList<>();
- map.put(jar, list);
- }
+ List<String> list = map.computeIfAbsent(jar, k -> new ArrayList<>());
list.add(clazz);
} catch (final ClassNotFoundException e) {
throw new IllegalArgumentException(e);
http://git-wip-us.apache.org/repos/asf/tomee/blob/cb67f0e5/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java b/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java
index cdde447..15a3296 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java
@@ -150,11 +150,7 @@ public class CoreContainerSystem implements ContainerSystem {
public void addWebContext(final WebContext webDeployment) {
final String id = webDeployment.getId();
- List<WebContext> list = this.webDeployments.get(id);
- if (list == null) {
- list = new ArrayList<>();
- this.webDeployments.put(id, list);
- }
+ List<WebContext> list = this.webDeployments.computeIfAbsent(id, k -> new ArrayList<>());
list.add(webDeployment);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/cb67f0e5/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortAddressRegistryImpl.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortAddressRegistryImpl.java b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortAddressRegistryImpl.java
index 3be867f..1344bfd 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortAddressRegistryImpl.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortAddressRegistryImpl.java
@@ -61,28 +61,16 @@ public class PortAddressRegistryImpl implements PortAddressRegistry {
// portsByInterface
Map<String, PortAddress> ports = null;
if (portInterface != null) { // localbean have no interface
- ports = portsByInterface.get(portInterface);
- if (ports == null) {
- ports = new TreeMap<>();
- portsByInterface.put(portInterface, ports);
- }
+ ports = portsByInterface.computeIfAbsent(portInterface, k -> new TreeMap<>());
ports.put(portId, portAddress);
}
// portsByServiceId
- ports = portsByServiceId.get(serviceId);
- if (ports == null) {
- ports = new TreeMap<>();
- portsByServiceId.put(serviceId, ports);
- }
+ ports = portsByServiceId.computeIfAbsent(serviceId, k -> new TreeMap<>());
ports.put(portId, portAddress);
// portsByServiceQName
- ports = portsByServiceQName.get(serviceQName);
- if (ports == null) {
- ports = new TreeMap<>();
- portsByServiceQName.put(serviceQName, ports);
- }
+ ports = portsByServiceQName.computeIfAbsent(serviceQName, k -> new TreeMap<>());
ports.put(portId, portAddress);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/cb67f0e5/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 4f735c1..49135c8 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
@@ -119,11 +119,7 @@ public class AutoConnectionTracker implements ConnectionTracker {
registry.putResource(KEY, txConnections);
}
- Map<ConnectionInfo, Object> connectionObjects = txConnections.get(connectionInfo.getManagedConnectionInfo());
- if (connectionObjects == null) {
- connectionObjects = new HashMap<>();
- txConnections.put(connectionInfo.getManagedConnectionInfo(), connectionObjects);
- }
+ Map<ConnectionInfo, Object> connectionObjects = txConnections.computeIfAbsent(connectionInfo.getManagedConnectionInfo(), k -> new HashMap<>());
connectionObjects.put(connectionInfo, connectionInfo.getConnectionProxy());
@@ -181,11 +177,7 @@ public class AutoConnectionTracker implements ConnectionTracker {
registry.putResource(KEY, txConnections);
}
- Map<ConnectionInfo, Object> connectionObjects = txConnections.get(connectionInfo.getManagedConnectionInfo());
- if (connectionObjects == null) {
- connectionObjects = new HashMap<>();
- txConnections.put(connectionInfo.getManagedConnectionInfo(), connectionObjects);
- }
+ Map<ConnectionInfo, Object> connectionObjects = txConnections.computeIfAbsent(connectionInfo.getManagedConnectionInfo(), k -> new HashMap<>());
connectionObjects.remove(connectionInfo);
if (connectionObjects.size() == 0) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/cb67f0e5/container/openejb-core/src/main/java/org/apache/openejb/util/LinkResolver.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/LinkResolver.java b/container/openejb-core/src/main/java/org/apache/openejb/util/LinkResolver.java
index 31e6853..9254ac3 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/LinkResolver.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/LinkResolver.java
@@ -45,11 +45,7 @@ public class LinkResolver<E> {
byFullName.put(uri, value);
// Short name: name -> List(values)
- Collection<E> values = byShortName.get(name);
- if (values == null) {
- values = new ArrayList<>();
- byShortName.put(name, values);
- }
+ Collection<E> values = byShortName.computeIfAbsent(name, k -> new ArrayList<>());
values.add(value);
return true;
http://git-wip-us.apache.org/repos/asf/tomee/blob/cb67f0e5/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java b/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java
index e532d41..53b1e00 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java
@@ -244,11 +244,7 @@ public class UrlCache {
}
private synchronized Map<URL, File> getAppCache(final String appId) {
- Map<URL, File> urlFileMap = cache.get(appId);
- if (urlFileMap == null) {
- urlFileMap = new LinkedHashMap<>();
- cache.put(appId, urlFileMap);
- }
+ Map<URL, File> urlFileMap = cache.computeIfAbsent(appId, k -> new LinkedHashMap<>());
return urlFileMap;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/cb67f0e5/container/openejb-core/src/main/java/org/apache/openejb/web/LightweightWebAppBuilder.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/web/LightweightWebAppBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/web/LightweightWebAppBuilder.java
index 9a869c3..447830b 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/web/LightweightWebAppBuilder.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/web/LightweightWebAppBuilder.java
@@ -193,11 +193,7 @@ public class LightweightWebAppBuilder implements WebAppBuilder {
});
}
- List<Object> list = listeners.get(webAppInfo);
- if (list == null) {
- list = new ArrayList<>();
- listeners.put(webAppInfo, list);
- }
+ List<Object> list = listeners.computeIfAbsent(webAppInfo, k -> new ArrayList<>());
list.add(instance);
}
for (final ClassListInfo info : webAppInfo.webAnnotatedClasses) {
@@ -216,11 +212,7 @@ public class LightweightWebAppBuilder implements WebAppBuilder {
});
}
- List<Object> list = listeners.get(webAppInfo);
- if (list == null) {
- list = new ArrayList<>();
- listeners.put(webAppInfo, list);
- }
+ List<Object> list = listeners.computeIfAbsent(webAppInfo, k -> new ArrayList<>());
list.add(instance);
}
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/cb67f0e5/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java b/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java
index d1eadb7..0a63d0d 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java
@@ -93,11 +93,7 @@ public class DependencyVisitor extends EmptyVisitor {
current = new HashMap<>();
} else {
final String p = getGroupKey(name);
- current = groups.get(p);
- if (current == null) {
- current = new HashMap<>();
- groups.put(p, current);
- }
+ current = groups.computeIfAbsent(p, k -> new HashMap<>());
if (signature == null) {
addName(superName);
http://git-wip-us.apache.org/repos/asf/tomee/blob/cb67f0e5/container/openejb-jee/src/main/java/org/apache/openejb/jee/AssemblyDescriptor.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/AssemblyDescriptor.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/AssemblyDescriptor.java
index 8bde1c9..a9f160f 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/AssemblyDescriptor.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/AssemblyDescriptor.java
@@ -145,11 +145,7 @@ public class AssemblyDescriptor {
for (final Method method : binding.getMethod()) {
if (method.getEjbName().equals(ejbName)) {
final String methodName = method.getMethodName();
- List<MethodAttribute> list = methods.get(methodName);
- if (list == null) {
- list = new ArrayList<MethodAttribute>();
- methods.put(methodName, list);
- }
+ List<MethodAttribute> list = methods.computeIfAbsent(methodName, k -> new ArrayList<MethodAttribute>());
list.add(new MethodAttribute(binding.getAttribute(), method));
}
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/cb67f0e5/container/openejb-jee/src/main/java/org/apache/openejb/jee/Beans.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Beans.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Beans.java
index 8d59bb5..e879b77 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Beans.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Beans.java
@@ -152,11 +152,7 @@ public class Beans {
}
public void addManagedClass(final URL url, final String clazz) {
- List<String> list = managedClasses.get(url);
- if (list == null) {
- list = new LinkedList<>();
- managedClasses.put(url, list);
- }
+ List<String> list = managedClasses.computeIfAbsent(url, k -> new LinkedList<>());
list.add(clazz);
}
[3/7] tomee git commit: Use foreach instead of manual do while.
Available in Java 5 and newer.
Posted by jl...@apache.org.
Use foreach instead of manual do while. Available in Java 5 and newer.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/8eb7338a
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/8eb7338a
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/8eb7338a
Branch: refs/heads/master
Commit: 8eb7338a97c1f8127604cdcd88282a2a2344c0ed
Parents: cb67f0e
Author: Otavio Santana <ot...@gmail.com>
Authored: Thu Dec 20 08:32:50 2018 -0200
Committer: Otavio Santana <ot...@gmail.com>
Committed: Thu Dec 20 08:32:50 2018 -0200
----------------------------------------------------------------------
.../main/java/org/apache/openejb/config/ReadDescriptors.java | 4 +---
.../openejb/config/rules/CheckIncorrectPropertyNames.java | 5 ++---
.../main/java/org/apache/openejb/core/ivm/naming/NameNode.java | 6 ++----
.../apache/openejb/core/webservices/HandlerResolverImpl.java | 5 ++---
4 files changed, 7 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/8eb7338a/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java b/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
index ab482f1..06156d7 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
@@ -474,9 +474,7 @@ public class ReadDescriptors implements DynamicDeployer {
}
private static void checkDuplicatedByBeansXml(final List<String> list, final List<String> duplicated) {
- final Iterator<String> it = list.iterator();
- while (it.hasNext()) {
- final String str = it.next();
+ for (String str : list) {
if (list.indexOf(str) != list.lastIndexOf(str)) {
duplicated.add(str);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/8eb7338a/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckIncorrectPropertyNames.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckIncorrectPropertyNames.java b/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckIncorrectPropertyNames.java
index 8b85bb3..bc856d8 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckIncorrectPropertyNames.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckIncorrectPropertyNames.java
@@ -72,9 +72,8 @@ public class CheckIncorrectPropertyNames extends ValidationBase {
this.module = appModule;
final Properties systemProperties = SystemInstance.get().getProperties();
- final Iterator iterator = incorrectAndCorrectPropNames.entrySet().iterator();
- while (iterator.hasNext()) {
- final Map.Entry<String, String> entry = (Map.Entry<String, String>) iterator.next();
+ for (Object o : incorrectAndCorrectPropNames.entrySet()) {
+ final Map.Entry<String, String> entry = (Map.Entry<String, String>) o;
if (systemProperties.containsKey(entry.getKey())) {
warn(appModule.toString(), "incorrect.property.name", entry.getKey(), entry.getValue());
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/8eb7338a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java
index c544e9c..e641649 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java
@@ -310,10 +310,8 @@ public class NameNode implements Serializable {
}
if(myObject instanceof Federation) {
- Iterator<Context> federatedContextsIterator = ((Federation) myObject).iterator();
- while(federatedContextsIterator.hasNext()) {
- Context current = federatedContextsIterator.next();
- if(IvmContext.class.isInstance(current)) {
+ for (Context current : ((Federation) myObject)) {
+ if (IvmContext.class.isInstance(current)) {
IvmContext.class.cast(current).setReadOnly(isReadOnly);
}
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/8eb7338a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/HandlerResolverImpl.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/HandlerResolverImpl.java b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/HandlerResolverImpl.java
index 5ed700f..c4653a4 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/HandlerResolverImpl.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/HandlerResolverImpl.java
@@ -158,9 +158,8 @@ public class HandlerResolverImpl implements HandlerResolver {
return true;
} else {
final String actualBindingURI = JaxWsUtils.getBindingURI(binding);
- final Iterator iter = bindings.iterator();
- while (iter.hasNext()) {
- final String bindingToken = (String) iter.next();
+ for (Object binding1 : bindings) {
+ final String bindingToken = (String) binding1;
final String bindingURI = JaxWsUtils.getBindingURI(bindingToken);
if (actualBindingURI.equals(bindingURI)) {
return true;
[5/7] tomee git commit: Uses removeIf method instead of use iterator.
Posted by jl...@apache.org.
Uses removeIf method instead of use iterator.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/7ad09234
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/7ad09234
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/7ad09234
Branch: refs/heads/master
Commit: 7ad09234c545aacb507b8b1171542ea59b8842a2
Parents: 3a613ff
Author: Otavio Santana <ot...@gmail.com>
Authored: Thu Dec 20 08:37:03 2018 -0200
Committer: Otavio Santana <ot...@gmail.com>
Committed: Thu Dec 20 08:37:03 2018 -0200
----------------------------------------------------------------------
.../org/apache/openejb/OpenEjbContainer.java | 7 +------
.../assembler/classic/MethodInfoUtil.java | 8 +------
.../classloader/ClassLoaderConfigurer.java | 7 +------
.../apache/openejb/config/DeploymentLoader.java | 9 ++------
.../apache/openejb/config/NewLoaderLogic.java | 22 +++-----------------
.../config/PersistenceUnitLinkResolver.java | 7 +------
.../config/rules/CheckRestMethodArePublic.java | 8 +------
.../jdbc/pool/PoolDataSourceCreator.java | 8 +------
.../openejb/core/ivm/naming/IvmContextTest.java | 6 +-----
.../apache/openejb/jee/oejb3/EjbDeployment.java | 7 +------
10 files changed, 13 insertions(+), 76 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/7ad09234/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java b/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
index 6713824..cf7c2e3 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
@@ -414,12 +414,7 @@ public final class OpenEjbContainer extends EJBContainer {
if (modules instanceof String) {
moduleLocations = configurationFactory.getModulesFromClassPath(null, classLoader);
- for (final Iterator<File> i = moduleLocations.iterator(); i.hasNext(); ) {
- final File file = i.next();
- if (!match((String) modules, file)) {
- i.remove();
- }
- }
+ moduleLocations.removeIf(file -> !match((String) modules, file));
} else if (modules instanceof String[]) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/7ad09234/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java
index 67e807d..c3b5bf4 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java
@@ -468,13 +468,7 @@ public class MethodInfoUtil {
}
// Remove methods that cannot be controlled by the user
- final Iterator<Method> iterator = methods.iterator();
- while (iterator.hasNext()) {
- final Method method = iterator.next();
- if (containerMethod(method)) {
- iterator.remove();
- }
- }
+ methods.removeIf(MethodInfoUtil::containerMethod);
return methods;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/7ad09234/container/openejb-core/src/main/java/org/apache/openejb/classloader/ClassLoaderConfigurer.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/classloader/ClassLoaderConfigurer.java b/container/openejb-core/src/main/java/org/apache/openejb/classloader/ClassLoaderConfigurer.java
index 7db485b..65e85fd 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/classloader/ClassLoaderConfigurer.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/classloader/ClassLoaderConfigurer.java
@@ -33,12 +33,7 @@ public interface ClassLoaderConfigurer {
}
public static void configure(final Collection<URL> urls, final ClassLoaderConfigurer configurer) {
- final Iterator<URL> it = urls.iterator();
- while (it.hasNext()) {
- if (!configurer.accept(it.next())) {
- it.remove();
- }
- }
+ urls.removeIf(url -> !configurer.accept(url));
urls.addAll(Arrays.asList(configurer.additionalURLs()));
}
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/7ad09234/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 1611740..1f55797 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
@@ -1532,13 +1532,8 @@ public class DeploymentLoader implements DeploymentFilterable {
// find the nested jar files
final HashMap<String, URL> rarLibs = new HashMap<>();
scanDir(rarFile, rarLibs, "");
- for (final Iterator<Map.Entry<String, URL>> iterator = rarLibs.entrySet().iterator(); iterator.hasNext(); ) {
- // remove all non jars from the rarLibs
- final Map.Entry<String, URL> fileEntry = iterator.next();
- if (!fileEntry.getKey().endsWith(".jar")) {
- iterator.remove();
- }
- }
+ // remove all non jars from the rarLibs
+ rarLibs.entrySet().removeIf(fileEntry -> !fileEntry.getKey().endsWith(".jar"));
// create the class loader
final List<URL> classPath = new ArrayList<>(rarLibs.values());
http://git-wip-us.apache.org/repos/asf/tomee/blob/7ad09234/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java b/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
index 845fc94..bbd864e 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
@@ -155,12 +155,7 @@ public class NewLoaderLogic {
"sun.reflect."
);
- final Iterator<String> classes = callers.iterator();
- while (classes.hasNext()) {
- if (unwanted.accept(classes.next())) {
- classes.remove();
- }
- }
+ callers.removeIf(unwanted::accept);
}
return callers;
@@ -221,13 +216,7 @@ public class NewLoaderLogic {
getExclusions(); // force init
final List<URL> urls = urlSet.getUrls();
- final Iterator<URL> iterator = urls.iterator();
- while (iterator.hasNext()) {
- final URL url = iterator.next();
- if (skip(url, includeFilter, excludeFilter)) {
- iterator.remove();
- }
- }
+ urls.removeIf(url -> skip(url, includeFilter, excludeFilter));
return new UrlSet(urls);
}
@@ -332,12 +321,7 @@ public class NewLoaderLogic {
if (ADDITIONAL_INCLUDE != null) { // include = not excluded
for (final String rawInclude : ADDITIONAL_INCLUDE.split("[ \t\n\n]*,[ \t\n\n]*")) {
final String include = rawInclude.trim();
- final Iterator<String> excluded = excludes.iterator();
- while (excluded.hasNext()) {
- if (excluded.next().startsWith(include)) {
- excluded.remove();
- }
- }
+ excludes.removeIf(s -> s.startsWith(include));
}
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/7ad09234/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceUnitLinkResolver.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceUnitLinkResolver.java b/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceUnitLinkResolver.java
index 52d41a4..1a7de56 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceUnitLinkResolver.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceUnitLinkResolver.java
@@ -50,12 +50,7 @@ public class PersistenceUnitLinkResolver extends UniqueDefaultLinkResolver<Persi
final WebModule war = extractWebApp(moduleUri);
if (war != null) { // keep only values related to this war
- final Iterator<PersistenceUnit> it = values.iterator();
- while (it.hasNext()) {
- if (!isIn(it.next(), war)) {
- it.remove();
- }
- }
+ values.removeIf(persistenceUnit -> !isIn(persistenceUnit, war));
return values;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/7ad09234/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckRestMethodArePublic.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckRestMethodArePublic.java b/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckRestMethodArePublic.java
index 6751143..43a9a35 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckRestMethodArePublic.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckRestMethodArePublic.java
@@ -93,13 +93,7 @@ public class CheckRestMethodArePublic implements ValidationRule {
}
// try to avoid to valid twice the same classes
- final Iterator<String> it = classes.iterator();
- while (it.hasNext()) {
- final String current = it.next();
- if (standAloneClasses.contains(current)) {
- it.remove();
- }
- }
+ classes.removeIf(standAloneClasses::contains);
// valid
for (final String classname : classes) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/7ad09234/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/pool/PoolDataSourceCreator.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/pool/PoolDataSourceCreator.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/pool/PoolDataSourceCreator.java
index 270cc09..6645e2f 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/pool/PoolDataSourceCreator.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/pool/PoolDataSourceCreator.java
@@ -42,13 +42,7 @@ public abstract class PoolDataSourceCreator implements DataSourceCreator {
protected void cleanProperty(final Object ds, final String name) {
final Map<String, Object> unsetProperties = recipes.get(ds).getUnsetProperties();
- final Iterator<Map.Entry<String, Object>> iterator = unsetProperties.entrySet().iterator();
- while (iterator.hasNext()) {
- final Map.Entry<String, Object> entry = iterator.next();
- if (entry.getKey().equalsIgnoreCase(name)) {
- iterator.remove();
- }
- }
+ unsetProperties.entrySet().removeIf(entry -> entry.getKey().equalsIgnoreCase(name));
}
@Override
http://git-wip-us.apache.org/repos/asf/tomee/blob/7ad09234/container/openejb-core/src/test/java/org/apache/openejb/core/ivm/naming/IvmContextTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/ivm/naming/IvmContextTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/ivm/naming/IvmContextTest.java
index c38bc74..ce93e36 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/core/ivm/naming/IvmContextTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/core/ivm/naming/IvmContextTest.java
@@ -97,11 +97,7 @@ public class IvmContextTest extends TestCase {
final Map<String, Object> map = Debug.contextToMap(context);
// Prune the context entries out
- final Iterator<Map.Entry<String, Object>> iterator = map.entrySet().iterator();
- while (iterator.hasNext()) {
- final Map.Entry<String, Object> entry = iterator.next();
- if (entry.getValue() instanceof Context) iterator.remove();
- }
+ map.entrySet().removeIf(entry -> entry.getValue() instanceof Context);
return map;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/7ad09234/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/EjbDeployment.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/EjbDeployment.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/EjbDeployment.java
index e6249fd..271892b 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/EjbDeployment.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/EjbDeployment.java
@@ -165,12 +165,7 @@ public class EjbDeployment {
}
public void removeResourceLink(final String resRefName) {
- for (final Iterator<ResourceLink> iterator = resourceLink.iterator(); iterator.hasNext(); ) {
- final ResourceLink link = iterator.next();
- if (resRefName.equals(link.getResRefName())) {
- iterator.remove();
- }
- }
+ resourceLink.removeIf(link -> resRefName.equals(link.getResRefName()));
}
public void addEjbLink(final EjbLink ejbLink) {
[4/7] tomee git commit: Uses list.sort instead of Collections.sort
method.
Posted by jl...@apache.org.
Uses list.sort instead of Collections.sort method.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/3a613ff0
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/3a613ff0
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/3a613ff0
Branch: refs/heads/master
Commit: 3a613ff08d70e46b56385f720d4852956dca6d52
Parents: 8eb7338
Author: Otavio Santana <ot...@gmail.com>
Authored: Thu Dec 20 08:35:46 2018 -0200
Committer: Otavio Santana <ot...@gmail.com>
Committed: Thu Dec 20 08:35:46 2018 -0200
----------------------------------------------------------------------
.../java/org/apache/openejb/assembler/classic/Assembler.java | 6 +++---
.../openejb/assembler/classic/InterceptorBindingBuilder.java | 6 +++---
.../openejb/assembler/classic/MethodConcurrencyBuilder.java | 4 ++--
.../org/apache/openejb/assembler/classic/MethodInfoUtil.java | 2 +-
.../openejb/assembler/classic/MethodTransactionBuilder.java | 2 +-
.../java/org/apache/openejb/cdi/OptimizedLoaderService.java | 2 +-
.../java/org/apache/openejb/config/AnnotationDeployer.java | 6 +++---
.../org/apache/openejb/config/rules/CheckClassLoading.java | 2 +-
.../main/java/org/apache/openejb/config/sys/WikiGenerator.java | 2 +-
.../src/main/java/org/apache/openejb/core/TempClassLoader.java | 2 +-
.../main/java/org/apache/openejb/monitoring/ManagedMBean.java | 4 ++--
.../src/main/java/org/apache/openejb/util/ConfUtils.java | 2 +-
.../classic/InterceptorBindingInfoComparatorTest.java | 4 ++--
.../assembler/classic/MethodTransactionInfoComparatorTest.java | 2 +-
.../java/org/apache/openejb/core/timer/GetAllTimersTest.java | 2 +-
.../test/java/org/apache/openejb/util/UrlComparatorTest.java | 4 ++--
.../java/org/apache/openejb/jee/oejb3/PropertiesAdapter.java | 2 +-
17 files changed, 27 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/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 808725e..29a3347 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
@@ -1829,7 +1829,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
// Sort all the singletons to the back of the list. We want to make sure
// all non-singletons are created first so that if a singleton refers to them
// they are available.
- Collections.sort(deployments, new Comparator<BeanContext>() {
+ deployments.sort(new Comparator<BeanContext>() {
@Override
public int compare(final BeanContext a, final BeanContext b) {
final int aa = a.getComponentType() == BeanType.SINGLETON ? 1 : 0;
@@ -1855,7 +1855,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
// Now Sort all the MDBs to the back of the list. The Resource Adapter
// may attempt to use the MDB on endpointActivation and the MDB may have
// references to other ejbs that would need to be available first.
- Collections.sort(deployments, new Comparator<BeanContext>() {
+ deployments.sort(new Comparator<BeanContext>() {
@Override
public int compare(final BeanContext a, final BeanContext b) {
final int aa = a.getComponentType() == BeanType.MESSAGE_DRIVEN ? 1 : 0;
@@ -1973,7 +1973,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
}
}
- Collections.sort(resources, new Comparator<DestroyingResource>() { // end by destroying RA after having closed CF pool (for jms for instance)
+ resources.sort(new Comparator<DestroyingResource>() { // end by destroying RA after having closed CF pool (for jms for instance)
@Override
public int compare(final DestroyingResource o1, final DestroyingResource o2) {
final boolean ra1 = isRa(o1.instance);
http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java
index c330ca9..fd2e131 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java
@@ -57,7 +57,7 @@ public class InterceptorBindingBuilder {
public InterceptorBindingBuilder(final ClassLoader cl, final EjbJarInfo ejbJarInfo) throws OpenEJBException {
bindings = new ArrayList<>(ejbJarInfo.interceptorBindings);
- Collections.sort(bindings, new IntercpetorBindingComparator());
+ bindings.sort(new IntercpetorBindingComparator());
Collections.reverse(bindings);
packageAndClassBindings = new ArrayList<>();
@@ -321,7 +321,7 @@ public class InterceptorBindingBuilder {
logger.warning("Interceptor method not found (skipping): public Object " + callbackInfo.method + "(InvocationContext); in class " + clazz.getName());
}
}
- Collections.sort(methods, new MethodCallbackComparator());
+ methods.sort(new MethodCallbackComparator());
callbacks.addAll(methods);
}
@@ -392,7 +392,7 @@ public class InterceptorBindingBuilder {
throw new IllegalStateException(message, e);
}
}
- Collections.sort(methods, new MethodCallbackComparator());
+ methods.sort(new MethodCallbackComparator());
callbacks.addAll(methods);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodConcurrencyBuilder.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodConcurrencyBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodConcurrencyBuilder.java
index b70fda8..58f74cf 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodConcurrencyBuilder.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodConcurrencyBuilder.java
@@ -132,10 +132,10 @@ public class MethodConcurrencyBuilder {
}
Collections.reverse(lockInfos);
- Collections.sort(lockInfos, new MethodConcurrencyBuilder.MethodConcurrencyComparator());
+ lockInfos.sort(new MethodConcurrencyComparator());
Collections.reverse(accessTimeoutInfos);
- Collections.sort(accessTimeoutInfos, new MethodConcurrencyBuilder.MethodConcurrencyComparator());
+ accessTimeoutInfos.sort(new MethodConcurrencyComparator());
}
public static class MethodConcurrencyComparator extends MethodInfoUtil.BaseComparator<MethodConcurrencyInfo> {
http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java
index 95d592e..67e807d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java
@@ -238,7 +238,7 @@ public class MethodInfoUtil {
}
}
- Collections.sort(normalized, new MethodPermissionComparator());
+ normalized.sort(new MethodPermissionComparator());
return normalized;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodTransactionBuilder.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodTransactionBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodTransactionBuilder.java
index 3f856ba..d53184c 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodTransactionBuilder.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodTransactionBuilder.java
@@ -97,7 +97,7 @@ public class MethodTransactionBuilder {
}
Collections.reverse(normalized);
- Collections.sort(normalized, new MethodTransactionComparator());
+ normalized.sort(new MethodTransactionComparator());
return normalized;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java
index 742ce47..adeb4e6 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java
@@ -113,7 +113,7 @@ public class OptimizedLoaderService implements LoaderService {
if ("true".equals(OptimizedLoaderService.this.config.getProperty("openejb.cdi.extensions.sorted",
SystemInstance.get().getProperty("openejb.cdi.extensions.sorted")))) {
- Collections.sort(list, new Comparator<Extension>() {
+ list.sort(new Comparator<Extension>() {
@Override
public int compare(final Extension o1, final Extension o2) {
final int val1 = getVal(o1);
http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
index 1edd22b..5e9380d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
@@ -5660,7 +5660,7 @@ public class AnnotationDeployer implements DynamicDeployer {
}
public static List<Annotated<Class<?>>> sortClasses(final List<Annotated<Class<?>>> list) {
- Collections.sort(list, new Comparator<Annotated<Class<?>>>() {
+ list.sort(new Comparator<Annotated<Class<?>>>() {
@Override
public int compare(final Annotated<Class<?>> o1, final Annotated<Class<?>> o2) {
return compareClasses(o1.get(), o2.get());
@@ -5670,7 +5670,7 @@ public class AnnotationDeployer implements DynamicDeployer {
}
public static List<Class<?>> sortClassesParentFirst(final List<Class<?>> list) {
- Collections.sort(list, new Comparator<Class<?>>() {
+ list.sort(new Comparator<Class<?>>() {
@Override
public int compare(final Class<?> o1, final Class<?> o2) {
return compareClasses(o2, o1);
@@ -5680,7 +5680,7 @@ public class AnnotationDeployer implements DynamicDeployer {
}
public static List<Annotated<Method>> sortMethods(final List<Annotated<Method>> list) {
- Collections.sort(list, new Comparator<Annotated<Method>>() {
+ list.sort(new Comparator<Annotated<Method>>() {
@Override
public int compare(final Annotated<Method> o1, final Annotated<Method> o2) {
return compareClasses(o1.get().getDeclaringClass(), o2.get().getDeclaringClass());
http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClassLoading.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClassLoading.java b/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClassLoading.java
index f5ba718..3057f49 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClassLoading.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClassLoading.java
@@ -148,7 +148,7 @@ public class CheckClassLoading extends ValidationBase {
}
}
- Collections.sort(diff, DiffItemComparator.getInstance());
+ diff.sort(DiffItemComparator.getInstance());
return diff;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java b/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java
index deb4d64..97bc2c7 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java
@@ -60,7 +60,7 @@ public class WikiGenerator {
// generate containers
final List<ServiceProvider> serviceProvider = servicesJar.getServiceProvider();
- Collections.sort(serviceProvider, new Comparator<ServiceProvider>() {
+ serviceProvider.sort(new Comparator<ServiceProvider>() {
@Override
public int compare(final ServiceProvider o1, final ServiceProvider o2) {
return grade(o2) - grade(o1);
http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java b/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
index 393bfe6..9417aa0 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
@@ -107,7 +107,7 @@ public class TempClassLoader extends URLClassLoader {
while (resources.hasMoreElements()) {
l.add(resources.nextElement());
}
- Collections.sort(l, new ResourceComparator(getParent(), name));
+ l.sort(new ResourceComparator(getParent(), name));
return l.iterator().next();
}
return url;
http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java
index 3708487..f39499d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java
@@ -244,8 +244,8 @@ public class ManagedMBean implements DynamicMBean {
}
}
- sort(operations, MBeanFeatureInfoComparator.INSTANCE);
- sort(attributes, MBeanFeatureInfoComparator.INSTANCE);
+ operations.sort(MBeanFeatureInfoComparator.INSTANCE);
+ attributes.sort(MBeanFeatureInfoComparator.INSTANCE);
if (filterAttributes) {
final Iterator<MBeanAttributeInfo> iterator = attributes.iterator();
http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java b/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java
index 475c216..1da0002 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java
@@ -81,7 +81,7 @@ public class ConfUtils {
}
// Sort so that the URL closest to openejb.base is first
- Collections.sort(urls, new UrlComparator(SystemInstance.get().getBase().getDirectory()));
+ urls.sort(new UrlComparator(SystemInstance.get().getBase().getDirectory()));
return urls.get(0);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/InterceptorBindingInfoComparatorTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/InterceptorBindingInfoComparatorTest.java b/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/InterceptorBindingInfoComparatorTest.java
index 50299ff..236e68d 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/InterceptorBindingInfoComparatorTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/InterceptorBindingInfoComparatorTest.java
@@ -62,7 +62,7 @@ public class InterceptorBindingInfoComparatorTest extends TestCase {
final ArrayList<InterceptorBindingInfo> actual = new ArrayList<>(expected);
Collections.shuffle(actual);
- Collections.sort(actual, new InterceptorBindingBuilder.IntercpetorBindingComparator());
+ actual.sort(new InterceptorBindingBuilder.IntercpetorBindingComparator());
for (int i = 0; i < actual.size(); i++) {
final InterceptorBindingInfo a = actual.get(i);
@@ -127,7 +127,7 @@ public class InterceptorBindingInfoComparatorTest extends TestCase {
info.interceptorOrder.add("TotalOrderingDefaultInterceptor");
actual.set(0, info);
- Collections.sort(actual, new InterceptorBindingBuilder.IntercpetorBindingComparator());
+ actual.sort(new InterceptorBindingBuilder.IntercpetorBindingComparator());
for (int i = 0; i < actual.size(); i++) {
final InterceptorBindingInfo a = actual.get(i);
http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/MethodTransactionInfoComparatorTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/MethodTransactionInfoComparatorTest.java b/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/MethodTransactionInfoComparatorTest.java
index 3246bff..0a03e82 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/MethodTransactionInfoComparatorTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/MethodTransactionInfoComparatorTest.java
@@ -73,7 +73,7 @@ public class MethodTransactionInfoComparatorTest extends TestCase {
final ArrayList<MethodTransactionInfo> actual = new ArrayList<>(expected);
Collections.shuffle(actual);
- Collections.sort(actual, new MethodTransactionBuilder.MethodTransactionComparator());
+ actual.sort(new MethodTransactionBuilder.MethodTransactionComparator());
for (int i = 0; i < actual.size(); i++) {
final MethodTransactionInfo a = actual.get(i);
http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-core/src/test/java/org/apache/openejb/core/timer/GetAllTimersTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/timer/GetAllTimersTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/timer/GetAllTimersTest.java
index ae92370..ba5349a 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/core/timer/GetAllTimersTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/core/timer/GetAllTimersTest.java
@@ -77,7 +77,7 @@ public class GetAllTimersTest {
}
private void checkList(final Collection<Timer> in) {
- final List<Timer> list = new ArrayList<>(in); Collections.sort(list, new Comparator<Timer>() {
+ final List<Timer> list = new ArrayList<>(in); list.sort(new Comparator<Timer>() {
@Override
public int compare(final Timer o1, final Timer o2) {
return o1.getInfo().toString().compareTo(o2.getInfo().toString());
http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-core/src/test/java/org/apache/openejb/util/UrlComparatorTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/util/UrlComparatorTest.java b/container/openejb-core/src/test/java/org/apache/openejb/util/UrlComparatorTest.java
index 8fe8aa1..0f8f161 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/util/UrlComparatorTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/util/UrlComparatorTest.java
@@ -35,11 +35,11 @@ public class UrlComparatorTest extends TestCase {
urls.add(new URL("file:///Users/jstuart/one"));
urls.add(new URL("file:///Users/scobert/three"));
- Collections.sort(urls, new UrlComparator(new URL("file:///Users/jstuart")));
+ urls.sort(new UrlComparator(new URL("file:///Users/jstuart")));
assertEquals(new URL("file:///Users/jstuart/two"), urls.get(0));
- Collections.sort(urls, new UrlComparator(new URL("file:///Users/jstuart/one")));
+ urls.sort(new UrlComparator(new URL("file:///Users/jstuart/one")));
assertEquals(new URL("file:///Users/jstuart/one"), urls.get(0));
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/PropertiesAdapter.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/PropertiesAdapter.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/PropertiesAdapter.java
index 61c7e6a..1ce9abb 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/PropertiesAdapter.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/PropertiesAdapter.java
@@ -69,7 +69,7 @@ public class PropertiesAdapter extends XmlAdapter<String, Properties> {
@Override
public Enumeration<Object> keys() {
final List<Object> list = new ArrayList<>(Collections.list(super.keys()));
- Collections.sort(list, new Comparator<Object>() {
+ list.sort(new Comparator<Object>() {
@Override
public int compare(final Object o1, final Object o2) {
return String.valueOf(o1).compareTo(String.valueOf(o2));
[7/7] tomee git commit: This closes #296. Thanks otaviojava.
Posted by jl...@apache.org.
This closes #296. Thanks otaviojava.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/df8d80ed
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/df8d80ed
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/df8d80ed
Branch: refs/heads/master
Commit: df8d80edc9ac2cad0d35d655010dc3ceb8e75780
Parents: f519c3c d2d44e6
Author: Jean-Louis Monteiro <je...@gmail.com>
Authored: Thu Dec 27 09:13:11 2018 +0100
Committer: Jean-Louis Monteiro <je...@gmail.com>
Committed: Thu Dec 27 09:13:11 2018 +0100
----------------------------------------------------------------------
.../org/apache/openejb/ClassLoaderUtil.java | 12 +-----
.../java/org/apache/openejb/MethodSpec.java | 4 +-
.../main/java/org/apache/openejb/OpenEJB.java | 12 +++---
.../org/apache/openejb/OpenEjbContainer.java | 7 +---
.../openejb/assembler/classic/Assembler.java | 18 +++------
.../openejb/assembler/classic/EjbResolver.java | 6 +--
.../classic/InterceptorBindingBuilder.java | 6 +--
.../classic/MethodConcurrencyBuilder.java | 4 +-
.../assembler/classic/MethodInfoUtil.java | 10 +----
.../classic/MethodTransactionBuilder.java | 2 +-
.../java/org/apache/openejb/cdi/CdiScanner.java | 12 +-----
.../openejb/cdi/OptimizedLoaderService.java | 2 +-
.../classloader/ClassLoaderConfigurer.java | 7 +---
.../openejb/config/AnnotationDeployer.java | 18 +++------
.../org/apache/openejb/config/AppValidator.java | 40 ++++++++++----------
.../org/apache/openejb/config/AutoConfig.java | 30 +++------------
.../apache/openejb/config/DeploymentLoader.java | 9 +----
.../apache/openejb/config/NewLoaderLogic.java | 22 ++---------
.../config/OpenEJBDeploymentManager.java | 3 +-
.../config/PersistenceUnitLinkResolver.java | 7 +---
.../apache/openejb/config/ReadDescriptors.java | 4 +-
.../apache/openejb/config/SunConversion.java | 4 +-
.../openejb/config/WebappAggregatedArchive.java | 6 +--
.../openejb/config/rules/CheckClassLoading.java | 2 +-
.../rules/CheckIncorrectPropertyNames.java | 5 +--
.../openejb/config/rules/CheckMethods.java | 40 ++++++++++----------
.../config/rules/CheckRestMethodArePublic.java | 8 +---
.../openejb/config/sys/WikiGenerator.java | 2 +-
.../openejb/core/CoreContainerSystem.java | 6 +--
.../openejb/core/NoSuchObjectException.java | 8 ++--
.../apache/openejb/core/TempClassLoader.java | 2 +-
.../apache/openejb/core/cmp/cmp2/CmrSet.java | 3 +-
.../openejb/core/cmp/cmp2/SetValuedCmr.java | 4 +-
.../core/entity/EntityEjbHomeHandler.java | 4 +-
.../openejb/core/ivm/naming/NameNode.java | 6 +--
.../openejb/core/mdb/MdbInstanceManager.java | 7 +---
.../core/security/AbstractSecurityService.java | 7 +---
.../security/jaas/PropertiesLoginModule.java | 4 +-
.../jaas/UsernamePasswordCallbackHandler.java | 3 +-
.../openejb/core/stateful/SimpleCache.java | 6 +--
.../TransactionRolledbackException.java | 8 ++--
.../core/webservices/HandlerResolverImpl.java | 5 +--
.../webservices/PortAddressRegistryImpl.java | 18 ++-------
.../math/stat/descriptive/moment/Variance.java | 4 +-
.../apache/openejb/monitoring/ManagedMBean.java | 4 +-
.../openejb/resource/AutoConnectionTracker.java | 12 +-----
.../jdbc/pool/PoolDataSourceCreator.java | 8 +---
.../apache/openejb/threads/task/CUCallable.java | 7 +---
.../org/apache/openejb/threads/task/CUTask.java | 7 +---
.../java/org/apache/openejb/util/Base64.java | 16 ++++----
.../java/org/apache/openejb/util/ConfUtils.java | 2 +-
.../openejb/util/IntrospectionSupport.java | 23 +++++------
.../openejb/util/JavaSecurityManagers.java | 7 +---
.../org/apache/openejb/util/LinkResolver.java | 6 +--
.../java/org/apache/openejb/util/Logger.java | 7 +---
.../org/apache/openejb/util/URISupport.java | 14 +++----
.../java/org/apache/openejb/util/UrlCache.java | 6 +--
.../openejb/web/LightweightWebAppBuilder.java | 12 +-----
.../org/apache/openejb/DependencyVisitor.java | 10 ++---
.../InterceptorBindingInfoComparatorTest.java | 4 +-
.../MethodTransactionInfoComparatorTest.java | 2 +-
.../openejb/core/ivm/naming/IvmContextTest.java | 6 +--
.../openejb/core/timer/GetAllTimersTest.java | 2 +-
.../MultiThreadedManagedDataSourceTest.java | 7 +---
.../threads/ManagedExecutorServiceTest.java | 7 +---
.../apache/openejb/util/UrlComparatorTest.java | 4 +-
.../apache/openejb/jee/AssemblyDescriptor.java | 6 +--
.../main/java/org/apache/openejb/jee/Beans.java | 6 +--
.../apache/openejb/jee/oejb3/EjbDeployment.java | 7 +---
.../openejb/jee/oejb3/PropertiesAdapter.java | 2 +-
70 files changed, 180 insertions(+), 411 deletions(-)
----------------------------------------------------------------------
[6/7] tomee git commit: Uses method references instead of anonymous
class
Posted by jl...@apache.org.
Uses method references instead of anonymous class
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d2d44e6d
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d2d44e6d
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d2d44e6d
Branch: refs/heads/master
Commit: d2d44e6d6ddf36bfefbf564405e0daef5d32cc99
Parents: 7ad0923
Author: Otavio Santana <ot...@gmail.com>
Authored: Thu Dec 20 09:14:02 2018 -0200
Committer: Otavio Santana <ot...@gmail.com>
Committed: Thu Dec 20 09:14:02 2018 -0200
----------------------------------------------------------------------
.../java/org/apache/openejb/core/mdb/MdbInstanceManager.java | 7 +------
.../apache/openejb/core/security/AbstractSecurityService.java | 7 +------
.../java/org/apache/openejb/core/stateful/SimpleCache.java | 6 +-----
.../main/java/org/apache/openejb/threads/task/CUCallable.java | 7 +------
.../src/main/java/org/apache/openejb/threads/task/CUTask.java | 7 +------
.../java/org/apache/openejb/util/JavaSecurityManagers.java | 7 +------
.../src/main/java/org/apache/openejb/util/Logger.java | 7 +------
.../resource/jdbc/MultiThreadedManagedDataSourceTest.java | 7 +------
.../apache/openejb/threads/ManagedExecutorServiceTest.java | 7 +------
9 files changed, 9 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/d2d44e6d/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceManager.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceManager.java b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceManager.java
index fd699f1..9f04c45 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceManager.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceManager.java
@@ -200,12 +200,7 @@ public class MdbInstanceManager {
final Data data = new Data(builder.build(), accessTimeout, closeTimeout);
- MdbContext mdbContext = new MdbContext(securityService, new Flushable() {
- @Override
- public void flush() throws IOException {
- data.flush();
- }
- });
+ MdbContext mdbContext = new MdbContext(securityService, data::flush);
try {
final Context context = beanContext.getJndiEnc();
http://git-wip-us.apache.org/repos/asf/tomee/blob/d2d44e6d/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java b/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java
index ff62082..4d72bc8 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java
@@ -420,12 +420,7 @@ public abstract class AbstractSecurityService implements DestroyableResource, Se
@SuppressWarnings("unchecked")
public SecurityContext(final Subject subject) {
this.subject = subject;
- this.acc = (AccessControlContext) Subject.doAsPrivileged(subject, new PrivilegedAction() {
- @Override
- public Object run() {
- return AccessController.getContext();
- }
- }, null);
+ this.acc = (AccessControlContext) Subject.doAsPrivileged(subject, (PrivilegedAction) AccessController::getContext, null);
}
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/d2d44e6d/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimpleCache.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimpleCache.java b/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimpleCache.java
index 59b3163..ea151a5 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimpleCache.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimpleCache.java
@@ -107,11 +107,7 @@ public class SimpleCache<K, V> implements Cache<K, V> {
final ClassLoader loader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(SimpleCache.class.getClassLoader());
try {
- future = executor.scheduleWithFixedDelay(new Runnable() {
- public void run() {
- processLRU();
- }
- }, frequency, frequency, TimeUnit.MILLISECONDS);
+ future = executor.scheduleWithFixedDelay(this::processLRU, frequency, frequency, TimeUnit.MILLISECONDS);
} finally {
Thread.currentThread().setContextClassLoader(loader);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/d2d44e6d/container/openejb-core/src/main/java/org/apache/openejb/threads/task/CUCallable.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/threads/task/CUCallable.java b/container/openejb-core/src/main/java/org/apache/openejb/threads/task/CUCallable.java
index 4a988ff..2ea832a 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/threads/task/CUCallable.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/threads/task/CUCallable.java
@@ -28,11 +28,6 @@ public class CUCallable<T> extends CUTask<T> implements Callable<T> {
@Override
public T call() throws Exception {
- return invoke(new Callable<T>() {
- @Override
- public T call() throws Exception {
- return delegate.call();
- }
- });
+ return invoke(delegate::call);
}
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/d2d44e6d/container/openejb-core/src/main/java/org/apache/openejb/threads/task/CUTask.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/threads/task/CUTask.java b/container/openejb-core/src/main/java/org/apache/openejb/threads/task/CUTask.java
index e264178..5cdcdea 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/threads/task/CUTask.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/threads/task/CUTask.java
@@ -279,12 +279,7 @@ public abstract class CUTask<T> extends ManagedTaskListenerTask implements Compa
if (errors.size() == 1) {
throw errors.iterator().next();
}
- throw new OpenEJBRuntimeException(Join.join("\n", new Join.NameCallback<RuntimeException>() {
- @Override
- public String getName(final RuntimeException object) {
- return object.getMessage();
- }
- }, errors));
+ throw new OpenEJBRuntimeException(Join.join("\n", Throwable::getMessage, errors));
}
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/d2d44e6d/container/openejb-core/src/main/java/org/apache/openejb/util/JavaSecurityManagers.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/JavaSecurityManagers.java b/container/openejb-core/src/main/java/org/apache/openejb/util/JavaSecurityManagers.java
index b22fd21..44c77ab 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/JavaSecurityManagers.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/JavaSecurityManagers.java
@@ -23,12 +23,7 @@ import java.util.Properties;
// WARN: don't add any logger or container dependency, it should stay self contained
public final class JavaSecurityManagers {
- private static final PrivilegedAction<Properties> GET_SYSTEM_PROPERTIES = new PrivilegedAction<Properties>() {
- @Override
- public Properties run() {
- return System.getProperties();
- }
- };
+ private static final PrivilegedAction<Properties> GET_SYSTEM_PROPERTIES = System::getProperties;
private JavaSecurityManagers() {
// no-op
http://git-wip-us.apache.org/repos/asf/tomee/blob/d2d44e6d/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java b/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
index e7cb77c..e424779 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
@@ -252,12 +252,7 @@ public class Logger {
/**
* Creates a MessageFormat object for a message and returns it
*/
- private static final Computable<String, MessageFormat> messageFormatResolver = new Computable<String, MessageFormat>() {
- @Override
- public MessageFormat compute(final String message) throws InterruptedException {
- return new MessageFormat(message);
- }
- };
+ private static final Computable<String, MessageFormat> messageFormatResolver = MessageFormat::new;
/**
* Cache of parent-child relationships between resource names
http://git-wip-us.apache.org/repos/asf/tomee/blob/d2d44e6d/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/MultiThreadedManagedDataSourceTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/MultiThreadedManagedDataSourceTest.java b/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/MultiThreadedManagedDataSourceTest.java
index 9c116eb..af4ad91 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/MultiThreadedManagedDataSourceTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/MultiThreadedManagedDataSourceTest.java
@@ -226,12 +226,7 @@ public class MultiThreadedManagedDataSourceTest {
private void run(final Runnable runnable) {
final ExecutorService es = Executors.newFixedThreadPool(20);
for (int i = 0; i < INSERTS_NB; i++) {
- es.submit(new Runnable() {
- @Override
- public void run() {
- runnable.run();
- }
- });
+ es.submit(runnable::run);
}
es.shutdown();
try {
http://git-wip-us.apache.org/repos/asf/tomee/blob/d2d44e6d/container/openejb-core/src/test/java/org/apache/openejb/threads/ManagedExecutorServiceTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/threads/ManagedExecutorServiceTest.java b/container/openejb-core/src/test/java/org/apache/openejb/threads/ManagedExecutorServiceTest.java
index 815142b..a813a84 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/threads/ManagedExecutorServiceTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/threads/ManagedExecutorServiceTest.java
@@ -115,12 +115,7 @@ public class ManagedExecutorServiceTest {
public boolean submitRunnable() {
final CountDownLatch done = new CountDownLatch(1);
- es.submit(new Runnable() {
- @Override
- public void run() {
- done.countDown();
- }
- });
+ es.submit(done::countDown);
try {
done.await();
} catch (final InterruptedException e) {