From 0d4e3f939af95b314b927aa31acedd707dbf3ea4 Mon Sep 17 00:00:00 2001 From: Jonas Bamberger Date: Fri, 30 Jun 2023 11:49:32 +0200 Subject: [PATCH] Clean up SavedRequestAwareWrapper and related test --- .../SavedRequestAwareWrapper.java | 23 ++++++------------- .../SavedRequestAwareWrapperTests.java | 11 ++++----- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapper.java b/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapper.java index 81535bf00a..5ff1bc1f1a 100644 --- a/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapper.java +++ b/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapper.java @@ -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 getHeaderNames() { return new Enumerator<>(this.savedRequest.getHeaderNames()); } @Override - @SuppressWarnings("unchecked") - public Enumeration getHeaders(String name) { + public Enumeration 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 getLocales() { List 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 getParameterMap() { Set names = getCombinedParameterNames(); Map parameterMap = new HashMap<>(names.size()); for (String name : names) { @@ -181,7 +174,6 @@ class SavedRequestAwareWrapper extends HttpServletRequestWrapper { return parameterMap; } - @SuppressWarnings("unchecked") private Set getCombinedParameterNames() { Set 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 getParameterNames() { + return new Enumerator<>(getCombinedParameterNames()); } @Override diff --git a/web/src/test/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapperTests.java b/web/src/test/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapperTests.java index ce4f0db67e..3b9357c878 100644 --- a/web/src/test/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapperTests.java +++ b/web/src/test/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapperTests.java @@ -43,22 +43,21 @@ public class SavedRequestAwareWrapperTests { @Test public void savedRequestCookiesAreIgnored() { MockHttpServletRequest newRequest = new MockHttpServletRequest(); - newRequest.setCookies(new Cookie[] { new Cookie("cookie", "fromnew") }); + newRequest.setCookies(new Cookie("cookie", "fromnew")); MockHttpServletRequest savedRequest = new MockHttpServletRequest(); - savedRequest.setCookies(new Cookie[] { new Cookie("cookie", "fromsaved") }); + savedRequest.setCookies(new Cookie("cookie", "fromsaved")); SavedRequestAwareWrapper wrapper = createWrapper(savedRequest, newRequest); assertThat(wrapper.getCookies()).hasSize(1); assertThat(wrapper.getCookies()[0].getValue()).isEqualTo("fromnew"); } @Test - @SuppressWarnings("unchecked") public void savedRequesthHeaderIsReturnedIfSavedRequestIsSet() { MockHttpServletRequest savedRequest = new MockHttpServletRequest(); savedRequest.addHeader("header", "savedheader"); SavedRequestAwareWrapper wrapper = createWrapper(savedRequest, new MockHttpServletRequest()); assertThat(wrapper.getHeader("nonexistent")).isNull(); - Enumeration headers = wrapper.getHeaders("nonexistent"); + Enumeration headers = wrapper.getHeaders("nonexistent"); assertThat(headers.hasMoreElements()).isFalse(); assertThat(wrapper.getHeader("Header")).isEqualTo("savedheader"); headers = wrapper.getHeaders("heaDer"); @@ -98,7 +97,7 @@ public class SavedRequestAwareWrapperTests { SavedRequestAwareWrapper wrapper = createWrapper(savedRequest, wrappedRequest); assertThat(wrapper.getParameterValues("action")).hasSize(1); assertThat(wrapper.getParameterMap()).hasSize(1); - assertThat(((String[]) wrapper.getParameterMap().get("action"))).hasSize(1); + assertThat(wrapper.getParameterMap().get("action")).hasSize(1); } @Test @@ -128,7 +127,7 @@ public class SavedRequestAwareWrapperTests { wrappedRequest.setParameter("action", "bar"); assertThat(wrapper.getParameterValues("action")).isEqualTo(new Object[] { "bar", "foo" }); // Check map is consistent - String[] valuesFromMap = (String[]) wrapper.getParameterMap().get("action"); + String[] valuesFromMap = wrapper.getParameterMap().get("action"); assertThat(valuesFromMap).hasSize(2); assertThat(valuesFromMap[0]).isEqualTo("bar"); }