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 9c5658b cxf-tools-wsdlto-core: fix PMD rule: UnusedAssignment
9c5658b is described below
commit 9c5658b9b39403cc95d38a61de900af0591222d5
Author: Alexey Markevich <[email protected]>
AuthorDate: Sat Mar 6 13:41:24 2021 +0300
cxf-tools-wsdlto-core: fix PMD rule: UnusedAssignment
---
.../org/apache/cxf/tools/wsdlto/WSDLToJava.java | 5 ++--
.../cxf/tools/wsdlto/WSDLToJavaContainer.java | 31 +++++++++-------------
.../cxf/tools/wsdlto/core/AbstractGenerator.java | 9 +++----
.../apache/cxf/tools/wsdlto/core/PluginLoader.java | 29 +++++++++-----------
.../tools/wsdlto/core/WSDLDefinitionBuilder.java | 2 +-
5 files changed, 33 insertions(+), 43 deletions(-)
diff --git
a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJava.java
b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJava.java
index 4e0c7a7..453f073 100644
---
a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJava.java
+++
b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJava.java
@@ -90,7 +90,7 @@ public class WSDLToJava {
if (os != null) {
this.out = (os instanceof PrintStream) ? (PrintStream)os : new
PrintStream(os);
}
- FrontEndProfile frontend = null;
+ final FrontEndProfile frontend;
if (args != null) {
context.put(ToolConstants.CFG_CMD_ARG, args);
frontend = loadFrontEnd(getFrontEndName(args));
@@ -143,9 +143,8 @@ public class WSDLToJava {
}
List<String> largs = Arrays.asList(pargs);
- int index = 0;
if (largs.contains(key)) {
- index = largs.indexOf(key);
+ int index = largs.indexOf(key);
if (index + 1 < largs.size()) {
return largs.get(index + 1);
}
diff --git
a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
index bc16352..a27d160 100644
---
a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
+++
b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
@@ -136,7 +136,7 @@ public class WSDLToJavaContainer extends
AbstractCXFToolContainer {
URL url = new URL(wsdlURL);
InputStream is = (InputStream)url.getContent();
try (BufferedReader reader = new BufferedReader(new
InputStreamReader(is))) {
- String tempLine = null;
+ String tempLine;
while ((tempLine = reader.readLine()) != null) {
ToolContext freshContext =
initialContextState.makeCopy();
freshContext.put(ToolConstants.CFG_WSDLURL, tempLine);
@@ -429,7 +429,7 @@ public class WSDLToJavaContainer extends
AbstractCXFToolContainer {
if (serviceName != null) {
for (Iterator<QName> ite =
definition.getServices().keySet().iterator(); ite.hasNext();) {
QName qn = ite.next();
- if
(qn.getLocalPart().equalsIgnoreCase(serviceName.toLowerCase())) {
+ if (qn.getLocalPart().equalsIgnoreCase(serviceName)) {
return qn;
}
}
@@ -454,12 +454,11 @@ public class WSDLToJavaContainer extends
AbstractCXFToolContainer {
public void setExcludePackageAndNamespaces(ToolContext env) {
if (env.get(ToolConstants.CFG_NEXCLUDE) != null) {
- String[] pns = null;
+ String[] pns;
try {
pns = (String[])env.get(ToolConstants.CFG_NEXCLUDE);
} catch (ClassCastException e) {
- pns = new String[1];
- pns[0] = (String)env.get(ToolConstants.CFG_NEXCLUDE);
+ pns = new String[]
{(String)env.get(ToolConstants.CFG_NEXCLUDE)};
}
for (int j = 0; j < pns.length; j++) {
@@ -481,12 +480,11 @@ public class WSDLToJavaContainer extends
AbstractCXFToolContainer {
public void setPackageAndNamespaces(ToolContext env) {
if (env.get(ToolConstants.CFG_PACKAGENAME) != null) {
- String[] pns = null;
+ String[] pns;
try {
pns = (String[])env.get(ToolConstants.CFG_PACKAGENAME);
} catch (ClassCastException e) {
- pns = new String[1];
- pns[0] = (String)env.get(ToolConstants.CFG_PACKAGENAME);
+ pns = new String[]
{(String)env.get(ToolConstants.CFG_PACKAGENAME)};
}
for (int j = 0; j < pns.length; j++) {
int pos = pns[j].indexOf('=');
@@ -730,7 +728,7 @@ public class WSDLToJavaContainer extends
AbstractCXFToolContainer {
public List<ServiceValidator> getServiceValidators() {
List<ServiceValidator> validators = new ArrayList<>();
- Properties initialExtensions = null;
+ final Properties initialExtensions;
try {
initialExtensions =
PropertiesLoaderUtils.loadAllProperties(SERVICE_VALIDATOR, Thread
.currentThread().getContextClassLoader());
@@ -781,7 +779,7 @@ public class WSDLToJavaContainer extends
AbstractCXFToolContainer {
List<Definition> defs =
(List<Definition>)context.get(ToolConstants.IMPORTED_DEFINITION);
Map<String, String> importWSDLMap = new HashMap<>();
for (Definition importDef : defs) {
- File importedWsdlFile = null;
+ File importedWsdlFile;
if (!StringUtils.isEmpty(importDef.getDocumentBaseURI())) {
importedWsdlFile = new
File(importDef.getDocumentBaseURI());
} else {
@@ -793,16 +791,13 @@ public class WSDLToJavaContainer extends
AbstractCXFToolContainer {
importWSDLMap.put(importDef.getTargetNamespace(),
importedWsdlFile.getName());
}
- OutputStreamCreator outputStreamCreator = null;
+ final OutputStreamCreator outputStreamCreator;
if (context.get(OutputStreamCreator.class) != null) {
outputStreamCreator = context.get(OutputStreamCreator.class);
} else {
outputStreamCreator = new OutputStreamCreator();
context.put(OutputStreamCreator.class, outputStreamCreator);
}
- Writer os = null;
-
-
for (XmlSchema imp : schemas.getXmlSchemas()) {
if (imp.getSourceURI() != null &&
!imp.getSourceURI().contains(".wsdl#")) {
@@ -813,10 +808,10 @@ public class WSDLToJavaContainer extends
AbstractCXFToolContainer {
Element el = imp.getSchemaDocument().getDocumentElement();
updateImports(el, sourceMap);
updateIncludes(el, sourceMap);
- os = new FileWriterUtil(impfile.getParent(),
context.get(OutputStreamCreator.class))
- .getWriter(impfile, StandardCharsets.UTF_8.name());
- StaxUtils.writeTo(el, os, 2);
- os.close();
+ try (Writer os = new FileWriterUtil(impfile.getParent(),
outputStreamCreator)
+ .getWriter(impfile, StandardCharsets.UTF_8.name())) {
+ StaxUtils.writeTo(el, os, 2);
+ }
}
}
diff --git
a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java
b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java
index 2a1452f..eefacbd 100644
---
a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java
+++
b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java
@@ -72,17 +72,16 @@ public abstract class AbstractGenerator implements
FrontEndGenerator {
}
protected Writer parseOutputName(String packageName, String filename,
String ext) throws ToolException {
- FileWriterUtil fw = null;
- Writer writer = null;
if (wantToKeep() && isCollision(packageName, filename, ext)) {
- Message msg = new Message("SKIP_GEN", LOG, packageName + "." +
filename + ext);
+ Message msg = new Message("SKIP_GEN", LOG, packageName + '.' +
filename + ext);
LOG.log(Level.INFO, msg.toString());
return null;
}
- fw = new FileWriterUtil(getOutputDir(),
+ FileWriterUtil fw = new FileWriterUtil(getOutputDir(),
env.get(OutputStreamCreator.class));
+ final Writer writer;
try {
if (".java".equals(ext)) {
writer = fw.getWriter(packageName, filename + ext,
@@ -91,7 +90,7 @@ public abstract class AbstractGenerator implements
FrontEndGenerator {
writer = fw.getWriter(packageName, filename + ext);
}
} catch (IOException ioe) {
- Message msg = new Message("FAIL_TO_WRITE_FILE", LOG, packageName +
"." + filename + ext);
+ Message msg = new Message("FAIL_TO_WRITE_FILE", LOG, packageName +
'.' + filename + ext);
throw new ToolException(msg, ioe);
}
diff --git
a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
index 3261ffb..7bac0f6 100644
---
a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
+++
b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
@@ -256,7 +256,7 @@ public final class PluginLoader {
if (StringUtils.isEmpty(fullPackage)) {
fullPackage = frontend.getPackage();
}
- return fullPackage + "." + generator.getName();
+ return fullPackage + '.' + generator.getName();
}
private List<FrontEndGenerator> getFrontEndGenerators(FrontEnd frontend) {
@@ -279,7 +279,7 @@ public final class PluginLoader {
}
private FrontEndProfile loadFrontEndProfile(String fullClzName) {
- FrontEndProfile profile = null;
+ final FrontEndProfile profile;
try {
Class<?> clz = ClassLoaderUtils.loadClass(fullClzName,
this.getClass());
profile = (FrontEndProfile)clz.newInstance();
@@ -292,7 +292,7 @@ public final class PluginLoader {
}
private Processor loadProcessor(String fullClzName) {
- Processor processor = null;
+ final Processor processor;
try {
processor = (Processor) ClassLoaderUtils.loadClass(fullClzName,
getClass()).newInstance();
} catch (Exception e) {
@@ -304,7 +304,7 @@ public final class PluginLoader {
}
private Class<? extends ToolContainer> loadContainerClass(String
fullClzName) {
- Class<?> clz = null;
+ final Class<?> clz;
try {
clz = ClassLoaderUtils.loadClass(fullClzName, getClass());
} catch (Exception e) {
@@ -326,7 +326,7 @@ public final class PluginLoader {
if (StringUtils.isEmpty(frontend.getProfile())) {
return "org.apache.cxf.tools.wsdlto.core.FrontEndProfile";
}
- return frontend.getPackage() + "." + frontend.getProfile();
+ return frontend.getPackage() + '.' + frontend.getProfile();
}
private String getProcessorClass(FrontEnd frontend) {
@@ -334,11 +334,11 @@ public final class PluginLoader {
if (StringUtils.isEmpty(pkgName)) {
pkgName = frontend.getPackage();
}
- return pkgName + "." + frontend.getProcessor().getName();
+ return pkgName + '.' + frontend.getProcessor().getName();
}
private String getContainerClass(FrontEnd frontend) {
- return getContainerPackage(frontend) + "." +
frontend.getContainer().getName();
+ return getContainerPackage(frontend) + '.' +
frontend.getContainer().getName();
}
private String getContainerPackage(FrontEnd frontend) {
@@ -351,11 +351,11 @@ public final class PluginLoader {
private String getToolspec(FrontEnd frontend) {
String toolspec = frontend.getContainer().getToolspec();
- return "/" + getContainerPackage(frontend).replace(".", "/") + "/" +
toolspec;
+ return '/' + getContainerPackage(frontend).replace('.', '/') + '/' +
toolspec;
}
private AbstractWSDLBuilder loadBuilder(String fullClzName) {
- AbstractWSDLBuilder builder = null;
+ final AbstractWSDLBuilder builder;
try {
builder = (AbstractWSDLBuilder) ClassLoaderUtils
.loadClass(fullClzName, getClass()).newInstance();
@@ -373,14 +373,13 @@ public final class PluginLoader {
if (StringUtils.isEmpty(pkgName)) {
pkgName = frontend.getPackage();
}
- return pkgName + "." + frontend.getBuilder().getName();
+ return pkgName + '.' + frontend.getBuilder().getName();
}
public FrontEndProfile getFrontEndProfile(String name) {
- FrontEndProfile profile = null;
FrontEnd frontend = getFrontEnd(name);
- profile = loadFrontEndProfile(getFrontEndProfileClass(frontend));
+ FrontEndProfile profile =
loadFrontEndProfile(getFrontEndProfileClass(frontend));
for (FrontEndGenerator generator : getFrontEndGenerators(frontend)) {
profile.registerGenerator(generator);
@@ -409,7 +408,7 @@ public final class PluginLoader {
}
private DataBindingProfile loadDataBindingProfile(String fullClzName) {
- DataBindingProfile profile = null;
+ final DataBindingProfile profile;
try {
profile =
(DataBindingProfile)ClassLoaderUtils.loadClass(fullClzName,
getClass()).newInstance();
@@ -422,10 +421,8 @@ public final class PluginLoader {
}
public DataBindingProfile getDataBindingProfile(String name) {
- DataBindingProfile profile = null;
DataBinding databinding = getDataBinding(name);
- profile = loadDataBindingProfile(databinding.getPackage() + "." +
databinding.getProfile());
- return profile;
+ return loadDataBindingProfile(databinding.getPackage() + '.' +
databinding.getProfile());
}
public Map<String, FrontEnd> getFrontEnds() {
diff --git
a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilder.java
b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilder.java
index 18e44df..3633904 100644
---
a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilder.java
+++
b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilder.java
@@ -129,7 +129,7 @@ public class WSDLDefinitionBuilder implements
WSDLBuilder<Definition> {
}
private void registerWSDLExtensibilityPlugins(ExtensionRegistry registry) {
- Properties initialExtensions = null;
+ final Properties initialExtensions;
try {
initialExtensions =
PropertiesLoaderUtils.loadAllProperties(WSDL_PLUGIN_RESOURCE, Thread
.currentThread().getContextClassLoader());
