Commit 542c3b7c authored by dreis2211's avatar dreis2211 Committed by Phillip Webb

Remove usage of Vector collection

Closes gh-11759
parent 3bd940ba
...@@ -20,7 +20,6 @@ import java.util.Collection; ...@@ -20,7 +20,6 @@ import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Vector;
import java.util.function.Supplier; import java.util.function.Supplier;
import javax.servlet.FilterRegistration; import javax.servlet.FilterRegistration;
...@@ -75,9 +74,9 @@ public class MappingsEndpointTests { ...@@ -75,9 +74,9 @@ public class MappingsEndpointTests {
public void servletWebMappings() { public void servletWebMappings() {
ServletContext servletContext = mock(ServletContext.class); ServletContext servletContext = mock(ServletContext.class);
given(servletContext.getInitParameterNames()) given(servletContext.getInitParameterNames())
.willReturn(new Vector<String>().elements()); .willReturn(Collections.emptyEnumeration());
given(servletContext.getAttributeNames()) given(servletContext.getAttributeNames())
.willReturn(new Vector<String>().elements()); .willReturn(Collections.emptyEnumeration());
FilterRegistration filterRegistration = mock(FilterRegistration.class); FilterRegistration filterRegistration = mock(FilterRegistration.class);
given((Map<String, FilterRegistration>) servletContext.getFilterRegistrations()) given((Map<String, FilterRegistration>) servletContext.getFilterRegistrations())
.willReturn(Collections.singletonMap("testFilter", filterRegistration)); .willReturn(Collections.singletonMap("testFilter", filterRegistration));
......
/* /*
* Copyright 2012-2017 the original author or authors. * Copyright 2012-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -20,10 +20,10 @@ import java.io.IOException; ...@@ -20,10 +20,10 @@ import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.net.URLClassLoader; import java.net.URLClassLoader;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Vector;
import javax.persistence.EntityManager; import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory; import javax.persistence.EntityManagerFactory;
...@@ -336,7 +336,7 @@ public class HibernateJpaAutoConfigurationTests ...@@ -336,7 +336,7 @@ public class HibernateJpaAutoConfigurationTests
@Override @Override
public Enumeration<URL> getResources(String name) throws IOException { public Enumeration<URL> getResources(String name) throws IOException {
if (HIDDEN_RESOURCES.contains(name)) { if (HIDDEN_RESOURCES.contains(name)) {
return new Vector<URL>().elements(); return Collections.emptyEnumeration();
} }
return super.getResources(name); return super.getResources(name);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment