From 1f3e52d9328ed4b8f8628069c6dd1de70336d7d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=A6=D1=8B=D0=BF?= =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= Date: Mon, 31 Aug 2020 12:35:00 +0300 Subject: [PATCH] gh-25650 Replace remaining usage of LinkedList with ArrayList in tests --- .../AbstractAspectJAdvisorFactoryTests.java | 7 ++-- .../beans/AbstractPropertyAccessorTests.java | 17 ++++----- .../beans/BeanWrapperGenericsTests.java | 27 +++++++------ ...wiredAnnotationBeanPostProcessorTests.java | 8 ++-- .../factory/config/SimpleScopeTests.java | 6 +-- .../support/BeanFactoryGenericsTests.java | 3 +- .../SpringValidatorAdapterTests.java | 5 +-- .../ValidatorFactoryTests.java | 8 ++-- .../aop/framework/AbstractAopProxyTests.java | 4 +- .../aop/framework/ProxyFactoryBeanTests.java | 4 +- .../annotation/ImportSelectorTests.java | 3 +- .../event/ApplicationContextEventTests.java | 4 +- .../SpringValidatorAdapterTests.java | 5 +-- .../beanvalidation/ValidatorFactoryTests.java | 8 ++-- .../DefaultConversionServiceTests.java | 3 +- .../CollectionToCollectionConverterTests.java | 9 ++--- .../util/AutoPopulatingListTests.java | 8 ++-- .../springframework/util/ClassUtilsTests.java | 13 +++---- .../util/CollectionUtilsTests.java | 27 +++++++------ .../util/ReflectionUtilsTests.java | 6 +-- .../jdbc/core/JdbcTemplateTests.java | 3 +- .../NamedParameterJdbcTemplateTests.java | 6 +-- .../MockMultipartHttpServletRequestTests.java | 6 +-- .../RuleBasedTransactionAttributeTests.java | 18 ++++----- .../transaction/jta/MockUOWManager.java | 6 +-- ...nnotationControllerHandlerMethodTests.java | 11 +++--- .../web/servlet/tags/UrlTagTests.java | 38 +++++++++---------- .../web/servlet/tags/form/SelectTagTests.java | 3 +- 28 files changed, 126 insertions(+), 140 deletions(-) diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java index c7bad57501..612aa61af6 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java @@ -23,7 +23,6 @@ import java.lang.reflect.Method; import java.lang.reflect.UndeclaredThrowableException; import java.rmi.RemoteException; import java.util.ArrayList; -import java.util.LinkedList; import java.util.List; import org.aspectj.lang.JoinPoint; @@ -136,7 +135,7 @@ abstract class AbstractAspectJAdvisorFactoryTests { int realAge = 65; target.setAge(realAge); - List advisors = new LinkedList<>(); + List advisors = new ArrayList<>(); PerTargetAspect aspect1 = new PerTargetAspect(); aspect1.count = 100; aspect1.setOrder(10); @@ -164,7 +163,7 @@ abstract class AbstractAspectJAdvisorFactoryTests { int realAge = 65; target.setAge(realAge); - List advisors = new LinkedList<>(); + List advisors = new ArrayList<>(); PerTargetAspectWithOrderAnnotation10 aspect1 = new PerTargetAspectWithOrderAnnotation10(); aspect1.count = 100; advisors.addAll( @@ -392,7 +391,7 @@ abstract class AbstractAspectJAdvisorFactoryTests { @Test void introductionOnTargetExcludedByTypePattern() { - LinkedList target = new LinkedList<>(); + ArrayList target = new ArrayList<>(); List proxy = (List) createProxy(target, AopUtils.findAdvisorsThatCanApply( getFixture().getAdvisors(new SingletonMetadataAwareAspectInstanceFactory(new MakeLockable(), "someBean")), diff --git a/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java index c30a9139e6..924ac6100d 100644 --- a/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 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. @@ -25,7 +25,6 @@ import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Properties; @@ -1072,7 +1071,7 @@ public abstract class AbstractPropertyAccessorTests { public void setGenericArrayProperty() { SkipReaderStub target = new SkipReaderStub(); AbstractPropertyAccessor accessor = createAccessor(target); - List values = new LinkedList<>(); + List values = new ArrayList<>(); values.add("1"); values.add("2"); values.add("3"); @@ -1113,7 +1112,7 @@ public abstract class AbstractPropertyAccessorTests { SortedSet sortedSet = new TreeSet<>(); sortedSet.add("sortedSet1"); accessor.setPropertyValue("sortedSet", sortedSet); - List list = new LinkedList<>(); + List list = new ArrayList<>(); list.add("list1"); accessor.setPropertyValue("list", list); assertThat(target.getCollection()).isSameAs(coll); @@ -1130,7 +1129,7 @@ public abstract class AbstractPropertyAccessorTests { Collection coll = new ArrayList<>(); coll.add("coll1"); accessor.setPropertyValue("collection", coll); - List set = new LinkedList<>(); + List set = new ArrayList<>(); set.add("set1"); accessor.setPropertyValue("set", set); List sortedSet = new ArrayList<>(); @@ -1157,7 +1156,7 @@ public abstract class AbstractPropertyAccessorTests { Collection coll = new HashSet<>(); coll.add("coll1"); accessor.setPropertyValue("collection", coll.toArray()); - List set = new LinkedList<>(); + List set = new ArrayList<>(); set.add("set1"); accessor.setPropertyValue("set", set.toArray()); List sortedSet = new ArrayList<>(); @@ -1184,7 +1183,7 @@ public abstract class AbstractPropertyAccessorTests { Collection coll = new HashSet<>(); coll.add(0); accessor.setPropertyValue("collection", new int[] {0}); - List set = new LinkedList<>(); + List set = new ArrayList<>(); set.add(1); accessor.setPropertyValue("set", new int[] {1}); List sortedSet = new ArrayList<>(); @@ -1211,7 +1210,7 @@ public abstract class AbstractPropertyAccessorTests { Collection coll = new HashSet<>(); coll.add(0); accessor.setPropertyValue("collection", 0); - List set = new LinkedList<>(); + List set = new ArrayList<>(); set.add(1); accessor.setPropertyValue("set", 1); List sortedSet = new ArrayList<>(); @@ -1235,7 +1234,7 @@ public abstract class AbstractPropertyAccessorTests { public void setCollectionPropertyWithStringValue() { IndexedTestBean target = new IndexedTestBean(); AbstractPropertyAccessor accessor = createAccessor(target); - List set = new LinkedList<>(); + List set = new ArrayList<>(); set.add("set1"); accessor.setPropertyValue("set", "set1"); List sortedSet = new ArrayList<>(); diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java index 4412ac8a32..be0c2cc595 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java @@ -23,7 +23,6 @@ import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Properties; @@ -197,8 +196,8 @@ public class BeanWrapperGenericsTests { @Test public void testGenericListOfLists() throws MalformedURLException { GenericBean gb = new GenericBean<>(); - List> list = new LinkedList<>(); - list.add(new LinkedList<>()); + List> list = new ArrayList<>(); + list.add(new ArrayList<>()); gb.setListOfLists(list); BeanWrapper bw = new BeanWrapperImpl(gb); bw.setPropertyValue("listOfLists[0][0]", 5); @@ -209,8 +208,8 @@ public class BeanWrapperGenericsTests { @Test public void testGenericListOfListsWithElementConversion() throws MalformedURLException { GenericBean gb = new GenericBean<>(); - List> list = new LinkedList<>(); - list.add(new LinkedList<>()); + List> list = new ArrayList<>(); + list.add(new ArrayList<>()); gb.setListOfLists(list); BeanWrapper bw = new BeanWrapperImpl(gb); bw.setPropertyValue("listOfLists[0][0]", "5"); @@ -246,7 +245,7 @@ public class BeanWrapperGenericsTests { @Test public void testGenericListOfMaps() throws MalformedURLException { GenericBean gb = new GenericBean<>(); - List> list = new LinkedList<>(); + List> list = new ArrayList<>(); list.add(new HashMap<>()); gb.setListOfMaps(list); BeanWrapper bw = new BeanWrapperImpl(gb); @@ -258,7 +257,7 @@ public class BeanWrapperGenericsTests { @Test public void testGenericListOfMapsWithElementConversion() throws MalformedURLException { GenericBean gb = new GenericBean<>(); - List> list = new LinkedList<>(); + List> list = new ArrayList<>(); list.add(new HashMap<>()); gb.setListOfMaps(list); BeanWrapper bw = new BeanWrapperImpl(gb); @@ -295,7 +294,7 @@ public class BeanWrapperGenericsTests { public void testGenericMapOfLists() throws MalformedURLException { GenericBean gb = new GenericBean<>(); Map> map = new HashMap<>(); - map.put(1, new LinkedList<>()); + map.put(1, new ArrayList<>()); gb.setMapOfLists(map); BeanWrapper bw = new BeanWrapperImpl(gb); bw.setPropertyValue("mapOfLists[1][0]", 5); @@ -307,7 +306,7 @@ public class BeanWrapperGenericsTests { public void testGenericMapOfListsWithElementConversion() throws MalformedURLException { GenericBean gb = new GenericBean<>(); Map> map = new HashMap<>(); - map.put(1, new LinkedList<>()); + map.put(1, new ArrayList<>()); gb.setMapOfLists(map); BeanWrapper bw = new BeanWrapperImpl(gb); bw.setPropertyValue("mapOfLists[1][0]", "5"); @@ -347,7 +346,7 @@ public class BeanWrapperGenericsTests { @Test public void testGenericTypeNestingListOfMapOfInteger() throws Exception { - List> list = new LinkedList<>(); + List> list = new ArrayList<>(); Map map = new HashMap<>(); map.put("testKey", "5"); list.add(map); @@ -381,9 +380,9 @@ public class BeanWrapperGenericsTests { @Test public void testComplexGenericMap() { Map, List> inputMap = new HashMap<>(); - List inputKey = new LinkedList<>(); + List inputKey = new ArrayList<>(); inputKey.add("1"); - List inputValue = new LinkedList<>(); + List inputValue = new ArrayList<>(); inputValue.add("10"); inputMap.put(inputKey, inputValue); @@ -414,7 +413,7 @@ public class BeanWrapperGenericsTests { @Test public void testComplexGenericIndexedMapEntry() { - List inputValue = new LinkedList<>(); + List inputValue = new ArrayList<>(); inputValue.add("10"); ComplexMapHolder holder = new ComplexMapHolder(); @@ -440,7 +439,7 @@ public class BeanWrapperGenericsTests { @Test public void testComplexDerivedIndexedMapEntry() { - List inputValue = new LinkedList<>(); + List inputValue = new ArrayList<>(); inputValue.add("10"); ComplexMapHolder holder = new ComplexMapHolder(); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java index 39a8d4b0af..0493c7f54f 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java @@ -24,13 +24,13 @@ import java.lang.annotation.Target; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Properties; @@ -2709,7 +2709,7 @@ public class AutowiredAnnotationBeanPostProcessorTests { @SuppressWarnings("serial") - public static class SelfInjectionCollectionBean extends LinkedList { + public static class SelfInjectionCollectionBean extends ArrayList { @Autowired public SelfInjectionCollectionBean reference; @@ -2833,7 +2833,7 @@ public class AutowiredAnnotationBeanPostProcessorTests { } public List iterateTestBeans() { - List resolved = new LinkedList<>(); + List resolved = new ArrayList<>(); for (TestBean tb : this.testBeanProvider) { resolved.add(tb); } @@ -2841,7 +2841,7 @@ public class AutowiredAnnotationBeanPostProcessorTests { } public List forEachTestBeans() { - List resolved = new LinkedList<>(); + List resolved = new ArrayList<>(); this.testBeanProvider.forEach(resolved::add); return resolved; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java index 38b10b562f..c66e65e248 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 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. @@ -16,7 +16,7 @@ package org.springframework.beans.factory.config; -import java.util.LinkedList; +import java.util.ArrayList; import java.util.List; import org.junit.jupiter.api.BeforeEach; @@ -47,7 +47,7 @@ public class SimpleScopeTests { beanFactory = new DefaultListableBeanFactory(); Scope scope = new NoOpScope() { private int index; - private List objects = new LinkedList<>(); { + private List objects = new ArrayList<>(); { objects.add(new TestBean()); objects.add(new TestBean()); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java index 6a69d4974e..e3ba7b5d93 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java @@ -26,7 +26,6 @@ import java.util.AbstractCollection; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; @@ -960,7 +959,7 @@ public class BeanFactoryGenericsTests { @SuppressWarnings("serial") - public static class NamedUrlList extends LinkedList { + public static class NamedUrlList extends ArrayList { } diff --git a/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/SpringValidatorAdapterTests.java b/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/SpringValidatorAdapterTests.java index 99f9d41291..813111adb0 100644 --- a/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/SpringValidatorAdapterTests.java +++ b/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/SpringValidatorAdapterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 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. @@ -28,7 +28,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.LinkedHashSet; -import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; @@ -406,7 +405,7 @@ public class SpringValidatorAdapterTests { private Set childSet = new LinkedHashSet<>(); @Valid - private List childList = new LinkedList<>(); + private List childList = new ArrayList<>(); public Integer getId() { return id; diff --git a/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/ValidatorFactoryTests.java b/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/ValidatorFactoryTests.java index 77e473dc08..a383ae5f8b 100644 --- a/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/ValidatorFactoryTests.java +++ b/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/ValidatorFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 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. @@ -20,10 +20,10 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; import java.util.LinkedHashSet; -import java.util.LinkedList; import java.util.List; import java.util.Optional; import java.util.Set; @@ -295,7 +295,7 @@ public class ValidatorFactoryTests { private ValidAddress address = new ValidAddress(); @Valid - private List addressList = new LinkedList<>(); + private List addressList = new ArrayList<>(); @Valid private Set addressSet = new LinkedHashSet<>(); @@ -457,7 +457,7 @@ public class ValidatorFactoryTests { public static class ListContainer { @NotXList - private List list = new LinkedList<>(); + private List list = new ArrayList<>(); public void addString(String value) { list.add(value); diff --git a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java index 01f541ed89..e076780e22 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java @@ -22,9 +22,9 @@ import java.lang.reflect.Method; import java.lang.reflect.UndeclaredThrowableException; import java.rmi.MarshalException; import java.sql.SQLException; +import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -1128,7 +1128,7 @@ public abstract class AbstractAopProxyTests { }; class NameSaver implements MethodInterceptor { - private List names = new LinkedList<>(); + private List names = new ArrayList<>(); @Override public Object invoke(MethodInvocation mi) throws Throwable { diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java index bca9e85573..57df369b68 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java @@ -19,7 +19,7 @@ package org.springframework.aop.framework; import java.io.FileNotFoundException; import java.lang.reflect.Method; import java.lang.reflect.Proxy; -import java.util.LinkedList; +import java.util.ArrayList; import java.util.List; import org.aopalliance.aop.Advice; @@ -654,7 +654,7 @@ public class ProxyFactoryBeanTests { @SuppressWarnings("serial") public static class PointcutForVoid extends DefaultPointcutAdvisor { - public static List methodNames = new LinkedList<>(); + public static List methodNames = new ArrayList<>(); public static void reset() { methodNames.clear(); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ImportSelectorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ImportSelectorTests.java index 337c4c5d90..1b9214753b 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ImportSelectorTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ImportSelectorTests.java @@ -25,7 +25,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; @@ -555,7 +554,7 @@ public class ImportSelectorTests { @Override public Iterable selectImports() { - LinkedList content = new LinkedList<>(this.instanceImports); + ArrayList content = new ArrayList<>(this.instanceImports); Collections.reverse(content); return content; } diff --git a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java index 3b40c090d7..f051ebc58d 100644 --- a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java @@ -16,8 +16,8 @@ package org.springframework.context.event; +import java.util.ArrayList; import java.util.HashSet; -import java.util.LinkedList; import java.util.List; import java.util.Set; import java.util.concurrent.Executor; @@ -537,7 +537,7 @@ public class ApplicationContextEventTests extends AbstractApplicationEventListen public static class MyOrderedListener1 implements ApplicationListener, Ordered { - public final List seenEvents = new LinkedList<>(); + public final List seenEvents = new ArrayList<>(); @Override public void onApplicationEvent(ApplicationEvent event) { diff --git a/spring-context/src/test/java/org/springframework/validation/beanvalidation/SpringValidatorAdapterTests.java b/spring-context/src/test/java/org/springframework/validation/beanvalidation/SpringValidatorAdapterTests.java index b4d925d845..fe5f62b598 100644 --- a/spring-context/src/test/java/org/springframework/validation/beanvalidation/SpringValidatorAdapterTests.java +++ b/spring-context/src/test/java/org/springframework/validation/beanvalidation/SpringValidatorAdapterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 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. @@ -27,7 +27,6 @@ import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedHashSet; -import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Set; @@ -361,7 +360,7 @@ public class SpringValidatorAdapterTests { private Set childSet = new LinkedHashSet<>(); @Valid - private List childList = new LinkedList<>(); + private List childList = new ArrayList<>(); public Integer getId() { return id; diff --git a/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java b/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java index 09d989834c..a8ae01122e 100644 --- a/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 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. @@ -20,10 +20,10 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; import java.util.LinkedHashSet; -import java.util.LinkedList; import java.util.List; import java.util.Optional; import java.util.Set; @@ -293,7 +293,7 @@ public class ValidatorFactoryTests { private ValidAddress address = new ValidAddress(); @Valid - private List addressList = new LinkedList<>(); + private List addressList = new ArrayList<>(); @Valid private Set addressSet = new LinkedHashSet<>(); @@ -455,7 +455,7 @@ public class ValidatorFactoryTests { public static class ListContainer { @NotXList - private List list = new LinkedList<>(); + private List list = new ArrayList<>(); public void addString(String value) { list.add(value); diff --git a/spring-core/src/test/java/org/springframework/core/convert/converter/DefaultConversionServiceTests.java b/spring-core/src/test/java/org/springframework/core/convert/converter/DefaultConversionServiceTests.java index 20bc09585d..a538c8da76 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/converter/DefaultConversionServiceTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/converter/DefaultConversionServiceTests.java @@ -33,7 +33,6 @@ import java.util.EnumSet; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; @@ -384,7 +383,7 @@ class DefaultConversionServiceTests { @Test void convertArrayToCollectionImpl() { - LinkedList result = conversionService.convert(new String[] {"1", "2", "3"}, LinkedList.class); + ArrayList result = conversionService.convert(new String[] {"1", "2", "3"}, ArrayList.class); assertThat(result.get(0)).isEqualTo("1"); assertThat(result.get(1)).isEqualTo("2"); assertThat(result.get(2)).isEqualTo("3"); diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java index b9eea5c207..b7eca2c604 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 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. @@ -26,7 +26,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.EnumSet; -import java.util.LinkedList; import java.util.List; import java.util.Vector; @@ -103,8 +102,8 @@ class CollectionToCollectionConverterTests { TypeDescriptor targetType = new TypeDescriptor(getClass().getField("emptyListDifferentTarget")); assertThat(conversionService.canConvert(sourceType, targetType)).isTrue(); @SuppressWarnings("unchecked") - LinkedList result = (LinkedList) conversionService.convert(list, sourceType, targetType); - assertThat(result.getClass()).isEqualTo(LinkedList.class); + ArrayList result = (ArrayList) conversionService.convert(list, sourceType, targetType); + assertThat(result.getClass()).isEqualTo(ArrayList.class); assertThat(result.isEmpty()).isTrue(); } @@ -270,7 +269,7 @@ class CollectionToCollectionConverterTests { public List emptyListTarget; - public LinkedList emptyListDifferentTarget; + public ArrayList emptyListDifferentTarget; public List>> objectToCollection; diff --git a/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java b/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java index 00e65b3f07..b3d553ff5c 100644 --- a/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java +++ b/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 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. @@ -16,7 +16,7 @@ package org.springframework.util; -import java.util.LinkedList; +import java.util.ArrayList; import org.junit.jupiter.api.Test; @@ -38,7 +38,7 @@ class AutoPopulatingListTests { @Test void withClassAndUserSuppliedBackingList() throws Exception { - doTestWithClass(new AutoPopulatingList(new LinkedList<>(), TestObject.class)); + doTestWithClass(new AutoPopulatingList(new ArrayList<>(), TestObject.class)); } @Test @@ -48,7 +48,7 @@ class AutoPopulatingListTests { @Test void withElementFactoryAndUserSuppliedBackingList() throws Exception { - doTestWithElementFactory(new AutoPopulatingList(new LinkedList<>(), new MockElementFactory())); + doTestWithElementFactory(new AutoPopulatingList(new ArrayList<>(), new MockElementFactory())); } private void doTestWithClass(AutoPopulatingList list) { diff --git a/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java index 358e80d976..194887d5a7 100644 --- a/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 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. @@ -29,7 +29,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import java.util.LinkedList; import java.util.List; import java.util.Set; @@ -364,17 +363,17 @@ class ClassUtilsTests { @Test void classNamesToString() { - List> ifcs = new LinkedList<>(); + List> ifcs = new ArrayList<>(); ifcs.add(Serializable.class); ifcs.add(Runnable.class); assertThat(ifcs.toString()).isEqualTo("[interface java.io.Serializable, interface java.lang.Runnable]"); assertThat(ClassUtils.classNamesToString(ifcs)).isEqualTo("[java.io.Serializable, java.lang.Runnable]"); - List> classes = new LinkedList<>(); - classes.add(LinkedList.class); + List> classes = new ArrayList<>(); + classes.add(ArrayList.class); classes.add(Integer.class); - assertThat(classes.toString()).isEqualTo("[class java.util.LinkedList, class java.lang.Integer]"); - assertThat(ClassUtils.classNamesToString(classes)).isEqualTo("[java.util.LinkedList, java.lang.Integer]"); + assertThat(classes.toString()).isEqualTo("[class java.util.ArrayList, class java.lang.Integer]"); + assertThat(ClassUtils.classNamesToString(classes)).isEqualTo("[java.util.ArrayList, java.lang.Integer]"); assertThat(Collections.singletonList(List.class).toString()).isEqualTo("[interface java.util.List]"); assertThat(ClassUtils.classNamesToString(List.class)).isEqualTo("[java.util.List]"); diff --git a/spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java b/spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java index fa781881b0..451a6895cc 100644 --- a/spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 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. @@ -22,7 +22,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Hashtable; import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Properties; @@ -46,7 +45,7 @@ class CollectionUtilsTests { assertThat(CollectionUtils.isEmpty(new HashMap())).isTrue(); assertThat(CollectionUtils.isEmpty(new HashSet<>())).isTrue(); - List list = new LinkedList<>(); + List list = new ArrayList<>(); list.add(new Object()); assertThat(CollectionUtils.isEmpty(list)).isFalse(); @@ -58,7 +57,7 @@ class CollectionUtilsTests { @Test void mergeArrayIntoCollection() { Object[] arr = new Object[] {"value1", "value2"}; - List> list = new LinkedList<>(); + List> list = new ArrayList<>(); list.add("value3"); CollectionUtils.mergeArrayIntoCollection(arr, list); @@ -70,7 +69,7 @@ class CollectionUtilsTests { @Test void mergePrimitiveArrayIntoCollection() { int[] arr = new int[] {1, 2}; - List> list = new LinkedList<>(); + List> list = new ArrayList<>(); list.add(Integer.valueOf(3)); CollectionUtils.mergeArrayIntoCollection(arr, list); @@ -101,10 +100,10 @@ class CollectionUtilsTests { void contains() { assertThat(CollectionUtils.contains((Iterator) null, "myElement")).isFalse(); assertThat(CollectionUtils.contains((Enumeration) null, "myElement")).isFalse(); - assertThat(CollectionUtils.contains(new LinkedList().iterator(), "myElement")).isFalse(); + assertThat(CollectionUtils.contains(new ArrayList().iterator(), "myElement")).isFalse(); assertThat(CollectionUtils.contains(new Hashtable().keys(), "myElement")).isFalse(); - List list = new LinkedList<>(); + List list = new ArrayList<>(); list.add("myElement"); assertThat(CollectionUtils.contains(list.iterator(), "myElement")).isTrue(); @@ -178,35 +177,35 @@ class CollectionUtilsTests { @Test void hasUniqueObject() { - List list = new LinkedList<>(); + List list = new ArrayList<>(); list.add("myElement"); list.add("myOtherElement"); assertThat(CollectionUtils.hasUniqueObject(list)).isFalse(); - list = new LinkedList<>(); + list = new ArrayList<>(); list.add("myElement"); assertThat(CollectionUtils.hasUniqueObject(list)).isTrue(); - list = new LinkedList<>(); + list = new ArrayList<>(); list.add("myElement"); list.add(null); assertThat(CollectionUtils.hasUniqueObject(list)).isFalse(); - list = new LinkedList<>(); + list = new ArrayList<>(); list.add(null); list.add("myElement"); assertThat(CollectionUtils.hasUniqueObject(list)).isFalse(); - list = new LinkedList<>(); + list = new ArrayList<>(); list.add(null); list.add(null); assertThat(CollectionUtils.hasUniqueObject(list)).isTrue(); - list = new LinkedList<>(); + list = new ArrayList<>(); list.add(null); assertThat(CollectionUtils.hasUniqueObject(list)).isTrue(); - list = new LinkedList<>(); + list = new ArrayList<>(); assertThat(CollectionUtils.hasUniqueObject(list)).isFalse(); } diff --git a/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java index f3ceaaffde..5d9d386776 100644 --- a/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java @@ -21,7 +21,7 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.rmi.ConnectException; import java.rmi.RemoteException; -import java.util.LinkedList; +import java.util.ArrayList; import java.util.List; import org.junit.jupiter.api.Disabled; @@ -370,9 +370,9 @@ class ReflectionUtilsTests { private static class ListSavingMethodCallback implements ReflectionUtils.MethodCallback { - private List methodNames = new LinkedList<>(); + private List methodNames = new ArrayList<>(); - private List methods = new LinkedList<>(); + private List methods = new ArrayList<>(); @Override public void doWith(Method m) throws IllegalArgumentException, IllegalAccessException { diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java index 8441317e53..339bec5838 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java @@ -30,7 +30,6 @@ import java.sql.Types; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -196,7 +195,7 @@ public class JdbcTemplateTests { String[] results = {"rod", "gary", " portia"}; class StringHandler implements RowCallbackHandler { - private List list = new LinkedList<>(); + private List list = new ArrayList<>(); @Override public void processRow(ResultSet rs) throws SQLException { this.list.add(rs.getString(1)); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java index b181587889..d9dc25f77a 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java @@ -22,10 +22,10 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; @@ -275,7 +275,7 @@ public class NamedParameterJdbcTemplateTests { params.put("id", new SqlParameterValue(Types.DECIMAL, 1)); params.put("country", "UK"); - final List customers = new LinkedList<>(); + final List customers = new ArrayList<>(); namedParameterTemplate.query(SELECT_NAMED_PARAMETERS, params, rs -> { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); @@ -300,7 +300,7 @@ public class NamedParameterJdbcTemplateTests { given(resultSet.getInt("id")).willReturn(1); given(resultSet.getString("forename")).willReturn("rod"); - final List customers = new LinkedList<>(); + final List customers = new ArrayList<>(); namedParameterTemplate.query(SELECT_NO_PARAMETERS, rs -> { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockMultipartHttpServletRequestTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockMultipartHttpServletRequestTests.java index 5b1a0ec44f..54caba8e8e 100644 --- a/spring-test/src/test/java/org/springframework/mock/web/MockMultipartHttpServletRequestTests.java +++ b/spring-test/src/test/java/org/springframework/mock/web/MockMultipartHttpServletRequestTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 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. @@ -18,9 +18,9 @@ package org.springframework.mock.web; import java.io.ByteArrayInputStream; import java.io.IOException; +import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; @@ -93,7 +93,7 @@ class MockMultipartHttpServletRequestTests { MultipartFile file1 = request.getFile("file1"); MultipartFile file2 = request.getFile("file2"); Map fileMap = request.getFileMap(); - List fileMapKeys = new LinkedList<>(fileMap.keySet()); + List fileMapKeys = new ArrayList<>(fileMap.keySet()); assertThat(fileMapKeys.size()).isEqualTo(2); assertThat(fileMap.get("file1")).isEqualTo(file1); assertThat(fileMap.get("file2")).isEqualTo(file2); diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttributeTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttributeTests.java index 24fee1a2b3..8aa9815e7c 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttributeTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttributeTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 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. @@ -18,8 +18,8 @@ package org.springframework.transaction.interceptor; import java.io.IOException; import java.rmi.RemoteException; +import java.util.ArrayList; import java.util.Collections; -import java.util.LinkedList; import java.util.List; import org.junit.jupiter.api.Test; @@ -51,7 +51,7 @@ public class RuleBasedTransactionAttributeTests { */ @Test public void testRuleForRollbackOnChecked() { - List list = new LinkedList<>(); + List list = new ArrayList<>(); list.add(new RollbackRuleAttribute(IOException.class.getName())); RuleBasedTransactionAttribute rta = new RuleBasedTransactionAttribute(TransactionDefinition.PROPAGATION_REQUIRED, list); @@ -64,7 +64,7 @@ public class RuleBasedTransactionAttributeTests { @Test public void testRuleForCommitOnUnchecked() { - List list = new LinkedList<>(); + List list = new ArrayList<>(); list.add(new NoRollbackRuleAttribute(MyRuntimeException.class.getName())); list.add(new RollbackRuleAttribute(IOException.class.getName())); RuleBasedTransactionAttribute rta = new RuleBasedTransactionAttribute(TransactionDefinition.PROPAGATION_REQUIRED, list); @@ -79,7 +79,7 @@ public class RuleBasedTransactionAttributeTests { @Test public void testRuleForSelectiveRollbackOnCheckedWithString() { - List l = new LinkedList<>(); + List l = new ArrayList<>(); l.add(new RollbackRuleAttribute(java.rmi.RemoteException.class.getName())); RuleBasedTransactionAttribute rta = new RuleBasedTransactionAttribute(TransactionDefinition.PROPAGATION_REQUIRED, l); doTestRuleForSelectiveRollbackOnChecked(rta); @@ -106,7 +106,7 @@ public class RuleBasedTransactionAttributeTests { */ @Test public void testRuleForCommitOnSubclassOfChecked() { - List list = new LinkedList<>(); + List list = new ArrayList<>(); // Note that it's important to ensure that we have this as // a FQN: otherwise it will match everything! list.add(new RollbackRuleAttribute("java.lang.Exception")); @@ -121,7 +121,7 @@ public class RuleBasedTransactionAttributeTests { @Test public void testRollbackNever() { - List list = new LinkedList<>(); + List list = new ArrayList<>(); list.add(new NoRollbackRuleAttribute("Throwable")); RuleBasedTransactionAttribute rta = new RuleBasedTransactionAttribute(TransactionDefinition.PROPAGATION_REQUIRED, list); @@ -134,7 +134,7 @@ public class RuleBasedTransactionAttributeTests { @Test public void testToStringMatchesEditor() { - List list = new LinkedList<>(); + List list = new ArrayList<>(); list.add(new NoRollbackRuleAttribute("Throwable")); RuleBasedTransactionAttribute rta = new RuleBasedTransactionAttribute(TransactionDefinition.PROPAGATION_REQUIRED, list); @@ -154,7 +154,7 @@ public class RuleBasedTransactionAttributeTests { */ @Test public void testConflictingRulesToDetermineExactContract() { - List list = new LinkedList<>(); + List list = new ArrayList<>(); list.add(new NoRollbackRuleAttribute(MyBusinessWarningException.class)); list.add(new RollbackRuleAttribute(MyBusinessException.class)); RuleBasedTransactionAttribute rta = new RuleBasedTransactionAttribute(TransactionDefinition.PROPAGATION_REQUIRED, list); diff --git a/spring-tx/src/test/java/org/springframework/transaction/jta/MockUOWManager.java b/spring-tx/src/test/java/org/springframework/transaction/jta/MockUOWManager.java index a94023c0a6..05c80273d3 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/jta/MockUOWManager.java +++ b/spring-tx/src/test/java/org/springframework/transaction/jta/MockUOWManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 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. @@ -16,8 +16,8 @@ package org.springframework.transaction.jta; +import java.util.ArrayList; import java.util.HashMap; -import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -45,7 +45,7 @@ public class MockUOWManager implements UOWManager { private final Map resources = new HashMap<>(); - private final List synchronizations = new LinkedList<>(); + private final List synchronizations = new ArrayList<>(); @Override diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java index b4583b1805..f325d93100 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java @@ -41,7 +41,6 @@ import java.util.Date; import java.util.GregorianCalendar; import java.util.HashSet; import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; @@ -2409,7 +2408,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Override public List getTestBeans() { - List list = new LinkedList<>(); + List list = new ArrayList<>(); list.add(new TestBean("tb1")); list.add(new TestBean("tb2")); return list; @@ -2436,7 +2435,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Override @ModelAttribute("testBeanList") public List getTestBeans() { - List list = new LinkedList<>(); + List list = new ArrayList<>(); list.add(new TestBean("tb1")); list.add(new TestBean("tb2")); return list; @@ -2463,7 +2462,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @ModelAttribute("testBeanList") public List getTestBeans() { - List list = new LinkedList<>(); + List list = new ArrayList<>(); list.add(new TestBean("tb1")); list.add(new TestBean("tb2")); return list; @@ -2500,7 +2499,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @ModelAttribute public List getTestBeans() { - List list = new LinkedList<>(); + List list = new ArrayList<>(); list.add(new TestBean("tb1")); list.add(new TestBean("tb2")); return list; @@ -2521,7 +2520,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @ModelAttribute("testBeanList") public List getTestBeans(@ModelAttribute(name="myCommand", binding=false) TestBean tb) { - List list = new LinkedList<>(); + List list = new ArrayList<>(); list.add(new TestBean("tb1")); list.add(new TestBean("tb2")); return list; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java index a6f1377425..1b84cd2204 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 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. @@ -16,8 +16,8 @@ package org.springframework.web.servlet.tags; +import java.util.ArrayList; import java.util.HashSet; -import java.util.LinkedList; import java.util.List; import java.util.Set; @@ -201,7 +201,7 @@ public class UrlTagTests extends AbstractTagTests { @Test public void createQueryStringNoParams() throws JspException { - List params = new LinkedList<>(); + List params = new ArrayList<>(); Set usedParams = new HashSet<>(); String queryString = tag.createQueryString(params, usedParams, true); @@ -210,7 +210,7 @@ public class UrlTagTests extends AbstractTagTests { @Test public void createQueryStringOneParam() throws JspException { - List params = new LinkedList<>(); + List params = new ArrayList<>(); Set usedParams = new HashSet<>(); Param param = new Param(); @@ -224,7 +224,7 @@ public class UrlTagTests extends AbstractTagTests { @Test public void createQueryStringOneParamForExsistingQueryString() throws JspException { - List params = new LinkedList<>(); + List params = new ArrayList<>(); Set usedParams = new HashSet<>(); Param param = new Param(); @@ -238,7 +238,7 @@ public class UrlTagTests extends AbstractTagTests { @Test public void createQueryStringOneParamEmptyValue() throws JspException { - List params = new LinkedList<>(); + List params = new ArrayList<>(); Set usedParams = new HashSet<>(); Param param = new Param(); @@ -252,7 +252,7 @@ public class UrlTagTests extends AbstractTagTests { @Test public void createQueryStringOneParamNullValue() throws JspException { - List params = new LinkedList<>(); + List params = new ArrayList<>(); Set usedParams = new HashSet<>(); Param param = new Param(); @@ -266,7 +266,7 @@ public class UrlTagTests extends AbstractTagTests { @Test public void createQueryStringOneParamAlreadyUsed() throws JspException { - List params = new LinkedList<>(); + List params = new ArrayList<>(); Set usedParams = new HashSet<>(); Param param = new Param(); @@ -281,7 +281,7 @@ public class UrlTagTests extends AbstractTagTests { @Test public void createQueryStringTwoParams() throws JspException { - List params = new LinkedList<>(); + List params = new ArrayList<>(); Set usedParams = new HashSet<>(); Param param = new Param(); @@ -300,7 +300,7 @@ public class UrlTagTests extends AbstractTagTests { @Test public void createQueryStringUrlEncoding() throws JspException { - List params = new LinkedList<>(); + List params = new ArrayList<>(); Set usedParams = new HashSet<>(); Param param = new Param(); @@ -319,7 +319,7 @@ public class UrlTagTests extends AbstractTagTests { @Test public void createQueryStringParamNullName() throws JspException { - List params = new LinkedList<>(); + List params = new ArrayList<>(); Set usedParams = new HashSet<>(); Param param = new Param(); @@ -333,7 +333,7 @@ public class UrlTagTests extends AbstractTagTests { @Test public void createQueryStringParamEmptyName() throws JspException { - List params = new LinkedList<>(); + List params = new ArrayList<>(); Set usedParams = new HashSet<>(); Param param = new Param(); @@ -347,7 +347,7 @@ public class UrlTagTests extends AbstractTagTests { @Test public void replaceUriTemplateParamsNoParams() throws JspException { - List params = new LinkedList<>(); + List params = new ArrayList<>(); Set usedParams = new HashSet<>(); String uri = tag.replaceUriTemplateParams("url/path", params, usedParams); @@ -357,7 +357,7 @@ public class UrlTagTests extends AbstractTagTests { @Test public void replaceUriTemplateParamsTemplateWithoutParamMatch() throws JspException { - List params = new LinkedList<>(); + List params = new ArrayList<>(); Set usedParams = new HashSet<>(); String uri = tag.replaceUriTemplateParams("url/{path}", params, usedParams); @@ -367,7 +367,7 @@ public class UrlTagTests extends AbstractTagTests { @Test public void replaceUriTemplateParamsTemplateWithParamMatch() throws JspException { - List params = new LinkedList<>(); + List params = new ArrayList<>(); Set usedParams = new HashSet<>(); Param param = new Param(); @@ -383,7 +383,7 @@ public class UrlTagTests extends AbstractTagTests { @Test public void replaceUriTemplateParamsTemplateWithParamMatchNamePreEncoding() throws JspException { - List params = new LinkedList<>(); + List params = new ArrayList<>(); Set usedParams = new HashSet<>(); Param param = new Param(); @@ -399,7 +399,7 @@ public class UrlTagTests extends AbstractTagTests { @Test public void replaceUriTemplateParamsTemplateWithParamMatchValueEncoded() throws JspException { - List params = new LinkedList<>(); + List params = new ArrayList<>(); Set usedParams = new HashSet<>(); Param param = new Param(); @@ -417,7 +417,7 @@ public class UrlTagTests extends AbstractTagTests { @Test // SPR-11401 public void replaceUriTemplateParamsTemplateWithPathSegment() throws JspException { - List params = new LinkedList<>(); + List params = new ArrayList<>(); Set usedParams = new HashSet<>(); Param param = new Param(); @@ -434,7 +434,7 @@ public class UrlTagTests extends AbstractTagTests { @Test public void replaceUriTemplateParamsTemplateWithPath() throws JspException { - List params = new LinkedList<>(); + List params = new ArrayList<>(); Set usedParams = new HashSet<>(); Param param = new Param(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java index b1c22670e5..2ceafc8260 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.HashMap; -import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; @@ -600,7 +599,7 @@ public class SelectTagTests extends AbstractFormTagTests { this.bean.setSomeList(list); BeanPropertyBindingResult errors = new BeanPropertyBindingResult(this.bean, COMMAND_NAME); - errors.getPropertyAccessor().registerCustomEditor(List.class, new CustomCollectionEditor(LinkedList.class) { + errors.getPropertyAccessor().registerCustomEditor(List.class, new CustomCollectionEditor(ArrayList.class) { @Override public String getAsText() { return getValue().toString();