From 372282457f9ec788ce2e285d329e01db092c2d8f Mon Sep 17 00:00:00 2001 From: Patrick Strawderman Date: Mon, 3 Jul 2023 19:03:35 -0700 Subject: [PATCH] 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 122bb95c94..cc84bc78c0 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 2e7e31e553..e16ea6957a 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(); } }