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

Clean up SavedRequestAwareWrapper and related test

Browse Source
This commit is contained in:
Jonas Bamberger
2023-06-30 11:49:32 +02:00
committed by Josh Cummings
parent 07f737b989
commit 0d4e3f939a
2 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
web/src/main/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapper.java
View File

@@ -58,10 +58,7 @@ class SavedRequestAwareWrapper extends HttpServletRequestWrapper {
protected static final TimeZone GMT_ZONE = TimeZone.getTimeZone("GMT");
/** The default Locale if none are specified. */
protected static Locale defaultLocale = Locale.getDefault();
protected SavedRequest savedRequest = null;
protected SavedRequest savedRequest;
/**
* The set of SimpleDateFormat formats to use in getDateHeader(). Notice that because
@@ -102,14 +99,12 @@ class SavedRequestAwareWrapper extends HttpServletRequestWrapper {
}
@Override
@SuppressWarnings("unchecked")
public Enumeration getHeaderNames() {
public Enumeration<String> getHeaderNames() {
return new Enumerator<>(this.savedRequest.getHeaderNames());
}
@Override
@SuppressWarnings("unchecked")
public Enumeration getHeaders(String name) {
public Enumeration<String> getHeaders(String name) {
return new Enumerator<>(this.savedRequest.getHeaderValues(name));
}
@@ -126,8 +121,7 @@ class SavedRequestAwareWrapper extends HttpServletRequestWrapper {
}
@Override
@SuppressWarnings("unchecked")
public Enumeration getLocales() {
public Enumeration<Locale> getLocales() {
List<Locale> locales = this.savedRequest.getLocales();
if (locales.isEmpty()) {
// Fall back to default locale
@@ -171,8 +165,7 @@ class SavedRequestAwareWrapper extends HttpServletRequestWrapper {
}
@Override
@SuppressWarnings("unchecked")
public Map getParameterMap() {
public Map<String, String[]> getParameterMap() {
Set<String> names = getCombinedParameterNames();
Map<String, String[]> parameterMap = new HashMap<>(names.size());
for (String name : names) {
@@ -181,7 +174,6 @@ class SavedRequestAwareWrapper extends HttpServletRequestWrapper {
return parameterMap;
}
@SuppressWarnings("unchecked")
private Set<String> getCombinedParameterNames() {
Set<String> names = new HashSet<>();
names.addAll(super.getParameterMap().keySet());
@@ -190,9 +182,8 @@ class SavedRequestAwareWrapper extends HttpServletRequestWrapper {
}
@Override
@SuppressWarnings("unchecked")
public Enumeration getParameterNames() {
return new Enumerator(getCombinedParameterNames());
public Enumeration<String> getParameterNames() {
return new Enumerator<>(getCombinedParameterNames());
}
@Override