This is an automated email from the ASF dual-hosted git repository.
sergeyb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 5f91cf1 [CXF-7609] Using Optional instead of Collector
5f91cf1 is described below
commit 5f91cf1cbf2a4310a69c156f7de60a07cb728c75
Author: Sergey Beryozkin <[email protected]>
AuthorDate: Tue Jan 16 17:18:05 2018 +0000
[CXF-7609] Using Optional instead of Collector
---
.../org/apache/cxf/jaxrs/provider/ServerProviderFactory.java | 7 +++----
.../java/org/apache/cxf/jaxrs/client/ClientProviderFactory.java | 9 +++------
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java
index 8bb8974..611ab47 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java
@@ -30,7 +30,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
import javax.ws.rs.BeanParam;
import javax.ws.rs.Priorities;
@@ -188,14 +187,14 @@ public final class ServerProviderFactory extends
ProviderFactory {
boolean makeDefaultWaeLeastSpecific =
MessageUtils.getContextualBoolean(m,
MAKE_DEFAULT_WAE_LEAST_SPECIFIC, false);
- List<ExceptionMapper<?>> candidates = exceptionMappers.stream()
+ return (ExceptionMapper<T>)exceptionMappers.stream()
.filter(em -> handleMapper(em, exceptionType, m,
ExceptionMapper.class, true))
.sorted(new ExceptionProviderInfoComparator(exceptionType,
makeDefaultWaeLeastSpecific))
.map(ProviderInfo::getProvider)
- .collect(Collectors.toList());
+ .findFirst()
+ .orElse(null);
- return candidates.isEmpty() ? null :
(ExceptionMapper<T>)candidates.get(0);
}
diff --git
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProviderFactory.java
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProviderFactory.java
index 9abd320..8807f99 100644
---
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProviderFactory.java
+++
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProviderFactory.java
@@ -21,7 +21,6 @@ package org.apache.cxf.jaxrs.client;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.stream.Collectors;
import javax.ws.rs.client.ClientRequestFilter;
import javax.ws.rs.client.ClientResponseFilter;
@@ -103,14 +102,12 @@ public final class ClientProviderFactory extends
ProviderFactory {
public <T extends Throwable> ResponseExceptionMapper<T>
createResponseExceptionMapper(
Message m, Class<?> paramType) {
- List<ResponseExceptionMapper<?>> candidates =
- responseExceptionMappers.stream()
+ return (ResponseExceptionMapper<T>)responseExceptionMappers.stream()
.filter(em -> handleMapper(em, paramType, m,
ResponseExceptionMapper.class, true))
.map(ProviderInfo::getProvider)
.sorted(new ProviderFactory.ClassComparator(paramType))
- .collect(Collectors.toList());
-
- return candidates.isEmpty() ? null :
(ResponseExceptionMapper<T>)candidates.get(0);
+ .findFirst()
+ .orElse(null);
}
@Override
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
