[cxf] branch master updated: cxf-tools-wsdlto-databinding-jaxb: fix PMD rule: UnusedAssignment

[buhhunyx]

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 49169ac  cxf-tools-wsdlto-databinding-jaxb: fix PMD rule: 
UnusedAssignment
49169ac is described below

commit 49169ac265c14a022fcdafded19b364e0f8b12d5
Author: Alexey Markevich <buhhu...@gmail.com>
AuthorDate: Sun Mar 7 13:41:18 2021 +0300

    cxf-tools-wsdlto-databinding-jaxb: fix PMD rule: UnusedAssignment
---
 .../wsdlto/databinding/jaxb/JAXBDataBinding.java      | 19 +++++++++----------
 .../tools/wsdlto/javascript/JavaScriptContainer.java  |  4 ++--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git 
a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
 
b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
index bb42370..552c36b 100644
--- 
a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
+++ 
b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
@@ -17,6 +17,7 @@
  * under the License.
  */
 package org.apache.cxf.tools.wsdlto.databinding.jaxb;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -352,8 +353,7 @@ public class JAXBDataBinding implements DataBindingProfile {
         Bus bus = context.get(Bus.class);
         OASISCatalogManager catalog = 
bus.getExtension(OASISCatalogManager.class);
 
-        Options opts = null;
-        opts = getOptions(schemaCompiler);
+        Options opts = getOptions(schemaCompiler);
         hackInNewInternalizationLogic(schemaCompiler, catalog, opts);
 
         ClassCollector classCollector = context.get(ClassCollector.class);
@@ -524,14 +524,13 @@ public class JAXBDataBinding implements 
DataBindingProfile {
                 }
             };
 
-            Constructor<DOMForest> c = null;
-            DOMForest forest = null;
+            DOMForest forest;
 
             try {
-                c = DOMForest.class.getConstructor(InternalizationLogic.class, 
Options.class);
+                Constructor<DOMForest> c = 
DOMForest.class.getConstructor(InternalizationLogic.class, Options.class);
                 forest = c.newInstance(logic, opts);
             } catch (Throwable t) {
-                c = DOMForest.class.getConstructor(InternalizationLogic.class);
+                Constructor<DOMForest> c = 
DOMForest.class.getConstructor(InternalizationLogic.class);
                 forest = c.newInstance(logic);
             }
             forest.setErrorHandler((ErrorReceiver)schemaCompiler);
@@ -598,13 +597,13 @@ public class JAXBDataBinding implements 
DataBindingProfile {
         return docs[0].getDocumentElement();
     }
     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 void addSchemas(Options opts,
diff --git 
a/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
 
b/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
index 1623333..b1cd224 100644
--- 
a/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
+++ 
b/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
@@ -174,7 +174,7 @@ public class JavaScriptContainer extends 
WSDLToJavaContainer {
     public void setNamespaceJavascriptPrefixes(ToolContext env) {
         Map<String, String> nsPrefixMap = new HashMap<>();
         if (env.get(ToolConstants.CFG_JSPACKAGEPREFIX) != null) {
-            String[] pns = null;
+            final String[] pns;
             try {
                 pns = (String[])env.get(ToolConstants.CFG_JSPACKAGEPREFIX);
             } catch (ClassCastException e) {
@@ -286,7 +286,7 @@ public class JavaScriptContainer extends 
WSDLToJavaContainer {
     public List<ServiceValidator> getServiceValidators() {
         List<ServiceValidator> validators = new ArrayList<>();
 
-        Properties initialExtensions = null;
+        final Properties initialExtensions;
         try {
             initialExtensions = 
PropertiesLoaderUtils.loadAllProperties(SERVICE_VALIDATOR, Thread
                 .currentThread().getContextClassLoader());