Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consistent use of empty enumerations

Browse Source
This commit is contained in:
Juergen Hoeller
2016-03-11 15:07:59 +01:00
parent 8852a5e178
commit d124a13eb4
9 changed files with 30 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.filter;
import java.io.IOException;
@@ -37,7 +38,6 @@ import org.springframework.web.util.UriComponents;
import org.springframework.web.util.UriComponentsBuilder;
import org.springframework.web.util.UrlPathHelper;
/**
* Filter that wraps the request in order to override its
* {@link HttpServletRequest#getServerName() getServerName()},
@@ -70,11 +70,9 @@ public class ForwardedHeaderFilter extends OncePerRequestFilter {
/**
* Configure a contextPath value that will replace the contextPath of
* proxy-forwarded requests.
*
* <p>This is useful when external clients are not aware of the application
* context path. However a proxy forwards the request to a URL that includes
* a contextPath.
*
* @param contextPath the context path; the given value will be sanitized to
* ensure it starts with a '/' but does not end with one, or if the context
* path is empty (default, root context) it is left as-is.
@@ -117,10 +115,6 @@ public class ForwardedHeaderFilter extends OncePerRequestFilter {
private static class ForwardedHeaderRequestWrapper extends HttpServletRequestWrapper {
public static final Enumeration<String> EMPTY_HEADER_VALUES =
Collections.enumeration(Collections.<String>emptyList());
private final String scheme;
private final boolean secure;
@@ -137,7 +131,6 @@ public class ForwardedHeaderFilter extends OncePerRequestFilter {
private final Map<String, List<String>> headers;
public ForwardedHeaderRequestWrapper(HttpServletRequest request, ContextPathHelper pathHelper) {
super(request);
@@ -228,7 +221,7 @@ public class ForwardedHeaderFilter extends OncePerRequestFilter {
@Override
public Enumeration<String> getHeaders(String name) {
List<String> value = this.headers.get(name);
return (CollectionUtils.isEmpty(value) ? EMPTY_HEADER_VALUES : Collections.enumeration(value));
return (Collections.enumeration(value != null ? value : Collections.<String>emptySet()));
}
@Override
@@ -244,7 +237,6 @@ public class ForwardedHeaderFilter extends OncePerRequestFilter {
private final UrlPathHelper urlPathHelper;
public ContextPathHelper(String contextPath) {
Assert.notNull(contextPath);
this.contextPath = sanitizeContextPath(contextPath);

11
spring-web/src/test/java/org/springframework/mock/web/test/MockServletContext.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2015 the original author or authors.
* Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@ import java.util.Collections;
import java.util.Enumeration;
import java.util.EventListener;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.Map;
@@ -144,7 +143,7 @@ public class MockServletContext implements ServletContext {
private String servletContextName = "MockServletContext";
private final Set<String> declaredRoles = new HashSet<String>();
private final Set<String> declaredRoles = new LinkedHashSet<String>();
private Set<SessionTrackingMode> sessionTrackingModes;
@@ -370,7 +369,6 @@ public class MockServletContext implements ServletContext {
/**
* Register a {@link RequestDispatcher} (typically a {@link MockRequestDispatcher})
* that acts as a wrapper for the named Servlet.
*
* @param name the name of the wrapped Servlet
* @param requestDispatcher the dispatcher that wraps the named Servlet
* @see #getNamedDispatcher
@@ -384,7 +382,6 @@ public class MockServletContext implements ServletContext {
/**
* Unregister the {@link RequestDispatcher} with the given name.
*
* @param name the name of the dispatcher to unregister
* @see #getNamedDispatcher
* @see #registerNamedDispatcher
@@ -429,13 +426,13 @@ public class MockServletContext implements ServletContext {
@Override
@Deprecated
public Enumeration<Servlet> getServlets() {
return Collections.enumeration(new HashSet<Servlet>());
return Collections.enumeration(Collections.<Servlet>emptySet());
}
@Override
@Deprecated
public Enumeration<String> getServletNames() {
return Collections.enumeration(new HashSet<String>());
return Collections.enumeration(Collections.<String>emptySet());
}
@Override