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

INT-3218 Spring 4 Compatibility

Browse Source 
Use `Arrays.asList()` instead of `Collections.arrayToList()` in
places where a generic type needs to be supplied by the caller.

This maintains compile-time compatibility with both Spring 3 and 4,
where Spring 4 added the generic type to the utility class.

The four occurrences where this was needed are not impacted
by the fact that `Arrays.asList()` returns an unmodifiable list.
This commit is contained in:
Gary Russell
2013-11-26 17:30:12 -05:00
parent a08b033b7c
commit 5f555e31b3
4 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-integration-security/src/test/java/org/springframework/integration/security/SecurityTestUtils.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2011 the original author or authors.
* Copyright 2002-2013 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,20 +16,21 @@
package org.springframework.integration.security;
import java.util.Arrays;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.context.SecurityContext;
import org.springframework.security.core.context.SecurityContextImpl;
import org.springframework.util.CollectionUtils;
/**
* @author Jonas Partner
* @author Oleg Zhurakousky
* @author Gary Russell
*/
public class SecurityTestUtils {
@SuppressWarnings("unchecked")
public static SecurityContext createContext(String username, String password, String... roles) {
SecurityContextImpl ctxImpl = new SecurityContextImpl();
UsernamePasswordAuthenticationToken authToken;
@@ -38,7 +39,8 @@ public class SecurityTestUtils {
for (int i = 0; i < roles.length; i++) {
authorities[i] = new SimpleGrantedAuthority(roles[i]);
}
authToken = new UsernamePasswordAuthenticationToken(username, password, CollectionUtils.arrayToList(authorities));
authToken = new UsernamePasswordAuthenticationToken(username, password,
Arrays.asList(authorities));
}
else {
authToken = new UsernamePasswordAuthenticationToken(username, password);