Use Stream.of().
This commit is contained in:
parent
5c6de5a7a0
commit
627a699bd0
|
@ -35,6 +35,7 @@ import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.TreeMap;
|
import java.util.TreeMap;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
import org.apache.commons.lang3.ArrayUtils;
|
import org.apache.commons.lang3.ArrayUtils;
|
||||||
import org.apache.commons.lang3.ClassUtils;
|
import org.apache.commons.lang3.ClassUtils;
|
||||||
|
@ -745,13 +746,13 @@ public class MethodUtils {
|
||||||
Validate.notNull(cls, "cls");
|
Validate.notNull(cls, "cls");
|
||||||
Validate.notEmpty(methodName, "methodName");
|
Validate.notEmpty(methodName, "methodName");
|
||||||
|
|
||||||
final List<Method> methods = Arrays.stream(cls.getDeclaredMethods())
|
final List<Method> methods = Stream.of(cls.getDeclaredMethods())
|
||||||
.filter(method -> method.getName().equals(methodName))
|
.filter(method -> method.getName().equals(methodName))
|
||||||
.collect(toList());
|
.collect(toList());
|
||||||
|
|
||||||
ClassUtils.getAllSuperclasses(cls).stream()
|
ClassUtils.getAllSuperclasses(cls).stream()
|
||||||
.map(Class::getDeclaredMethods)
|
.map(Class::getDeclaredMethods)
|
||||||
.flatMap(Arrays::stream)
|
.flatMap(Stream::of)
|
||||||
.filter(method -> method.getName().equals(methodName))
|
.filter(method -> method.getName().equals(methodName))
|
||||||
.forEach(methods::add);
|
.forEach(methods::add);
|
||||||
|
|
||||||
|
@ -782,7 +783,7 @@ public class MethodUtils {
|
||||||
|
|
||||||
throw new IllegalStateException(
|
throw new IllegalStateException(
|
||||||
String.format("Found multiple candidates for method %s on class %s : %s",
|
String.format("Found multiple candidates for method %s on class %s : %s",
|
||||||
methodName + Arrays.stream(parameterTypes).map(String::valueOf).collect(Collectors.joining(",", "(", ")")),
|
methodName + Stream.of(parameterTypes).map(String::valueOf).collect(Collectors.joining(",", "(", ")")),
|
||||||
cls.getName(),
|
cls.getName(),
|
||||||
bestCandidates.stream().map(Method::toString).collect(Collectors.joining(",", "[", "]")))
|
bestCandidates.stream().map(Method::toString).collect(Collectors.joining(",", "[", "]")))
|
||||||
);
|
);
|
||||||
|
|
|
@ -19,7 +19,6 @@ package org.apache.commons.lang3.time;
|
||||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
|
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Calendar;
|
import java.util.Calendar;
|
||||||
import java.util.TimeZone;
|
import java.util.TimeZone;
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
|
@ -32,7 +31,7 @@ public class FastDatePrinterTimeZonesTest {
|
||||||
private static final String PATTERN = "h:mma z";
|
private static final String PATTERN = "h:mma z";
|
||||||
|
|
||||||
public static Stream<TimeZone> data() {
|
public static Stream<TimeZone> data() {
|
||||||
return Arrays.stream(TimeZone.getAvailableIDs()).map(TimeZone::getTimeZone);
|
return Stream.of(TimeZone.getAvailableIDs()).map(TimeZone::getTimeZone);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ParameterizedTest
|
@ParameterizedTest
|
||||||
|
|
Loading…
Reference in New Issue