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 0dce4cd  cxf-rt-wsdl: fix PMD rule: UnusedAssignment
0dce4cd is described below

commit 0dce4cd3c0362da3a9864a1a93da0f6e5d480d7f
Author: Alexey Markevich <[email protected]>
AuthorDate: Tue Mar 2 17:45:43 2021 +0300

    cxf-rt-wsdl: fix PMD rule: UnusedAssignment
---
 .../org/apache/cxf/wsdl/JAXBExtensionHelper.java   |  2 +-
 .../cxf/wsdl/interceptors/BareInInterceptor.java   |  4 ++--
 .../cxf/wsdl/interceptors/BareOutInterceptor.java  |  4 ++--
 .../wsdl/interceptors/DocLiteralInInterceptor.java |  8 +++----
 .../factory/DefaultServiceConfiguration.java       |  9 +++-----
 .../factory/ReflectionServiceFactoryBean.java      | 11 +++++-----
 .../org/apache/cxf/wsdl11/CatalogWSDLLocator.java  |  4 ++--
 .../apache/cxf/wsdl11/PartialWSDLProcessor.java    |  3 +--
 .../org/apache/cxf/wsdl11/SOAPBindingUtil.java     | 17 +++++++--------
 .../org/apache/cxf/wsdl11/ServiceWSDLBuilder.java  | 25 +++++++---------------
 .../org/apache/cxf/wsdl11/WSDLManagerImpl.java     |  2 +-
 .../org/apache/cxf/wsdl11/WSDLServiceBuilder.java  |  7 +++---
 .../apache/cxf/wsdl11/WSDLServiceBuilderTest.java  | 12 ++++-------
 13 files changed, 43 insertions(+), 65 deletions(-)

diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java 
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
index c8b6478..165d153 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
@@ -347,7 +347,7 @@ public class JAXBExtensionHelper implements 
ExtensionSerializer, ExtensionDeseri
         try {
             u = createUnmarshaller();
 
-            Object o = null;
+            Object o;
             if (namespace == null) {
                 o = u.unmarshal(element, extensionClass);
             } else {
diff --git 
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareInInterceptor.java 
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareInInterceptor.java
index 33a911e..f177bbc 100644
--- 
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareInInterceptor.java
+++ 
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareInInterceptor.java
@@ -103,9 +103,8 @@ public class BareInInterceptor extends 
AbstractInDatabindingInterceptor {
 
         while (StaxUtils.toNextElement(xmlReader)) {
             QName elName = xmlReader.getName();
-            Object o = null;
 
-            MessagePartInfo p;
+            final MessagePartInfo p;
             if (msgInfo != null && msgInfo.getMessageParts() != null) {
                 assert msgInfo.getMessageParts().size() > paramNum;
                 p = msgInfo.getMessageParts().get(paramNum);
@@ -118,6 +117,7 @@ public class BareInInterceptor extends 
AbstractInDatabindingInterceptor {
                                 Fault.FAULT_CODE_CLIENT);
             }
 
+            final Object o;
             try {
                 o = dr.read(p, xmlReader);
             } catch (Fault fault) {
diff --git 
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareOutInterceptor.java
 
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareOutInterceptor.java
index 2a204dc..a612497 100644
--- 
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareOutInterceptor.java
+++ 
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareOutInterceptor.java
@@ -48,8 +48,8 @@ public class BareOutInterceptor extends 
AbstractOutDatabindingInterceptor {
             return;
         }
 
-        List<MessagePartInfo> parts = null;
-        BindingMessageInfo bmsg = null;
+        final List<MessagePartInfo> parts;
+        final BindingMessageInfo bmsg;
         boolean client = isRequestor(message);
 
         if (!client) {
diff --git 
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptor.java
 
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptor.java
index 2cc3a30..91a3cd6 100644
--- 
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptor.java
+++ 
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptor.java
@@ -149,9 +149,8 @@ public class DocLiteralInInterceptor extends 
AbstractInDatabindingInterceptor {
                     setMessage(message, bop, client, si, 
msgInfo.getMessageInfo());
                 }
 
-                Collection<OperationInfo> operations = null;
-                operations = new ArrayList<>();
-                operations.addAll(si.getInterface().getOperations());
+                final Collection<OperationInfo> operations = new ArrayList<>(
+                    si.getInterface().getOperations());
 
                 if (xmlReader == null || !StaxUtils.toNextElement(xmlReader)) {
                     // empty input
@@ -165,7 +164,6 @@ public class DocLiteralInInterceptor extends 
AbstractInDatabindingInterceptor {
 
                 do {
                     QName elName = xmlReader.getName();
-                    Object o = null;
 
                     MessagePartInfo p;
                     if (!client && msgInfo != null && 
msgInfo.getMessageParts() != null
@@ -191,7 +189,7 @@ public class DocLiteralInInterceptor extends 
AbstractInDatabindingInterceptor {
                         validatePart(p, elName, message);
                     }
 
-                    o = dr.read(p, xmlReader);
+                    final Object o = dr.read(p, xmlReader);
                     if (forceDocLitBare && parameters.isEmpty()) {
                         // webservice provider does not need to ensure size
                         parameters.add(o);
diff --git 
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/DefaultServiceConfiguration.java
 
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/DefaultServiceConfiguration.java
index 1ffc000..7da7895 100644
--- 
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/DefaultServiceConfiguration.java
+++ 
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/DefaultServiceConfiguration.java
@@ -121,7 +121,7 @@ public class DefaultServiceConfiguration extends 
AbstractServiceConfiguration {
 
     public static String createName(final Method method, final int 
paramNumber, final int currentSize,
                               boolean addMethodName, final String flow) {
-        String paramName = "";
+        final String paramName;
 
         if (paramNumber != -1) {
             String[] names = 
ParamReader.getParameterNamesFromDebugInfo(method);
@@ -137,9 +137,7 @@ public class DefaultServiceConfiguration extends 
AbstractServiceConfiguration {
             paramName = flow;
         }
 
-        paramName = addMethodName ? method.getName() + paramName : paramName;
-
-        return paramName;
+        return addMethodName ? method.getName() + paramName : paramName;
     }
 
     @Override
@@ -262,8 +260,7 @@ public class DefaultServiceConfiguration extends 
AbstractServiceConfiguration {
         if (isHolder(cls, type)) {
             if (type instanceof ParameterizedType) {
                 //JAX-WS style using generics
-                ParameterizedType paramType = (ParameterizedType)type;
-                cls = getHolderClass(paramType);
+                //cls = getHolderClass((ParameterizedType)type);
             } else {
                 //JAXRPC style of code generated holder
                 return cls.getDeclaredFields()[0].getType();
diff --git 
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
 
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
index d68c693..7a28ebc 100644
--- 
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
+++ 
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
@@ -145,8 +145,8 @@ public class ReflectionServiceFactoryBean extends 
org.apache.cxf.service.factory
     public static final String METHOD_ANNOTATIONS = 
"method.return.annotations";
     public static final String PARAM_ANNOTATION = "parameter.annotations";
     private static final Logger LOG = 
LogUtils.getL7dLogger(ReflectionServiceFactoryBean.class);
-    private static final boolean DO_VALIDATE = 
SystemPropertyAction.getProperty("cxf.validateServiceSchemas", "false")
-            .equals("true");
+    private static final boolean DO_VALIDATE = "true".equals(
+        SystemPropertyAction.getProperty("cxf.validateServiceSchemas", 
"false"));
 
     private static Class<? extends DataBinding> defaultDatabindingClass;
 
@@ -819,7 +819,7 @@ public class ReflectionServiceFactoryBean extends 
org.apache.cxf.service.factory
 
         MessagePartInfo part = null;
         if (isIn && !isOut) {
-            QName name = getInPartName(o, method, i);
+            final QName name = getInPartName(o, method, i);
             part = o.getInput().getMessagePart(name);
             if (part == null && isFromWsdl()) {
                 part = o.getInput().getMessagePartByIndex(i);
@@ -832,7 +832,6 @@ public class ReflectionServiceFactoryBean extends 
org.apache.cxf.service.factory
                     part = o.getInput().getMessagePart(name2);
                     if (part != null) {
                         add = false;
-                        name = name2;
                     }
                 }
                 if (part != null) {
@@ -949,7 +948,7 @@ public class ReflectionServiceFactoryBean extends 
org.apache.cxf.service.factory
                     LOG.log(Level.WARNING, message.toString());
                 }
                 for (MessagePartInfo mpi : mpis) {
-                    String ns = null;
+                    final String ns;
                     if (mpi.isElement()) {
                         ns = mpi.getElementQName().getNamespaceURI();
                     } else {
@@ -1197,7 +1196,6 @@ public class ReflectionServiceFactoryBean extends 
org.apache.cxf.service.factory
         int paraNumber = 0;
         for (MessagePartInfo mpi : messageParts) {
             SchemaInfo schemaInfo = null;
-            XmlSchema schema = null;
 
             QName qname = (QName)mpi.getProperty(ELEMENT_NAME);
             if (messageParts.size() == 1 && qname == null) {
@@ -1225,6 +1223,7 @@ public class ReflectionServiceFactoryBean extends 
org.apache.cxf.service.factory
                 }
             }
 
+            final XmlSchema schema;
             if (schemaInfo == null) {
                 schemaInfo = getOrCreateSchema(serviceInfo, 
qname.getNamespaceURI(), true);
                 schema = schemaInfo.getSchema();
diff --git 
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/CatalogWSDLLocator.java 
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/CatalogWSDLLocator.java
index b44e7b4..ff72ee6 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/CatalogWSDLLocator.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/CatalogWSDLLocator.java
@@ -97,7 +97,7 @@ public class CatalogWSDLLocator implements WSDLLocator {
     }
 
     public InputSource getImportInputSource(String parent, String 
importLocation) {
-        String resolvedImportLocation = null;
+        final String resolvedImportLocation;
         try {
             resolvedImportLocation = new 
OASISCatalogManagerHelper().resolve(manager,
                                          importLocation, parent);
@@ -106,7 +106,7 @@ public class CatalogWSDLLocator implements WSDLLocator {
         }
 
 
-        InputSource in = null;
+        InputSource in;
         if (resolvedImportLocation == null) {
             in = this.resolver.resolve(importLocation, parent);
         } else {
diff --git 
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/PartialWSDLProcessor.java 
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/PartialWSDLProcessor.java
index 7aa7a58..01b7d56 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/PartialWSDLProcessor.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/PartialWSDLProcessor.java
@@ -64,11 +64,10 @@ public final class PartialWSDLProcessor  {
         if (portTypes == null || portTypes.isEmpty()) {
             return false;
         }
-        String existPortTypeName = null;
         PortType portType = null;
         try {
             for (Entry<QName, PortType> entry : portTypes.entrySet()) {
-                existPortTypeName = entry.getKey().getLocalPart();
+                String existPortTypeName = entry.getKey().getLocalPart();
                 if (name.getLocalPart().contains(existPortTypeName)) {
                     portType = entry.getValue();
                     break;
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java 
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java
index 05912cf..bb4e843 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java
@@ -79,7 +79,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(Thread.currentThread().getContextClassLoader(),
                                               new Class[] {cls}, ih);
@@ -303,7 +303,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)) {
@@ -319,7 +318,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 = "";
                     }
@@ -372,7 +371,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);
@@ -385,7 +384,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"));
@@ -398,7 +397,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,
@@ -415,7 +414,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,
@@ -430,7 +429,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,
@@ -445,7 +444,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/wsdl/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java 
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java
index 65ca956..c5c129f 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java
@@ -189,7 +189,6 @@ public class ServiceWSDLBuilder {
                     
wsdlImport.setLocationURI(service.getInterface().getName().getLocalPart() + 
".wsdl");
                     definition.addImport(wsdlImport);
                     addNamespace(getPrefix(tns), tns, definition);
-                    definition = portTypeDef;
                 }
                 portTypes.add(buildPortType(service.getInterface(), 
portTypeDef));
 
@@ -455,9 +454,8 @@ public class ServiceWSDLBuilder {
     protected void buildBinding(Definition definition,
                                 Collection<BindingInfo> bindingInfos,
                                 Collection<PortType> portTypes) {
-        Binding binding = null;
         for (BindingInfo bindingInfo : bindingInfos) {
-            binding = definition.createBinding();
+            final Binding binding = definition.createBinding();
             addDocumentation(binding, bindingInfo.getDocumentation());
             binding.setUndefined(false);
             for (PortType portType : portTypes) {
@@ -478,9 +476,8 @@ public class ServiceWSDLBuilder {
 
     protected void buildBindingOperation(Definition def, Binding binding,
                                        Collection<BindingOperationInfo> 
bindingOperationInfos) {
-        BindingOperation bindingOperation = null;
         for (BindingOperationInfo bindingOperationInfo : 
bindingOperationInfos) {
-            bindingOperation = def.createBindingOperation();
+            final BindingOperation bindingOperation = 
def.createBindingOperation();
             addDocumentation(bindingOperation, 
bindingOperationInfo.getDocumentation());
             
bindingOperation.setName(bindingOperationInfo.getName().getLocalPart());
             for (Operation operation
@@ -501,10 +498,8 @@ public class ServiceWSDLBuilder {
 
     protected void buildBindingFault(Definition def, BindingOperation 
bindingOperation,
                                    Collection<BindingFaultInfo> 
bindingFaultInfos) {
-        BindingFault bindingFault = null;
-        for (BindingFaultInfo bindingFaultInfo
-            : bindingFaultInfos) {
-            bindingFault = def.createBindingFault();
+        for (BindingFaultInfo bindingFaultInfo : bindingFaultInfos) {
+            final BindingFault bindingFault = def.createBindingFault();
             addDocumentation(bindingFault, 
bindingFaultInfo.getDocumentation());
             
bindingFault.setName(bindingFaultInfo.getFaultInfo().getFaultName().getLocalPart());
             bindingOperation.addBindingFault(bindingFault);
@@ -516,9 +511,8 @@ public class ServiceWSDLBuilder {
 
     protected void buildBindingInput(Definition def, BindingOperation 
bindingOperation,
                                          BindingMessageInfo 
bindingMessageInfo) {
-        BindingInput bindingInput = null;
         if (bindingMessageInfo != null) {
-            bindingInput = def.createBindingInput();
+            final BindingInput bindingInput = def.createBindingInput();
             addDocumentation(bindingInput, 
bindingMessageInfo.getDocumentation());
             
bindingInput.setName(bindingMessageInfo.getMessageInfo().getName().getLocalPart());
             bindingOperation.setBindingInput(bindingInput);
@@ -529,9 +523,8 @@ public class ServiceWSDLBuilder {
 
     protected void buildBindingOutput(Definition def, BindingOperation 
bindingOperation,
                                    BindingMessageInfo bindingMessageInfo) {
-        BindingOutput bindingOutput = null;
         if (bindingMessageInfo != null) {
-            bindingOutput = def.createBindingOutput();
+            final BindingOutput bindingOutput = def.createBindingOutput();
             addDocumentation(bindingOutput, 
bindingMessageInfo.getDocumentation());
             
bindingOutput.setName(bindingMessageInfo.getMessageInfo().getName().getLocalPart());
             bindingOperation.setBindingOutput(bindingOutput);
@@ -687,9 +680,8 @@ public class ServiceWSDLBuilder {
                 }
                 //loop to add fault
                 Collection<FaultInfo> faults = operationInfo.getFaults();
-                Fault fault = null;
                 for (FaultInfo faultInfo : faults) {
-                    fault = def.createFault();
+                    final Fault fault = def.createFault();
                     addDocumentation(fault, faultInfo.getDocumentation());
                     fault.setName(faultInfo.getFaultName().getLocalPart());
                     message = def.createMessage();
@@ -737,9 +729,8 @@ public class ServiceWSDLBuilder {
         def.addMessage(message);
 
         List<MessagePartInfo> messageParts = 
messageContainer.getMessageParts();
-        Part messagePart = null;
         for (MessagePartInfo messagePartInfo : messageParts) {
-            messagePart = def.createPart();
+            final Part messagePart = def.createPart();
             messagePart.setName(messagePartInfo.getName().getLocalPart());
             if (messagePartInfo.isElement()) {
                 messagePart.setElementName(messagePartInfo.getElementQName());
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java 
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
index 1a911fc..a61868f 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
@@ -223,7 +223,7 @@ public class WSDLManagerImpl implements WSDLManager {
                                                                                
 catLocator,
                                                                                
 bus);
         InputSource src = wsdlLocator.getBaseInputSource();
-        Definition def = null;
+        final Definition def;
         if (src.getByteStream() != null || src.getCharacterStream() != null) {
             final Document doc;
             XMLStreamReader xmlReader = null;
diff --git 
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java 
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
index f200b55..0b4a2d7 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
@@ -517,7 +517,7 @@ public class WSDLServiceBuilder {
                 if (bop.getBindingOutput() != null) {
                     outName = bop.getBindingOutput().getName();
                 }
-                BindingOperationInfo bop2 = null;
+                final BindingOperationInfo bop2;
                 if (onlyExtensors) {
                     bop2 = bi.getOperation(new 
QName(binding.getQName().getNamespaceURI(),
                                                        bop.getName()));
@@ -698,9 +698,8 @@ public class WSDLServiceBuilder {
         }
         // RULE No.3:
         // The output message part refers to a global element declaration
-        MessagePartInfo outputPart = null;
         if (outputMessage != null && outputMessage.size() == 1) {
-            outputPart = outputMessage.getMessagePartByIndex(0);
+            final MessagePartInfo outputPart = 
outputMessage.getMessagePartByIndex(0);
             if (outputPart != null) {
                 if (!outputPart.isElement()
                     || schemas.getElementByQName(outputPart.getElementQName()) 
== null) {
@@ -727,7 +726,7 @@ public class WSDLServiceBuilder {
                                                      inputMessage.getName());
         MessageInfo unwrappedOutput = null;
 
-        XmlSchemaComplexType xsct = null;
+        XmlSchemaComplexType xsct;
         if (inputEl.getSchemaType() instanceof XmlSchemaComplexType) {
 
             xsct = (XmlSchemaComplexType)inputEl.getSchemaType();
diff --git 
a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java 
b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
index 682c212..b66b921 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
@@ -297,9 +297,8 @@ public class WSDLServiceBuilderTest {
     @Test
     public void testBindingInfo() throws Exception {
         setUpBasic();
-        BindingInfo bindingInfo = null;
         assertEquals(1, serviceInfo.getBindings().size());
-        bindingInfo = serviceInfo.getBindings().iterator().next();
+        BindingInfo bindingInfo = serviceInfo.getBindings().iterator().next();
         assertNotNull(bindingInfo);
         assertEquals(bindingInfo.getInterface().getName().getLocalPart(), 
"Greeter");
         assertEquals(bindingInfo.getName().getLocalPart(), 
"Greeter_SOAPBinding");
@@ -310,8 +309,7 @@ public class WSDLServiceBuilderTest {
     @Test
     public void testBindingOperationInfo() throws Exception {
         setUpBasic();
-        BindingInfo bindingInfo = null;
-        bindingInfo = serviceInfo.getBindings().iterator().next();
+        BindingInfo bindingInfo = serviceInfo.getBindings().iterator().next();
         Collection<BindingOperationInfo> bindingOperationInfos = 
bindingInfo.getOperations();
         assertNotNull(bindingOperationInfos);
         assertEquals(bindingOperationInfos.size(), 4);
@@ -342,8 +340,7 @@ public class WSDLServiceBuilderTest {
     @Test
     public void testBindingMessageInfo() throws Exception {
         setUpBasic();
-        BindingInfo bindingInfo = null;
-        bindingInfo = serviceInfo.getBindings().iterator().next();
+        BindingInfo bindingInfo = serviceInfo.getBindings().iterator().next();
 
         QName name = new QName(serviceInfo.getName().getNamespaceURI(), 
"sayHi");
         BindingOperationInfo sayHi = bindingInfo.getOperation(name);
@@ -435,8 +432,7 @@ public class WSDLServiceBuilderTest {
     @Test
     public void testBare() throws Exception {
         setUpWSDL(BARE_WSDL_PATH, 0);
-        BindingInfo bindingInfo = null;
-        bindingInfo = serviceInfo.getBindings().iterator().next();
+        BindingInfo bindingInfo = serviceInfo.getBindings().iterator().next();
         Collection<BindingOperationInfo> bindingOperationInfos = 
bindingInfo.getOperations();
         assertNotNull(bindingOperationInfos);
         assertEquals(bindingOperationInfos.size(), 1);

Reply via email to