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 ebf96ec  cxf-rt-bindings-soap: fix PMD rule: UnusedAssignment
ebf96ec is described below

commit ebf96ece52588ae1509d1fbe63fae43571c18116
Author: Alexey Markevich <[email protected]>
AuthorDate: Wed Mar 3 21:20:23 2021 +0300

    cxf-rt-bindings-soap: fix PMD rule: UnusedAssignment
---
 .../org/apache/cxf/binding/soap/SOAPBindingUtil.java    | 17 ++++++++---------
 .../org/apache/cxf/binding/soap/SoapBindingFactory.java | 11 +++++------
 .../java/org/apache/cxf/binding/soap/SoapFault.java     |  4 ++--
 .../soap/interceptor/AbstractSoapInterceptor.java       | 12 +++++++-----
 .../cxf/binding/soap/interceptor/RPCInInterceptor.java  |  4 ++--
 .../cxf/binding/soap/interceptor/RPCOutInterceptor.java |  7 +++----
 .../soap/interceptor/ReadHeadersInterceptor.java        |  3 +--
 .../soap/interceptor/Soap12FaultInInterceptor.java      | 10 +++++-----
 .../soap/interceptor/Soap12FaultOutInterceptor.java     |  4 ++--
 .../soap/interceptor/SoapPreProtocolOutInterceptor.java |  2 +-
 .../binding/soap/jms/interceptor/SoapFaultFactory.java  |  2 +-
 .../apache/cxf/binding/soap/saaj/SAAJStreamWriter.java  |  2 +-
 .../org/apache/cxf/binding/soap/saaj/SAAJUtils.java     |  4 ++--
 .../cxf/binding/soap/wsdl11/SoapAddressPlugin.java      |  4 +---
 .../apache/cxf/binding/soap/ServiceModelUtilTest.java   |  9 +++------
 .../soap/interceptor/SoapFaultSerializerTest.java       |  2 +-
 .../org/apache/cxf/binding/soap/saaj/ParseBodyTest.java |  2 +-
 17 files changed, 46 insertions(+), 53 deletions(-)

diff --git 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SOAPBindingUtil.java
 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SOAPBindingUtil.java
index c0ff8f2..9c284e1 100644
--- 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SOAPBindingUtil.java
+++ 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SOAPBindingUtil.java
@@ -87,7 +87,7 @@ public final class SOAPBindingUtil {
         /*
          * If we put proxies into the loader of the proxied class, they'll 
just pile up.
          */
-        Object proxy = null;
+        Object proxy;
         try {
             proxy = Proxy.newProxyInstance(getContextClassLoader(),
                                               new Class[] {cls}, ih);
@@ -362,7 +362,6 @@ public final class SOAPBindingUtil {
     public static boolean isMixedStyle(Binding binding) {
         String bindingStyle = "";
         String previousOpStyle = "";
-        String style = "";
 
         for (Object obj : binding.getExtensibilityElements()) {
             if (isSOAPBinding(obj)) {
@@ -378,7 +377,7 @@ public final class SOAPBindingUtil {
             for (Object obj : bop.getExtensibilityElements()) {
                 if (isSOAPOperation(obj)) {
                     SoapOperation soapOperation = getSoapOperation(obj);
-                    style = soapOperation.getStyle();
+                    String style = soapOperation.getStyle();
                     if (style == null) {
                         style = "";
                     }
@@ -431,7 +430,7 @@ public final class SOAPBindingUtil {
 
     public static SoapAddress createSoapAddress(ExtensionRegistry extReg, 
boolean isSOAP12)
         throws WSDLException {
-        ExtensibilityElement extElement = null;
+        final ExtensibilityElement extElement;
         if (isSOAP12) {
             extElement = extReg.createExtension(Port.class,
                                                                
WSDLConstants.QNAME_SOAP12_BINDING_ADDRESS);
@@ -444,7 +443,7 @@ public final class SOAPBindingUtil {
 
     public static SoapBody createSoapBody(ExtensionRegistry extReg, Class<?> 
clz, boolean isSOAP12)
         throws WSDLException {
-        ExtensibilityElement extElement = null;
+        final ExtensibilityElement extElement;
         if (isSOAP12) {
             extElement = extReg.createExtension(clz, new 
QName(WSDLConstants.NS_SOAP12,
                                                                            
"body"));
@@ -457,7 +456,7 @@ public final class SOAPBindingUtil {
 
     public static SoapBinding createSoapBinding(ExtensionRegistry extReg, 
boolean isSOAP12)
         throws WSDLException {
-        ExtensibilityElement extElement = null;
+        final ExtensibilityElement extElement;
         if (isSOAP12) {
             extElement = extReg.createExtension(Binding.class,
                                                                new 
QName(WSDLConstants.NS_SOAP12,
@@ -474,7 +473,7 @@ public final class SOAPBindingUtil {
 
     public static SoapOperation createSoapOperation(ExtensionRegistry extReg, 
boolean isSOAP12)
         throws WSDLException {
-        ExtensibilityElement extElement = null;
+        final ExtensibilityElement extElement;
         if (isSOAP12) {
             extElement = extReg.createExtension(BindingOperation.class,
                                                                  new 
QName(WSDLConstants.NS_SOAP12,
@@ -489,7 +488,7 @@ public final class SOAPBindingUtil {
 
     public static SoapFault createSoapFault(ExtensionRegistry extReg, boolean 
isSOAP12)
         throws WSDLException {
-        ExtensibilityElement extElement = null;
+        final ExtensibilityElement extElement;
         if (isSOAP12) {
             extElement = extReg.createExtension(BindingFault.class,
                                                              new 
QName(WSDLConstants.NS_SOAP12,
@@ -504,7 +503,7 @@ public final class SOAPBindingUtil {
 
     public static SoapHeader createSoapHeader(ExtensionRegistry extReg, 
Class<?> clz, boolean isSOAP12)
         throws WSDLException {
-        ExtensibilityElement extElement = null;
+        final ExtensibilityElement extElement;
         if (isSOAP12) {
             extElement = extReg.createExtension(clz,
                                                               new 
QName(WSDLConstants.NS_SOAP12,
diff --git 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
index cc7986b..3119c36 100644
--- 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
+++ 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
@@ -178,7 +178,7 @@ public class SoapBindingFactory extends 
AbstractWSDLBindingFactory {
 
             BindingMessageInfo bInput = bop.getInput();
             if (bInput != null) {
-                MessageInfo input = null;
+                final MessageInfo input;
                 BindingMessageInfo unwrappedMsg = bInput;
                 if (bop.isUnwrappedCapable()) {
                     input = 
bop.getOperationInfo().getUnwrappedOperation().getInput();
@@ -191,7 +191,7 @@ public class SoapBindingFactory extends 
AbstractWSDLBindingFactory {
 
             BindingMessageInfo bOutput = bop.getOutput();
             if (bOutput != null) {
-                MessageInfo output = null;
+                final MessageInfo output;
                 BindingMessageInfo unwrappedMsg = bOutput;
                 if (bop.isUnwrappedCapable()) {
                     output = 
bop.getOperationInfo().getUnwrappedOperation().getOutput();
@@ -341,8 +341,8 @@ public class SoapBindingFactory extends 
AbstractWSDLBindingFactory {
 
         boolean hasWrapped = false;
 
-        org.apache.cxf.binding.soap.SoapBinding sb = null;
-        SoapVersion version = null;
+        final org.apache.cxf.binding.soap.SoapBinding sb;
+        final SoapVersion version;
         if (binding instanceof SoapBindingInfo) {
             SoapBindingInfo sbi = (SoapBindingInfo) binding;
             version = sbi.getSoapVersion();
@@ -556,11 +556,10 @@ public class SoapBindingFactory extends 
AbstractWSDLBindingFactory {
     private void addOutOfBandParts(final BindingOperationInfo bop, final 
javax.wsdl.Message msg,
                                    final SchemaCollection schemas, boolean 
isInput,
                                    final String partName) {
-        MessageInfo minfo = null;
         MessageInfo.Type type;
 
         int nextId = 0;
-        minfo = bop.getOperationInfo().getInput();
+        MessageInfo minfo = bop.getOperationInfo().getInput();
         if (minfo != null) {
             for (MessagePartInfo part : minfo.getMessageParts()) {
                 if (part.getIndex() >= nextId) {
diff --git 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapFault.java 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapFault.java
index 0cc9517..ec47926 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapFault.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapFault.java
@@ -90,7 +90,7 @@ public class SoapFault extends Fault {
     }
 
     private String getFaultCodeString(String prefix, String defaultPrefix, 
QName fCode) {
-        String codePrefix = null;
+        String codePrefix;
         if (StringUtils.isEmpty(prefix)) {
             codePrefix = fCode.getPrefix();
             if (StringUtils.isEmpty(codePrefix)) {
@@ -100,7 +100,7 @@ public class SoapFault extends Fault {
             codePrefix = prefix;
         }
 
-        return codePrefix + ":" + fCode.getLocalPart();
+        return codePrefix + ':' + fCode.getLocalPart();
     }
 
     private QName getRootSubCode() {
diff --git 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java
 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java
index d06a6f1..cb95aa3 100644
--- 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java
+++ 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java
@@ -85,16 +85,18 @@ public abstract class AbstractSoapInterceptor extends 
AbstractPhaseInterceptor<S
             StringBuilder sb = new StringBuilder();
             Throwable throwable = fault.getCause();
             sb.append("Caused by: 
").append(throwable.getClass().getCanonicalName())
-                .append(": " + throwable.getMessage() + 
"\n").append(Message.EXCEPTION_CAUSE_SUFFIX);
+                .append(": 
").append(throwable.getMessage()).append('\n').append(Message.EXCEPTION_CAUSE_SUFFIX);
             while (throwable != null) {
                 for (StackTraceElement ste : throwable.getStackTrace()) {
-                    sb.append(ste.getClassName() + "!" + ste.getMethodName() + 
"!" + ste.getFileName() + "!"
-                          + ste.getLineNumber() + 
Message.EXCEPTION_CAUSE_SUFFIX);
+                    sb.append(ste.getClassName()).append('!')
+                        .append(ste.getMethodName()).append('!')
+                        .append(ste.getFileName()).append('!')
+                        
.append(ste.getLineNumber()).append(Message.EXCEPTION_CAUSE_SUFFIX);
                 }
                 throwable = throwable.getCause();
                 if (throwable != null) {
-                    sb.append("Caused by: " +  
throwable.getClass().getCanonicalName()
-                              + " : " + throwable.getMessage() + 
Message.EXCEPTION_CAUSE_SUFFIX);
+                    sb.append("Caused by: 
").append(throwable.getClass().getCanonicalName())
+                        .append(" : 
").append(throwable.getMessage()).append(Message.EXCEPTION_CAUSE_SUFFIX);
                 }
             }
             Element detail = fault.getDetail();
diff --git 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
index 5f281c9..8f8c2a4 100644
--- 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
+++ 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
@@ -72,7 +72,7 @@ public class RPCInInterceptor extends 
AbstractInDatabindingInterceptor {
             boolean output = !isRequestor(message);
             for (BindingOperationInfo info : service.getOperations()) {
                 if 
(info.getName().getLocalPart().equals(opName.getLocalPart())) {
-                    SoapBody body = null;
+                    final SoapBody body;
                     if (output) {
                         body = info.getOutput().getExtensor(SoapBody.class);
                     } else {
@@ -94,7 +94,6 @@ public class RPCInInterceptor extends 
AbstractInDatabindingInterceptor {
         }
         DepthXMLStreamReader xmlReader = getXMLStreamReader(message);
 
-        BindingOperationInfo operation = null;
         if (!StaxUtils.toNextElement(xmlReader)) {
             message.setContent(Exception.class, new RuntimeException("There 
must be a method name element."));
         }
@@ -103,6 +102,7 @@ public class RPCInInterceptor extends 
AbstractInDatabindingInterceptor {
             opName = opName.substring(0, opName.length() - 8);
         }
 
+        final BindingOperationInfo operation;
         if (message.getExchange().getBindingOperationInfo() == null) {
             operation = getOperation(message, new 
QName(xmlReader.getNamespaceURI(), opName));
             if (operation == null) {
diff --git 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java
 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java
index 288a5b6..0f891e1 100644
--- 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java
+++ 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java
@@ -72,9 +72,8 @@ public class RPCOutInterceptor extends 
AbstractOutDatabindingInterceptor {
                 xmlWriter = cache;
             }
 
-            List<MessagePartInfo> parts = null;
-
-            boolean output = false;
+            final List<MessagePartInfo> parts;
+            final boolean output;
             if (!isRequestor(message)) {
                 if (operation.getOutput() == null) {
                     return;
@@ -138,7 +137,7 @@ public class RPCOutInterceptor extends 
AbstractOutDatabindingInterceptor {
                                       BindingOperationInfo boi)
         throws XMLStreamException {
         String ns = boi.getName().getNamespaceURI();
-        SoapBody body = null;
+        final SoapBody body;
         if (output) {
             body = boi.getOutput().getExtensor(SoapBody.class);
         } else {
diff --git 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
index 3f96558..02d151b 100644
--- 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
+++ 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
@@ -185,7 +185,7 @@ public class ReadHeadersInterceptor extends 
AbstractSoapInterceptor {
 
                 Node nd = message.getContent(Node.class);
                 W3CDOMStreamWriter writer = 
message.get(W3CDOMStreamWriter.class);
-                Document doc = null;
+                final Document doc;
                 if (writer != null) {
                     StaxUtils.copy(filteredReader, writer);
                     doc = writer.getDocument();
@@ -227,7 +227,6 @@ public class ReadHeadersInterceptor extends 
AbstractSoapInterceptor {
                     List<Element> elemList = 
DOMUtils.findAllElementsByTagNameNS(element,
                                                                                
  header.getNamespaceURI(),
                                                                                
  header.getLocalPart());
-                    soapBody = new ArrayList<Element>();      
                     soapBody = DOMUtils.getChildrenWithName(element,
                                                                                
  body.getNamespaceURI(),
                                                                                
  body.getLocalPart());
diff --git 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultInInterceptor.java
 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultInInterceptor.java
index 0cab47e..9d88033 100644
--- 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultInInterceptor.java
+++ 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultInInterceptor.java
@@ -68,20 +68,20 @@ public class Soap12FaultInInterceptor extends 
AbstractSoapInterceptor {
 
     public static SoapFault unmarshalFault(SoapMessage message,
                                            XMLStreamReader reader) {
-        String exMessage = null;
+        String exMessage;
         QName faultCode = null;
         List<QName> subCodes = null;
-        String role = null;
-        String node = null;
+        final String role;
+        final String node;
         Element detail = null;
-        String lang = null;
+        final String lang;
 
         Map<String, String> ns = new HashMap<>();
         ns.put("s", Soap12.SOAP_NAMESPACE);
         XPathUtils xu = new XPathUtils(ns);
         try {
             Node mainNode = message.getContent(Node.class);
-            Node fault = null;
+            Node fault;
 
             if (reader instanceof W3CDOMStreamReader) {
                 W3CDOMStreamReader dr = (W3CDOMStreamReader)reader;
diff --git 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java
 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java
index ef4bd78..35a6a5b 100644
--- 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java
+++ 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java
@@ -161,7 +161,7 @@ public class Soap12FaultOutInterceptor extends 
AbstractSoapInterceptor {
 
         //REVISIT either make SoapFault's this method public or put this 
method into a soap fault utility class
         private static String getCodeString(String prefix, String 
defaultPrefix, QName code) {
-            String codePrefix = null;
+            String codePrefix;
             if (StringUtils.isEmpty(prefix)) {
                 codePrefix = code.getPrefix();
                 if (StringUtils.isEmpty(codePrefix)) {
@@ -171,7 +171,7 @@ public class Soap12FaultOutInterceptor extends 
AbstractSoapInterceptor {
                 codePrefix = prefix;
             }
 
-            return codePrefix + ":" + code.getLocalPart();
+            return codePrefix + ':' + code.getLocalPart();
         }
     }
 }
diff --git 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
index b6e1e1b..e046587 100644
--- 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
+++ 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
@@ -150,7 +150,7 @@ public class SoapPreProtocolOutInterceptor extends 
AbstractSoapInterceptor {
         }
 
         if (!action.startsWith("\"")) {
-            action = new 
StringBuilder().append("\"").append(action).append("\"").toString();
+            action = '"' + action + '"';
         }
 
         return action;
diff --git 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactory.java
 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactory.java
index 757c0ea..d74791d 100644
--- 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactory.java
+++ 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactory.java
@@ -43,7 +43,7 @@ public class SoapFaultFactory  {
     }
 
     public Fault createFault(JMSFault jmsFault) {
-        Fault f = null;
+        final Fault f;
         if (version == Soap11.getInstance()) {
             f = createSoap11Fault(jmsFault);
             // so we can encode the SequenceFault as header
diff --git 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
index 1dced4b..304baff 100644
--- 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
+++ 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
@@ -218,7 +218,7 @@ public final class SAAJStreamWriter extends 
OverlayW3CDOMStreamWriter {
             }
         } else if (cur instanceof SOAPElement) {
             try {
-                Element el = null;
+                final Element el;
                 if (StringUtils.isEmpty(pfx) && StringUtils.isEmpty(ns)) {
                     el = ((SOAPElement)cur).addChildElement(local, "", "");
                 } else {
diff --git 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJUtils.java
 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJUtils.java
index 7759b13..a7b5ba2 100644
--- 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJUtils.java
+++ 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJUtils.java
@@ -99,8 +99,8 @@ public final class SAAJUtils {
                 e.setPrefix(prefix);
                 if (e instanceof SOAPElement) {
                     ((SOAPElement)e).removeNamespaceDeclaration(s);
-                } else if (e.getClass().getName().equals(
-                       
"com.sun.org.apache.xerces.internal.dom.ElementNSImpl")) {
+                } else if 
("com.sun.org.apache.xerces.internal.dom.ElementNSImpl".equals(
+                       e.getClass().getName())) {
                     //since java9 159 SOAPPart1_1Impl.getDocumentElement not 
return SOAPElement
                     try {
                         Method method = 
e.getClass().getMethod("removeAttribute", String.class);
diff --git 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl11/SoapAddressPlugin.java
 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl11/SoapAddressPlugin.java
index 3892dba..61733ba 100644
--- 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl11/SoapAddressPlugin.java
+++ 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl11/SoapAddressPlugin.java
@@ -39,9 +39,7 @@ public final class SoapAddressPlugin extends 
AbstractWSDLPlugin {
 
     public ExtensibilityElement createExtension(final boolean isSOAP12,
                                                 final String address) throws 
WSDLException {
-        SoapAddress soapAddress = null;
-
-        soapAddress = SOAPBindingUtil.createSoapAddress(registry, isSOAP12);
+        SoapAddress soapAddress = SOAPBindingUtil.createSoapAddress(registry, 
isSOAP12);
 
         soapAddress.setLocationURI(address);
 
diff --git 
a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
 
b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
index 495b4d8..ef31fec 100644
--- 
a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
+++ 
b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
@@ -53,7 +53,6 @@ import static org.junit.Assert.assertTrue;
 
 public class ServiceModelUtilTest {
     private static final String WSDL_PATH = "test-soap-header.wsdl";
-    private Definition def;
     private Service service;
     private ServiceInfo serviceInfo;
 
@@ -67,9 +66,8 @@ public class ServiceModelUtilTest {
         WSDLFactory wsdlFactory = WSDLFactory.newInstance();
         WSDLReader wsdlReader = wsdlFactory.newWSDLReader();
         wsdlReader.setFeature("javax.wsdl.verbose", false);
-        def = wsdlReader.readWSDL(wsdlUrl);
+        Definition def = wsdlReader.readWSDL(wsdlUrl);
 
-        WSDLServiceBuilder wsdlServiceBuilder = new WSDLServiceBuilder(bus);
         for (Service serv : CastUtils.cast(def.getServices().values(), 
Service.class)) {
             if (serv != null) {
                 service = serv;
@@ -80,7 +78,7 @@ public class ServiceModelUtilTest {
         control = EasyMock.createNiceControl();
         bus = control.createMock(Bus.class);
         bindingFactoryManager = 
control.createMock(BindingFactoryManager.class);
-        wsdlServiceBuilder = new WSDLServiceBuilder(bus);
+        WSDLServiceBuilder wsdlServiceBuilder = new WSDLServiceBuilder(bus);
 
         
EasyMock.expect(bus.getExtension(BindingFactoryManager.class)).andReturn(bindingFactoryManager);
 
@@ -98,8 +96,7 @@ public class ServiceModelUtilTest {
 
     @Test
     public void testGetSchema() throws Exception {
-        BindingInfo bindingInfo = null;
-        bindingInfo = serviceInfo.getBindings().iterator().next();
+        BindingInfo bindingInfo = serviceInfo.getBindings().iterator().next();
         QName name = new QName(serviceInfo.getName().getNamespaceURI(), 
"inHeader");
         BindingOperationInfo inHeader = bindingInfo.getOperation(name);
         BindingMessageInfo input = inHeader.getInput();
diff --git 
a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
 
b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
index 1e6ca11..e855688 100644
--- 
a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
+++ 
b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
@@ -334,7 +334,7 @@ public class SoapFaultSerializerTest {
         new StartBodyInterceptor().handleMessage(m);
         new Soap12FaultInInterceptor().handleMessage(m);
 
-        nd = m.getContent(Node.class);
+        //nd = m.getContent(Node.class);
 
         fault2 = (SoapFault)m.getContent(Exception.class);
         assertNotNull(fault2);
diff --git 
a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
 
b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
index c0a7fbe..55c8025 100644
--- 
a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
+++ 
b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
@@ -124,7 +124,7 @@ public class ParseBodyTest {
 
         DocumentBuilder db = dbf.newDocumentBuilder();
         db.setEntityResolver(new NullResolver());
-        doc = StaxUtils.read(db, reader, false);
+        StaxUtils.read(db, reader, false);
 
     }
 

Reply via email to