Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace Collections.sort() with List.sort().

Browse Source 
Resolves #1325.
This commit is contained in:
hduelme
2023-01-26 21:26:03 +01:00
committed by Greg L. Turnquist
parent aee1243d6c
commit 4074c58bf7
2 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-ws-core/src/main/java/org/springframework/ws/server/MessageDispatcher.java
View File

@@ -403,8 +403,8 @@ public class MessageDispatcher implements WebServiceMessageReceiver, BeanNameAwa
Map<String, EndpointAdapter> matchingBeans = BeanFactoryUtils.beansOfTypeIncludingAncestors(applicationContext,
EndpointAdapter.class, true, false);
if (!matchingBeans.isEmpty()) {
endpointAdapters = new ArrayList<EndpointAdapter>(matchingBeans.values());
Collections.sort(endpointAdapters, new OrderComparator());
endpointAdapters = new ArrayList<>(matchingBeans.values());
endpointAdapters.sort(new OrderComparator());
} else {
endpointAdapters = defaultStrategiesHelper.getDefaultStrategies(EndpointAdapter.class, applicationContext);
if (logger.isDebugEnabled()) {
@@ -425,8 +425,8 @@ public class MessageDispatcher implements WebServiceMessageReceiver, BeanNameAwa
Map<String, EndpointExceptionResolver> matchingBeans = BeanFactoryUtils
.beansOfTypeIncludingAncestors(applicationContext, EndpointExceptionResolver.class, true, false);
if (!matchingBeans.isEmpty()) {
endpointExceptionResolvers = new ArrayList<EndpointExceptionResolver>(matchingBeans.values());
Collections.sort(endpointExceptionResolvers, new OrderComparator());
endpointExceptionResolvers = new ArrayList<>(matchingBeans.values());
endpointExceptionResolvers.sort(new OrderComparator());
} else {
endpointExceptionResolvers = defaultStrategiesHelper.getDefaultStrategies(EndpointExceptionResolver.class,
applicationContext);
@@ -448,8 +448,8 @@ public class MessageDispatcher implements WebServiceMessageReceiver, BeanNameAwa
Map<String, EndpointMapping> matchingBeans = BeanFactoryUtils.beansOfTypeIncludingAncestors(applicationContext,
EndpointMapping.class, true, false);
if (!matchingBeans.isEmpty()) {
endpointMappings = new ArrayList<EndpointMapping>(matchingBeans.values());
Collections.sort(endpointMappings, new OrderComparator());
endpointMappings = new ArrayList<>(matchingBeans.values());
endpointMappings.sort(new OrderComparator());
} else {
endpointMappings = defaultStrategiesHelper.getDefaultStrategies(EndpointMapping.class, applicationContext);
if (logger.isDebugEnabled()) {

40
spring-ws-core/src/main/java/org/springframework/ws/support/DefaultStrategiesHelper.java
View File

@@ -115,29 +115,27 @@ public class DefaultStrategiesHelper {
throws BeanInitializationException {
String key = strategyInterface.getName();
try {
List<T> result;
String value = defaultStrategies.getProperty(key);
if (value != null) {
String[] classNames = StringUtils.commaDelimitedListToStringArray(value);
result = new ArrayList<T>(classNames.length);
ClassLoader classLoader = null;
if (applicationContext != null) {
classLoader = applicationContext.getClassLoader();
}
if (classLoader == null) {
classLoader = DefaultStrategiesHelper.class.getClassLoader();
}
for (String className : classNames) {
Class<T> clazz = (Class<T>) ClassUtils.forName(className, classLoader);
Assert.isTrue(strategyInterface.isAssignableFrom(clazz),
clazz.getName() + " is not a " + strategyInterface.getName());
T strategy = instantiateBean(clazz, applicationContext);
result.add(strategy);
}
} else {
result = Collections.emptyList();
if (value == null) {
return Collections.emptyList();
}
Collections.sort(result, new OrderComparator());
String[] classNames = StringUtils.commaDelimitedListToStringArray(value);
List<T> result = new ArrayList<>(classNames.length);
ClassLoader classLoader = null;
if (applicationContext != null) {
classLoader = applicationContext.getClassLoader();
}
if (classLoader == null) {
classLoader = DefaultStrategiesHelper.class.getClassLoader();
}
for (String className : classNames) {
Class<T> clazz = (Class<T>) ClassUtils.forName(className, classLoader);
Assert.isTrue(strategyInterface.isAssignableFrom(clazz),
clazz.getName() + " is not a " + strategyInterface.getName());
T strategy = instantiateBean(clazz, applicationContext);
result.add(strategy);
}
result.sort(new OrderComparator());
return result;
} catch (ClassNotFoundException ex) {
throw new BeanInitializationException("Could not find default strategy class for interface [" + key + "]", ex);