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 48e6367 cxf-tools-wsdlto-frontend-jaxws: fix PMD rule:
UnusedAssignment
48e6367 is described below
commit 48e63678e194e9a92c8ee0a5b43a3a04a53d44f1
Author: Alexey Markevich <[email protected]>
AuthorDate: Sat Mar 6 16:26:42 2021 +0300
cxf-tools-wsdlto-frontend-jaxws: fix PMD rule: UnusedAssignment
---
.../jaxws/customization/CustomizationParser.java | 17 +++++++++--------
.../wsdlto/frontend/jaxws/generators/ImplGenerator.java | 5 +----
.../frontend/jaxws/processor/WSDLToJavaProcessor.java | 2 +-
.../jaxws/processor/internal/FaultProcessor.java | 4 ++--
.../jaxws/processor/internal/ParameterProcessor.java | 12 ++++--------
.../jaxws/processor/internal/ProcessorUtil.java | 4 ++--
.../jaxws/processor/internal/ServiceProcessor.java | 10 ++++------
.../internal/annotator/WebMethodAnnotator.java | 2 +-
.../processor/internal/annotator/WebParamAnnotator.java | 2 +-
.../internal/annotator/WebResultAnnotator.java | 2 +-
.../internal/annotator/WebServiceAnnotator.java | 2 +-
.../internal/annotator/XmlSeeAlsoAnnotator.java | 2 +-
12 files changed, 28 insertions(+), 36 deletions(-)
diff --git
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
index 3dfe73f..8321a07 100644
---
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
+++
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
@@ -20,6 +20,7 @@ package
org.apache.cxf.tools.wsdlto.frontend.jaxws.customization;
import java.io.File;
import java.io.IOException;
+import java.io.Writer;
import java.net.URI;
import java.net.URISyntaxException;
import java.nio.file.Files;
@@ -475,7 +476,7 @@ public final class CustomizationParser {
private void addBinding(String bindingFile) throws XMLStreamException {
- Element root = null;
+ final Element root;
XMLStreamReader xmlReader = null;
try (URIResolver resolver = new URIResolver(bindingFile)) {
xmlReader =
StaxUtils.createXMLStreamReader(resolver.getURI().toString(),
resolver.getInputStream());
@@ -491,7 +492,7 @@ public final class CustomizationParser {
if (isValidJaxwsBindingFile(bindingFile, reader)) {
String wsdlLocation = root.getAttribute("wsdlLocation");
- Element targetNode = null;
+ Element targetNode;
if (!StringUtils.isEmpty(wsdlLocation)) {
String wsdlURI = getAbsoluteURI(wsdlLocation, bindingFile);
targetNode = getTargetNode(wsdlURI);
@@ -518,7 +519,7 @@ public final class CustomizationParser {
String schemaLocation = root.getAttribute("schemaLocation");
String resolvedSchemaLocation = resolveByCatalog(schemaLocation);
if (resolvedSchemaLocation != null) {
- InputSource tmpIns = null;
+ final InputSource tmpIns;
try {
tmpIns = convertToTmpInputSource(root,
resolvedSchemaLocation);
} catch (Exception e1) {
@@ -533,7 +534,7 @@ public final class CustomizationParser {
}
private String getAbsoluteURI(String uri, String bindingFile) {
- URI locURI = null;
+ URI locURI;
try {
locURI = new URI(uri);
} catch (URISyntaxException e) {
@@ -578,13 +579,13 @@ public final class CustomizationParser {
}
private InputSource convertToTmpInputSource(Element ele, String schemaLoc)
throws Exception {
- InputSource result = null;
ele.setAttributeNS(null, "schemaLocation", schemaLoc);
File tmpFile = FileUtils.createTempFile("jaxbbinding", ".xml");
- StaxUtils.writeTo(ele, Files.newOutputStream(tmpFile.toPath()));
- result = new
InputSource(URIParserUtil.getAbsoluteURI(tmpFile.getAbsolutePath()));
tmpFile.deleteOnExit();
- return result;
+ try (Writer w = Files.newBufferedWriter(tmpFile.toPath())) {
+ StaxUtils.writeTo(ele, w);
+ }
+ return new
InputSource(URIParserUtil.getAbsoluteURI(tmpFile.getAbsolutePath()));
}
private boolean isValidJaxbBindingFile(XMLStreamReader reader) {
diff --git
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java
index fe6a36b..86620bb 100644
---
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java
+++
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java
@@ -65,14 +65,11 @@ public class ImplGenerator extends AbstractJAXWSGenerator {
Map<String, JavaServiceClass> services =
javaModel.getServiceClasses();
- JavaServiceClass service = null;
if (!services.values().isEmpty()) {
for (JavaServiceClass javaservice : services.values()) {
- service = javaservice;
for (JavaPort jport : javaservice.getPorts()) {
JavaInterface intf =
interfaces.get(jport.getInterfaceClass());
- outputImpl(intf, service, jport.getPortName(), penv);
-
+ outputImpl(intf, javaservice, jport.getPortName(),
penv);
}
}
} else {
diff --git
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/WSDLToJavaProcessor.java
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/WSDLToJavaProcessor.java
index 4ea41bf..2aa705b 100644
---
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/WSDLToJavaProcessor.java
+++
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/WSDLToJavaProcessor.java
@@ -62,7 +62,7 @@ public class WSDLToJavaProcessor extends WSDLToProcessor
implements ClassNamePro
}
private JavaModel wsdlDefinitionToJavaModel(ServiceInfo serviceInfo)
throws ToolException {
- JavaModel javaModel = null;
+ final JavaModel javaModel;
Map<QName, JavaModel> map = CastUtils.cast((Map<?,
?>)context.get(MODEL_MAP));
if (map == null) {
map = new LinkedHashMap<>();
diff --git
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/FaultProcessor.java
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/FaultProcessor.java
index 7e6269b..949634b 100644
---
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/FaultProcessor.java
+++
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/FaultProcessor.java
@@ -108,8 +108,8 @@ public class FaultProcessor extends AbstractProcessor {
expClass.setPackageName(packageName);
for (MessagePartInfo part : faultParts) {
- String fName = null;
- String fNamespace = null;
+ final String fName;
+ String fNamespace;
if (part.getElementQName() != null) {
fNamespace = part.getElementQName().getNamespaceURI();
diff --git
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
index 9357c7a..b59834e 100644
---
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
+++
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
@@ -526,9 +526,7 @@ public class ParameterProcessor extends AbstractProcessor {
private JavaParameter getParameterFromQName(QName wrapperElement, QName
item, JavaType.Style style,
MessagePartInfo part) {
- String fullJavaName = "";
-
- fullJavaName = this.dataBinding.getWrappedElementType(wrapperElement,
item);
+ String fullJavaName =
this.dataBinding.getWrappedElementType(wrapperElement, item);
String targetNamespace = item.getNamespaceURI();
@@ -556,10 +554,8 @@ public class ParameterProcessor extends AbstractProcessor {
private JavaReturn getReturnFromQName(QName element, MessagePartInfo part)
{
- String fullJavaName = "";
- String simpleJavaName = "";
- fullJavaName =
this.dataBinding.getWrappedElementType(part.getElementQName(), element);
- simpleJavaName = fullJavaName;
+ String fullJavaName =
this.dataBinding.getWrappedElementType(part.getElementQName(), element);
+ String simpleJavaName = fullJavaName;
int index = fullJavaName.lastIndexOf('.');
@@ -567,7 +563,7 @@ public class ParameterProcessor extends AbstractProcessor {
simpleJavaName = fullJavaName.substring(index);
}
- String targetNamespace = "";
+ final String targetNamespace;
if (isHeader(part)) {
targetNamespace =
part.getMessageInfo().getOperation().getInterface().
getService().getTargetNamespace();
diff --git
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java
index ea3fd34..7846302 100644
---
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java
+++
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java
@@ -76,7 +76,7 @@ public final class ProcessorUtil {
}
public static String getType(MessagePartInfo part, ToolContext context,
boolean fullname) {
- String type = "";
+ String type;
DataBindingProfile dataBinding = context.get(DataBindingProfile.class);
if (part.isElement()) {
type = dataBinding.getType(getElementName(part), true);
@@ -138,7 +138,7 @@ public final class ProcessorUtil {
}
return resolvePartType(part);
}
- String name = "";
+ String name;
if (part.isElement()) {
name = dataBinding.getType(getElementName(part), true);
} else {
diff --git
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
index fa89743..483e584 100644
---
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
+++
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
@@ -679,10 +679,8 @@ public class ServiceProcessor extends AbstractProcessor {
QName operationName = bop.getName();
MessageInfo bodyMessage = null;
QName headerMessage = null;
- SoapHeader header = null;
boolean containParts = false;
boolean isSameMessage = false;
- boolean isNonWrappable = false;
boolean allPartsHeader = false;
int result = NO_HEADER;
@@ -696,7 +694,7 @@ public class ServiceProcessor extends AbstractProcessor {
bodyMessage = getMessage(operationName, true);
}
if (SOAPBindingUtil.isSOAPHeader(ext)) {
- header = SOAPBindingUtil.getSoapHeader(ext);
+ SoapHeader header = SOAPBindingUtil.getSoapHeader(ext);
headerMessage = header.getMessage();
if (header.getPart().length() > 0) {
containParts = true;
@@ -711,7 +709,7 @@ public class ServiceProcessor extends AbstractProcessor {
isSameMessage = true;
}
- isNonWrappable = isSameMessage && containParts;
+ boolean isNonWrappable = isSameMessage && containParts;
// if is nonwrapple then return
if (isNonWrappable) {
result = IN_HEADER;
@@ -729,7 +727,7 @@ public class ServiceProcessor extends AbstractProcessor {
bodyMessage = getMessage(operationName, false);
}
if (SOAPBindingUtil.isSOAPHeader(ext)) {
- header = SOAPBindingUtil.getSoapHeader(ext);
+ SoapHeader header = SOAPBindingUtil.getSoapHeader(ext);
headerMessage = header.getMessage();
if (header.getPart().length() > 0) {
containParts = true;
@@ -746,7 +744,7 @@ public class ServiceProcessor extends AbstractProcessor {
}
}
- isNonWrappable = isSameMessage && containParts;
+ boolean isNonWrappable = isSameMessage && containParts;
if (isNonWrappable && allPartsHeader) {
result = RESULT_HEADER;
}
diff --git
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebMethodAnnotator.java
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebMethodAnnotator.java
index c1400e6..38905ed 100644
---
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebMethodAnnotator.java
+++
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebMethodAnnotator.java
@@ -31,7 +31,7 @@ import org.apache.cxf.tools.common.model.JavaMethod;
public class WebMethodAnnotator implements Annotator {
public void annotate(JavaAnnotatable ja) {
- JavaMethod method = null;
+ final JavaMethod method;
if (ja instanceof JavaMethod) {
method = (JavaMethod) ja;
} else {
diff --git
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotator.java
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotator.java
index 46a8fbd..bb42f22 100644
---
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotator.java
+++
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotator.java
@@ -40,7 +40,7 @@ public class WebParamAnnotator implements Annotator {
}
public void annotate(JavaAnnotatable ja) {
- JavaParameter parameter = null;
+ final JavaParameter parameter;
if (ja instanceof JavaParameter) {
parameter = (JavaParameter) ja;
} else {
diff --git
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebResultAnnotator.java
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebResultAnnotator.java
index 3893db9..4441b78 100644
---
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebResultAnnotator.java
+++
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebResultAnnotator.java
@@ -32,7 +32,7 @@ import org.apache.cxf.tools.common.model.JavaMethod;
public class WebResultAnnotator implements Annotator {
public void annotate(JavaAnnotatable ja) {
- JavaMethod method = null;
+ final JavaMethod method;
if (ja instanceof JavaMethod) {
method = (JavaMethod) ja;
} else {
diff --git
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebServiceAnnotator.java
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebServiceAnnotator.java
index 861d1bd..a923d76 100644
---
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebServiceAnnotator.java
+++
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebServiceAnnotator.java
@@ -30,7 +30,7 @@ import org.apache.cxf.tools.common.model.JavaInterface;
public final class WebServiceAnnotator implements Annotator {
public void annotate(JavaAnnotatable ja) {
- JavaInterface intf = null;
+ final JavaInterface intf;
if (ja instanceof JavaInterface) {
intf = (JavaInterface) ja;
} else {
diff --git
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlSeeAlsoAnnotator.java
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlSeeAlsoAnnotator.java
index 9229421..75e448a 100644
---
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlSeeAlsoAnnotator.java
+++
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlSeeAlsoAnnotator.java
@@ -44,7 +44,7 @@ public final class XmlSeeAlsoAnnotator implements Annotator {
return;
}
- JavaInterface intf = null;
+ final JavaInterface intf;
if (ja instanceof JavaInterface) {
intf = (JavaInterface) ja;
} else {
