|
|
|
@ -16,8 +16,10 @@ |
|
|
|
|
|
|
|
|
|
package org.springframework.test.context.util; |
|
|
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
|
import java.util.Arrays; |
|
|
|
|
import java.util.List; |
|
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
import java.util.stream.Stream; |
|
|
|
|
|
|
|
|
|
import org.springframework.core.io.Resource; |
|
|
|
|
import org.springframework.core.io.ResourceLoader; |
|
|
|
@ -98,8 +100,7 @@ public abstract class TestContextResourceUtils { |
|
|
|
|
* @see #convertToClasspathResourcePaths |
|
|
|
|
*/ |
|
|
|
|
public static Resource[] convertToResources(ResourceLoader resourceLoader, String... paths) { |
|
|
|
|
List<Resource> list = convertToResourceList(resourceLoader, paths); |
|
|
|
|
return list.toArray(new Resource[list.size()]); |
|
|
|
|
return stream(resourceLoader, paths).toArray(Resource[]::new); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
@ -114,11 +115,11 @@ public abstract class TestContextResourceUtils { |
|
|
|
|
* @see #convertToClasspathResourcePaths |
|
|
|
|
*/ |
|
|
|
|
public static List<Resource> convertToResourceList(ResourceLoader resourceLoader, String... paths) { |
|
|
|
|
List<Resource> list = new ArrayList<>(); |
|
|
|
|
for (String path : paths) { |
|
|
|
|
list.add(resourceLoader.getResource(path)); |
|
|
|
|
return stream(resourceLoader, paths).collect(Collectors.toList()); |
|
|
|
|
} |
|
|
|
|
return list; |
|
|
|
|
|
|
|
|
|
private static Stream<Resource> stream(ResourceLoader resourceLoader, String... paths) { |
|
|
|
|
return Arrays.stream(paths).map(resourceLoader::getResource); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|