This is an automated email from the ASF dual-hosted git repository.
buhhunyx 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 aec252e cxf-rt-frontend-jaxws: fix PMD rule: UnusedAssignment
aec252e is described below
commit aec252eda5197098f9306e62edbf6a46e35cd054
Author: Alexey Markevich <[email protected]>
AuthorDate: Fri Mar 12 23:36:55 2021 +0300
cxf-rt-frontend-jaxws: fix PMD rule: UnusedAssignment
---
.../java/org/apache/cxf/jaxws/EndpointImpl.java | 4 +--
.../java/org/apache/cxf/jaxws/ServiceImpl.java | 11 +++----
.../cxf/jaxws/context/WrappedMessageContext.java | 4 +--
.../handler/AnnotationHandlerChainBuilder.java | 4 +--
.../cxf/jaxws/handler/HandlerChainInvoker.java | 12 ++-----
.../logical/LogicalHandlerOutInterceptor.java | 2 +-
.../jaxws/handler/logical/LogicalMessageImpl.java | 4 +--
.../jaxws/handler/soap/SOAPMessageContextImpl.java | 2 +-
.../interceptors/MessageModeOutInterceptor.java | 2 +-
.../cxf/jaxws/interceptors/SwAInInterceptor.java | 2 +-
.../cxf/jaxws/interceptors/SwAOutInterceptor.java | 2 +-
.../jaxws/interceptors/WebFaultOutInterceptor.java | 4 +--
.../interceptors/WrapperClassInInterceptor.java | 2 +-
.../interceptors/WrapperClassOutInterceptor.java | 2 +-
.../org/apache/cxf/jaxws/spi/ProviderImpl.java | 13 ++------
.../JaxWsWebServicePublisherBeanPostProcessor.java | 4 +--
.../jaxws/support/JaxWsServiceConfiguration.java | 12 +++----
.../cxf/jaxws/support/ServiceDelegateAccessor.java | 2 +-
.../java/org/apache/cxf/jaxws/CodeFirstTest.java | 3 +-
.../java/org/apache/cxf/jaxws/JaxWsClientTest.java | 5 ++-
.../jaxws/WrapperNamespaceClassGeneratorTest.java | 10 ++----
.../cxf/jaxws/handler/HandlerChainInvokerTest.java | 25 +++++++--------
.../handler/soap/SOAPHandlerInterceptorTest.java | 4 +--
.../apache/cxf/jaxws/spring/SpringBeansTest.java | 2 ++
.../ExtSoapHeaderClientServerTest.java | 37 ++++++----------------
25 files changed, 65 insertions(+), 109 deletions(-)
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
index 307fb53..6ee698c 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
@@ -325,8 +325,6 @@ public class EndpointImpl extends javax.xml.ws.Endpoint
checkPublishPermission();
checkPublishable();
- ServerImpl serv = null;
-
ClassLoaderHolder loader = null;
try {
if (bus != null) {
@@ -335,7 +333,7 @@ public class EndpointImpl extends javax.xml.ws.Endpoint
loader =
ClassLoaderUtils.setThreadContextClassloader(newLoader);
}
}
- serv = getServer(addr);
+ ServerImpl serv = getServer(addr);
if (addr != null) {
EndpointInfo endpointInfo =
serv.getEndpoint().getEndpointInfo();
if (endpointInfo.getAddress() == null ||
!endpointInfo.getAddress().contains(addr)) {
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
index 85a0e77..186236a 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
@@ -245,7 +245,7 @@ public class ServiceImpl extends ServiceDelegate {
private JaxWsClientEndpointImpl getJaxwsEndpoint(QName portName,
AbstractServiceFactoryBean sf,
WebServiceFeature...features) {
Service service = sf.getService();
- EndpointInfo ei = null;
+ EndpointInfo ei;
if (portName == null) {
ei =
service.getServiceInfos().get(0).getEndpoints().iterator().next();
} else {
@@ -286,7 +286,7 @@ public class ServiceImpl extends ServiceDelegate {
private AbstractServiceFactoryBean createDispatchService(DataBinding db) {
AbstractServiceFactoryBean serviceFactory;
- Service dispatchService = null;
+ final Service dispatchService;
if (null != wsdlURL) {
WSDLServiceFactory sf = new WSDLServiceFactory(bus, wsdlURL,
serviceName);
@@ -516,7 +516,6 @@ public class ServiceImpl extends ServiceDelegate {
private EndpointInfo createEndpointInfo(AbstractServiceFactoryBean
serviceFactory,
QName portName,
PortInfoImpl portInfo) throws
BusException {
- EndpointInfo ei = null;
String address = portInfo.getAddress();
String bindingID = BindingID.getBindingID(portInfo.getBindingID());
@@ -530,7 +529,7 @@ public class ServiceImpl extends ServiceDelegate {
}
DestinationFactory df = dfm.getDestinationFactoryForUri(address);
- String transportId = null;
+ final String transportId;
if (df != null && df.getTransportIds() != null &&
!df.getTransportIds().isEmpty()) {
transportId = df.getTransportIds().get(0);
} else {
@@ -548,7 +547,7 @@ public class ServiceImpl extends ServiceDelegate {
Service service = serviceFactory.getService();
service.getServiceInfos().get(0).addBinding(bindingInfo);
- ei = new EndpointInfo(service.getServiceInfos().get(0), transportId);
+ EndpointInfo ei = new EndpointInfo(service.getServiceInfos().get(0),
transportId);
ei.setName(portName);
ei.setAddress(address);
ei.setBinding(bindingInfo);
@@ -638,7 +637,7 @@ public class ServiceImpl extends ServiceDelegate {
//Initialize Features.
configureObject(portName.toString() + ".jaxws-client.proxyFactory",
clientFac);
- AbstractServiceFactoryBean sf = null;
+ final AbstractServiceFactoryBean sf;
try {
DataBinding db;
if (context != null) {
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
index 46c8698..5a711d6 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
@@ -250,7 +250,7 @@ public class WrappedMessageContext implements
MessageContext {
//may have to create the out message and add the headers
Message tmp = createResponseMessage();
if (tmp != null) {
- ret = tmp.get(Message.PROTOCOL_HEADERS);
+ mp = (Map<?, ?>)tmp.get(Message.PROTOCOL_HEADERS);
}
}
ret = mp;
@@ -335,7 +335,7 @@ public class WrappedMessageContext implements
MessageContext {
if (isResponse()) {
return getWrappedMessage();
}
- Message m = null;
+ Message m;
if (isRequestor()) {
m = exchange.getInFaultMessage();
if (m == null) {
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java
index 97e7110..3682c22 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java
@@ -67,7 +67,7 @@ public class AnnotationHandlerChainBuilder extends
HandlerChainBuilder {
LOG.fine("building handler chain");
HandlerChainAnnotation hcAnn = findHandlerChainAnnotation(clz, true);
- List<Handler> chain = null;
+ final List<Handler> chain;
if (hcAnn == null) {
if (LOG.isLoggable(Level.FINE)) {
LOG.fine("no HandlerChain annotation on " + clz);
@@ -155,7 +155,7 @@ public class AnnotationHandlerChainBuilder extends
HandlerChainBuilder {
WebService ws = clz.getAnnotation(WebService.class);
if (ws != null &&
!StringUtils.isEmpty(ws.endpointInterface())) {
String seiClassName = ws.endpointInterface().trim();
- Class<?> seiClass = null;
+ final Class<?> seiClass;
try {
seiClass = ClassLoaderUtils.loadClass(seiClassName,
clz);
} catch (ClassNotFoundException e) {
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainInvoker.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainInvoker.java
index 12cfa76..fcc1092 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainInvoker.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainInvoker.java
@@ -247,7 +247,7 @@ public class HandlerChainInvoker {
handlerChain = reverseHandlerChain(handlerChain);
}
- boolean continueProcessing = true;
+ boolean continueProcessing;
MessageContext oldCtx = null;
try {
oldCtx = WebServiceContextImpl.setMessageContext(ctx);
@@ -304,7 +304,7 @@ public class HandlerChainInvoker {
handlerChain = reverseHandlerChain(handlerChain);
}
- boolean continueProcessing = true;
+ boolean continueProcessing;
MessageContext oldCtx = null;
try {
oldCtx = WebServiceContextImpl.setMessageContext(ctx);
@@ -339,7 +339,6 @@ public class HandlerChainInvoker {
}
} catch (RuntimeException e) {
LOG.log(Level.WARNING, "HANDLER_RAISED_RUNTIME_EXCEPTION", e);
- continueProcessing = false;
throw e;
}
return continueProcessing;
@@ -415,14 +414,12 @@ public class HandlerChainInvoker {
//observer, we have to call close here.
if (isRequestor()) {
invokeReversedClose();
- continueProcessing = false;
setFault(e);
throw e;
} else if (!responseExpected && !outbound) {
invokeReversedClose();
continueProcessing = false;
} else {
- continueProcessing = false;
setFault(e);
throw e;
}
@@ -453,13 +450,11 @@ public class HandlerChainInvoker {
msg.removeContent(Source.class);
try {
- SOAPMessage soapMessage = null;
-
SoapVersion version = null;
if (msg instanceof SoapMessage) {
version = ((SoapMessage)msg).getVersion();
}
- soapMessage =
SAAJFactoryResolver.createMessageFactory(version).createMessage();
+ SOAPMessage soapMessage =
SAAJFactoryResolver.createMessageFactory(version).createMessage();
msg.setContent(SOAPMessage.class, soapMessage);
SOAPBody body = SAAJUtils.getBody(soapMessage);
@@ -529,7 +524,6 @@ public class HandlerChainInvoker {
} catch (RuntimeException e) {
LOG.log(Level.WARNING, "HANDLER_RAISED_RUNTIME_EXCEPTION", e);
invokeReversedClose();
- continueProcessing = false;
closed = true;
throw e;
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 1331ef2..09f1730 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
@@ -72,7 +72,7 @@ public class LogicalHandlerOutInterceptor
Node nd = message.getContent(Node.class);
SOAPMessage m = message.getContent(SOAPMessage.class);
- Document document = null;
+ final Document document;
if (m != null) {
document = m.getSOAPPart();
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java
index 2c0e405..aee9288 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java
@@ -69,7 +69,7 @@ public class LogicalMessageImpl implements LogicalMessage {
}
public Source getPayload() {
- Source source = null;
+ Source source;
Service.Mode mode =
msgContext.getWrappedMessage().getExchange().get(Service.Mode.class);
@@ -277,7 +277,7 @@ public class LogicalMessageImpl implements LogicalMessage {
}
private SOAPMessage initSOAPMessage(InputStream is) throws SOAPException,
IOException {
- SOAPMessage msg = null;
+ final SOAPMessage msg;
if (is != null) {
msg =
SAAJFactoryResolver.createMessageFactory(null).createMessage(null, is);
} else {
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPMessageContextImpl.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPMessageContextImpl.java
index b7a9d43..b3b648d 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPMessageContextImpl.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPMessageContextImpl.java
@@ -64,7 +64,7 @@ public class SOAPMessageContextImpl extends
WrappedMessageContext implements SOA
}
public SOAPMessage getMessage() {
- SOAPMessage message = null;
+ SOAPMessage message;
if (getWrappedMessage().getContent(Object.class) instanceof
SOAPMessage) {
message =
(SOAPMessage)getWrappedMessage().getContent(Object.class);
} else {
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java
index b31a871..1d82b9d 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java
@@ -290,7 +290,7 @@ public class MessageModeOutInterceptor extends
AbstractPhaseInterceptor<Message>
public void handleMessage(SoapMessage message) throws Fault {
MessageContentsList list =
(MessageContentsList)message.getContent(List.class);
Object o = list.remove(0);
- SOAPMessage soapMessage = null;
+ final SOAPMessage soapMessage;
if (o instanceof SOAPMessage) {
soapMessage = (SOAPMessage)o;
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAInInterceptor.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAInInterceptor.java
index 6c26805..4b49eb3 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAInInterceptor.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAInInterceptor.java
@@ -88,7 +88,7 @@ public class SwAInInterceptor extends AbstractSoapInterceptor
{
if (a.getId().startsWith(start)) {
DataHandler dh = a.getDataHandler();
String ct = dh.getContentType();
- Object o = null;
+ final Object o;
Class<?> typeClass = mpi.getTypeClass();
if (DataHandler.class.isAssignableFrom(typeClass)) {
o = dh;
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java
index 6b70a47..4c817cf 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java
@@ -177,7 +177,7 @@ public class SwAOutInterceptor extends
AbstractSoapInterceptor {
continue;
}
outObjects.set(idx, null);
- DataHandler dh = null;
+ DataHandler dh;
// This code could probably be refactored out somewhere...
if (o instanceof Source) {
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java
index 73c2043..3ccb336 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java
@@ -136,7 +136,7 @@ public class WebFaultOutInterceptor extends
FaultOutInterceptor {
}
if (cause instanceof Exception && fault != null) {
Exception ex = (Exception)cause;
- Object faultInfo = null;
+ Object faultInfo;
try {
Method method = cause.getClass().getMethod("getFaultInfo", new
Class[0]);
faultInfo = method.invoke(cause, new Object[0]);
@@ -241,7 +241,7 @@ public class WebFaultOutInterceptor extends
FaultOutInterceptor {
private MessagePartInfo getFaultMessagePart(QName qname, OperationInfo op)
{
for (FaultInfo faultInfo : op.getFaults()) {
for (MessagePartInfo mpi : faultInfo.getMessageParts()) {
- String ns = null;
+ final String ns;
if (mpi.isElement()) {
ns = mpi.getElementQName().getNamespaceURI();
} else {
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
index 6259c9d..5cfbaab 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
@@ -197,7 +197,7 @@ public class WrapperClassInInterceptor extends
AbstractPhaseInterceptor<Message>
partNames.set(idx, null);
}
} else {
- String elementType = null;
+ final String elementType;
if (p.getTypeQName() == null) {
// handling anonymous complex type
elementType = null;
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
index bd5e182..6cec899 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
@@ -170,7 +170,7 @@ public class WrapperClassOutInterceptor extends
AbstractPhaseInterceptor<Message
partNames.set(p.getIndex(), p.getName().getLocalPart());
- String elementType = null;
+ final String elementType;
if (p.getTypeQName() == null) {
// handling anonymous complex type
elementType = null;
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
index 16992d6..553e934 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
@@ -107,11 +107,9 @@ public class ProviderImpl extends
javax.xml.ws.spi.Provider {
@Override
public Endpoint createEndpoint(String bindingId, Object implementor) {
- Endpoint ep = null;
if (EndpointUtils.isValidImplementor(implementor)) {
Bus bus = BusFactory.getThreadDefaultBus();
- ep = createEndpointImpl(bus, bindingId, implementor);
- return ep;
+ return createEndpointImpl(bus, bindingId, implementor);
}
throw new WebServiceException(new Message("INVALID_IMPLEMENTOR_EXC",
LOG).toString());
}
@@ -119,11 +117,9 @@ public class ProviderImpl extends
javax.xml.ws.spi.Provider {
public Endpoint createEndpoint(String bindingId,
Object implementor,
WebServiceFeature ... features) {
- EndpointImpl ep = null;
if (EndpointUtils.isValidImplementor(implementor)) {
Bus bus = BusFactory.getThreadDefaultBus();
- ep = createEndpointImpl(bus, bindingId, implementor, features);
- return ep;
+ return createEndpointImpl(bus, bindingId, implementor, features);
}
throw new WebServiceException(new Message("INVALID_IMPLEMENTOR_EXC",
LOG).toString());
}
@@ -306,11 +302,8 @@ public class ProviderImpl extends
javax.xml.ws.spi.Provider {
writer.writeEndElement();
}
-
- String serviceNamePrefix = null;
-
if (serviceName != null) {
- serviceNamePrefix =
+ String serviceNamePrefix =
(serviceName.getPrefix() == null ||
serviceName.getPrefix().length() == 0)
? "ns2" : serviceName.getPrefix();
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsWebServicePublisherBeanPostProcessor.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsWebServicePublisherBeanPostProcessor.java
index e56b6ce..023f489 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsWebServicePublisherBeanPostProcessor.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsWebServicePublisherBeanPostProcessor.java
@@ -153,7 +153,7 @@ public class JaxWsWebServicePublisherBeanPostProcessor
}
private void createAndPublishEndpoint(String url, Object implementor) {
- ServerFactoryBean serverFactory = null;
+ final ServerFactoryBean serverFactory;
if (prototypeServerFactoryBeanName != null) {
if (!beanFactory.isPrototype(prototypeServerFactoryBeanName)) {
throw
@@ -171,7 +171,7 @@ public class JaxWsWebServicePublisherBeanPostProcessor
serverFactory.setServiceClass(ClassHelper.getRealClass(implementor));
serverFactory.setAddress(url);
- DataBinding dataBinding = null;
+ final DataBinding dataBinding;
if (prototypeDataBindingBeanName != null) {
if (!beanFactory.isPrototype(prototypeDataBindingBeanName)) {
throw
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
index 90cb931..00b35f5 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
@@ -312,7 +312,7 @@ public class JaxWsServiceConfiguration extends
AbstractServiceConfiguration {
}
if (tns == null || tns.length() == 0) {
- QName wrappername = null;
+ final QName wrappername;
if (input) {
wrappername = getRequestWrapperName(op, method);
} else {
@@ -342,7 +342,7 @@ public class JaxWsServiceConfiguration extends
AbstractServiceConfiguration {
private String getDefaultLocalName(OperationInfo op, Method method, int
paramNumber,
int partIndex, String prefix) {
- String paramName = null;
+ final String paramName;
if (paramNumber != -1) {
paramName = prefix + partIndex;
} else {
@@ -622,7 +622,7 @@ public class JaxWsServiceConfiguration extends
AbstractServiceConfiguration {
Method m = getDeclaredMethod(selected);
ResponseWrapper rw = m.getAnnotation(ResponseWrapper.class);
- String clsName = "";
+ final String clsName;
if (rw == null) {
clsName = getPackageName(selected) + ".jaxws." +
StringUtils.capitalize(selected.getName())
+ "Response";
@@ -630,7 +630,7 @@ public class JaxWsServiceConfiguration extends
AbstractServiceConfiguration {
clsName = rw.className();
}
- if (clsName.length() > 0) {
+ if (!clsName.isEmpty()) {
cachedClass = responseMethodClassCache.get(clsName);
if (cachedClass != null) {
responseMethodClassCache.put(selected, cachedClass);
@@ -696,14 +696,14 @@ public class JaxWsServiceConfiguration extends
AbstractServiceConfiguration {
Method m = getDeclaredMethod(selected);
RequestWrapper rw = m.getAnnotation(RequestWrapper.class);
- String clsName = "";
+ final String clsName;
if (rw == null) {
clsName = getPackageName(selected) + ".jaxws." +
StringUtils.capitalize(selected.getName());
} else {
clsName = rw.className();
}
- if (clsName.length() > 0) {
+ if (!clsName.isEmpty()) {
cachedClass = requestMethodClassCache.get(clsName);
if (cachedClass != null) {
requestMethodClassCache.put(selected, cachedClass);
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ServiceDelegateAccessor.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ServiceDelegateAccessor.java
index cb0ec8e..383e31a 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ServiceDelegateAccessor.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ServiceDelegateAccessor.java
@@ -55,7 +55,7 @@ public final class ServiceDelegateAccessor {
* @throws WebServiceException if access to the field fails for any reason
*/
public static ServiceImpl get(Service service) {
- ServiceImpl delegate = null;
+ ServiceImpl delegate;
try {
Field delegateField =
Service.class.getDeclaredField(DELEGATE_FIELD_NAME);
ReflectionUtil.setAccessible(delegateField);
diff --git
a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
index 5697936..5599e61 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
@@ -414,8 +414,7 @@ public class CodeFirstTest extends AbstractJaxWsTest {
JaxWsServerFactoryBean factory = new JaxWsServerFactoryBean();
factory.setServiceBean(new GenericsService2Impl());
factory.setAddress("local://localhost/test");
- Server server = null;
- server = factory.create();
+ Server server = factory.create();
Document doc = getWSDLDocument(server);
assertXPathEquals("//xsd:schema/xsd:complexType[@name='convert']/xsd:sequence/xsd:element/@type",
diff --git
a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java
b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java
index 1f83e11..809e9fd 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java
@@ -102,7 +102,7 @@ public class JaxWsClientTest extends AbstractJaxWsTest {
assertNotNull(s);
try {
- s = javax.xml.ws.Service.create(new
URL("file:/does/not/exist.wsdl"),
+ javax.xml.ws.Service.create(new URL("file:/does/not/exist.wsdl"),
new
QName("http://apache.org/hello_world_soap_http";, "SoapPort"));
fail("did not throw exception");
} catch (WebServiceException sce) {
@@ -117,10 +117,9 @@ public class JaxWsClientTest extends AbstractJaxWsTest {
.create(url, SERVICE_NAME);
Greeter greeter = s.getPort(PORT_NAME, Greeter.class);
InvocationHandler handler = Proxy.getInvocationHandler(greeter);
- BindingProvider bp = null;
if (handler instanceof BindingProvider) {
- bp = (BindingProvider)handler;
+ BindingProvider bp = (BindingProvider)handler;
//System.out.println(bp.toString());
Map<String, Object> requestContext = bp.getRequestContext();
String reqAddr =
diff --git
a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperNamespaceClassGeneratorTest.java
b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperNamespaceClassGeneratorTest.java
index 1d98893..90acc73 100644
---
a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperNamespaceClassGeneratorTest.java
+++
b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperNamespaceClassGeneratorTest.java
@@ -79,9 +79,6 @@ public class WrapperNamespaceClassGeneratorTest {
List<String> elTypeNames = Arrays.asList(new String[] {"list"});
List<Class<?>> partClasses = Arrays.asList(new Class<?>[]
{List.class});
- String className = requestClass.getName();
- className = className.substring(0, className.lastIndexOf('.') + 1);
-
WrapperHelper wh = new
JAXBDataBinding().createWrapperHelper(requestClass, null,
partNames,
elTypeNames, partClasses);
@@ -98,9 +95,6 @@ public class WrapperNamespaceClassGeneratorTest {
elTypeNames = Arrays.asList(new String[] {"list"});
partClasses = Arrays.asList(new Class<?>[] {List.class});
- className = responseClass.getName();
- className = className.substring(0, className.lastIndexOf('.') + 1);
-
wh = new JAXBDataBinding().createWrapperHelper(responseClass, null,
partNames,
elTypeNames, partClasses);
List<Object> resPara = new ArrayList<>();
@@ -169,7 +163,7 @@ public class WrapperNamespaceClassGeneratorTest {
List<Class<?>> partClasses = Arrays.asList(new Class<?>[]
{List.class});
// generate class and store it to class loader
- WrapperHelper wh = new
JAXBDataBinding().createWrapperHelper(requestClass, null,
+ new JAXBDataBinding().createWrapperHelper(requestClass, null,
partNames, elTypeNames, partClasses);
// now no more generation is allowed
@@ -180,7 +174,7 @@ public class WrapperNamespaceClassGeneratorTest {
bus.setExtension(wrapperHelperClassLoader, WrapperHelperCreator.class);
- wh = new JAXBDataBinding().createWrapperHelper(requestClass, null,
+ WrapperHelper wh = new
JAXBDataBinding().createWrapperHelper(requestClass, null,
partNames, elTypeNames, partClasses);
assertFalse("Precompiled class not loaded", wh instanceof
JAXBWrapperHelper);
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 c2affc6..37057e8 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,9 +205,9 @@ public class HandlerChainInvokerTest {
assertTrue(invoker.isOutbound());
- boolean continueProcessing = true;
invoker.setLogicalMessageContext(lmc);
- continueProcessing = invoker.invokeLogicalHandlers(false, lmc);
+ boolean continueProcessing = invoker.invokeLogicalHandlers(false, lmc);
+ assertTrue(continueProcessing);
invoker.setProtocolMessageContext(pmc);
continueProcessing = invoker.invokeProtocolHandlers(false, pmc);
@@ -219,8 +219,10 @@ public class HandlerChainInvokerTest {
protocolHandlers[2].setHandleMessageRet(true);
invoker.setProtocolMessageContext(pmc);
continueProcessing = invoker.invokeProtocolHandlers(false, pmc);
+ assertTrue(continueProcessing);
invoker.setLogicalMessageContext(lmc);
continueProcessing = invoker.invokeLogicalHandlers(false, lmc);
+ assertTrue(continueProcessing);
assertEquals(2, logicalHandlers[0].getHandleMessageCount());
@@ -269,9 +271,8 @@ public class HandlerChainInvokerTest {
invoker.setRequestor(true);
assertTrue(invoker.isOutbound());
- boolean continueProcessing = true;
invoker.setLogicalMessageContext(lmc);
- continueProcessing = invoker.invokeLogicalHandlers(false, lmc);
+ boolean continueProcessing = invoker.invokeLogicalHandlers(false, lmc);
assertTrue(continueProcessing);
//create an empty SOAP body for testing
@@ -286,7 +287,7 @@ public class HandlerChainInvokerTest {
try {
invoker.setProtocolMessageContext(pmc);
- continueProcessing = invoker.invokeProtocolHandlers(false, pmc);
+ invoker.invokeProtocolHandlers(false, pmc);
fail("did not get expected exception");
} catch (ProtocolException e) {
assertEquals("banzai", e.getMessage());
@@ -356,14 +357,13 @@ public class HandlerChainInvokerTest {
invoker.setRequestor(true);
assertTrue(invoker.isOutbound());
- boolean continueProcessing = true;
invoker.setLogicalMessageContext(lmc);
- continueProcessing = invoker.invokeLogicalHandlers(false, lmc);
+ boolean continueProcessing = invoker.invokeLogicalHandlers(false, lmc);
assertTrue(continueProcessing);
try {
invoker.setProtocolMessageContext(pmc);
- continueProcessing = invoker.invokeProtocolHandlers(false, pmc);
+ invoker.invokeProtocolHandlers(false, pmc);
fail("did not get expected exception");
} catch (ProtocolException e) {
assertEquals("banzai", e.getMessage());
@@ -425,8 +425,7 @@ public class HandlerChainInvokerTest {
logicalHandlers[2].setHandleMessageRet(true);
logicalHandlers[3].setHandleMessageRet(true);
- boolean continueProcessing = true;
- continueProcessing = invoker.invokeLogicalHandlers(false, lmc);
+ boolean continueProcessing = invoker.invokeLogicalHandlers(false, lmc);
assertTrue(continueProcessing);
@@ -466,9 +465,8 @@ public class HandlerChainInvokerTest {
logicalHandlers[3].setHandleMessageRet(true);
invoker.setResponseExpected(true);
- boolean continueProcessing = true;
invoker.setLogicalMessageContext(lmc);
- continueProcessing = invoker.invokeLogicalHandlers(false, lmc);
+ boolean continueProcessing = invoker.invokeLogicalHandlers(false, lmc);
assertFalse(continueProcessing);
@@ -517,8 +515,7 @@ public class HandlerChainInvokerTest {
logicalHandlers[3].setHandleMessageRet(true);
invoker.setResponseExpected(false);
- boolean continueProcessing = true;
- continueProcessing = invoker.invokeLogicalHandlers(false, lmc);
+ boolean continueProcessing = invoker.invokeLogicalHandlers(false, lmc);
assertFalse(continueProcessing);
diff --git
a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
index c9316f9..e9af573 100644
---
a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
+++
b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
@@ -550,11 +550,9 @@ public class SOAPHandlerInterceptorTest {
private SOAPMessage prepareSOAPMessage(String resouceName) throws
Exception {
InputStream is = this.getClass().getResourceAsStream(resouceName);
- SOAPMessage soapMessage = null;
MessageFactory factory = MessageFactory.newInstance();
MimeHeaders mhs = null;
- soapMessage = factory.createMessage(mhs, is);
- return soapMessage;
+ return factory.createMessage(mhs, is);
}
diff --git
a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
index d65e439..b329621 100644
---
a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
+++
b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
@@ -220,6 +220,7 @@ public class SpringBeansTest {
}
}
assertTrue(saaj);
+ assertTrue(logging);
}
@Test
@@ -286,6 +287,7 @@ public class SpringBeansTest {
assertTrue("Not soap version 1.2: " + sbc.getVersion(),
sbc.getVersion() instanceof Soap12);
bean = (JaxWsServerFactoryBean) ctx.getBean("inlineDataBinding");
+ assertNotNull(bean);
boolean found = false;
String[] names =
ctx.getBeanNamesForType(SpringServerFactoryBean.class);
diff --git
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader_ext/ExtSoapHeaderClientServerTest.java
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader_ext/ExtSoapHeaderClientServerTest.java
index 3c91ab7..06b0b8c 100644
---
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader_ext/ExtSoapHeaderClientServerTest.java
+++
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader_ext/ExtSoapHeaderClientServerTest.java
@@ -29,14 +29,14 @@ import javax.xml.namespace.QName;
import javax.xml.ws.Endpoint;
import javax.xml.ws.WebServiceClient;
+import org.apache.cxf.Bus;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.soap_ext_header.audit.Audit;
import org.apache.cxf.soap_ext_header.ws.SamplePortType;
import org.apache.cxf.soap_ext_header.ws.SampleService;
-import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.testutil.common.AbstractClientServerTestBase;
+import org.apache.cxf.testutil.common.AbstractServerTestServerBase;
-import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -44,18 +44,18 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class ExtSoapHeaderClientServerTest extends
AbstractBusClientServerTestBase {
+public class ExtSoapHeaderClientServerTest extends
AbstractClientServerTestBase {
public static final String PORT0 = allocatePort(Server.class, 0);
public static final String PORT1 = allocatePort(Server.class, 1);
private static SamplePortType client;
- private static org.apache.cxf.endpoint.Server extserver;
private static final QName SERVIVE_NAME = new
QName("http://cxf.apache.org/soap_ext_header/ws";, "SampleService");
- public static class Server extends AbstractBusTestServerBase {
+ public static class Server extends AbstractServerTestServerBase {
- protected void run() {
+ @Override
+ protected org.apache.cxf.endpoint.Server createServer(Bus bus) throws
Exception {
String address0 = "http://localhost:"; + PORT0 +
"/SoapExtHeader/SampleService";
Object implementor1 = new SamplePortTypeImpl();
@@ -70,38 +70,21 @@ public class ExtSoapHeaderClientServerTest extends
AbstractBusClientServerTestBa
sf.setWsdlLocation(webService.wsdlLocation());
sf.setAddress(address1);
- extserver = sf.create();
+ return sf.create();
}
- public static void main(String[] args) {
- try {
- Server s = new Server();
- s.start();
- } catch (Exception ex) {
- ex.printStackTrace();
- System.exit(-1);
- } finally {
- System.out.println("done!");
- }
+ public static void main(String[] args) throws Exception {
+ new Server().start();
}
}
@BeforeClass
public static void startServers() throws Exception {
- createStaticBus();
assertTrue("server did not launch correctly",
launchServer(Server.class, true));
initClient();
}
- @AfterClass
- public static void tearDownExtServer() throws Exception {
- if (extserver != null) {
- extserver.stop();
- extserver.destroy();
- }
- }
-
private static void initClient() {
URL wsdl =
ExtSoapHeaderClientServerTest.class.getResource("/wsdl_systest/soap_ext_header.wsdl");
assertNotNull("WSDL is null", wsdl);
