From 372282457f9ec788ce2e285d329e01db092c2d8f Mon Sep 17 00:00:00 2001 From: Patrick Strawderman Date: Mon, 3 Jul 2023 19:03:35 -0700 Subject: [PATCH 1/3] Use Collections.emptyEnumeration() where appropriate Closes gh-30803 --- .../testfixture/index/CandidateComponentsTestClassLoader.java | 3 +-- .../web/servlet/handler/SimpleServletPostProcessor.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/index/CandidateComponentsTestClassLoader.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/index/CandidateComponentsTestClassLoader.java index 122bb95c94d..cc84bc78c05 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/index/CandidateComponentsTestClassLoader.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/index/CandidateComponentsTestClassLoader.java @@ -43,8 +43,7 @@ public class CandidateComponentsTestClassLoader extends ClassLoader { * @see CandidateComponentsIndexLoader#COMPONENTS_RESOURCE_LOCATION */ public static ClassLoader disableIndex(ClassLoader classLoader) { - return new CandidateComponentsTestClassLoader(classLoader, - Collections.enumeration(Collections.emptyList())); + return new CandidateComponentsTestClassLoader(classLoader, Collections.emptyEnumeration()); } /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletPostProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletPostProcessor.java index 2e7e31e553f..e16ea6957a7 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletPostProcessor.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletPostProcessor.java @@ -170,7 +170,7 @@ public class SimpleServletPostProcessor implements @Override public Enumeration getInitParameterNames() { - return Collections.enumeration(Collections.emptySet()); + return Collections.emptyEnumeration(); } } From df079feea91620acde6bf1693bcd97d7c9e80c28 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Wed, 5 Jul 2023 13:48:13 +0200 Subject: [PATCH 2/3] Update copyright header --- .../testfixture/index/CandidateComponentsTestClassLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/index/CandidateComponentsTestClassLoader.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/index/CandidateComponentsTestClassLoader.java index cc84bc78c05..d578e407d9f 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/index/CandidateComponentsTestClassLoader.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/index/CandidateComponentsTestClassLoader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 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. From 58b4286216dad9e719d9f95a2c79be41953fd9a1 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Wed, 5 Jul 2023 13:59:47 +0200 Subject: [PATCH 3/3] Polish MockHttpServletRequest --- .../org/springframework/mock/web/MockHttpServletRequest.java | 3 ++- .../web/testfixture/servlet/MockHttpServletRequest.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java index f1d54c4d3ab..9acaa1346f4 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java @@ -1159,7 +1159,8 @@ public class MockHttpServletRequest implements HttpServletRequest { @Override public Enumeration getHeaders(String name) { HeaderValueHolder header = this.headers.get(name); - return Collections.enumeration(header != null ? header.getStringValues() : new LinkedList<>()); + return (header != null ? Collections.enumeration(header.getStringValues()) : + Collections.emptyEnumeration()); } @Override diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java index 065c37bf3a4..33bf23f2bdf 100644 --- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java +++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java @@ -1159,7 +1159,8 @@ public class MockHttpServletRequest implements HttpServletRequest { @Override public Enumeration getHeaders(String name) { HeaderValueHolder header = this.headers.get(name); - return Collections.enumeration(header != null ? header.getStringValues() : new LinkedList<>()); + return (header != null ? Collections.enumeration(header.getStringValues()) : + Collections.emptyEnumeration()); } @Override