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/03 03:34:59 UTC
[10/14] tomee git commit: diamond operator
diamond operator
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/c2ef2a0b
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c2ef2a0b
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c2ef2a0b
Branch: refs/heads/master
Commit: c2ef2a0b3da8791481e2e990c4af4f0f50aadf04
Parents: 363d8c0
Author: Hayri Cicek <ha...@Hayris-MBP.lan>
Authored: Sun Sep 16 01:26:27 2018 +0200
Committer: Hayri Cicek <ha...@Hayris-MBP.lan>
Committed: Sun Sep 16 01:26:27 2018 +0200
----------------------------------------------------------------------
.../apache/catalina/startup/OpenEJBContextConfig.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/c2ef2a0b/tomee/tomee-catalina/src/main/java/org/apache/catalina/startup/OpenEJBContextConfig.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/catalina/startup/OpenEJBContextConfig.java b/tomee/tomee-catalina/src/main/java/org/apache/catalina/startup/OpenEJBContextConfig.java
index a081b18..6bd27e2 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/catalina/startup/OpenEJBContextConfig.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/catalina/startup/OpenEJBContextConfig.java
@@ -170,7 +170,7 @@ public class OpenEJBContextConfig extends ContextConfig {
}
final Container[] children = context.findChildren();
- final Map<String, Container> mappedChildren = new HashMap<String, Container>();
+ final Map<String, Container> mappedChildren = new HashMap<>();
if (children != null) {
// index potential rest containers by class to cleanup applications defined as servlet
for (final Container c : children) {
@@ -310,7 +310,7 @@ public class OpenEJBContextConfig extends ContextConfig {
if (ids == null) {
final Properties props = new Properties();
final OpenEjbConfiguration runningConfig = SystemInstance.get().getComponent(OpenEjbConfiguration.class);
- final List<String> resourceIds = new ArrayList<String>();
+ final List<String> resourceIds = new ArrayList<>();
if (runningConfig != null) {
for (final ResourceInfo resourceInfo : runningConfig.facilities.resources) {
if (ConfigurationFactory.isResourceType(resourceInfo.service, resourceInfo.types, "javax.sql.DataSource")
@@ -373,7 +373,7 @@ public class OpenEJBContextConfig extends ContextConfig {
public class OpenEJBWebXml extends WebXml {
public static final String OPENEJB_WEB_XML_MAJOR_VERSION_PROPERTY = "openejb.web.xml.major";
- private String prefix;
+ private final String prefix;
private boolean cdiConversation = false;
public OpenEJBWebXml(final String prefix) {
@@ -468,7 +468,7 @@ public class OpenEJBContextConfig extends ContextConfig {
return null;
}
- final Set<Class<?>> classes = new HashSet<Class<?>>();
+ final Set<Class<?>> classes = new HashSet<>();
for (final Set<String> entry : scanned.values()) {
for (final String name : entry) {
try {
@@ -504,7 +504,7 @@ public class OpenEJBContextConfig extends ContextConfig {
iterator.remove();
}
}
- initializerClassMap.put(new TomEEJasperInitializer(), new HashSet<Class<?>>());
+ initializerClassMap.put(new TomEEJasperInitializer(), new HashSet<>());
final ClassLoader loader = context.getLoader().getClassLoader();
@@ -513,7 +513,7 @@ public class OpenEJBContextConfig extends ContextConfig {
final Class<?> initializer = Class.forName("org.springframework.web.SpringServletContainerInitializer", true, loader);
final ServletContainerInitializer instance = (ServletContainerInitializer) initializer.newInstance();
typeInitializerMap.put(Class.forName("org.springframework.web.WebApplicationInitializer", true, loader), Collections.singleton(instance));
- initializerClassMap.put(instance, new HashSet<Class<?>>());
+ initializerClassMap.put(instance, new HashSet<>());
} catch (final Exception | NoClassDefFoundError ignored) {
// no-op
}