Author: markt
Date: Thu Jul 12 21:40:27 2012
New Revision: 1360966
URL: http://svn.apache.org/viewvc?rev=1360966&view=rev
Log:
Code clean-up for o.a.catalina.deploy
- Add final prompted by UCDetector
- Java 7 use of <>
Modified:
tomcat/trunk/java/org/apache/catalina/deploy/ContextHandler.java
tomcat/trunk/java/org/apache/catalina/deploy/ContextService.java
tomcat/trunk/java/org/apache/catalina/deploy/ContextTransaction.java
tomcat/trunk/java/org/apache/catalina/deploy/FilterDef.java
tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java
tomcat/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java
tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java
tomcat/trunk/java/org/apache/catalina/deploy/ResourceBase.java
tomcat/trunk/java/org/apache/catalina/deploy/SecurityConstraint.java
tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java
tomcat/trunk/java/org/apache/catalina/deploy/SessionConfig.java
tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
Modified: tomcat/trunk/java/org/apache/catalina/deploy/ContextHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ContextHandler.java?rev=1360966&r1=1360965&r2=1360966&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/ContextHandler.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ContextHandler.java Thu Jul 12
21:40:27 2012
@@ -56,8 +56,7 @@ public class ContextHandler extends Reso
* soapHeader[0] : namespaceURI
* soapHeader[1] : localpart
*/
- private final HashMap<String, String> soapHeaders =
- new HashMap<String, String>();
+ private final HashMap<String, String> soapHeaders = new HashMap<>();
public Iterator<String> getLocalparts() {
return soapHeaders.keySet().iterator();
@@ -81,7 +80,7 @@ public class ContextHandler extends Reso
/**
* The soapRole.
*/
- private final ArrayList<String> soapRoles = new ArrayList<String>();
+ private final ArrayList<String> soapRoles = new ArrayList<>();
public String getSoapRole(int i) {
return this.soapRoles.get(i);
@@ -98,7 +97,7 @@ public class ContextHandler extends Reso
/**
* The portName.
*/
- private final ArrayList<String> portNames = new ArrayList<String>();
+ private final ArrayList<String> portNames = new ArrayList<>();
public String getPortName(int i) {
return this.portNames.get(i);
Modified: tomcat/trunk/java/org/apache/catalina/deploy/ContextService.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ContextService.java?rev=1360966&r1=1360965&r2=1360966&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/ContextService.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ContextService.java Thu Jul 12
21:40:27 2012
@@ -186,8 +186,7 @@ public class ContextService extends Reso
*
* The instantiation of the handler have to be done.
*/
- private final HashMap<String, ContextHandler> handlers =
- new HashMap<String, ContextHandler>();
+ private final HashMap<String, ContextHandler> handlers = new HashMap<>();
public Iterator<String> getHandlers() {
return handlers.keySet().iterator();
Modified: tomcat/trunk/java/org/apache/catalina/deploy/ContextTransaction.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ContextTransaction.java?rev=1360966&r1=1360965&r2=1360966&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/ContextTransaction.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ContextTransaction.java Thu
Jul 12 21:40:27 2012
@@ -41,7 +41,7 @@ public class ContextTransaction implemen
/**
* Holder for our configured properties.
*/
- private HashMap<String, Object> properties = new HashMap<String, Object>();
+ private final HashMap<String, Object> properties = new HashMap<>();
/**
* Return a configured property.
Modified: tomcat/trunk/java/org/apache/catalina/deploy/FilterDef.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/FilterDef.java?rev=1360966&r1=1360965&r2=1360966&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/FilterDef.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/FilterDef.java Thu Jul 12
21:40:27 2012
@@ -130,7 +130,7 @@ public class FilterDef implements Serial
* The set of initialization parameters for this filter, keyed by
* parameter name.
*/
- private Map<String, String> parameters = new HashMap<String, String>();
+ private final Map<String, String> parameters = new HashMap<>();
public Map<String, String> getParameterMap() {
Modified: tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java?rev=1360966&r1=1360965&r2=1360966&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java Thu Jul 12
21:40:27 2012
@@ -178,7 +178,7 @@ public class FilterMap implements Serial
}
public String[] getDispatcherNames() {
- ArrayList<String> result = new ArrayList<String>();
+ ArrayList<String> result = new ArrayList<>();
if ((dispatcherMapping & FORWARD) > 0) {
result.add(DispatcherType.FORWARD.name());
}
Modified: tomcat/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java?rev=1360966&r1=1360965&r2=1360966&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java Thu Jul
12 21:40:27 2012
@@ -35,13 +35,13 @@ public class JspPropertyGroup {
}
public Boolean getElIgnored() { return elIgnored; }
- private Set<String> includeCodas = new LinkedHashSet<String>();
+ private final Set<String> includeCodas = new LinkedHashSet<>();
public void addIncludeCoda(String includeCoda) {
includeCodas.add(includeCoda);
}
public Set<String> getIncludeCodas() { return includeCodas; }
- private Set<String> includePreludes = new LinkedHashSet<String>();
+ private final Set<String> includePreludes = new LinkedHashSet<>();
public void addIncludePrelude(String includePrelude) {
includePreludes.add(includePrelude);
}
Modified: tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java?rev=1360966&r1=1360965&r2=1360966&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java Thu Jul
12 21:40:27 2012
@@ -87,66 +87,62 @@ public class NamingResources extends Lif
/**
* Set of naming entries, keyed by name.
*/
- private Set<String> entries = new HashSet<String>();
+ private final Set<String> entries = new HashSet<>();
/**
* The EJB resource references for this web application, keyed by name.
*/
- private HashMap<String, ContextEjb> ejbs =
- new HashMap<String, ContextEjb>();
+ private final HashMap<String, ContextEjb> ejbs = new HashMap<>();
/**
* The environment entries for this web application, keyed by name.
*/
- private HashMap<String, ContextEnvironment> envs =
- new HashMap<String, ContextEnvironment>();
+ private final HashMap<String, ContextEnvironment> envs = new HashMap<>();
/**
* The local EJB resource references for this web application, keyed by
* name.
*/
- private HashMap<String, ContextLocalEjb> localEjbs =
- new HashMap<String, ContextLocalEjb>();
+ private final HashMap<String, ContextLocalEjb> localEjbs = new HashMap<>();
/**
* The message destination referencess for this web application,
* keyed by name.
*/
- private HashMap<String, MessageDestinationRef> mdrs =
- new HashMap<String, MessageDestinationRef>();
+ private final HashMap<String, MessageDestinationRef> mdrs = new
HashMap<>();
/**
* The resource environment references for this web application,
* keyed by name.
*/
- private HashMap<String, ContextResourceEnvRef> resourceEnvRefs =
- new HashMap<String, ContextResourceEnvRef>();
+ private final HashMap<String, ContextResourceEnvRef> resourceEnvRefs =
+ new HashMap<>();
/**
* The resource references for this web application, keyed by name.
*/
- private HashMap<String, ContextResource> resources =
- new HashMap<String, ContextResource>();
+ private final HashMap<String, ContextResource> resources =
+ new HashMap<>();
/**
* The resource links for this web application, keyed by name.
*/
- private HashMap<String, ContextResourceLink> resourceLinks =
- new HashMap<String, ContextResourceLink>();
+ private final HashMap<String, ContextResourceLink> resourceLinks =
+ new HashMap<>();
/**
* The web service references for this web application, keyed by name.
*/
- private HashMap<String, ContextService> services =
- new HashMap<String, ContextService>();
+ private final HashMap<String, ContextService> services =
+ new HashMap<>();
/**
@@ -158,7 +154,8 @@ public class NamingResources extends Lif
/**
* The property change support for this component.
*/
- protected PropertyChangeSupport support = new PropertyChangeSupport(this);
+ protected final PropertyChangeSupport support =
+ new PropertyChangeSupport(this);
// ------------------------------------------------------------- Properties
Modified: tomcat/trunk/java/org/apache/catalina/deploy/ResourceBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ResourceBase.java?rev=1360966&r1=1360965&r2=1360966&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/ResourceBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ResourceBase.java Thu Jul 12
21:40:27 2012
@@ -83,8 +83,7 @@ public class ResourceBase implements Ser
/**
* Holder for our configured properties.
*/
- private final HashMap<String, Object> properties =
- new HashMap<String, Object>();
+ private final HashMap<String, Object> properties = new HashMap<>();
/**
* Return a configured property.
@@ -114,7 +113,7 @@ public class ResourceBase implements Ser
return properties.keySet().iterator();
}
- private final List<InjectionTarget> injectionTargets = new
ArrayList<InjectionTarget>();
+ private final List<InjectionTarget> injectionTargets = new ArrayList<>();
@Override
public void addInjectionTarget(String injectionTargetName, String
jndiName) {
Modified: tomcat/trunk/java/org/apache/catalina/deploy/SecurityConstraint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/SecurityConstraint.java?rev=1360966&r1=1360965&r2=1360966&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/SecurityConstraint.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/SecurityConstraint.java Thu
Jul 12 21:40:27 2012
@@ -481,7 +481,7 @@ public class SecurityConstraint implemen
*/
public static SecurityConstraint[] createConstraints(
ServletSecurityElement element, String urlPattern) {
- Set<SecurityConstraint> result = new HashSet<SecurityConstraint>();
+ Set<SecurityConstraint> result = new HashSet<>();
// Add the per method constraints
Collection<HttpMethodConstraintElement> methods =
Modified: tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java?rev=1360966&r1=1360965&r2=1360966&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java Thu Jul 12
21:40:27 2012
@@ -140,7 +140,7 @@ public class ServletDef implements Seria
* The set of initialization parameters for this servlet, keyed by
* parameter name.
*/
- private Map<String, String> parameters = new HashMap<String, String>();
+ private final Map<String, String> parameters = new HashMap<>();
public Map<String, String> getParameterMap() {
@@ -197,8 +197,7 @@ public class ServletDef implements Seria
/**
* The set of security role references for this servlet
*/
- private Set<SecurityRoleRef> securityRoleRefs =
- new HashSet<SecurityRoleRef>();
+ private final Set<SecurityRoleRef> securityRoleRefs = new HashSet<>();
public Set<SecurityRoleRef> getSecurityRoleRefs() {
return (this.securityRoleRefs);
Modified: tomcat/trunk/java/org/apache/catalina/deploy/SessionConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/SessionConfig.java?rev=1360966&r1=1360965&r2=1360966&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/SessionConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/SessionConfig.java Thu Jul 12
21:40:27 2012
@@ -35,7 +35,7 @@ public class SessionConfig {
private Boolean cookieHttpOnly;
private Boolean cookieSecure;
private Integer cookieMaxAge;
- private EnumSet<SessionTrackingMode> sessionTrackingModes =
+ private final EnumSet<SessionTrackingMode> sessionTrackingModes =
EnumSet.noneOf(SessionTrackingMode.class);
public Integer getSessionTimeout() {
Modified: tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java?rev=1360966&r1=1360965&r2=1360966&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java Thu Jul 12
21:40:27 2012
@@ -79,13 +79,13 @@ public class WebXml {
private Set<String> absoluteOrdering = null;
public void addAbsoluteOrdering(String fragmentName) {
if (absoluteOrdering == null) {
- absoluteOrdering = new LinkedHashSet<String>();
+ absoluteOrdering = new LinkedHashSet<>();
}
absoluteOrdering.add(fragmentName);
}
public void addAbsoluteOrderingOthers() {
if (absoluteOrdering == null) {
- absoluteOrdering = new LinkedHashSet<String>();
+ absoluteOrdering = new LinkedHashSet<>();
}
absoluteOrdering.add(ORDER_OTHERS);
}
@@ -95,7 +95,7 @@ public class WebXml {
// web-fragment.xml only elements
// Relative ordering
- private Set<String> after = new LinkedHashSet<String>();
+ private final Set<String> after = new LinkedHashSet<>();
public void addAfterOrdering(String fragmentName) {
after.add(fragmentName);
}
@@ -108,7 +108,7 @@ public class WebXml {
}
public Set<String> getAfterOrdering() { return after; }
- private Set<String> before = new LinkedHashSet<String>();
+ private final Set<String> before = new LinkedHashSet<>();
public void addBeforeOrdering(String fragmentName) {
before.add(fragmentName);
}
@@ -265,7 +265,7 @@ public class WebXml {
// context-param
// TODO: description (multiple with language) is ignored
- private Map<String,String> contextParams = new HashMap<String,String>();
+ private final Map<String,String> contextParams = new HashMap<>();
public void addContextParam(String param, String value) {
contextParams.put(param, value);
}
@@ -276,8 +276,7 @@ public class WebXml {
// TODO: Should support multiple display-name elements with language
// TODO: Should support multiple icon elements
// TODO: Description for init-param is ignored
- private Map<String,FilterDef> filters =
- new LinkedHashMap<String,FilterDef>();
+ private final Map<String,FilterDef> filters = new LinkedHashMap<>();
public void addFilter(FilterDef filter) {
if (filters.containsKey(filter.getFilterName())) {
// Filter names must be unique within a web(-fragment).xml
@@ -290,8 +289,8 @@ public class WebXml {
public Map<String,FilterDef> getFilters() { return filters; }
// filter-mapping
- private Set<FilterMap> filterMaps = new LinkedHashSet<FilterMap>();
- private Set<String> filterMappingNames = new HashSet<String>();
+ private final Set<FilterMap> filterMaps = new LinkedHashSet<>();
+ private final Set<String> filterMappingNames = new HashSet<>();
public void addFilterMapping(FilterMap filterMap) {
filterMaps.add(filterMap);
filterMappingNames.add(filterMap.getFilterName());
@@ -302,7 +301,7 @@ public class WebXml {
// TODO: description (multiple with language) is ignored
// TODO: display-name (multiple with language) is ignored
// TODO: icon (multiple) is ignored
- private Set<String> listeners = new LinkedHashSet<String>();
+ private final Set<String> listeners = new LinkedHashSet<>();
public void addListener(String className) {
listeners.add(className);
}
@@ -314,7 +313,7 @@ public class WebXml {
// TODO: icon (multiple) is ignored
// TODO: init-param/description (multiple with language) is ignored
// TODO: security-role-ref/description (multiple with language) is ignored
- private Map<String,ServletDef> servlets = new HashMap<String,ServletDef>();
+ private final Map<String,ServletDef> servlets = new HashMap<>();
public void addServlet(ServletDef servletDef) {
servlets.put(servletDef.getServletName(), servletDef);
if (overridable) {
@@ -324,8 +323,8 @@ public class WebXml {
public Map<String,ServletDef> getServlets() { return servlets; }
// servlet-mapping
- private Map<String,String> servletMappings = new HashMap<String,String>();
- private Set<String> servletMappingNames = new HashSet<String>();
+ private final Map<String,String> servletMappings = new HashMap<>();
+ private final Set<String> servletMappingNames = new HashSet<>();
public void addServletMapping(String urlPattern, String servletName) {
servletMappings.put(urlPattern, servletName);
servletMappingNames.add(servletName);
@@ -341,7 +340,7 @@ public class WebXml {
public SessionConfig getSessionConfig() { return sessionConfig; }
// mime-mapping
- private Map<String,String> mimeMappings = new HashMap<String,String>();
+ private final Map<String,String> mimeMappings = new HashMap<>();
public void addMimeMapping(String extension, String mimeType) {
mimeMappings.put(extension, mimeType);
}
@@ -366,7 +365,7 @@ public class WebXml {
}
// welcome-file-list
- private Set<String> welcomeFiles = new LinkedHashSet<String>();
+ private final Set<String> welcomeFiles = new LinkedHashSet<>();
public void addWelcomeFile(String welcomeFile) {
if (replaceWelcomeFiles) {
welcomeFiles.clear();
@@ -377,7 +376,7 @@ public class WebXml {
public Set<String> getWelcomeFiles() { return welcomeFiles; }
// error-page
- private Map<String,ErrorPage> errorPages = new HashMap<String,ErrorPage>();
+ private final Map<String,ErrorPage> errorPages = new HashMap<>();
public void addErrorPage(ErrorPage errorPage) {
errorPages.put(errorPage.getName(), errorPage);
}
@@ -385,7 +384,7 @@ public class WebXml {
// Digester will check there is only one jsp-config
// jsp-config/taglib or taglib (2.3 and earlier)
- private Map<String,String> taglibs = new HashMap<String,String>();
+ private final Map<String,String> taglibs = new HashMap<>();
public void addTaglib(String uri, String location) {
if (taglibs.containsKey(uri)) {
// Taglib URIs must be unique within a web(-fragment).xml
@@ -397,8 +396,7 @@ public class WebXml {
public Map<String,String> getTaglibs() { return taglibs; }
// jsp-config/jsp-property-group
- private Set<JspPropertyGroup> jspPropertyGroups =
- new LinkedHashSet<JspPropertyGroup>();
+ private final Set<JspPropertyGroup> jspPropertyGroups = new
LinkedHashSet<>();
public void addJspPropertyGroup(JspPropertyGroup propertyGroup) {
jspPropertyGroups.add(propertyGroup);
}
@@ -409,8 +407,7 @@ public class WebXml {
// security-constraint
// TODO: Should support multiple display-name elements with language
// TODO: Should support multiple description elements with language
- private Set<SecurityConstraint> securityConstraints =
- new HashSet<SecurityConstraint>();
+ private final Set<SecurityConstraint> securityConstraints = new
HashSet<>();
public void addSecurityConstraint(SecurityConstraint securityConstraint) {
securityConstraints.add(securityConstraint);
}
@@ -428,7 +425,7 @@ public class WebXml {
// security-role
// TODO: description (multiple with language) is ignored
- private Set<String> securityRoles = new HashSet<String>();
+ private final Set<String> securityRoles = new HashSet<>();
public void addSecurityRole(String securityRole) {
securityRoles.add(securityRole);
}
@@ -436,8 +433,7 @@ public class WebXml {
// env-entry
// TODO: Should support multiple description elements with language
- private Map<String,ContextEnvironment> envEntries =
- new HashMap<String,ContextEnvironment>();
+ private final Map<String,ContextEnvironment> envEntries = new HashMap<>();
public void addEnvEntry(ContextEnvironment envEntry) {
if (envEntries.containsKey(envEntry.getName())) {
// env-entry names must be unique within a web(-fragment).xml
@@ -451,7 +447,7 @@ public class WebXml {
// ejb-ref
// TODO: Should support multiple description elements with language
- private Map<String,ContextEjb> ejbRefs = new HashMap<String,ContextEjb>();
+ private final Map<String,ContextEjb> ejbRefs = new HashMap<>();
public void addEjbRef(ContextEjb ejbRef) {
ejbRefs.put(ejbRef.getName(),ejbRef);
}
@@ -459,8 +455,7 @@ public class WebXml {
// ejb-local-ref
// TODO: Should support multiple description elements with language
- private Map<String,ContextLocalEjb> ejbLocalRefs =
- new HashMap<String,ContextLocalEjb>();
+ private final Map<String,ContextLocalEjb> ejbLocalRefs = new HashMap<>();
public void addEjbLocalRef(ContextLocalEjb ejbLocalRef) {
ejbLocalRefs.put(ejbLocalRef.getName(),ejbLocalRef);
}
@@ -472,8 +467,7 @@ public class WebXml {
// TODO: Should support multiple description elements with language
// TODO: Should support multiple display-names elements with language
// TODO: Should support multiple icon elements ???
- private Map<String,ContextService> serviceRefs =
- new HashMap<String,ContextService>();
+ private final Map<String,ContextService> serviceRefs = new HashMap<>();
public void addServiceRef(ContextService serviceRef) {
serviceRefs.put(serviceRef.getName(), serviceRef);
}
@@ -481,8 +475,7 @@ public class WebXml {
// resource-ref
// TODO: Should support multiple description elements with language
- private Map<String,ContextResource> resourceRefs =
- new HashMap<String,ContextResource>();
+ private final Map<String,ContextResource> resourceRefs = new HashMap<>();
public void addResourceRef(ContextResource resourceRef) {
if (resourceRefs.containsKey(resourceRef.getName())) {
// resource-ref names must be unique within a web(-fragment).xml
@@ -498,8 +491,7 @@ public class WebXml {
// resource-env-ref
// TODO: Should support multiple description elements with language
- private Map<String,ContextResourceEnvRef> resourceEnvRefs =
- new HashMap<String,ContextResourceEnvRef>();
+ private final Map<String,ContextResourceEnvRef> resourceEnvRefs = new
HashMap<>();
public void addResourceEnvRef(ContextResourceEnvRef resourceEnvRef) {
if (resourceEnvRefs.containsKey(resourceEnvRef.getName())) {
// resource-env-ref names must be unique within a
web(-fragment).xml
@@ -515,8 +507,8 @@ public class WebXml {
// message-destination-ref
// TODO: Should support multiple description elements with language
- private Map<String,MessageDestinationRef> messageDestinationRefs =
- new HashMap<String,MessageDestinationRef>();
+ private final Map<String,MessageDestinationRef> messageDestinationRefs =
+ new HashMap<>();
public void addMessageDestinationRef(
MessageDestinationRef messageDestinationRef) {
if (messageDestinationRefs.containsKey(
@@ -538,8 +530,8 @@ public class WebXml {
// TODO: Should support multiple description elements with language
// TODO: Should support multiple display-names elements with language
// TODO: Should support multiple icon elements ???
- private Map<String,MessageDestination> messageDestinations =
- new HashMap<String,MessageDestination>();
+ private final Map<String,MessageDestination> messageDestinations =
+ new HashMap<>();
public void addMessageDestination(
MessageDestination messageDestination) {
if (messageDestinations.containsKey(
@@ -558,8 +550,7 @@ public class WebXml {
}
// locale-encoging-mapping-list
- private Map<String,String> localeEncodingMappings =
- new HashMap<String,String>();
+ private final Map<String,String> localeEncodingMappings = new HashMap<>();
public void addLocaleEncodingMapping(String locale, String encoding) {
localeEncodingMappings.put(locale, encoding);
}
@@ -1449,7 +1440,7 @@ public class WebXml {
// As per 'clarification' from the Servlet EG, filter definitions in
the
// main web.xml override those in fragments and those in fragments
// override those in annotations
- List<FilterMap> filterMapsToAdd = new ArrayList<FilterMap>();
+ List<FilterMap> filterMapsToAdd = new ArrayList<>();
for (WebXml fragment : fragments) {
for (FilterMap filterMap : fragment.getFilterMappings()) {
if (!filterMappingNames.contains(filterMap.getFilterName())) {
@@ -1598,8 +1589,7 @@ public class WebXml {
// fragments override those in annotations
// Skip servlet definitions and mappings from fragments that are
// defined in web.xml
- List<Map.Entry<String,String>> servletMappingsToAdd =
- new ArrayList<Map.Entry<String,String>>();
+ List<Map.Entry<String,String>> servletMappingsToAdd = new
ArrayList<>();
for (WebXml fragment : fragments) {
for (Map.Entry<String,String> servletMap :
fragment.getServletMappings().entrySet()) {
@@ -2094,7 +2084,7 @@ public class WebXml {
public static Set<WebXml> orderWebFragments(WebXml application,
Map<String,WebXml> fragments) {
- Set<WebXml> orderedFragments = new LinkedHashSet<WebXml>();
+ Set<WebXml> orderedFragments = new LinkedHashSet<>();
boolean absoluteOrdering =
(application.getAbsoluteOrdering() != null);
@@ -2124,7 +2114,7 @@ public class WebXml {
}
}
} else {
- List<String> order = new LinkedList<String>();
+ List<String> order = new LinkedList<>();
// Start by adding all fragments - order doesn't matter
order.addAll(fragments.keySet());
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
