You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2017/08/04 16:07:30 UTC
[07/12] cxf git commit: Fix a BUNCH more warnings
Fix a BUNCH more warnings
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/13bcc236
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/13bcc236
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/13bcc236
Branch: refs/heads/master
Commit: 13bcc2362509c6d893ed21fff9461d576fda1ccc
Parents: 8f1d475
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Aug 4 10:40:30 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Aug 4 10:40:44 2017 -0400
----------------------------------------------------------------------
.../apache/cxf/osgi/itests/jaxrs/BookStore.java | 17 ++--
.../apache/cxf/clustering/RetryStrategy.java | 5 +-
.../logging/event/DefaultLogEventMapper.java | 24 ++---
.../cxf/throttling/SimpleThrottlingManager.java | 3 +-
.../java/org/apache/cxf/jaxrs/JAXRSInvoker.java | 11 +--
.../org/apache/cxf/jaxrs/JAXRSServiceImpl.java | 3 +-
.../JAXRSServerFactoryBeanDefinitionParser.java | 3 +-
.../cxf/jaxrs/ext/MessageContextImpl.java | 3 +-
.../org/apache/cxf/jaxrs/ext/xml/XMLSource.java | 9 +-
.../jaxrs/impl/AbstractResponseContextImpl.java | 8 +-
.../cxf/jaxrs/impl/AsyncResponseImpl.java | 3 +-
.../jaxrs/impl/CacheControlHeaderProvider.java | 18 ++--
.../jaxrs/impl/ContainerRequestContextImpl.java | 11 +--
.../apache/cxf/jaxrs/impl/HttpHeadersImpl.java | 34 +++----
.../jaxrs/impl/HttpServletRequestFilter.java | 6 +-
.../apache/cxf/jaxrs/impl/LinkBuilderImpl.java | 19 ++--
.../cxf/jaxrs/impl/LinkHeaderProvider.java | 3 +-
.../cxf/jaxrs/impl/MediaTypeHeaderProvider.java | 6 +-
.../org/apache/cxf/jaxrs/impl/MetadataMap.java | 10 +-
.../cxf/jaxrs/impl/NewCookieHeaderProvider.java | 6 +-
.../apache/cxf/jaxrs/impl/PathSegmentImpl.java | 3 +-
.../cxf/jaxrs/impl/ReaderInterceptorMBR.java | 2 +-
.../cxf/jaxrs/impl/ResponseBuilderImpl.java | 3 +-
.../org/apache/cxf/jaxrs/impl/ResponseImpl.java | 26 +++---
.../jaxrs/provider/AbstractJAXBProvider.java | 3 +-
.../cxf/jaxrs/provider/ProviderFactory.java | 4 +-
.../provider/RequestDispatcherProvider.java | 2 +-
.../org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 2 +-
.../validation/JAXRSBeanValidationInvoker.java | 2 +-
.../jaxb/jaxbelement/ParamJAXBElement.java | 11 +--
.../jaxrs/provider/DataSourceProviderTest.java | 4 +-
.../provider/FormEncodingProviderTest.java | 39 ++++----
.../provider/PrimitiveTextProviderTest.java | 2 +-
.../cxf/jaxrs/provider/ProviderFactoryTest.java | 2 +-
.../cxf/jaxrs/provider/SourceProviderTest.java | 2 +-
.../cxf/jaxrs/provider/XPathProviderTest.java | 2 +-
.../cxf/jaxws/EndpointReferenceBuilder.java | 2 +-
.../blueprint/EndpointDefinitionParser.java | 6 +-
.../dynamic/JaxWsDynamicClientFactory.java | 3 +-
.../logical/LogicalHandlerOutInterceptor.java | 4 +-
.../handler/soap/SOAPHandlerInterceptor.java | 3 +-
.../apache/cxf/jaxws/SEIWithJAXBAnnoTest.java | 4 +-
.../cxf/jaxws/dispatch/DispatchOpTest.java | 5 +-
.../apache/cxf/jaxws/dispatch/DispatchTest.java | 5 +-
.../jaxws/handler/HandlerChainInvokerTest.java | 16 ++--
.../endpoint/dynamic/DynamicClientFactory.java | 8 +-
.../ServerFactoryBeanDefinitionParser.java | 3 +-
.../ResponseTimeMessageInInterceptor.java | 4 +-
.../ResponseTimeMessageInvokerInterceptor.java | 4 +-
.../ResponseTimeMessageOutInterceptor.java | 2 +-
.../cxf/jaxrs/client/ClientProviderFactory.java | 2 +-
.../cxf/jaxrs/client/JaxrsClientCallback.java | 4 +-
.../CacheControlClientReaderInterceptor.java | 2 +-
.../client/spec/ClientResponseContextImpl.java | 2 +-
.../cxf/jaxrs/model/wadl/WadlGenerator.java | 2 +-
.../provider/json/SimpleTypeJsonProvider.java | 2 +-
.../cxf/jaxrs/rx/provider/ObservableReader.java | 2 +-
.../ext/search/tika/TikaContentExtractor.java | 3 +-
.../jpa/JPATypedQueryVisitorFiqlTest.java | 2 +-
.../jpa/JPATypedQueryVisitorODataTest.java | 2 +-
.../jose/common/KeyManagementUtils.java | 2 +-
.../jwe/AesGcmContentEncryptionAlgorithm.java | 4 +-
.../security/jose/jws/JwsJsonConsumerTest.java | 6 +-
.../DefaultEHCacheOAuthDataProvider.java | 2 +-
.../provider/OAuthServerJoseJwtProducer.java | 4 +-
.../oauth2/services/AccessTokenService.java | 2 +-
.../services/AuthorizationCodeGrantService.java | 2 +-
.../rs/security/oauth2/utils/EHCacheUtil.java | 2 +-
.../security/oidc/idp/FormIdTokenResponse.java | 2 +-
.../rs/security/oidc/utils/OidcUtilsTest.java | 4 +-
.../saml/sso/EHCacheTokenReplayCache.java | 4 +-
.../cxf/rs/security/saml/sso/EHCacheUtil.java | 2 +-
.../saml/sso/SamlPostBindingFilter.java | 2 +-
.../saml/sso/state/EHCacheSPStateManager.java | 4 +-
.../saml/sso/AbstractSAMLCallbackHandler.java | 6 +-
.../saml/sso/CombinedValidatorTest.java | 6 +-
.../saml/sso/SAMLResponseValidatorTest.java | 2 +-
.../saml/sso/SAMLSSOResponseValidatorTest.java | 2 +-
.../cxf/rs/security/common/RSSecurityUtils.java | 2 +-
.../apache/cxf/rs/security/saml/SAMLUtils.java | 2 +-
.../interceptor/WSS4JBasicAuthValidator.java | 6 +-
.../http_jetty/JettyHTTPServerEngine.java | 2 +-
.../JettyHTTPServerEngineFactoryHolder.java | 4 +-
.../http_jetty/JettyHTTPDestinationTest.java | 8 +-
.../http/netty/client/NettyHttpConduit.java | 4 +-
.../netty/server/NettyHttpDestinationTest.java | 8 +-
.../UndertowHTTPServerEngineFactoryHolder.java | 4 +-
.../osgi/HTTPUndertowTransportActivator.java | 2 +-
.../UndertowHTTPDestinationTest.java | 8 +-
.../http/auth/AbstractSpnegoAuthSupplier.java | 2 +-
.../HttpConduitBPBeanDefinitionParser.java | 3 +-
.../HttpDestinationBPBeanDefinitionParser.java | 3 +-
.../cxf/transport/servlet/CXFServlet.java | 2 +-
.../cxf/transport/jms/JMSHeaderTypeTest.java | 2 +-
.../apache/cxf/transport/udp/UDPConduit.java | 2 +-
.../websocket/ahc/AhcWebSocketConduit.java | 2 +-
.../apache/cxf/ws/addressing/soap/MAPCodec.java | 8 +-
.../ws/addressing/soap/VersionTransformer.java | 87 ++++++------------
.../cxf/ws/addressing/soap/MAPCodecTest.java | 96 ++++++++++----------
.../policy/ClientPolicyInFaultInterceptor.java | 2 +-
.../cxf/ws/policy/PolicyInInterceptor.java | 2 +-
.../cxf/ws/policy/PolicyOutInterceptor.java | 2 +-
.../policy/ServerPolicyOutFaultInterceptor.java | 2 +-
.../cxf/ws/rm/persistence/PersistenceUtils.java | 2 +-
.../cxf/ws/rm/policy/RM12AssertionBuilder.java | 3 +-
.../cxf/ws/rm/policy/RMPolicyUtilities.java | 5 +-
.../FragmentDialectLanguageXPath10.java | 2 +-
.../wsdl/interceptors/BareInInterceptor.java | 3 +-
.../org/apache/cxf/xkms/cache/EHCacheUtil.java | 2 +-
.../provider/XkmsCryptoProviderFactory.java | 7 +-
.../cxf/systest/grizzly/EndpointAPITest.java | 4 +-
.../validators/CustomValidatorJAXBTest.java | 6 +-
.../org/apache/cxf/systest/jaxrs/BookStore.java | 2 +-
.../jaxrs/JAXRSClientServerSpringBookTest.java | 2 +-
.../extraction/JAXRSClientServerTikaTest.java | 2 +-
.../jaxrs/websocket/WebSocketTestClient.java | 2 +-
.../kerberos/common/SecurityTestUtil.java | 6 +-
.../jaxrs/kerberos/JAXRSKerberosBookTest.java | 6 +-
.../wssec/kerberos/KerberosTokenTest.java | 21 +++--
.../kerberos/wssec/spnego/SpnegoTokenTest.java | 13 +--
.../grants/CallbackHandlerLoginHandler.java | 4 +-
.../jaxrs/security/saml/JAXRSSamlTest.java | 4 +-
.../systest/jms/security/JMSWSSecurityTest.java | 22 ++---
.../apache/cxf/systest/jms/security/Server.java | 8 +-
.../systest/http_undertow/SessionServer.java | 3 +-
.../http_undertow/UndertowBasicAuthServer.java | 3 +-
.../http_undertow/UndertowBasicAuthTest.java | 3 +-
.../http_undertow/UndertowDigestAuthTest.java | 5 +-
.../websocket/WebSocketTestClient.java | 2 +-
.../org/apache/cxf/https/ssl3/SSLv3Test.java | 33 +++----
.../org/apache/cxf/systest/http/BareServer.java | 3 +-
.../apache/cxf/systest/http/SessionServer.java | 3 +-
.../http_jetty/JettyBasicAuthServer.java | 3 +-
.../systest/http_jetty/JettyBasicAuthTest.java | 3 +-
.../systest/http_jetty/JettyDigestAuthTest.java | 5 +-
.../https/ciphersuites/CipherSuitesTest.java | 73 +++++++--------
.../https/clientauth/ClientAuthTest.java | 29 +++---
.../hostname/HostnameVerificationTest.java | 17 ++--
.../systest/https/trust/TrustManagerTest.java | 21 +++--
.../apache/cxf/systest/bus/BusShutdownTest.java | 3 +-
.../ws/rm/MessageCallbackOnewayTest.java | 2 +-
.../wssec/examples/saml/SamlTokenTest.java | 45 ++++-----
.../secconv/SecureConversationTest.java | 5 +-
.../wssec/examples/ut/UsernameTokenTest.java | 29 +++---
.../wssec/examples/x509/X509TokenTest.java | 17 ++--
.../systest/ws/addr_responses/HelloService.java | 2 +-
.../apache/cxf/systest/ws/addr_wsdl/Server.java | 5 +-
.../ws/addressing/AbstractGreeterImpl.java | 2 +-
.../systest/ws/addressing/HeaderVerifier.java | 14 +--
.../cxf/systest/ws/addressing/MAPTestBase.java | 6 +-
.../cxf/systest/ws/addressing/MAPVerifier.java | 10 +-
151 files changed, 574 insertions(+), 624 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/BookStore.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/BookStore.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/BookStore.java
index 1cebd2b..08b735f 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/BookStore.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/BookStore.java
@@ -89,10 +89,9 @@ public class BookStore {
Book b = books.get(id);
if (b == null) {
return Response.status(Status.NOT_FOUND).build();
- } else {
- b.setName(book.getName());
- return Response.ok().build();
}
+ b.setName(book.getName());
+ return Response.ok().build();
}
@POST
@@ -132,12 +131,11 @@ public class BookStore {
Book b = books.get(book.getId());
if (b != null) {
return Response.status(Status.CONFLICT).build();
- } else {
- books.put(book.getId(), book);
- URI createdURI = UriBuilder.fromUri(ui.getAbsolutePath())
- .path(Long.toString(book.getId())).build();
- return Response.created(createdURI).build();
}
+ books.put(book.getId(), book);
+ URI createdURI = UriBuilder.fromUri(ui.getAbsolutePath())
+ .path(Long.toString(book.getId())).build();
+ return Response.created(createdURI).build();
}
@DELETE
@@ -147,9 +145,8 @@ public class BookStore {
Book b = books.remove(id);
if (b == null) {
return Response.status(Status.NOT_FOUND).build();
- } else {
- return Response.ok().build();
}
+ return Response.ok().build();
}
private void init() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/features/clustering/src/main/java/org/apache/cxf/clustering/RetryStrategy.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/RetryStrategy.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/RetryStrategy.java
index a6cb801..727bbdc 100644
--- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/RetryStrategy.java
+++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/RetryStrategy.java
@@ -53,10 +53,9 @@ public class RetryStrategy extends SequentialStrategy {
// and then stay on the same address for maxNumberOfRetries
if (++counter <= maxNumberOfRetries) {
return true;
- } else {
- counter = 0;
- return false;
}
+ counter = 0;
+ return false;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
index 27b9813..c598263 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
@@ -164,9 +164,8 @@ public class DefaultLogEventMapper {
String query = safeGet(message, Message.QUERY_STRING);
if (query != null) {
return uri + "?" + query;
- } else {
- return uri;
}
+ return uri;
}
private boolean isBinaryContent(Message message) {
@@ -221,9 +220,8 @@ public class DefaultLogEventMapper {
boolean isOutbound = MessageUtils.isOutbound(message);
if (isRequestor) {
return isOutbound ? message : message.getExchange().getOutMessage();
- } else {
- return isOutbound ? message.getExchange().getInMessage() : message;
}
+ return isOutbound ? message.getExchange().getInMessage() : message;
}
private String getRestOperationName(Message curMessage) {
@@ -273,16 +271,13 @@ public class DefaultLogEventMapper {
if (isOutbound) {
if (isFault) {
return EventType.FAULT_OUT;
- } else {
- return isRequestor ? EventType.REQ_OUT : EventType.RESP_OUT;
- }
- } else {
- if (isFault) {
- return EventType.FAULT_IN;
- } else {
- return isRequestor ? EventType.RESP_IN : EventType.REQ_IN;
}
+ return isRequestor ? EventType.REQ_OUT : EventType.RESP_OUT;
+ }
+ if (isFault) {
+ return EventType.FAULT_IN;
}
+ return isRequestor ? EventType.RESP_IN : EventType.REQ_IN;
}
/**
@@ -296,10 +291,9 @@ public class DefaultLogEventMapper {
Object opName = message.getExchange().get("org.apache.cxf.resource.operation.name");
if (opName == null) {
return true;
- } else {
- Integer responseCode = (Integer)message.get(Message.RESPONSE_CODE);
- return (responseCode != null) && (responseCode >= 400);
}
+ Integer responseCode = (Integer)message.get(Message.RESPONSE_CODE);
+ return (responseCode != null) && (responseCode >= 400);
}
public void setEpInfo(Message message, final LogEvent event) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/features/throttling/src/main/java/org/apache/cxf/throttling/SimpleThrottlingManager.java
----------------------------------------------------------------------
diff --git a/rt/features/throttling/src/main/java/org/apache/cxf/throttling/SimpleThrottlingManager.java b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/SimpleThrottlingManager.java
index 39f580a..bda3889 100644
--- a/rt/features/throttling/src/main/java/org/apache/cxf/throttling/SimpleThrottlingManager.java
+++ b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/SimpleThrottlingManager.java
@@ -47,9 +47,8 @@ public class SimpleThrottlingManager extends ThrottleResponse implements Throttl
if (counter.incrementAndGet() >= threshold) {
m.put(THROTTLED_KEY, true);
return this;
- } else {
- return null;
}
+ return null;
}
public int getThreshold() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
index c0ca2ff..dd18c01 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
@@ -126,10 +126,9 @@ public class JAXRSInvoker extends AbstractInvoker {
Object asyncObj = ar.getResponseObject();
if (asyncObj instanceof Throwable) {
return handleAsyncFault(exchange, ar, (Throwable)asyncObj);
- } else {
- setResponseContentTypeIfNeeded(exchange.getInMessage(), asyncObj);
- return new MessageContentsList(asyncObj);
}
+ setResponseContentTypeIfNeeded(exchange.getInMessage(), asyncObj);
+ return new MessageContentsList(asyncObj);
}
private Object handleAsyncFault(Exchange exchange, AsyncResponseImpl ar, Throwable t) {
@@ -313,9 +312,8 @@ public class JAXRSInvoker extends AbstractInvoker {
if (r != null) {
JAXRSUtils.setMessageContentType(exchange.getInMessage(), r);
return new MessageContentsList(r);
- } else {
- return null;
}
+ return null;
}
private void setResponseContentTypeIfNeeded(Message inMessage, Object response) {
@@ -375,9 +373,8 @@ public class JAXRSInvoker extends AbstractInvoker {
OperationResourceInfo ori = exchange.get(OperationResourceInfo.class);
ClassResourceInfo cri = ori.getClassResourceInfo();
return cri.getResourceProvider();
- } else {
- return (ResourceProvider)provider;
}
+ return (ResourceProvider)provider;
}
public Object getServiceObject(Exchange exchange) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java
index dc8e7ca..6866b3a 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java
@@ -101,9 +101,8 @@ public class JAXRSServiceImpl extends AbstractAttributedInterceptorProvider impl
Class<?> primaryClass = classResourceInfos.get(0).getServiceClass();
String ns = PackageUtils.getNamespace(PackageUtils.getPackageName(primaryClass));
return new QName(ns, primaryClass.getSimpleName());
- } else {
- return new QName(address, "WebClient");
}
+ return new QName(address, "WebClient");
}
public List<ClassResourceInfo> getClassResourceInfos() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java
index cb097e8..a9d3612 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java
@@ -36,6 +36,7 @@ import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.model.UserResource;
import org.apache.cxf.jaxrs.utils.ResourceUtils;
+import org.osgi.service.blueprint.reflect.ComponentMetadata;
import org.osgi.service.blueprint.reflect.Metadata;
@@ -136,7 +137,7 @@ public class JAXRSServerFactoryBeanDefinitionParser extends SimpleBPBeanDefiniti
bean.setInitMethod("init");
// We don't really want to delay the registration of our Server
- bean.setActivation(MutableBeanMetadata.ACTIVATION_EAGER);
+ bean.setActivation(ComponentMetadata.ACTIVATION_EAGER);
return bean;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java
index 270bcdc..d63d857 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java
@@ -125,9 +125,8 @@ public class MessageContextImpl implements MessageContext {
Object value = m.getContextualProperty(key.toString());
if (value == null && key.getClass() == Class.class) {
return m.getExchange().get((Class<?>)key);
- } else {
- return value;
}
+ return value;
}
public <T> T getContext(Class<T> contextClass) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java
index 0b2cb53..14f1de2 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java
@@ -114,9 +114,8 @@ public class XMLSource {
Node node = (Node)obj;
if (cls.isPrimitive() || cls == String.class) {
return (T)readPrimitiveValue(node, cls);
- } else {
- return readNode(node, cls);
}
+ return readNode(node, cls);
}
return cls.cast(evaluate(expression, namespaces, XPathConstants.STRING));
}
@@ -348,9 +347,8 @@ public class XMLSource {
if (String.class == cls) {
if (node.getNodeType() == Node.ELEMENT_NODE) {
return StaxUtils.toString((Element)node);
- } else {
- return cls.cast(node.getNodeValue());
}
+ return cls.cast(node.getNodeValue());
}
return InjectionUtils.convertStringToPrimitive(node.getNodeValue(), cls);
@@ -379,9 +377,8 @@ public class XMLSource {
try {
if (cls.getAnnotation(XmlRootElement.class) != null) {
return cls.cast(u.unmarshal(s));
- } else {
- return u.unmarshal(s, cls).getValue();
}
+ return u.unmarshal(s, cls).getValue();
} finally {
JAXBUtils.closeUnmarshaller(u);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractResponseContextImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractResponseContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractResponseContextImpl.java
index 94f7fa8..fd83cee 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractResponseContextImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractResponseContextImpl.java
@@ -124,7 +124,7 @@ public abstract class AbstractResponseContextImpl {
}
public void setEntity(Object entity, Annotation[] anns, MediaType mt) {
- ((ResponseImpl)r).setEntity(entity, anns);
+ r.setEntity(entity, anns);
if (mt != null) {
r.getMetadata().putSingle(HttpHeaders.CONTENT_TYPE, mt);
m.put(Message.CONTENT_TYPE, mt.toString());
@@ -132,18 +132,18 @@ public abstract class AbstractResponseContextImpl {
}
public void setEntity(Object entity) {
- ((ResponseImpl)r).setEntity(entity, getResponseEntityAnnotations());
+ r.setEntity(entity, getResponseEntityAnnotations());
}
protected Annotation[] getResponseEntityAnnotations() {
- return ((ResponseImpl)r).getEntityAnnotations();
+ return r.getEntityAnnotations();
}
public void setStatus(int status) {
m.getExchange().put(Message.RESPONSE_CODE, status);
m.put(Message.RESPONSE_CODE, status);
- ((ResponseImpl)r).setStatus(status);
+ r.setStatus(status);
}
public void setStatusInfo(StatusType status) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
index 80a7fe5..f52d308 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
@@ -265,9 +265,8 @@ public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
cont.suspend(AsyncResponse.NO_TIMEOUT);
initialSuspend = false;
return true;
- } else {
- return false;
}
+ return false;
}
@SuppressWarnings("resource") // Response that is built here shouldn't be closed here
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProvider.java
index 7b3b42e..10e529c 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProvider.java
@@ -129,10 +129,9 @@ public class CacheControlHeaderProvider implements HeaderDelegate<CacheControl>
}
}
return values.toArray(new String[values.size()]);
- } else {
- String separator = getSeparator();
- return StringUtils.split(c, separator);
}
+ String separator = getSeparator();
+ return StringUtils.split(c, separator);
}
public String toString(CacheControl c) {
@@ -191,13 +190,12 @@ public class CacheControlHeaderProvider implements HeaderDelegate<CacheControl>
String f = i == token.length() + 1 ? "" : token.substring(i + 1);
if (f.length() < 2 || !f.startsWith("\"") || !f.endsWith("\"")) {
return;
- } else {
- f = f.length() == 2 ? "" : f.substring(1, f.length() - 1);
- if (f.length() > 0) {
- String[] values = StringUtils.split(f, ",");
- for (String v : values) {
- fields.add(v.trim());
- }
+ }
+ f = f.length() == 2 ? "" : f.substring(1, f.length() - 1);
+ if (f.length() > 0) {
+ String[] values = StringUtils.split(f, ",");
+ for (String v : values) {
+ fields.add(v.trim());
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java
index 3dd0479..9d7bcc6 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java
@@ -103,13 +103,12 @@ public class ContainerRequestContextImpl extends AbstractRequestContextImpl
if (!requestUriString.startsWith(baseUriString)) {
setRequestUri(requestUri, URI.create("/"));
return;
- } else {
- requestUriString = requestUriString.substring(baseUriString.length());
- if (requestUriString.isEmpty()) {
- requestUriString = "/";
- }
- requestUri = URI.create(requestUriString);
}
+ requestUriString = requestUriString.substring(baseUriString.length());
+ if (requestUriString.isEmpty()) {
+ requestUriString = "/";
+ }
+ requestUri = URI.create(requestUriString);
}
doSetRequestUri(requestUri);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
index bf144b7..b38b5b1 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
@@ -130,16 +130,15 @@ public class HttpHeadersImpl implements HttpHeaders {
String separator = getCookieSeparatorFromProperty();
if (separator != null) {
return separator;
- } else {
- if (value.contains(DOLLAR_CHAR)
- && (value.contains(COOKIE_VERSION_PARAM)
- || value.contains(COOKIE_PATH_PARAM)
- || value.contains(COOKIE_DOMAIN_PARAM))) {
- return DEFAULT_SEPARATOR;
- }
-
- return DEFAULT_COOKIE_SEPARATOR;
}
+ if (value.contains(DOLLAR_CHAR)
+ && (value.contains(COOKIE_VERSION_PARAM)
+ || value.contains(COOKIE_PATH_PARAM)
+ || value.contains(COOKIE_DOMAIN_PARAM))) {
+ return DEFAULT_SEPARATOR;
+ }
+
+ return DEFAULT_COOKIE_SEPARATOR;
}
private String getCookieSeparatorFromProperty() {
Object cookiePropValue = message.getContextualProperty(COOKIE_SEPARATOR_PROPERTY);
@@ -152,9 +151,8 @@ public class HttpHeadersImpl implements HttpHeaders {
throw ExceptionUtils.toInternalServerErrorException(null, null);
}
return separator;
- } else {
- return null;
}
+ return null;
}
public Locale getLanguage() {
@@ -177,9 +175,8 @@ public class HttpHeadersImpl implements HttpHeaders {
newHeaders.put(entry.getKey(), getRequestHeader(entry.getKey()));
}
return new MetadataMap<String, String>(Collections.unmodifiableMap(newHeaders), false);
- } else {
- return new MetadataMap<String, String>(Collections.unmodifiableMap(headers), false);
}
+ return new MetadataMap<String, String>(Collections.unmodifiableMap(headers), false);
}
public List<Locale> getAcceptableLanguages() {
@@ -263,13 +260,12 @@ public class HttpHeadersImpl implements HttpHeaders {
String[] ls = StringUtils.split(originalValue, sep);
if (ls.length == 1) {
return Collections.singletonList(ls[0].trim());
- } else {
- List<String> newValues = new ArrayList<>();
- for (String v : ls) {
- newValues.add(v.trim());
- }
- return newValues;
}
+ List<String> newValues = new ArrayList<>();
+ for (String v : ls) {
+ newValues.add(v.trim());
+ }
+ return newValues;
}
if (originalValue.startsWith("\"") && originalValue.endsWith("\"")) {
String actualValue = originalValue.length() == 2 ? ""
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
index 4e4b52a..119b891 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
@@ -58,9 +58,8 @@ public class HttpServletRequestFilter extends HttpServletRequestWrapper {
}
if (is instanceof ServletInputStream) {
return (ServletInputStream)is;
- } else {
- return super.getInputStream();
}
+ return super.getInputStream();
}
@Override
public String getParameter(String name) {
@@ -90,9 +89,8 @@ public class HttpServletRequestFilter extends HttpServletRequestWrapper {
map2.put(e.getKey(), e.getValue().toArray(new String[]{}));
}
return Collections.unmodifiableMap(map2);
- } else {
- return map1;
}
+ return map1;
}
@Override
public Enumeration<String> getParameterNames() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkBuilderImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkBuilderImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkBuilderImpl.java
index caed5cd..e254344 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkBuilderImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkBuilderImpl.java
@@ -67,9 +67,8 @@ public class LinkBuilderImpl implements Builder {
if (!uri.isAbsolute() && baseUri != null && baseUri.isAbsolute()) {
UriBuilder linkUriBuilder = UriBuilder.fromUri(baseUri);
return HttpUtils.resolve(linkUriBuilder, uri);
- } else {
- return uri;
}
+ return uri;
}
@Override
@@ -190,14 +189,13 @@ public class LinkBuilderImpl implements Builder {
String rel = getRel();
if (rel == null) {
return Collections.<String>emptyList();
- } else {
- String[] values = rel.split(" ");
- List<String> rels = new ArrayList<>(values.length);
- for (String val : values) {
- rels.add(val.trim());
- }
- return rels;
}
+ String[] values = rel.split(" ");
+ List<String> rels = new ArrayList<>(values.length);
+ for (String val : values) {
+ rels.add(val.trim());
+ }
+ return rels;
}
@Override
@@ -256,9 +254,8 @@ public class LinkBuilderImpl implements Builder {
Link other = (Link)o;
return uri.equals(other.getUri())
&& getParams().equals(other.getParams());
- } else {
- return false;
}
+ return false;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkHeaderProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkHeaderProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkHeaderProvider.java
index 5bcc2f6..8eaaf4f 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkHeaderProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkHeaderProvider.java
@@ -88,9 +88,8 @@ public class LinkHeaderProvider implements HeaderDelegate<Link> {
private String removeQuotesIfNeeded(String value) {
if (value.length() > 1 && value.startsWith("\"") && value.endsWith("\"")) {
return value.substring(1, value.length() - 1);
- } else {
- return value;
}
+ return value;
}
public String toString(Link link) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
index 281d0ca..a78f930 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
@@ -168,9 +168,8 @@ public class MediaTypeHeaderProvider implements HeaderDelegate<MediaType> {
return new MediaType(MediaType.MEDIA_TYPE_WILDCARD,
MediaType.MEDIA_TYPE_WILDCARD,
parameters);
- } else {
- return MediaType.WILDCARD_TYPE;
}
+ return MediaType.WILDCARD_TYPE;
}
}
@@ -187,8 +186,7 @@ public class MediaTypeHeaderProvider implements HeaderDelegate<MediaType> {
}
LOG.fine("Converting a malformed media type '" + mType + "' to '" + typeToString(mt) + "'");
return mt;
- } else {
- throw new IllegalArgumentException("Media type separator is missing");
}
+ throw new IllegalArgumentException("Media type separator is missing");
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java
index f228737..328d3c8a 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java
@@ -174,11 +174,10 @@ public class MetadataMap<K, V> implements MultivaluedMap<K, V> {
public Set<K> keySet() {
if (!caseInsensitive) {
return m.keySet();
- } else {
- Set<K> set = new TreeSet<K>(new KeyComparator<K>());
- set.addAll(m.keySet());
- return set;
}
+ Set<K> set = new TreeSet<K>(new KeyComparator<K>());
+ set.addAll(m.keySet());
+ return set;
}
public List<V> put(K key, List<V> value) {
@@ -200,9 +199,8 @@ public class MetadataMap<K, V> implements MultivaluedMap<K, V> {
if (caseInsensitive) {
K realKey = getMatchingKey(key);
return m.remove(realKey == null ? key : realKey);
- } else {
- return m.remove(key);
}
+ return m.remove(key);
}
public int size() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProvider.java
index 1ecc1b6..db1aeb2 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProvider.java
@@ -21,6 +21,7 @@ package org.apache.cxf.jaxrs.impl;
import java.util.Date;
+import javax.ws.rs.core.Cookie;
import javax.ws.rs.core.NewCookie;
import javax.ws.rs.ext.RuntimeDelegate.HeaderDelegate;
@@ -59,7 +60,7 @@ public class NewCookieHeaderProvider implements HeaderDelegate<NewCookie> {
boolean isSecure = false;
Date expires = null;
boolean httpOnly = false;
- int version = NewCookie.DEFAULT_VERSION;
+ int version = Cookie.DEFAULT_VERSION;
String[] tokens = StringUtils.split(c, ";");
for (String token : tokens) {
@@ -153,9 +154,8 @@ public class NewCookieHeaderProvider implements HeaderDelegate<NewCookie> {
}
buff.append('"');
return buff.toString();
- } else {
- return value == null ? "" : value;
}
+ return value == null ? "" : value;
}
static String maybeQuoteAll(String value) {
return maybeQuote(TSPECIALS_ALL, value);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/PathSegmentImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/PathSegmentImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/PathSegmentImpl.java
index e558ec5..08fef01 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/PathSegmentImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/PathSegmentImpl.java
@@ -58,9 +58,8 @@ public class PathSegmentImpl implements PathSegment {
int index = path.indexOf(';');
if (index == -1) {
return null;
- } else {
- return path.substring(index);
}
+ return path.substring(index);
}
public String toString() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ReaderInterceptorMBR.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ReaderInterceptorMBR.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ReaderInterceptorMBR.java
index fcf890d..d39dffd 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ReaderInterceptorMBR.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ReaderInterceptorMBR.java
@@ -56,7 +56,7 @@ public class ReaderInterceptorMBR implements ReaderInterceptor {
})
@Override
public Object aroundReadFrom(ReaderInterceptorContext c) throws IOException, WebApplicationException {
- Class entityCls = (Class)c.getType();
+ Class entityCls = c.getType();
Type entityType = c.getGenericType();
MediaType entityMt = c.getMediaType();
Annotation[] entityAnns = c.getAnnotations();
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java
index 49f3dbf..bf797c2 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java
@@ -279,9 +279,8 @@ public class ResponseBuilderImpl extends ResponseBuilder implements Cloneable {
public ResponseBuilder allow(Set<String> methods) {
if (methods == null) {
return allow();
- } else {
- return allow(methods.toArray(new String[methods.size()]));
}
+ return allow(methods.toArray(new String[methods.size()]));
}
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
index ce81189..3f8c541 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
@@ -167,28 +167,26 @@ public final class ResponseImpl extends Response {
private List<String> toListOfStrings(String headerName, List<Object> values) {
if (values == null) {
return null;
- } else {
- List<String> stringValues = new ArrayList<>(values.size());
- HeaderDelegate<Object> hd = HttpUtils.getHeaderDelegate(values.get(0));
- for (Object value : values) {
- String actualValue = hd == null ? value.toString() : hd.toString(value);
- stringValues.add(actualValue);
- }
- return stringValues;
}
+ List<String> stringValues = new ArrayList<>(values.size());
+ HeaderDelegate<Object> hd = HttpUtils.getHeaderDelegate(values.get(0));
+ for (Object value : values) {
+ String actualValue = hd == null ? value.toString() : hd.toString(value);
+ stringValues.add(actualValue);
+ }
+ return stringValues;
}
public Set<String> getAllowedMethods() {
List<Object> methodValues = metadata.get(HttpHeaders.ALLOW);
if (methodValues == null) {
return Collections.emptySet();
- } else {
- Set<String> methods = new HashSet<>();
- for (Object o : methodValues) {
- methods.add(o.toString());
- }
- return methods;
}
+ Set<String> methods = new HashSet<>();
+ for (Object o : methodValues) {
+ methods.add(o.toString());
+ }
+ return methods;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
index 5edc28d..6ef6b1b 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
@@ -308,9 +308,8 @@ public abstract class AbstractJAXBProvider<T> extends AbstractConfigurableProvid
}
if (jaxbElementClassNames.contains(cls.getName())) {
return cls;
- } else {
- return getJaxbElementClass(cls.getSuperclass());
}
+ return getJaxbElementClass(cls.getSuperclass());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
index dc129b9..9ceed02 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
@@ -703,11 +703,11 @@ public abstract class ProviderFactory {
.getGenericInterfaces()[0]).getActualTypeArguments()[0];
if (type == Object.class) {
theProviderComparator =
- (Comparator<?>)(new ProviderInfoClassComparator((Comparator<Object>)theProviderComparator));
+ new ProviderInfoClassComparator((Comparator<Object>)theProviderComparator);
}
List<T> theProviders = (List<T>)listOfProviders;
Comparator<? super T> theComparator = (Comparator<? super T>)theProviderComparator;
- Collections.sort((List<T>)theProviders, theComparator);
+ Collections.sort(theProviders, theComparator);
}
private void sortContextResolvers() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java
index 9e1ac3f..a715500 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java
@@ -277,7 +277,7 @@ public class RequestDispatcherProvider extends AbstractConfigurableProvider
private String getPathFromMessageContext() {
if (mc != null) {
- Object resourcePathProp = (String)mc.get(MESSAGE_RESOURCE_PATH_PROPERTY);
+ Object resourcePathProp = mc.get(MESSAGE_RESOURCE_PATH_PROPERTY);
if (resourcePathProp != null) {
StringBuilder sb = new StringBuilder();
if (locationPrefix != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
index 42f18a9..4c286a6 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
@@ -1350,7 +1350,7 @@ public final class JAXRSUtils {
} else {
MessageBodyReader<?> provider = ((ReaderInterceptorMBR)readers.get(0)).getMBR();
@SuppressWarnings("rawtypes")
- Class cls = (Class)targetTypeClass;
+ Class cls = targetTypeClass;
return provider.readFrom(
cls, parameterType, parameterAnnotations, mediaType,
new HttpHeadersImpl(m).getRequestHeaders(), is);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationInvoker.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationInvoker.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationInvoker.java
index 0611351..96ae9c3 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationInvoker.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationInvoker.java
@@ -53,7 +53,7 @@ public class JAXRSBeanValidationInvoker extends JAXRSInvoker {
if (response instanceof MessageContentsList) {
MessageContentsList list = (MessageContentsList)response;
if (list.size() == 1) {
- Object entity = ((MessageContentsList)list).get(0);
+ Object entity = list.get(0);
if (entity instanceof Response) {
theProvider.validateReturnValue(serviceObject, m, ((Response)entity).getEntity());
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/fortest/jaxb/jaxbelement/ParamJAXBElement.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/fortest/jaxb/jaxbelement/ParamJAXBElement.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/fortest/jaxb/jaxbelement/ParamJAXBElement.java
index b57b111..e1693fb 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/fortest/jaxb/jaxbelement/ParamJAXBElement.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/fortest/jaxb/jaxbelement/ParamJAXBElement.java
@@ -21,22 +21,17 @@ package org.apache.cxf.jaxrs.fortest.jaxb.jaxbelement;
import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
-@SuppressWarnings({
- "unchecked", "rawtypes"
-})
-//CHECKSTYLE:OFF
public class ParamJAXBElement extends JAXBElement<ParamType> {
- private static final long serialVersionUID = 4994571526736505284L;
protected static final QName NAME = new QName("http://jaxbelement/10", "param");
+ private static final long serialVersionUID = 4994571526736505284L;
public ParamJAXBElement(ParamType value) {
- super(NAME, ((Class) ParamType.class), null, value);
+ super(NAME, ParamType.class, null, value);
}
public ParamJAXBElement() {
- super(NAME, ((Class) ParamType.class), null, null);
+ super(NAME, ParamType.class, null, null);
}
}
-//CHECKSTYLE:ON
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
index 687a8b8..4051c25 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
@@ -39,7 +39,7 @@ public class DataSourceProviderTest extends Assert {
@Test
public void testReadDataHandler() throws Exception {
DataSourceProvider<DataHandler> p = new DataSourceProvider<DataHandler>();
- DataHandler ds = (DataHandler)p.readFrom(DataHandler.class, null, new Annotation[]{},
+ DataHandler ds = p.readFrom(DataHandler.class, null, new Annotation[]{},
MediaType.valueOf("image/png"), new MetadataMap<String, String>(),
new ByteArrayInputStream("image".getBytes()));
@@ -63,7 +63,7 @@ public class DataSourceProviderTest extends Assert {
@Test
public void testReadDataSource() throws Exception {
DataSourceProvider<DataSource> p = new DataSourceProvider<DataSource>();
- DataSource ds = (DataSource)p.readFrom(DataSource.class, null, new Annotation[]{},
+ DataSource ds = p.readFrom(DataSource.class, null, new Annotation[]{},
MediaType.valueOf("image/png"), new MetadataMap<String, String>(),
new ByteArrayInputStream("image".getBytes()));
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
index f0fc738..7fbdd25 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
@@ -50,8 +50,8 @@ public class FormEncodingProviderTest extends Assert {
InputStream is = getClass().getResourceAsStream("singleValPostBody.txt");
@SuppressWarnings("unchecked")
MultivaluedMap<String, String> mvMap =
- (MultivaluedMap<String, String>)ferp.readFrom(MultivaluedMap.class, null,
- new Annotation[]{}, MediaType.APPLICATION_FORM_URLENCODED_TYPE, null, is);
+ ferp.readFrom(MultivaluedMap.class, null,
+ new Annotation[]{}, MediaType.APPLICATION_FORM_URLENCODED_TYPE, null, is);
assertEquals("Wrong entry for foo", "bar", mvMap.getFirst("foo"));
assertEquals("Wrong entry for boo", "far", mvMap.getFirst("boo"));
@@ -77,11 +77,10 @@ public class FormEncodingProviderTest extends Assert {
@SuppressWarnings("rawtypes")
FormEncodingProvider<MultivaluedMap> ferp
= new FormEncodingProvider<MultivaluedMap>();
- @SuppressWarnings("rawtypes")
MultivaluedMap<String, String> mvMap =
- (MultivaluedMap<String, String>)ferp.readFrom((Class)MultivaluedMap.class, null,
- new Annotation[]{}, MediaType.APPLICATION_FORM_URLENCODED_TYPE, null,
- new ByteArrayInputStream(values.getBytes()));
+ ferp.readFrom(MultivaluedMap.class, null,
+ new Annotation[]{}, MediaType.APPLICATION_FORM_URLENCODED_TYPE, null,
+ new ByteArrayInputStream(values.getBytes()));
assertEquals("Wrong entry for foo", "1 2", mvMap.getFirst("foo"));
assertEquals("Wrong entry for boo", "1 3", mvMap.getFirst("bar"));
@@ -95,10 +94,10 @@ public class FormEncodingProviderTest extends Assert {
FormEncodingProvider<MultivaluedMap> ferp
= new FormEncodingProvider<MultivaluedMap>();
MultivaluedMap<String, String> mvMap =
- (MultivaluedMap<String, String>)ferp.readFrom(MultivaluedMap.class, null,
- new Annotation[]{CustomMap.class.getAnnotations()[0]},
- MediaType.APPLICATION_FORM_URLENCODED_TYPE, null,
- new ByteArrayInputStream(values.getBytes()));
+ ferp.readFrom(MultivaluedMap.class, null,
+ new Annotation[]{CustomMap.class.getAnnotations()[0]},
+ MediaType.APPLICATION_FORM_URLENCODED_TYPE, null,
+ new ByteArrayInputStream(values.getBytes()));
assertEquals("Wrong entry for foo", "1+2", mvMap.getFirst("foo"));
assertEquals("Wrong entry for boo", "1+3", mvMap.getFirst("bar"));
@@ -231,8 +230,8 @@ public class FormEncodingProviderTest extends Assert {
= new FormEncodingProvider<MultivaluedMap>();
MultivaluedMap<String, String> mvMap =
- (MultivaluedMap<String, String>)ferp.readFrom(MultivaluedMap.class, null,
- new Annotation[]{}, MediaType.APPLICATION_FORM_URLENCODED_TYPE, null, is);
+ ferp.readFrom(MultivaluedMap.class, null,
+ new Annotation[]{}, MediaType.APPLICATION_FORM_URLENCODED_TYPE, null, is);
List<String> vals = mvMap.get("foo");
@@ -258,10 +257,10 @@ public class FormEncodingProviderTest extends Assert {
= new FormEncodingProvider<MultivaluedMap>();
MultivaluedMap<String, String> mvMap =
- (MultivaluedMap<String, String>)ferp.readFrom(MultivaluedMap.class, null,
- new Annotation[]{},
- MediaType.valueOf(MediaType.APPLICATION_FORM_URLENCODED + ";charset=ISO-8859-1"), null,
- new ByteArrayInputStream(iso88591bytes));
+ ferp.readFrom(MultivaluedMap.class, null,
+ new Annotation[]{},
+ MediaType.valueOf(MediaType.APPLICATION_FORM_URLENCODED + ";charset=ISO-8859-1"), null,
+ new ByteArrayInputStream(iso88591bytes));
String value = mvMap.getFirst("name");
assertEquals(helloStringISO88591, "name=" + value);
}
@@ -277,10 +276,10 @@ public class FormEncodingProviderTest extends Assert {
= new FormEncodingProvider<MultivaluedMap>();
MultivaluedMap<String, String> mvMap =
- (MultivaluedMap<String, String>)ferp.readFrom(MultivaluedMap.class, null,
- new Annotation[]{},
- MediaType.valueOf(MediaType.APPLICATION_FORM_URLENCODED + ";charset=UTF-8"), null,
- new ByteArrayInputStream(s.getBytes(StandardCharsets.UTF_8)));
+ ferp.readFrom(MultivaluedMap.class, null,
+ new Annotation[]{},
+ MediaType.valueOf(MediaType.APPLICATION_FORM_URLENCODED + ";charset=UTF-8"), null,
+ new ByteArrayInputStream(s.getBytes(StandardCharsets.UTF_8)));
String value = mvMap.getFirst("name");
assertEquals(s, "name=" + value);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
index 7d3afdd..7e293c8 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
@@ -204,7 +204,7 @@ public class PrimitiveTextProviderTest extends Assert {
MessageBodyReader<String> p = new PrimitiveTextProvider<String>();
- String value = (String)p.readFrom(String.class, null,
+ String value = p.readFrom(String.class, null,
new Annotation[]{},
MediaType.valueOf(MediaType.APPLICATION_XML + ";charset=UTF-8"), null,
new ByteArrayInputStream(s.getBytes(StandardCharsets.UTF_8)));
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
index f44517b..c4a5d0a 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
@@ -539,7 +539,7 @@ public class ProviderFactoryTest extends Assert {
Message m = new MessageImpl();
Exchange ex = new ExchangeImpl();
m.setExchange(ex);
- m.put(ServerProviderFactory.IGNORE_TYPE_VARIABLES, true);
+ m.put(ProviderFactory.IGNORE_TYPE_VARIABLES, true);
MessageBodyReader<Book> reader =
pf.createMessageBodyReader(Book.class, Book.class, null, MediaType.APPLICATION_JSON_TYPE,
m);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java
index 34e0050..2d63d7b 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java
@@ -146,7 +146,7 @@ public class SourceProviderTest extends Assert {
private <T> T verifyRead(MessageBodyReader<T> p, Class<?> type) throws Exception {
@SuppressWarnings("unchecked")
Class<T> cls = (Class<T>)type;
- return (T)p.readFrom(cls,
+ return p.readFrom(cls,
null, null, null, null,
new ByteArrayInputStream("<test/>".getBytes()));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java
index f289681..c3eaec3 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java
@@ -63,7 +63,7 @@ public class XPathProviderTest extends Assert {
provider.setExpression("/Book");
provider.setClassName(Book.class.getName());
provider.setForceDOM(true);
- Book book = (Book)provider.readFrom(Book.class, null, null, null, null,
+ Book book = provider.readFrom(Book.class, null, null, null, null,
new ByteArrayInputStream(value.getBytes()));
assertNotNull(book);
assertEquals(2L, book.getId());
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointReferenceBuilder.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointReferenceBuilder.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointReferenceBuilder.java
index 2ac07fd..311974d 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointReferenceBuilder.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointReferenceBuilder.java
@@ -71,7 +71,7 @@ public class EndpointReferenceBuilder {
*/
addressElements.get(0).setTextContent(this.endpoint.getEndpointInfo().getAddress());
}
- return W3CEndpointReference.readFrom(new DOMSource(eprEle));
+ return EndpointReference.readFrom(new DOMSource(eprEle));
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/EndpointDefinitionParser.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/EndpointDefinitionParser.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/EndpointDefinitionParser.java
index 5281b7e..3564647 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/EndpointDefinitionParser.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/EndpointDefinitionParser.java
@@ -33,6 +33,8 @@ import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.configuration.blueprint.AbstractBPBeanDefinitionParser;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.jaxws.EndpointImpl;
+import org.osgi.service.blueprint.reflect.BeanMetadata;
+import org.osgi.service.blueprint.reflect.ComponentMetadata;
import org.osgi.service.blueprint.reflect.Metadata;
class EndpointDefinitionParser extends AbstractBPBeanDefinitionParser {
@@ -76,7 +78,7 @@ class EndpointDefinitionParser extends AbstractBPBeanDefinitionParser {
String pre = node.getPrefix();
String name = node.getLocalName();
if ("createdFromAPI".equals(name) || "abstract".equals(name)) {
- cxfBean.setScope(MutableBeanMetadata.SCOPE_PROTOTYPE);
+ cxfBean.setScope(BeanMetadata.SCOPE_PROTOTYPE);
isAbstract = true;
} else if ("publish".equals(name)) {
publish = Boolean.parseBoolean(val);
@@ -136,7 +138,7 @@ class EndpointDefinitionParser extends AbstractBPBeanDefinitionParser {
cxfBean.setDestroyMethod("stop");
}
// We don't want to delay the registration of our Server
- cxfBean.setActivation(MutableBeanMetadata.ACTIVATION_EAGER);
+ cxfBean.setActivation(ComponentMetadata.ACTIVATION_EAGER);
return cxfBean;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/endpoint/dynamic/JaxWsDynamicClientFactory.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/endpoint/dynamic/JaxWsDynamicClientFactory.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/endpoint/dynamic/JaxWsDynamicClientFactory.java
index 1e37908..a75abdc 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/endpoint/dynamic/JaxWsDynamicClientFactory.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/endpoint/dynamic/JaxWsDynamicClientFactory.java
@@ -20,6 +20,7 @@
package org.apache.cxf.jaxws.endpoint.dynamic;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.CXFBusFactory;
import org.apache.cxf.endpoint.EndpointImplFactory;
import org.apache.cxf.endpoint.dynamic.DynamicClientFactory;
@@ -68,7 +69,7 @@ public class JaxWsDynamicClientFactory extends DynamicClientFactory {
* @see CXFBusFactory#getDefaultBus()
*/
public static JaxWsDynamicClientFactory newInstance() {
- Bus bus = CXFBusFactory.getThreadDefaultBus();
+ Bus bus = BusFactory.getThreadDefaultBus();
return new JaxWsDynamicClientFactory(bus);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java
index 82ff043..1331ef2 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java
@@ -35,12 +35,12 @@ import org.w3c.dom.Node;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.interceptor.InterceptorChain;
import org.apache.cxf.jaxws.handler.AbstractJAXWSHandlerInterceptor;
import org.apache.cxf.jaxws.handler.HandlerChainInvoker;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.phase.Phase;
-import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.staxutils.W3CDOMStreamReader;
import org.apache.cxf.staxutils.W3CDOMStreamWriter;
@@ -160,7 +160,7 @@ public class LogicalHandlerOutInterceptor
.getContent(XMLStreamReader.class));
message.getExchange().setInMessage(responseMsg);
- responseMsg.put(PhaseInterceptorChain.STARTING_AT_INTERCEPTOR_ID,
+ responseMsg.put(InterceptorChain.STARTING_AT_INTERCEPTOR_ID,
LogicalHandlerInInterceptor.class.getName());
observer.onMessage(responseMsg);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
index 340c966..4fd4018 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
@@ -63,7 +63,6 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.phase.Phase;
-import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.ws.addressing.Names;
@@ -202,7 +201,7 @@ public class SOAPHandlerInterceptor extends
XMLStreamReader xmlReader = createXMLStreamReaderFromSOAPMessage(soapMessage);
responseMsg.setContent(XMLStreamReader.class, xmlReader);
}
- responseMsg.put(PhaseInterceptorChain.STARTING_AT_INTERCEPTOR_ID,
+ responseMsg.put(InterceptorChain.STARTING_AT_INTERCEPTOR_ID,
SOAPHandlerInterceptor.class.getName());
observer.onMessage(responseMsg);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java
index 3220777..fe6f500 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java
@@ -25,7 +25,7 @@ import java.util.List;
import javax.xml.ws.Endpoint;
-import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.ext.logging.LoggingOutInterceptor;
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.jaxws.service.AddNumbers;
@@ -44,7 +44,7 @@ public class SEIWithJAXBAnnoTest extends AbstractJaxWsTest {
Endpoint.publish("local://localhost:9000/Hello", serviceImpl);
JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
- factory.setBus(SpringBusFactory.getDefaultBus());
+ factory.setBus(BusFactory.getDefaultBus());
factory.setServiceClass(AddNumbers.class);
factory.setAddress(address);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchOpTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchOpTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchOpTest.java
index b9d5695..b789217 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchOpTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchOpTest.java
@@ -21,6 +21,7 @@ package org.apache.cxf.jaxws.dispatch;
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
+import javax.xml.ws.BindingProvider;
import javax.xml.ws.Dispatch;
import javax.xml.ws.Service;
import javax.xml.ws.handler.MessageContext;
@@ -75,7 +76,7 @@ public class DispatchOpTest extends AbstractJaxWsTest {
Dispatch<Source> disp = service.createDispatch(
portName, Source.class, Service.Mode.PAYLOAD);
disp.getRequestContext().put(MessageContext.WSDL_OPERATION, operationName);
- disp.getRequestContext().put(Dispatch.ENDPOINT_ADDRESS_PROPERTY, address);
+ disp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, address);
d.setMessageObserver(new MessageReplayObserver(responseResource));
@@ -102,7 +103,7 @@ public class DispatchOpTest extends AbstractJaxWsTest {
Dispatch<Source> disp = service.createDispatch(
portName, Source.class, Service.Mode.PAYLOAD);
disp.getRequestContext().put(MessageContext.WSDL_OPERATION, operationName);
- disp.getRequestContext().put(Dispatch.ENDPOINT_ADDRESS_PROPERTY, address);
+ disp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, address);
d.setMessageObserver(new MessageReplayObserver(responseResource));
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchTest.java
index a50431e..73606d9 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchTest.java
@@ -25,6 +25,7 @@ import javax.xml.bind.JAXBContext;
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
+import javax.xml.ws.BindingProvider;
import javax.xml.ws.Dispatch;
import javax.xml.ws.Service;
import javax.xml.ws.http.HTTPBinding;
@@ -100,7 +101,7 @@ public class DispatchTest extends AbstractJaxWsTest {
new ServiceImpl(getBus(), getClass().getResource("/wsdl/hello_world.wsdl"), serviceName, null);
Dispatch<Source> disp = service.createDispatch(portName, Source.class, Service.Mode.MESSAGE);
- disp.getRequestContext().put(Dispatch.ENDPOINT_ADDRESS_PROPERTY, address);
+ disp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, address);
d.setMessageObserver(new MessageReplayObserver("/org/apache/cxf/jaxws/sayHiResponse.xml"));
@@ -176,7 +177,7 @@ public class DispatchTest extends AbstractJaxWsTest {
new ServiceImpl(getBus(), getClass().getResource("/wsdl/hello_world.wsdl"), serviceName, null);
Dispatch<Source> disp = service.createDispatch(portName, Source.class, Service.Mode.MESSAGE);
- disp.getRequestContext().put(Dispatch.ENDPOINT_ADDRESS_PROPERTY, address);
+ disp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, address);
disp.getRequestContext().put("find.dispatch.operation", Boolean.TRUE);
d.setMessageObserver(new MessageReplayObserver("/org/apache/cxf/jaxws/sayHiResponse.xml"));
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
index a06bf02..c14b4d9 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
@@ -205,8 +205,8 @@ public class HandlerChainInvokerTest extends Assert {
invoker.setProtocolMessageContext(pmc);
continueProcessing = invoker.invokeProtocolHandlers(false, pmc);
- assertFalse((Boolean)pmc.get(SOAPMessageContext.MESSAGE_OUTBOUND_PROPERTY));
- assertFalse((Boolean)lmc.get(LogicalMessageContext.MESSAGE_OUTBOUND_PROPERTY));
+ assertFalse((Boolean)pmc.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY));
+ assertFalse((Boolean)lmc.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY));
assertTrue(invoker.isInbound());
assertFalse(continueProcessing);
@@ -286,8 +286,8 @@ public class HandlerChainInvokerTest extends Assert {
assertEquals("banzai", e.getMessage());
}
- assertFalse((Boolean)pmc.get(SOAPMessageContext.MESSAGE_OUTBOUND_PROPERTY));
- assertFalse((Boolean)lmc.get(LogicalMessageContext.MESSAGE_OUTBOUND_PROPERTY));
+ assertFalse((Boolean)pmc.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY));
+ assertFalse((Boolean)lmc.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY));
assertTrue(invoker.isInbound());
//the message is replaced by fault message
@@ -363,8 +363,8 @@ public class HandlerChainInvokerTest extends Assert {
assertEquals("banzai", e.getMessage());
}
- assertFalse((Boolean)pmc.get(SOAPMessageContext.MESSAGE_OUTBOUND_PROPERTY));
- assertFalse((Boolean)lmc.get(LogicalMessageContext.MESSAGE_OUTBOUND_PROPERTY));
+ assertFalse((Boolean)pmc.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY));
+ assertFalse((Boolean)lmc.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY));
assertTrue(invoker.isInbound());
//assertFalse(continueProcessing);
@@ -466,7 +466,7 @@ public class HandlerChainInvokerTest extends Assert {
assertFalse(continueProcessing);
- assertFalse((Boolean)lmc.get(LogicalMessageContext.MESSAGE_OUTBOUND_PROPERTY));
+ assertFalse((Boolean)lmc.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY));
assertEquals(1, logicalHandlers[0].getHandleMessageCount());
assertEquals(1, logicalHandlers[1].getHandleMessageCount());
@@ -567,7 +567,7 @@ public class HandlerChainInvokerTest extends Assert {
//assertTrue(invoker.isClosed());
assertSame(pe, invoker.getFault());
- assertFalse((Boolean)lmc.get(LogicalMessageContext.MESSAGE_OUTBOUND_PROPERTY));
+ assertFalse((Boolean)lmc.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY));
assertEquals(1, logicalHandlers[0].getHandleMessageCount());
assertEquals(1, logicalHandlers[1].getHandleMessageCount());
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
----------------------------------------------------------------------
diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java b/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
index 277cd13..448e0b8 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
@@ -48,6 +48,7 @@ import javax.xml.XMLConstants;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.util.StreamReaderDelegate;
@@ -73,6 +74,7 @@ import com.sun.tools.xjc.reader.internalizer.InternalizationLogic;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.CXFBusFactory;
import org.apache.cxf.catalog.OASISCatalogManager;
import org.apache.cxf.catalog.OASISCatalogManagerHelper;
@@ -174,7 +176,7 @@ public class DynamicClientFactory {
* @see CXFBusFactory#getDefaultBus()
*/
public static DynamicClientFactory newInstance() {
- Bus bus = CXFBusFactory.getThreadDefaultBus();
+ Bus bus = BusFactory.getThreadDefaultBus();
return new DynamicClientFactory(bus);
}
@@ -1033,7 +1035,7 @@ public class DynamicClientFactory {
public int next() throws XMLStreamException {
int i = super.next();
- if (i == XMLStreamReader.START_ELEMENT) {
+ if (i == XMLStreamConstants.START_ELEMENT) {
QName qn = super.getName();
isInclude = qn.equals(WSDLConstants.QNAME_SCHEMA_INCLUDE);
isImport = qn.equals(WSDLConstants.QNAME_SCHEMA_IMPORT);
@@ -1051,7 +1053,7 @@ public class DynamicClientFactory {
public int nextTag() throws XMLStreamException {
int i = super.nextTag();
- if (i == XMLStreamReader.START_ELEMENT) {
+ if (i == XMLStreamConstants.START_ELEMENT) {
QName qn = super.getName();
isInclude = qn.equals(WSDLConstants.QNAME_SCHEMA_INCLUDE);
isImport = qn.equals(WSDLConstants.QNAME_SCHEMA_IMPORT);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/ServerFactoryBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/ServerFactoryBeanDefinitionParser.java b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/ServerFactoryBeanDefinitionParser.java
index a9bb508..ed3714d 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/ServerFactoryBeanDefinitionParser.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/ServerFactoryBeanDefinitionParser.java
@@ -30,6 +30,7 @@ import org.apache.cxf.configuration.blueprint.SimpleBPBeanDefinitionParser;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.frontend.ServerFactoryBean;
import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
+import org.osgi.service.blueprint.reflect.ComponentMetadata;
import org.osgi.service.blueprint.reflect.Metadata;
@@ -83,7 +84,7 @@ public class ServerFactoryBeanDefinitionParser extends SimpleBPBeanDefinitionPar
bean.setDestroyMethod("destroy");
// We don't really want to delay the registration of our Server
- bean.setActivation(MutableBeanMetadata.ACTIVATION_EAGER);
+ bean.setActivation(ComponentMetadata.ACTIVATION_EAGER);
return bean;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptor.java b/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptor.java
index ce6a986..3bda49f 100644
--- a/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptor.java
+++ b/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptor.java
@@ -36,7 +36,7 @@ public class ResponseTimeMessageInInterceptor extends AbstractMessageResponseTim
public void handleMessage(Message message) throws Fault {
Exchange ex = message.getExchange();
//if serviceCounter is disabled , all responseTimeInterceptors will be skipped
- Boolean forceDisabled = Boolean.FALSE.equals((Boolean)ex.get("org.apache.cxf.management.counter.enabled"));
+ Boolean forceDisabled = Boolean.FALSE.equals(ex.get("org.apache.cxf.management.counter.enabled"));
if (!forceDisabled && isServiceCounterEnabled(ex)) {
if (isClient(message)) {
if (!ex.isOneWay()) {
@@ -51,7 +51,7 @@ public class ResponseTimeMessageInInterceptor extends AbstractMessageResponseTim
@Override
public void handleFault(Message message) {
Exchange ex = message.getExchange();
- if (Boolean.TRUE.equals((Boolean)ex.get("org.apache.cxf.management.counter.enabled"))) {
+ if (Boolean.TRUE.equals(ex.get("org.apache.cxf.management.counter.enabled"))) {
FaultMode mode = message.get(FaultMode.class);
if (mode == null) {
mode = FaultMode.UNCHECKED_APPLICATION_FAULT;