You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2018/12/04 04:54:37 UTC
[06/12] tomee git commit: Added diamond operator usage to the OpenEJB
Container Core project, where appropriate
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/HandlerChainData.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/HandlerChainData.java b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/HandlerChainData.java
index 5cdb590..89f08c6 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/HandlerChainData.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/HandlerChainData.java
@@ -24,8 +24,8 @@ import java.util.List;
public class HandlerChainData {
private final QName serviceNamePattern;
private final QName portNamePattern;
- private final List<String> protocolBindings = new ArrayList<String>();
- private final List<HandlerData> handlers = new ArrayList<HandlerData>();
+ private final List<String> protocolBindings = new ArrayList<>();
+ private final List<HandlerData> handlers = new ArrayList<>();
public HandlerChainData(final QName serviceNamePattern, final QName portNamePattern, final List<String> protocolBindings, final List<HandlerData> handlers) {
this.serviceNamePattern = serviceNamePattern;
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/HandlerData.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/HandlerData.java b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/HandlerData.java
index fa1f482..40d7a17 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/HandlerData.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/HandlerData.java
@@ -26,10 +26,10 @@ import java.util.Properties;
public class HandlerData {
private final Class<?> handlerClass;
private final Properties initParams = new Properties();
- private final List<QName> soapHeaders = new ArrayList<QName>();
- private final List<String> soapRoles = new ArrayList<String>();
- private final List<Method> postConstruct = new ArrayList<Method>();
- private final List<Method> preDestroy = new ArrayList<Method>();
+ private final List<QName> soapHeaders = new ArrayList<>();
+ private final List<String> soapRoles = new ArrayList<>();
+ private final List<Method> postConstruct = new ArrayList<>();
+ private final List<Method> preDestroy = new ArrayList<>();
public HandlerData(final Class<?> handlerClass) {
if (handlerClass == null) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/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 b5962ea..5ed700f 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
@@ -51,7 +51,7 @@ public class HandlerResolverImpl implements HandlerResolver {
private final List<HandlerChainData> handlerChains;
private final Collection<Injection> injections;
private final Context context;
- private final List<InjectionProcessor<Handler>> handlerInstances = new ArrayList<InjectionProcessor<Handler>>();
+ private final List<InjectionProcessor<Handler>> handlerInstances = new ArrayList<>();
public HandlerResolverImpl(final List<HandlerChainData> handlerChains, final Collection<Injection> injections, final Context context) {
this.handlerChains = handlerChains;
@@ -60,7 +60,7 @@ public class HandlerResolverImpl implements HandlerResolver {
}
public void destroyHandlers() {
- final List<InjectionProcessor<Handler>> handlerInstances = new ArrayList<InjectionProcessor<Handler>>(this.handlerInstances);
+ final List<InjectionProcessor<Handler>> handlerInstances = new ArrayList<>(this.handlerInstances);
this.handlerInstances.clear();
for (final InjectionProcessor<Handler> handlerInstance : handlerInstances) {
handlerInstance.preDestroy();
@@ -68,7 +68,7 @@ public class HandlerResolverImpl implements HandlerResolver {
}
public List<Handler> getHandlerChain(final PortInfo portInfo) {
- List<Handler> chain = new ArrayList<Handler>();
+ List<Handler> chain = new ArrayList<>();
for (final HandlerChainData handlerChain : handlerChains) {
List<Handler> handlers = buildHandlers(portInfo, handlerChain);
handlers = sortHandlers(handlers);
@@ -85,7 +85,7 @@ public class HandlerResolverImpl implements HandlerResolver {
return Collections.emptyList();
}
- final List<Handler> handlers = new ArrayList<Handler>(handlerChain.getHandlers().size());
+ final List<Handler> handlers = new ArrayList<>(handlerChain.getHandlers().size());
for (final HandlerData handler : handlerChain.getHandlers()) {
final WebBeansContext webBeansContext = AppFinder.findAppContextOrWeb(
Thread.currentThread().getContextClassLoader(), AppFinder.WebBeansContextTransformer.INSTANCE);
@@ -120,7 +120,7 @@ public class HandlerResolverImpl implements HandlerResolver {
try { // old way
final Class<? extends Handler> handlerClass = handler.getHandlerClass().asSubclass(Handler.class);
- final InjectionProcessor<Handler> processor = new InjectionProcessor<Handler>(handlerClass,
+ final InjectionProcessor<Handler> processor = new InjectionProcessor<>(handlerClass,
injections,
handler.getPostConstruct(),
handler.getPreDestroy(),
@@ -207,8 +207,8 @@ public class HandlerResolverImpl implements HandlerResolver {
* @return sorted list of handlers
*/
private List<Handler> sortHandlers(final List<Handler> handlers) {
- final List<LogicalHandler> logicalHandlers = new ArrayList<LogicalHandler>();
- final List<Handler> protocolHandlers = new ArrayList<Handler>();
+ final List<LogicalHandler> logicalHandlers = new ArrayList<>();
+ final List<Handler> protocolHandlers = new ArrayList<>();
for (final Handler handler : handlers) {
if (handler instanceof LogicalHandler) {
@@ -218,7 +218,7 @@ public class HandlerResolverImpl implements HandlerResolver {
}
}
- final List<Handler> sortedHandlers = new ArrayList<Handler>();
+ final List<Handler> sortedHandlers = new ArrayList<>();
sortedHandlers.addAll(logicalHandlers);
sortedHandlers.addAll(protocolHandlers);
return sortedHandlers;
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/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 c4fb476..3be867f 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
@@ -28,10 +28,10 @@ import java.util.Set;
import java.util.TreeMap;
public class PortAddressRegistryImpl implements PortAddressRegistry {
- private final Map<String, PortAddress> portsById = new TreeMap<String, PortAddress>();
- private final Map<String, Map<String, PortAddress>> portsByInterface = new TreeMap<String, Map<String, PortAddress>>();
- private final Map<String, Map<String, PortAddress>> portsByServiceId = new TreeMap<String, Map<String, PortAddress>>();
- private final Map<QName, Map<String, PortAddress>> portsByServiceQName = new HashMap<QName, Map<String, PortAddress>>();
+ private final Map<String, PortAddress> portsById = new TreeMap<>();
+ private final Map<String, Map<String, PortAddress>> portsByInterface = new TreeMap<>();
+ private final Map<String, Map<String, PortAddress>> portsByServiceId = new TreeMap<>();
+ private final Map<QName, Map<String, PortAddress>> portsByServiceQName = new HashMap<>();
public synchronized void addPort(final String serviceId, final QName serviceQName, final String portId, final QName portQName, final String portInterface, final String address) throws OpenEJBException {
if (serviceId == null) {
@@ -63,7 +63,7 @@ public class PortAddressRegistryImpl implements PortAddressRegistry {
if (portInterface != null) { // localbean have no interface
ports = portsByInterface.get(portInterface);
if (ports == null) {
- ports = new TreeMap<String, PortAddress>();
+ ports = new TreeMap<>();
portsByInterface.put(portInterface, ports);
}
ports.put(portId, portAddress);
@@ -72,7 +72,7 @@ public class PortAddressRegistryImpl implements PortAddressRegistry {
// portsByServiceId
ports = portsByServiceId.get(serviceId);
if (ports == null) {
- ports = new TreeMap<String, PortAddress>();
+ ports = new TreeMap<>();
portsByServiceId.put(serviceId, ports);
}
ports.put(portId, portAddress);
@@ -80,7 +80,7 @@ public class PortAddressRegistryImpl implements PortAddressRegistry {
// portsByServiceQName
ports = portsByServiceQName.get(serviceQName);
if (ports == null) {
- ports = new TreeMap<String, PortAddress>();
+ ports = new TreeMap<>();
portsByServiceQName.put(serviceQName, ports);
}
ports.put(portId, portAddress);
@@ -159,7 +159,7 @@ public class PortAddressRegistryImpl implements PortAddressRegistry {
}
// find matching ports by id
- final Map<String, PortAddress> ports = new TreeMap<String, PortAddress>();
+ final Map<String, PortAddress> ports = new TreeMap<>();
if (id != null) {
final Map<String, PortAddress> idPorts = portsByServiceId.get(id);
if (idPorts != null) {
@@ -175,7 +175,7 @@ public class PortAddressRegistryImpl implements PortAddressRegistry {
}
}
- final Set<PortAddress> portAddresses = new HashSet<PortAddress>(ports.values());
+ final Set<PortAddress> portAddresses = new HashSet<>(ports.values());
return portAddresses;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortData.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortData.java b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortData.java
index 52d4b4a..771fa9f 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortData.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortData.java
@@ -33,8 +33,8 @@ public class PortData implements PortInfo {
private String bindingId;
private URL wsdlUrl;
- private final List<HandlerChainData> handlerChains = new ArrayList<HandlerChainData>();
- private final List<Injection> injections = new ArrayList<Injection>();
+ private final List<HandlerChainData> handlerChains = new ArrayList<>();
+ private final List<Injection> injections = new ArrayList<>();
private boolean mtomEnabled;
private QName wsdlPort;
private QName wsdlService;
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortRefData.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortRefData.java b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortRefData.java
index b7e53ee..c32b5cf 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortRefData.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortRefData.java
@@ -27,7 +27,7 @@ public class PortRefData {
private String serviceEndpointInterface;
private boolean enableMtom;
private final Properties properties = new Properties();
- private final List<String> addresses = new ArrayList<String>(1);
+ private final List<String> addresses = new ArrayList<>(1);
public PortRefData() {
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java
index a1314dd..e9c4590 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java
@@ -488,7 +488,7 @@ public class ProviderWrapper extends Provider {
public Enumeration<URL> getResources(final String name) throws IOException {
Enumeration<URL> resources = super.getResources(name);
if (PROVIDER_RESOURCE.equals(name)) {
- final ArrayList<URL> list = new ArrayList<URL>();
+ final ArrayList<URL> list = new ArrayList<>();
list.add(PROVIDER_URL);
list.addAll(Collections.list(resources));
resources = Collections.enumeration(list);
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ServiceRefData.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ServiceRefData.java b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ServiceRefData.java
index 435cb8f..17ac3e8 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ServiceRefData.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ServiceRefData.java
@@ -41,8 +41,8 @@ public class ServiceRefData {
private final QName portQName;
private final Class<?> referenceClass;
private final URL wsdlURL;
- private final List<HandlerChainData> handlerChains = new ArrayList<HandlerChainData>();
- private final List<PortRefData> portRefs = new ArrayList<PortRefData>();
+ private final List<HandlerChainData> handlerChains = new ArrayList<>();
+ private final List<PortRefData> portRefs = new ArrayList<>();
public ServiceRefData(final String id, final QName serviceQName, final Class<? extends Service> serviceClass, final QName portQName, final Class<?> referenceClass, final URL wsdlURL, final List<HandlerChainData> handlerChains, final List<PortRefData> portRefs) {
this.id = id;
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java b/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java
index 7cc0284..4ba1d4a 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java
@@ -109,7 +109,7 @@ public class DynamicSubclass implements Opcodes {
private static byte[] generateBytes(final Class<?> classToProxy, final boolean proxyNonAbstractMethods) throws ProxyGenerationException {
- final Map<String, MethodVisitor> visitors = new HashMap<String, MethodVisitor>();
+ final Map<String, MethodVisitor> visitors = new HashMap<>();
final ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/log/ColorFormatter.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/log/ColorFormatter.java b/container/openejb-core/src/main/java/org/apache/openejb/log/ColorFormatter.java
index 9d851ff..7e30200 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/log/ColorFormatter.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/log/ColorFormatter.java
@@ -30,7 +30,7 @@ import java.util.logging.LogRecord;
public class ColorFormatter extends SingleLineFormatter {
public static final String OPENEJB_LOG_COLOR_PREFIX = "openejb.log.color.";
- private final Map<Level, Ansi.Color> colors = new HashMap<Level, Ansi.Color>();
+ private final Map<Level, Ansi.Color> colors = new HashMap<>();
public ColorFormatter() {
// until info level information should be not so import so keep default color
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Log4jLogger.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Log4jLogger.java b/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Log4jLogger.java
index 6be14d7..df06689 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Log4jLogger.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Log4jLogger.java
@@ -98,7 +98,7 @@ public class Log4jLogger extends AbstractDelegatingLogger {
}
public synchronized Handler[] getHandlers() {
- final List<Handler> ret = new ArrayList<Handler>();
+ final List<Handler> ret = new ArrayList<>();
final Enumeration<?> en = log.getAllAppenders();
while (en.hasMoreElements()) {
final Appender ap = (Appender) en.nextElement();
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java
index e850aef..e52ce32 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java
@@ -80,9 +80,9 @@ public class DynamicMBeanWrapper implements DynamicMBean, MBeanRegistration {
}
private final MBeanInfo info;
- private final Map<String, Method> getters = new HashMap<String, Method>();
- private final Map<String, Method> setters = new HashMap<String, Method>();
- private final Map<String, Method> operations = new HashMap<String, Method>();
+ private final Map<String, Method> getters = new HashMap<>();
+ private final Map<String, Method> setters = new HashMap<>();
+ private final Map<String, Method> operations = new HashMap<>();
private final Object instance;
private final ClassLoader classloader;
@@ -106,9 +106,9 @@ public class DynamicMBeanWrapper implements DynamicMBean, MBeanRegistration {
final CacheInfo cache = CACHE.get(annotatedMBean);
if (cache == null) {
final String description;
- final List<MBeanAttributeInfo> attributeInfos = new ArrayList<MBeanAttributeInfo>();
- final List<MBeanOperationInfo> operationInfos = new ArrayList<MBeanOperationInfo>();
- final List<MBeanNotificationInfo> notificationInfos = new ArrayList<MBeanNotificationInfo>();
+ final List<MBeanAttributeInfo> attributeInfos = new ArrayList<>();
+ final List<MBeanOperationInfo> operationInfos = new ArrayList<>();
+ final List<MBeanNotificationInfo> notificationInfos = new ArrayList<>();
// class
final Description classDescription = findAnnotation(annotatedMBean, Description.class);
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/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 d6e6e91..3708487 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
@@ -62,11 +62,11 @@ public class ManagedMBean implements DynamicMBean {
private static final MBeanNotificationInfo[] EMPTY_NOTIFICATIONS = new MBeanNotificationInfo[0];
- private final List<MBeanAttributeInfo> attributes = new ArrayList<MBeanAttributeInfo>();
- private final List<MBeanOperationInfo> operations = new ArrayList<MBeanOperationInfo>();
- private final Map<String, Member> attributesMap = new HashMap<String, Member>();
- private final Map<String, MethodMember> operationsMap = new HashMap<String, MethodMember>();
- private final List<Member> dynamic = new ArrayList<Member>();
+ private final List<MBeanAttributeInfo> attributes = new ArrayList<>();
+ private final List<MBeanOperationInfo> operations = new ArrayList<>();
+ private final Map<String, Member> attributesMap = new HashMap<>();
+ private final Map<String, MethodMember> operationsMap = new HashMap<>();
+ private final List<Member> dynamic = new ArrayList<>();
private Pattern includes = Pattern.compile("");
private Pattern excludes = Pattern.compile("");
@@ -218,8 +218,8 @@ public class ManagedMBean implements DynamicMBean {
public MBeanInfo getMBeanInfo() {
- final List<MBeanAttributeInfo> attributes = new ArrayList<MBeanAttributeInfo>(this.attributes);
- final List<MBeanOperationInfo> operations = new ArrayList<MBeanOperationInfo>(this.operations);
+ final List<MBeanAttributeInfo> attributes = new ArrayList<>(this.attributes);
+ final List<MBeanOperationInfo> operations = new ArrayList<>(this.operations);
for (final Member member : dynamic) {
try {
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ObjectNameBuilder.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ObjectNameBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ObjectNameBuilder.java
index ab52dbe..c1bdb20 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ObjectNameBuilder.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ObjectNameBuilder.java
@@ -36,7 +36,7 @@ public class ObjectNameBuilder {
}
public ObjectNameBuilder(final String domain) {
- map = new LinkedHashMap<String, String>();
+ map = new LinkedHashMap<>();
this.domain = domain;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java
index 5e93544..1e472cd 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java
@@ -54,7 +54,7 @@ public class StatsInterceptor {
public static final InterceptorData metadata = InterceptorData.scan(StatsInterceptor.class);
- private final Map<Method, Stats> map = new ConcurrentHashMap<Method, Stats>();
+ private final Map<Method, Stats> map = new ConcurrentHashMap<>();
private final AtomicLong invocations = new AtomicLong();
private final AtomicLong invocationTime = new AtomicLong();
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/monitoring/remote/RemoteResourceMonitor.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/remote/RemoteResourceMonitor.java b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/remote/RemoteResourceMonitor.java
index ea9841f..5b75966 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/remote/RemoteResourceMonitor.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/remote/RemoteResourceMonitor.java
@@ -54,7 +54,7 @@ public class RemoteResourceMonitor implements DynamicMBean {
new MBeanParameterInfo("host", String.class.getName(), "the host to ping")
}, String.class.getName(), MBeanOperationInfo.INFO);
- private final Collection<String> hosts = new CopyOnWriteArraySet<String>();
+ private final Collection<String> hosts = new CopyOnWriteArraySet<>();
private ObjectName objectName;
private MBeanInfo info;
@@ -135,7 +135,7 @@ public class RemoteResourceMonitor implements DynamicMBean {
}
private void buildMBeanInfo() {
- final List<MBeanOperationInfo> operationInfos = new ArrayList<MBeanOperationInfo>();
+ final List<MBeanOperationInfo> operationInfos = new ArrayList<>();
for (final String host : hosts) {
operationInfos.add(new MBeanOperationInfo(host, "ping host " + host, EMPTY_PARAMETERS, String.class.getName(), MBeanOperationInfo.INFO));
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManager.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManager.java b/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManager.java
index 2661942..2bcb861 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManager.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManager.java
@@ -377,7 +377,7 @@ public class JtaEntityManager implements EntityManager, Serializable {
private <T> TypedQuery<T> typedProxyIfNoTx(final Method method, final Object... args) {
if (wrapNoTxQueries && !extended && !isTransactionActive()) {
- return new JtaTypedQuery<T>(getEntityManager(), this, method, args);
+ return new JtaTypedQuery<>(getEntityManager(), this, method, args);
}
return createQuery(TypedQuery.class, getEntityManager(), method, args);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManagerRegistry.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManagerRegistry.java b/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManagerRegistry.java
index 1a0a0e7..407c261 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManagerRegistry.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManagerRegistry.java
@@ -201,7 +201,7 @@ public class JtaEntityManagerRegistry {
private class ExtendedRegistry {
private final Map<InstanceId, Map<EntityManagerFactory, EntityManagerTracker>> entityManagersByDeploymentId =
- new HashMap<InstanceId, Map<EntityManagerFactory, EntityManagerTracker>>();
+ new HashMap<>();
private void addEntityManagers(final InstanceId instanceId, final Map<EntityManagerFactory, EntityManagerTracker> entityManagers)
throws EntityManagerAlreadyRegisteredException {
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaQuery.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaQuery.java b/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaQuery.java
index 2336f45..9b0f98e 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaQuery.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaQuery.java
@@ -41,7 +41,7 @@ public class JtaQuery implements Query {
private final Object[] args;
private final Method method;
private final JtaEntityManager jtaEntityManager;
- private final Collection<QueryOperation> appliedOperations = new ArrayList<QueryOperation>();
+ private final Collection<QueryOperation> appliedOperations = new ArrayList<>();
private boolean underTx;
private boolean unwrap;
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceBootstrap.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceBootstrap.java b/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceBootstrap.java
index 7b260f4..2658d14 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceBootstrap.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceBootstrap.java
@@ -126,7 +126,7 @@ public class PersistenceBootstrap {
debug("searching for persistence.xml files");
// create persistence.xml names respecting altdd
- final Collection<String> pXmlNames = new ArrayList<String>();
+ final Collection<String> pXmlNames = new ArrayList<>();
// altdd logic duplicated to avoid classloading issue in tomee-webapp mode
final String altDD = getAltDD();
@@ -139,7 +139,7 @@ public class PersistenceBootstrap {
pXmlNames.add("persistence.xml");
}
- final List<URL> urls = new LinkedList<URL>();
+ final List<URL> urls = new LinkedList<>();
for (final String pXmlName : pXmlNames) { // find persistence.xml in the classloader and in WEB-INF
urls.addAll(Collections.list(classLoader.getResources("META-INF/" + pXmlName)));
if ("true".equals(args.getProperty("web-scan", "false"))) { // findUrls is slow for small tests and rarely needed
@@ -173,7 +173,7 @@ public class PersistenceBootstrap {
return;
}
- final Map<String, Unit> units = new HashMap<String, Unit>();
+ final Map<String, Unit> units = new HashMap<>();
for (final URL url : urls) {
final String urlPath = url.toExternalForm();
@@ -407,7 +407,7 @@ public class PersistenceBootstrap {
private static class Unit {
private String provider;
- private final Set<String> classes = new HashSet<String>();
+ private final Set<String> classes = new HashSet<>();
private final String name;
public Unit(final String name) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java b/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
index 3389b5f..1e31aad 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
@@ -87,12 +87,12 @@ public class PersistenceUnitInfoImpl implements PersistenceUnitInfo {
/**
* Names if the entity-mapping.xml files relative to to the persistenceUnitRootUrl.
*/
- private final List<String> mappingFileNames = new ArrayList<String>();
+ private final List<String> mappingFileNames = new ArrayList<>();
/**
* The jar file locations that make up this persistence unit.
*/
- private final List<URL> jarFileUrls = new ArrayList<URL>();
+ private final List<URL> jarFileUrls = new ArrayList<>();
/**
* Location of the root of the persistent unit. The directory in which
@@ -103,7 +103,7 @@ public class PersistenceUnitInfoImpl implements PersistenceUnitInfo {
/**
* List of the managed entity classes.
*/
- private final List<String> managedClassNames = new ArrayList<String>();
+ private final List<String> managedClassNames = new ArrayList<>();
/**
* Should class not listed in the persistence unit be managed by the EntityManager?
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/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 d9f4618..abbfe8a 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
@@ -57,7 +57,7 @@ public class AutoConnectionTracker implements ConnectionTracker {
private final TransactionSynchronizationRegistry registry;
private final TransactionManager txMgr;
private final Logger logger = Logger.getInstance(LogCategory.OPENEJB_CONNECTOR, "org.apache.openejb.resource");
- private final ConcurrentMap<ManagedConnectionInfo, ProxyPhantomReference> references = new ConcurrentHashMap<ManagedConnectionInfo, ProxyPhantomReference>();
+ private final ConcurrentMap<ManagedConnectionInfo, ProxyPhantomReference> references = new ConcurrentHashMap<>();
private final ReferenceQueue referenceQueue = new ReferenceQueue();
private final ConcurrentMap<Class<?>, Class<?>> proxies = new ConcurrentHashMap<>();
private final ConcurrentMap<Class<?>, Class<?>[]> interfaces = new ConcurrentHashMap<>();
@@ -115,13 +115,13 @@ public class AutoConnectionTracker implements ConnectionTracker {
if (currentTx != null) {
Map<ManagedConnectionInfo, Map<ConnectionInfo, Object>> txConnections = (Map<ManagedConnectionInfo, Map<ConnectionInfo, Object>>) registry.getResource(KEY);
if (txConnections == null) {
- txConnections = new HashMap<ManagedConnectionInfo, Map<ConnectionInfo, Object>>();
+ txConnections = new HashMap<>();
registry.putResource(KEY, txConnections);
}
Map<ConnectionInfo, Object> connectionObjects = txConnections.get(connectionInfo.getManagedConnectionInfo());
if (connectionObjects == null) {
- connectionObjects = new HashMap<ConnectionInfo, Object>();
+ connectionObjects = new HashMap<>();
txConnections.put(connectionInfo.getManagedConnectionInfo(), connectionObjects);
}
@@ -177,13 +177,13 @@ public class AutoConnectionTracker implements ConnectionTracker {
if (currentTx != null) {
Map<ManagedConnectionInfo, Map<ConnectionInfo, Object>> txConnections = (Map<ManagedConnectionInfo, Map<ConnectionInfo, Object>>) registry.getResource(KEY);
if (txConnections == null) {
- txConnections = new HashMap<ManagedConnectionInfo, Map<ConnectionInfo, Object>>();
+ txConnections = new HashMap<>();
registry.putResource(KEY, txConnections);
}
Map<ConnectionInfo, Object> connectionObjects = txConnections.get(connectionInfo.getManagedConnectionInfo());
if (connectionObjects == null) {
- connectionObjects = new HashMap<ConnectionInfo, Object>();
+ connectionObjects = new HashMap<>();
txConnections.put(connectionInfo.getManagedConnectionInfo(), connectionObjects);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java
index ae5fc43..e890747 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java
@@ -82,7 +82,7 @@ public class ActiveMQ5Factory implements BrokerFactoryHandler {
final Properties properties = getLowerCaseProperties();
final URISupport.CompositeData compositeData = URISupport.parseComposite(new URI(brokerURI.getRawSchemeSpecificPart()));
- final Map<String, String> params = new HashMap<String, String>(compositeData.getParameters());
+ final Map<String, String> params = new HashMap<>(compositeData.getParameters());
final PersistenceAdapter persistenceAdapter;
if ("true".equals(params.remove("usekahadb"))) {
persistenceAdapter = createPersistenceAdapter("org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter", "kahadb", params);
@@ -314,7 +314,7 @@ public class ActiveMQ5Factory implements BrokerFactoryHandler {
// forking org.apache.activemq.broker.DefaultBrokerFactory.createBroker() to support network connector properties
private BrokerService newDefaultBroker(final URI uri) throws Exception {
final URISupport.CompositeData compositeData = URISupport.parseComposite(uri);
- final Map<String, String> params = new HashMap<String, String>(compositeData.getParameters());
+ final Map<String, String> params = new HashMap<>(compositeData.getParameters());
final BrokerService brokerService = newPatchedBrokerService();
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
index e0db5e3..e49304d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
@@ -280,7 +280,7 @@ public class DataSourceFactory {
final FlushableDataSourceHandler.FlushConfig flushConfig;
properties.remove("flushable"); // don't let it wrap the delegate again
- final Map<String, Object> recipeProps = new HashMap<>(objectRecipe == null ? new HashMap<String, Object>() : objectRecipe.getProperties());
+ final Map<String, Object> recipeProps = new HashMap<>(objectRecipe == null ? new HashMap<>() : objectRecipe.getProperties());
recipeProps.remove("properties");
recipeProps.put("OpenEJBResourceClasspath", String.valueOf(useAlternativeDriver));
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/driver/AlternativeDriver.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/driver/AlternativeDriver.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/driver/AlternativeDriver.java
index f2028cd..678a878 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/driver/AlternativeDriver.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/driver/AlternativeDriver.java
@@ -72,7 +72,7 @@ public class AlternativeDriver implements Driver {
DriverManager.registerDriver(this);
}
- ensureFirst(new LinkedHashSet<Driver>());
+ ensureFirst(new LinkedHashSet<>());
}
public void deregister() throws SQLException {
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/logging/LoggingPreparedSqlStatement.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/logging/LoggingPreparedSqlStatement.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/logging/LoggingPreparedSqlStatement.java
index d68135b..5224e19 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/logging/LoggingPreparedSqlStatement.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/logging/LoggingPreparedSqlStatement.java
@@ -37,7 +37,7 @@ public class LoggingPreparedSqlStatement implements InvocationHandler {
private final PreparedStatement delegate;
private final String sql;
- private final List<Parameter> parameters = new ArrayList<Parameter>();
+ private final List<Parameter> parameters = new ArrayList<>();
private final String[] packages;
private int parameterIndex;
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/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 2929117..270cc09 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
@@ -38,7 +38,7 @@ import java.util.Map;
import java.util.Properties;
public abstract class PoolDataSourceCreator implements DataSourceCreator {
- protected final Map<Object, ObjectRecipe> recipes = new HashMap<Object, ObjectRecipe>();
+ protected final Map<Object, ObjectRecipe> recipes = new HashMap<>();
protected void cleanProperty(final Object ds, final String name) {
final Map<String, Object> unsetProperties = recipes.get(ds).getUnsetProperties();
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/pool/XADataSourceResource.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/pool/XADataSourceResource.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/pool/XADataSourceResource.java
index 42650d7..6dbe474 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/pool/XADataSourceResource.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/pool/XADataSourceResource.java
@@ -33,7 +33,7 @@ public final class XADataSourceResource {
private static class LazyXADataSourceHandler implements InvocationHandler {
private final String name;
- private final AtomicReference<XADataSource> ref = new AtomicReference<XADataSource>();
+ private final AtomicReference<XADataSource> ref = new AtomicReference<>();
public LazyXADataSourceHandler(final String xaDataSource) {
if (xaDataSource.startsWith("openejb:") || xaDataSource.startsWith("java:global")) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/router/FailOverRouter.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/router/FailOverRouter.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/router/FailOverRouter.java
index 26cfedc..934d5ee 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/router/FailOverRouter.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/router/FailOverRouter.java
@@ -148,7 +148,7 @@ public class FailOverRouter extends AbstractRouter {
strategyRuntime = new Strategy() { // simply rotating the list each time
@Override
public Collection<DataSourceHolder> prepare(final Collection<DataSourceHolder> list) {
- final List<DataSourceHolder> ds = new ArrayList<DataSourceHolder>(list);
+ final List<DataSourceHolder> ds = new ArrayList<>(list);
Collections.shuffle(ds);
return ds;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/resource/quartz/QuartzResourceAdapter.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/quartz/QuartzResourceAdapter.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/quartz/QuartzResourceAdapter.java
index a5d1086..8dad12b 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/quartz/QuartzResourceAdapter.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/quartz/QuartzResourceAdapter.java
@@ -51,10 +51,10 @@ public class QuartzResourceAdapter implements ResourceAdapter {
public static final String OPENEJB_QUARTZ_TIMEOUT = "openejb.quartz.timeout";
//Start and stop may be called from different threads so use atomics
- private final AtomicReference<Throwable> ex = new AtomicReference<Throwable>();
- private final AtomicReference<Scheduler> scheduler = new AtomicReference<Scheduler>();
- private final AtomicReference<BootstrapContext> bootstrapContext = new AtomicReference<BootstrapContext>();
- private final AtomicReference<Thread> startThread = new AtomicReference<Thread>();
+ private final AtomicReference<Throwable> ex = new AtomicReference<>();
+ private final AtomicReference<Scheduler> scheduler = new AtomicReference<>();
+ private final AtomicReference<BootstrapContext> bootstrapContext = new AtomicReference<>();
+ private final AtomicReference<Thread> startThread = new AtomicReference<>();
@Override
public void start(final BootstrapContext bootstrapContext) throws ResourceAdapterInternalException {
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/rest/AbstractRestThreadLocalProxy.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/rest/AbstractRestThreadLocalProxy.java b/container/openejb-core/src/main/java/org/apache/openejb/rest/AbstractRestThreadLocalProxy.java
index 9dcfdd1..2c98a32 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/rest/AbstractRestThreadLocalProxy.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/rest/AbstractRestThreadLocalProxy.java
@@ -23,7 +23,7 @@ import java.io.Serializable;
public class AbstractRestThreadLocalProxy<T> implements Serializable {
- private final ThreadLocal<T> infos = new ThreadLocal<T>();
+ private final ThreadLocal<T> infos = new ThreadLocal<>();
private final Class<T> clazz;
protected AbstractRestThreadLocalProxy(final Class<T> clazz) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/rest/MultivaluedMapWithCaseInsensitiveKeySet.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/rest/MultivaluedMapWithCaseInsensitiveKeySet.java b/container/openejb-core/src/main/java/org/apache/openejb/rest/MultivaluedMapWithCaseInsensitiveKeySet.java
index d801e46..f0b5035 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/rest/MultivaluedMapWithCaseInsensitiveKeySet.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/rest/MultivaluedMapWithCaseInsensitiveKeySet.java
@@ -127,7 +127,7 @@ public class MultivaluedMapWithCaseInsensitiveKeySet<V> implements MultivaluedMa
}
private static Set<String> getInsensitiveKeySet(final Set<String> values) {
- final Set<String> set = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
+ final Set<String> set = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
set.addAll(values);
return set;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalHttpHeaders.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalHttpHeaders.java b/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalHttpHeaders.java
index d654248..d51ca01 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalHttpHeaders.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalHttpHeaders.java
@@ -66,7 +66,7 @@ public class ThreadLocalHttpHeaders extends AbstractRestThreadLocalProxy<HttpHea
@Override
public MultivaluedMap<String, String> getRequestHeaders() {
- return new MultivaluedMapWithCaseInsensitiveKeySet<String>(get().getRequestHeaders());
+ return new MultivaluedMapWithCaseInsensitiveKeySet<>(get().getRequestHeaders());
}
@Override
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoTransactionService.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoTransactionService.java b/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoTransactionService.java
index 2257721..f6dc8a9 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoTransactionService.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoTransactionService.java
@@ -43,7 +43,7 @@ import java.util.Properties;
*/
public class PseudoTransactionService implements TransactionService, TransactionManager, TransactionSynchronizationRegistry {
private static final Logger logger = Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.core.cmp");
- private final ThreadLocal<MyTransaction> threadTransaction = new ThreadLocal<MyTransaction>();
+ private final ThreadLocal<MyTransaction> threadTransaction = new ThreadLocal<>();
public void init(final Properties props) {
}
@@ -185,9 +185,9 @@ public class PseudoTransactionService implements TransactionService, Transaction
}
public class MyTransaction implements Transaction {
- private final List<Synchronization> registeredSynchronizations = Collections.synchronizedList(new ArrayList<Synchronization>());
- private final List<XAResource> xaResources = Collections.synchronizedList(new ArrayList<XAResource>());
- private final Map<Object, Object> resources = new HashMap<Object, Object>();
+ private final List<Synchronization> registeredSynchronizations = Collections.synchronizedList(new ArrayList<>());
+ private final List<XAResource> xaResources = Collections.synchronizedList(new ArrayList<>());
+ private final Map<Object, Object> resources = new HashMap<>();
private int status = Status.STATUS_ACTIVE;
public boolean delistResource(final XAResource xaRes, final int flag) {
@@ -270,13 +270,13 @@ public class PseudoTransactionService implements TransactionService, Transaction
}
private void doBeforeCompletion() {
- for (final Synchronization sync : new ArrayList<Synchronization>(registeredSynchronizations)) {
+ for (final Synchronization sync : new ArrayList<>(registeredSynchronizations)) {
sync.beforeCompletion();
}
}
private void doAfterCompletion(final int status) {
- for (final Synchronization sync : new ArrayList<Synchronization>(registeredSynchronizations)) {
+ for (final Synchronization sync : new ArrayList<>(registeredSynchronizations)) {
try {
sync.afterCompletion(status);
} catch (final RuntimeException e) {
@@ -286,7 +286,7 @@ public class PseudoTransactionService implements TransactionService, Transaction
}
private void doXAResources(final int status) {
- for (final XAResource xaRes : new ArrayList<XAResource>(xaResources)) {
+ for (final XAResource xaRes : new ArrayList<>(xaResources)) {
if (status == Status.STATUS_COMMITTED) {
try {
xaRes.commit(null, true);
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/table/Lines.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/table/Lines.java b/container/openejb-core/src/main/java/org/apache/openejb/table/Lines.java
index 2c04f85..2abcef7 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/table/Lines.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/table/Lines.java
@@ -25,7 +25,7 @@ import java.util.Iterator;
import java.util.List;
public class Lines {
- private final List<Line> lines = new ArrayList<Line>();
+ private final List<Line> lines = new ArrayList<>();
private final String cr;
public Lines() {
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java b/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
index 2127c7d..4207e74 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
@@ -208,7 +208,7 @@ public class ApplicationComposers {
final List<Throwable> errors = new ArrayList<>();
if (isContainer()) {
- final Map<Object, List<Method>> annotatedConfigurationMethods = findAnnotatedMethods(new HashMap<Object, List<Method>>(), Configuration.class);
+ final Map<Object, List<Method>> annotatedConfigurationMethods = findAnnotatedMethods(new HashMap<>(), Configuration.class);
{
int nbProp = 0;
int nbOpenejb = 0;
@@ -229,10 +229,10 @@ public class ApplicationComposers {
}
int injectorSize = 0;
- for (final List<Method> m : findAnnotatedMethods(new HashMap<Object, List<Method>>(), org.apache.openejb.junit.MockInjector.class).values()) {
+ for (final List<Method> m : findAnnotatedMethods(new HashMap<>(), org.apache.openejb.junit.MockInjector.class).values()) {
injectorSize += m.size();
}
- for (final List<Method> m : findAnnotatedMethods(new HashMap<Object, List<Method>>(), MockInjector.class).values()) {
+ for (final List<Method> m : findAnnotatedMethods(new HashMap<>(), MockInjector.class).values()) {
injectorSize += m.size();
}
if (injectorSize > 1) {
@@ -240,10 +240,10 @@ public class ApplicationComposers {
}
final List<Method> components = new ArrayList<>();
- for (final List<Method> l : findAnnotatedMethods(new HashMap<Object, List<Method>>(), Component.class).values()) {
+ for (final List<Method> l : findAnnotatedMethods(new HashMap<>(), Component.class).values()) {
components.addAll(l);
}
- for (final List<Method> l : findAnnotatedMethods(new HashMap<Object, List<Method>>(), org.apache.openejb.junit.Component.class).values()) {
+ for (final List<Method> l : findAnnotatedMethods(new HashMap<>(), org.apache.openejb.junit.Component.class).values()) {
components.addAll(l);
}
for (final Method method : components) {
@@ -263,10 +263,10 @@ public class ApplicationComposers {
if (isApplication()) {
final List<Method> descriptors = new ArrayList<>();
- for (final List<Method> l : findAnnotatedMethods(new HashMap<Object, List<Method>>(), Descriptors.class).values()) {
+ for (final List<Method> l : findAnnotatedMethods(new HashMap<>(), Descriptors.class).values()) {
descriptors.addAll(l);
}
- for (final List<Method> l : findAnnotatedMethods(new HashMap<Object, List<Method>>(), org.apache.openejb.junit.Descriptors.class).values()) {
+ for (final List<Method> l : findAnnotatedMethods(new HashMap<>(), org.apache.openejb.junit.Descriptors.class).values()) {
descriptors.addAll(l);
}
for (final Method method : descriptors) {
@@ -279,10 +279,10 @@ public class ApplicationComposers {
}
final List<Method> classes = new ArrayList<>();
- for (final List<Method> l : findAnnotatedMethods(new HashMap<Object, List<Method>>(), Classes.class).values()) {
+ for (final List<Method> l : findAnnotatedMethods(new HashMap<>(), Classes.class).values()) {
classes.addAll(l);
}
- for (final List<Method> l : findAnnotatedMethods(new HashMap<Object, List<Method>>(), org.apache.openejb.junit.Classes.class).values()) {
+ for (final List<Method> l : findAnnotatedMethods(new HashMap<>(), org.apache.openejb.junit.Classes.class).values()) {
classes.addAll(l);
}
for (final Method method : classes) {
@@ -294,7 +294,7 @@ public class ApplicationComposers {
}
}
- for (final List<Method> l : findAnnotatedMethods(new HashMap<Object, List<Method>>(), Jars.class).values()) {
+ for (final List<Method> l : findAnnotatedMethods(new HashMap<>(), Jars.class).values()) {
for (final Method method : l) {
final Class<?> returnType = method.getReturnType();
if (!returnType.equals(WebModule.class) && !returnType.equals(EjbModule.class)
@@ -309,10 +309,10 @@ public class ApplicationComposers {
int modules = 0;
final List<Method> moduleMethods = new ArrayList<>();
- for (final List<Method> l : findAnnotatedMethods(new HashMap<Object, List<Method>>(), Module.class).values()) {
+ for (final List<Method> l : findAnnotatedMethods(new HashMap<>(), Module.class).values()) {
moduleMethods.addAll(l);
}
- for (final List<Method> l : findAnnotatedMethods(new HashMap<Object, List<Method>>(), org.apache.openejb.junit.Module.class).values()) {
+ for (final List<Method> l : findAnnotatedMethods(new HashMap<>(), org.apache.openejb.junit.Module.class).values()) {
moduleMethods.addAll(l);
}
for (final Method method : moduleMethods) {
@@ -669,7 +669,7 @@ public class ApplicationComposers {
}
// config for the app
- for (final Map.Entry<Object, List<Method>> method : findAnnotatedMethods(new HashMap<Object, List<Method>>(), ApplicationConfiguration.class).entrySet()) {
+ for (final Map.Entry<Object, List<Method>> method : findAnnotatedMethods(new HashMap<>(), ApplicationConfiguration.class).entrySet()) {
for (final Method m : method.getValue()) {
final Object o = m.invoke(method.getKey());
if (Properties.class.isInstance(o)) {
@@ -1438,12 +1438,12 @@ public class ApplicationComposers {
}
}
- for (final Map.Entry<Object, List<Method>> method : findAnnotatedMethods(new HashMap<Object, List<Method>>(), Component.class).entrySet()) {
+ for (final Map.Entry<Object, List<Method>> method : findAnnotatedMethods(new HashMap<>(), Component.class).entrySet()) {
for (final Method m : method.getValue()) {
setComponent(method.getKey(), m);
}
}
- for (final Map.Entry<Object, List<Method>> method : findAnnotatedMethods(new HashMap<Object, List<Method>>(), org.apache.openejb.junit.Component.class).entrySet()) {
+ for (final Map.Entry<Object, List<Method>> method : findAnnotatedMethods(new HashMap<>(), org.apache.openejb.junit.Component.class).entrySet()) {
for (final Method m : method.getValue()) {
setComponent(method.getKey(), m);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/testng/PropertiesBuilder.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/testng/PropertiesBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/testng/PropertiesBuilder.java
index 572e20d..c1ec743 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/testng/PropertiesBuilder.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/testng/PropertiesBuilder.java
@@ -38,7 +38,7 @@ public class PropertiesBuilder {
}
public Map<String, String> asMap() {
- final Map<String, String> map = new HashMap<String, String>();
+ final Map<String, String> map = new HashMap<>();
for (final Map.Entry<Object, Object> entry : properties.entrySet()) {
map.put(String.class.cast(entry.getKey()), String.class.cast(entry.getValue()));
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
index 68b27e8..c31f368 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
@@ -124,7 +124,7 @@ public class ManagedExecutorServiceImpl extends AbstractExecutorService implemen
@Override
public <T> Future<T> submit(final Callable<T> task) {
- final CUCallable<T> wrapper = new CUCallable<T>(task);
+ final CUCallable<T> wrapper = new CUCallable<>(task);
final Future<T> future = delegate.submit(wrapper);
wrapper.taskSubmitted(future, this, task);
return new CUFuture<>(future, wrapper);
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedScheduledExecutorServiceImpl.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedScheduledExecutorServiceImpl.java b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedScheduledExecutorServiceImpl.java
index 6fb7f3b..fd46554 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedScheduledExecutorServiceImpl.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedScheduledExecutorServiceImpl.java
@@ -50,7 +50,7 @@ public class ManagedScheduledExecutorServiceImpl extends ManagedExecutorServiceI
@Override
public ScheduledFuture<?> schedule(final Runnable runnable, final Trigger trigger) {
final Date taskScheduledTime = new Date();
- final AtomicReference<Future<?>> futureHandle = new AtomicReference<Future<?>>();
+ final AtomicReference<Future<?>> futureHandle = new AtomicReference<>();
final TriggerRunnable wrapper = new TriggerRunnable(this, runnable, new CURunnable(runnable), trigger, taskScheduledTime, getTaskId(runnable), AtomicReference.class.cast(futureHandle));
final ScheduledFuture<?> future = delegate.schedule(wrapper, trigger.getNextRunTime(wrapper.getLastExecution(), taskScheduledTime).getTime() - nowMs(), TimeUnit.MILLISECONDS);
return initTriggerScheduledFuture(runnable, AtomicReference.class.cast(futureHandle), wrapper, ScheduledFuture.class.cast(future));
@@ -59,7 +59,7 @@ public class ManagedScheduledExecutorServiceImpl extends ManagedExecutorServiceI
@Override
public <V> ScheduledFuture<V> schedule(final Callable<V> vCallable, final Trigger trigger) {
final Date taskScheduledTime = new Date();
- final AtomicReference<Future<V>> futureHandle = new AtomicReference<Future<V>>();
+ final AtomicReference<Future<V>> futureHandle = new AtomicReference<>();
final TriggerCallable<V> wrapper = new TriggerCallable<>(this, vCallable, new CUCallable<>(vCallable), trigger, taskScheduledTime, getTaskId(vCallable), futureHandle);
final ScheduledFuture<V> future = delegate.schedule(wrapper, trigger.getNextRunTime(wrapper.getLastExecution(), taskScheduledTime).getTime() - nowMs(), TimeUnit.MILLISECONDS);
return initTriggerScheduledFuture(vCallable, futureHandle, wrapper, future);
@@ -77,12 +77,12 @@ public class ManagedScheduledExecutorServiceImpl extends ManagedExecutorServiceI
final CURunnable wrapper = new CURunnable(command);
final ScheduledFuture<?> future = delegate.schedule(wrapper, delay, unit);
wrapper.taskSubmitted(future, this, command);
- return new CUScheduleFuture<Object>(ScheduledFuture.class.cast(future), wrapper);
+ return new CUScheduleFuture<>(ScheduledFuture.class.cast(future), wrapper);
}
@Override
public <V> ScheduledFuture<V> schedule(final Callable<V> callable, final long delay, final TimeUnit unit) {
- final CUCallable<V> wrapper = new CUCallable<V>(callable);
+ final CUCallable<V> wrapper = new CUCallable<>(callable);
final ScheduledFuture<V> future = delegate.schedule(wrapper, delay, unit);
wrapper.taskSubmitted(future, this, callable);
return new CUScheduleFuture<>(future, wrapper);
@@ -93,7 +93,7 @@ public class ManagedScheduledExecutorServiceImpl extends ManagedExecutorServiceI
final CURunnable wrapper = new CURunnable(command);
final ScheduledFuture<?> future = delegate.scheduleAtFixedRate(wrapper, initialDelay, period, unit);
wrapper.taskSubmitted(future, this, command);
- return new CUScheduleFuture<Object>(ScheduledFuture.class.cast(future), wrapper);
+ return new CUScheduleFuture<>(ScheduledFuture.class.cast(future), wrapper);
}
@Override
@@ -101,7 +101,7 @@ public class ManagedScheduledExecutorServiceImpl extends ManagedExecutorServiceI
final CURunnable wrapper = new CURunnable(command);
final ScheduledFuture<?> future = delegate.scheduleWithFixedDelay(wrapper, initialDelay, delay, unit);
wrapper.taskSubmitted(future, this, command);
- return new CUScheduleFuture<Object>(ScheduledFuture.class.cast(future), wrapper);
+ return new CUScheduleFuture<>(ScheduledFuture.class.cast(future), wrapper);
}
public static long nowMs() {
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java b/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
index c3c4f94..8d9570a 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
@@ -63,7 +63,7 @@ public class AnnotationFinder {
private static final int ASM_FLAGS = ClassReader.SKIP_CODE + ClassReader.SKIP_DEBUG + ClassReader.SKIP_FRAMES;
private final ClassLoader classLoader;
- private final List<String> classesNotLoaded = new ArrayList<String>();
+ private final List<String> classesNotLoaded = new ArrayList<>();
private final List<String> classNames;
/**
@@ -114,7 +114,7 @@ public class AnnotationFinder {
public AnnotationFinder(final ClassLoader classLoader, final Collection<URL> urls) {
this.classLoader = classLoader;
- classNames = new ArrayList<String>();
+ classNames = new ArrayList<>();
for (final URL location : urls) {
if (location == null) {
continue;
@@ -190,7 +190,7 @@ public class AnnotationFinder {
@SuppressWarnings("deprecation")
private static List<String> file(final URL location) {
- final List<String> classNames = new ArrayList<String>();
+ final List<String> classNames = new ArrayList<>();
File dir;
try {
dir = new File(URLDecoder.decode(location.getPath(), "UTF-8"));
@@ -250,7 +250,7 @@ public class AnnotationFinder {
}
private static List<String> jar(final JarFile jarFile) {
- final List<String> classNames = new ArrayList<String>();
+ final List<String> classNames = new ArrayList<>();
final Enumeration<? extends JarEntry> jarEntries = jarFile.entries();
while (jarEntries.hasMoreElements()) {
@@ -262,7 +262,7 @@ public class AnnotationFinder {
}
private static List<String> jar(final JarInputStream jarStream) throws IOException {
- final List<String> classNames = new ArrayList<String>();
+ final List<String> classNames = new ArrayList<>();
JarEntry entry;
while ((entry = jarStream.getNextJarEntry()) != null) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/util/AsynchronousRunner.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/AsynchronousRunner.java b/container/openejb-core/src/main/java/org/apache/openejb/util/AsynchronousRunner.java
index 2cb9555..482243d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/AsynchronousRunner.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/AsynchronousRunner.java
@@ -44,7 +44,7 @@ public class AsynchronousRunner {
*/
public Future<Object> runAsync(final Object object, final Method method, final Object... arguments) {
final Callable<Object> callable = new MethodInvoker(object, method, arguments);
- final FutureTask<Object> futureTask = new FutureTask<Object>(callable);
+ final FutureTask<Object> futureTask = new FutureTask<>(callable);
executor.execute(futureTask);
return futureTask;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/util/Classes.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/Classes.java b/container/openejb-core/src/main/java/org/apache/openejb/util/Classes.java
index a52f42a..ab68bf3 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/Classes.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/Classes.java
@@ -84,7 +84,7 @@ public class Classes {
}
public static List<String> getSimpleNames(final Class... classes) {
- final List<String> list = new ArrayList<String>();
+ final List<String> list = new ArrayList<>();
for (final Class aClass : classes) {
list.add(aClass.getSimpleName());
}
@@ -103,7 +103,7 @@ public class Classes {
* @return
*/
public static List<Class<?>> ancestors(Class clazz) {
- final ArrayList<Class<?>> ancestors = new ArrayList<Class<?>>();
+ final ArrayList<Class<?>> ancestors = new ArrayList<>();
while (clazz != null && !clazz.equals(Object.class)) {
ancestors.add(clazz);
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/util/Debug.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/Debug.java b/container/openejb-core/src/main/java/org/apache/openejb/util/Debug.java
index 6b5a345..0303252 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/Debug.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/Debug.java
@@ -53,7 +53,7 @@ public class Debug {
}
public static Map<String, Object> contextToMap(final Context context) throws NamingException {
- final Map<String, Object> map = new TreeMap<String, Object>(String.CASE_INSENSITIVE_ORDER);
+ final Map<String, Object> map = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
contextToMap(context, "", map);
return map;
}
@@ -101,7 +101,7 @@ public class Debug {
return Collections.EMPTY_LIST;
}
- final List<Field> fields = new ArrayList<Field>();
+ final List<Field> fields = new ArrayList<>();
fields.addAll(Arrays.asList(clazz.getDeclaredFields()));
@@ -115,9 +115,9 @@ public class Debug {
private static final Trace trace = new Trace();
- private final Map<String, Node> elements = new LinkedHashMap<String, Node>();
+ private final Map<String, Node> elements = new LinkedHashMap<>();
- private final List<Event> events = new ArrayList<Event>();
+ private final List<Event> events = new ArrayList<>();
private static final class Event {
private final long time = System.currentTimeMillis();
@@ -165,7 +165,7 @@ public class Debug {
public static void mark() {
final Throwable throwable = new Exception().fillInStackTrace();
- final List<StackTraceElement> stackTraceElements = new ArrayList<StackTraceElement>(Arrays.asList(throwable.getStackTrace()));
+ final List<StackTraceElement> stackTraceElements = new ArrayList<>(Arrays.asList(throwable.getStackTrace()));
Collections.reverse(stackTraceElements);
final Iterator<StackTraceElement> iterator = stackTraceElements.iterator();
@@ -183,7 +183,7 @@ public class Debug {
}
public void print(final PrintStream out) {
- final Set<Node> seen = new HashSet<Node>();
+ final Set<Node> seen = new HashSet<>();
for (final Node node : elements.values()) {
if (node.parent == null) {
@@ -252,7 +252,7 @@ public class Debug {
private final String trace;
private final StackTraceElement element;
- private final List<Node> children = new ArrayList<Node>();
+ private final List<Node> children = new ArrayList<>();
public Node(final StackTraceElement element) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/util/DirectoryMonitor.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/DirectoryMonitor.java b/container/openejb-core/src/main/java/org/apache/openejb/util/DirectoryMonitor.java
index c8217a9..267dd5d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/DirectoryMonitor.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/DirectoryMonitor.java
@@ -38,7 +38,7 @@ public class DirectoryMonitor {
private final Listener listener;
- private final Map<String, FileInfo> files = new HashMap<String, FileInfo>();
+ private final Map<String, FileInfo> files = new HashMap<>();
private final Timer timer;
@@ -136,7 +136,7 @@ public class DirectoryMonitor {
final File[] files = target.isDirectory() ? target.listFiles() : new File[]{target};
- final HashSet<String> missingFilesList = new HashSet<String>(this.files.keySet());
+ final HashSet<String> missingFilesList = new HashSet<>(this.files.keySet());
if (files != null) {
for (final File file : files) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/util/Duration.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/Duration.java b/container/openejb-core/src/main/java/org/apache/openejb/util/Duration.java
index a6b45b4..f028a16 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/Duration.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/Duration.java
@@ -293,7 +293,7 @@ public class Duration {
}
private static List<String> lowercase(final Enum... units) {
- final List<String> list = new ArrayList<String>();
+ final List<String> list = new ArrayList<>();
for (final Enum unit : units) {
list.add(unit.name().toLowerCase());
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/util/ExecutorBuilder.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/ExecutorBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/util/ExecutorBuilder.java
index abff525..9aa2417 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/ExecutorBuilder.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/ExecutorBuilder.java
@@ -136,16 +136,16 @@ public class ExecutorBuilder {
public BlockingQueue<Runnable> create(final Options options, final String prefix, final int queueSize) {
switch (this) {
case ARRAY: {
- return new ArrayBlockingQueue<Runnable>(queueSize > 0 ? queueSize : 1);
+ return new ArrayBlockingQueue<>(queueSize > 0 ? queueSize : 1);
}
case LINKED: {
- return new LinkedBlockingQueue<Runnable>(queueSize > 0 ? queueSize : 1);
+ return new LinkedBlockingQueue<>(queueSize > 0 ? queueSize : 1);
}
case PRIORITY: {
- return new PriorityBlockingQueue<Runnable>();
+ return new PriorityBlockingQueue<>();
}
case SYNCHRONOUS: {
- return new SynchronousQueue<Runnable>(options.get(prefix + ".QueueFair", false));
+ return new SynchronousQueue<>(options.get(prefix + ".QueueFair", false));
}
default: {
// The Options class will throw an error if the user supplies an unknown enum string
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/util/Index.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/Index.java b/container/openejb-core/src/main/java/org/apache/openejb/util/Index.java
index 0ad6bbd..3471bb1 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/Index.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/Index.java
@@ -40,11 +40,11 @@ public class Index<K, V> extends AbstractMap<K, V> {
public Index(final Map<K, V> map) {
entries = new IndexEntry[map.size()];
- keyIndicies = new LinkedHashMap<K, Integer>(map.size());
+ keyIndicies = new LinkedHashMap<>(map.size());
int i = 0;
for (final Entry<K, V> entry : map.entrySet()) {
- entries[i] = new IndexEntry<K, V>(entry);
+ entries[i] = new IndexEntry<>(entry);
keyIndicies.put(entry.getKey(), new Integer(i));
i++;
}
@@ -54,10 +54,10 @@ public class Index<K, V> extends AbstractMap<K, V> {
public Index(final List<K> keys) {
entries = new IndexEntry[keys.size()];
- keyIndicies = new LinkedHashMap<K, Integer>(keys.size());
+ keyIndicies = new LinkedHashMap<>(keys.size());
for (int i = 0; i < keys.size(); i++) {
final K key = keys.get(i);
- entries[i] = new IndexEntry<K, V>(key, null);
+ entries[i] = new IndexEntry<>(key, null);
keyIndicies.put(key, new Integer(i));
}
@@ -66,10 +66,10 @@ public class Index<K, V> extends AbstractMap<K, V> {
public Index(final K[] keys) {
entries = new IndexEntry[keys.length];
- keyIndicies = new LinkedHashMap<K, Integer>(keys.length);
+ keyIndicies = new LinkedHashMap<>(keys.length);
for (int i = 0; i < keys.length; i++) {
final K key = keys[i];
- entries[i] = new IndexEntry<K, V>(key, null);
+ entries[i] = new IndexEntry<>(key, null);
keyIndicies.put(key, new Integer(i));
}
@@ -78,7 +78,7 @@ public class Index<K, V> extends AbstractMap<K, V> {
public List<V> values() {
if (indexValueList == null) {
- indexValueList = new IndexValueList<V>();
+ indexValueList = new IndexValueList<>();
}
return indexValueList;
}
@@ -147,18 +147,18 @@ public class Index<K, V> extends AbstractMap<K, V> {
}
public Iterator<V> iterator() {
- return new IndexIterator<V>();
+ return new IndexIterator<>();
}
public ListIterator<V> listIterator() {
- return new IndexListIterator<V>(0);
+ return new IndexListIterator<>(0);
}
public ListIterator<V> listIterator(final int index) {
if (index < 0 || index >= entries.length) {
throw new IndexOutOfBoundsException(String.valueOf(index));
}
- return new IndexListIterator<V>(index);
+ return new IndexListIterator<>(index);
}
public Object[] toArray() {
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/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 17f66bb..1f0a16e 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
@@ -116,7 +116,7 @@ public class IntrospectionSupport {
throw new IllegalArgumentException("props was null.");
}
- final HashMap<String, Object> rc = new HashMap<String, Object>(props.size());
+ final HashMap<String, Object> rc = new HashMap<>(props.size());
for (final Iterator iter = props.keySet().iterator(); iter.hasNext(); ) {
String name = (String) iter.next();
@@ -235,7 +235,7 @@ public class IntrospectionSupport {
}
public static String toString(final Object target, final Class stopClass) {
- final LinkedHashMap<String, Object> map = new LinkedHashMap<String, Object>();
+ final LinkedHashMap<String, Object> map = new LinkedHashMap<>();
addFields(target, target.getClass(), stopClass, map);
final StringBuilder buffer = new StringBuilder(simpleName(target.getClass()));
buffer.append(" {");
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/main/java/org/apache/openejb/util/Join.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/Join.java b/container/openejb-core/src/main/java/org/apache/openejb/util/Join.java
index 10ef1bd..3669aca 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/Join.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/Join.java
@@ -77,7 +77,7 @@ public class Join {
}
public static <T> List<String> strings(final Collection<T> collection, final NameCallback<T> callback) {
- final List<String> list = new ArrayList<String>();
+ final List<String> list = new ArrayList<>();
for (final T t : collection) {
final String name = callback.getName(t);
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/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 cbd5551..31e6853 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
@@ -26,8 +26,8 @@ import java.util.TreeMap;
public class LinkResolver<E> {
- private final Map<URI, E> byFullName = new TreeMap<URI, E>();
- private final Map<String, Collection<E>> byShortName = new TreeMap<String, Collection<E>>();
+ private final Map<URI, E> byFullName = new TreeMap<>();
+ private final Map<String, Collection<E>> byShortName = new TreeMap<>();
public boolean add(final String modulePackageName, final String name, final E value) {
return add(URLs.uri(modulePackageName), name, value);
@@ -47,7 +47,7 @@ public class LinkResolver<E> {
// Short name: name -> List(values)
Collection<E> values = byShortName.get(name);
if (values == null) {
- values = new ArrayList<E>();
+ values = new ArrayList<>();
byShortName.put(name, values);
}
values.add(value);