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 f37825a cxf-tools-common: fix PMD rule: UnusedAssignment
f37825a is described below
commit f37825ad081b58ffd69203e834cf3fe10238d7d2
Author: Alexey Markevich <[email protected]>
AuthorDate: Tue Mar 2 22:43:55 2021 +0300
cxf-tools-common: fix PMD rule: UnusedAssignment
---
.../apache/cxf/tools/common/VelocityGenerator.java | 20 +++-----
.../cxf/tools/common/toolspec/ToolRunner.java | 2 +-
.../cxf/tools/common/toolspec/parser/Argument.java | 5 +-
.../common/toolspec/parser/CommandLineParser.java | 16 ++-----
.../cxf/tools/common/toolspec/parser/Option.java | 10 ++--
.../org/apache/cxf/tools/util/AnnotationUtil.java | 2 +-
.../java/org/apache/cxf/tools/common/Tag.java | 12 ++---
.../apache/cxf/tools/util/FileWriterUtilTest.java | 56 +++++-----------------
8 files changed, 37 insertions(+), 86 deletions(-)
diff --git
a/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java
b/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java
index 59969d7..afc1741 100644
---
a/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java
+++
b/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java
@@ -23,7 +23,7 @@ import java.io.File;
import java.io.IOException;
import java.io.Writer;
import java.lang.reflect.Constructor;
-import java.util.Calendar;
+import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@@ -55,7 +55,7 @@ public final class VelocityGenerator {
private static String getVelocityLogFile(String logfile) {
String logdir = System.getProperty("user.home");
- if (logdir == null || logdir.length() == 0) {
+ if (logdir == null || logdir.isEmpty()) {
logdir = System.getProperty("user.dir");
}
return logdir + File.separator + logfile;
@@ -93,7 +93,7 @@ public final class VelocityGenerator {
}
public void doWrite(String templateName, Writer outputs) throws
ToolException {
- Template tmpl = null;
+ final Template tmpl;
try {
tmpl = Velocity.getTemplate(templateName);
} catch (Exception e) {
@@ -101,17 +101,11 @@ public final class VelocityGenerator {
throw new ToolException(msg, e);
}
- VelocityContext ctx = new VelocityContext();
+ VelocityContext ctx = new VelocityContext(attributes);
- for (Map.Entry<String, Object> entry : attributes.entrySet()) {
- ctx.put(entry.getKey(), entry.getValue());
- }
-
- VelocityWriter writer = new VelocityWriter(outputs);
- ctx.put("out", writer);
- try {
+ try (VelocityWriter writer = new VelocityWriter(outputs)) {
+ ctx.put("out", writer);
tmpl.merge(ctx, writer);
- writer.close();
} catch (Exception e) {
Message msg = new Message("VELOCITY_ENGINE_WRITE_ERRORS", LOG);
throw new ToolException(msg, e);
@@ -138,7 +132,7 @@ public final class VelocityGenerator {
}
public void setCommonAttributes() {
- attributes.put("currentdate", Calendar.getInstance().getTime());
+ attributes.put("currentdate", new Date());
attributes.put("version", Version.getCurrentVersion());
attributes.put("name", Version.getName());
attributes.put("fullversion", Version.getCompleteVersionString());
diff --git
a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolRunner.java
b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolRunner.java
index e0fbcc3..904961b 100644
---
a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolRunner.java
+++
b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolRunner.java
@@ -76,7 +76,7 @@ public final class ToolRunner {
OutputStream os) throws Exception {
System.setProperty("org.apache.cxf.JDKBugHacks.defaultUsesCaches",
"true");
- ToolContainer container = null;
+ final ToolContainer container;
try {
Constructor<? extends ToolContainer> cons
diff --git
a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Argument.java
b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Argument.java
index b533282..91f1ef5c 100644
---
a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Argument.java
+++
b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Argument.java
@@ -86,12 +86,11 @@ public class Argument implements TokenConsumer {
}
private boolean isAtleastMinimum() {
- boolean result = true;
- int minOccurs = 0;
-
+ final boolean result;
if (!"".equals(element.getAttribute("minOccurs"))) {
result = numMatches >=
Integer.parseInt(element.getAttribute("minOccurs"));
} else {
+ int minOccurs = 0;
result = numMatches >= minOccurs;
}
return result;
diff --git
a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java
b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java
index ba37374..103f681 100644
---
a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java
+++
b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java
@@ -213,7 +213,7 @@ public class CommandLineParser {
}
public String getFormattedDetailedUsage() throws TransformerException,
IOException {
- String usage = null;
+ final String usage;
try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
InputStream is =
getClass().getResourceAsStream("detailedUsage.xsl")) {
toolspec.transform(is, baos);
@@ -231,17 +231,9 @@ public class CommandLineParser {
int optSpan = optSize + afterOptLen - 1;
int beforeDesSpan = beforeOptSpan + optSpan + 1;
String lineSeparator = System.getProperty("line.separator");
- StringTokenizer st1 = new StringTokenizer(usage, lineSeparator);
- int i = 0;
- int length = st1.countTokens();
- String[] originalStrs = new String[length];
- while (st1.hasMoreTokens()) {
- String str = st1.nextToken();
- originalStrs[i] = str;
- i++;
- }
+ String[] originalStrs = usage.split(lineSeparator);
StringBuilder strbuffer = new StringBuilder();
- for (int j = 0; j < length - 1; j = j + 2) {
+ for (int j = 0; j < originalStrs.length - 1; j = j + 2) {
int optionLen = originalStrs[j].length();
addWhiteNamespace(strbuffer, beforeOptSpan);
if (optionLen <= optSpan) {
@@ -267,7 +259,7 @@ public class CommandLineParser {
}
String tmpStr = originalStrs[j + 1];
- for (i = 0; i < tmpStr.length(); i = i + (totalLen -
beforeDesSpan)) {
+ for (int i = 0; i < tmpStr.length(); i = i + (totalLen -
beforeDesSpan)) {
if (i + totalLen - beforeDesSpan < tmpStr.length()) {
addWhiteNamespace(strbuffer, beforeDesSpan);
int lastIdx = i + totalLen - beforeDesSpan;
diff --git
a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Option.java
b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Option.java
index 6031ec0..fdeaa12 100644
---
a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Option.java
+++
b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Option.java
@@ -252,25 +252,23 @@ public class Option implements TokenConsumer {
}
private boolean isAtleastMinimum() {
- boolean result = true;
- int minOccurs = 0;
-
+ final boolean result;
if (!"".equals(element.getAttribute("minOccurs"))) {
result = numMatches >=
Integer.parseInt(element.getAttribute("minOccurs"));
} else {
+ int minOccurs = 0;
result = numMatches >= minOccurs;
}
return result;
}
private boolean isNoGreaterThanMaximum() {
- boolean result = true;
- int maxOccurs = 1;
-
+ final boolean result;
if (!"".equals(element.getAttribute("maxOccurs"))) {
result = "unbounded".equals(element.getAttribute("maxOccurs"))
|| numMatches <=
Integer.parseInt(element.getAttribute("maxOccurs"));
} else {
+ int maxOccurs = 1;
result = numMatches <= maxOccurs;
}
return result;
diff --git
a/tools/common/src/main/java/org/apache/cxf/tools/util/AnnotationUtil.java
b/tools/common/src/main/java/org/apache/cxf/tools/util/AnnotationUtil.java
index fbfa990..0ebc21e 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/util/AnnotationUtil.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/util/AnnotationUtil.java
@@ -78,7 +78,7 @@ public final class AnnotationUtil {
return ClassLoaderUtils.getURLClassLoader(urls, parent);
}
public static synchronized Class<?> loadClass(String className,
ClassLoader parent) {
- Class<?> clazz = null;
+ final Class<?> clazz;
URL[] urls = URIParserUtil.pathToURLs(getClassPath());
ClassLoader classLoader = newLoader(urls, parent);
try {
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/Tag.java
b/tools/common/src/test/java/org/apache/cxf/tools/common/Tag.java
similarity index 92%
rename from tools/common/src/main/java/org/apache/cxf/tools/common/Tag.java
rename to tools/common/src/test/java/org/apache/cxf/tools/common/Tag.java
index 353bbd0..d890c8c 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/Tag.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/Tag.java
@@ -104,33 +104,31 @@ public class Tag {
return sb.toString().trim();
}
- private String formatTag(Tag tag, int indent) {
- StringBuilder sb = new StringBuilder();
+ private void formatTag(Tag tag, int indent, StringBuilder sb) {
sb.append(createIndent(indent));
sb.append(indent);
sb.append('<');
sb.append(formatAttribute(tag));
sb.append('>');
if (tag.getParent() != null) {
- sb.append(" (" + tag.getParent().getName().getLocalPart() + ")");
+ sb.append("
(").append(tag.getParent().getName().getLocalPart()).append(')');
}
if (text != null) {
sb.append(text);
}
sb.append('\n');
- if (tag.getTags().size() > 0) {
+ if (!tag.getTags().isEmpty()) {
indent++;
for (Tag subTag : tag.getTags()) {
- sb.append(formatTag(subTag, indent));
+ formatTag(subTag, indent, sb);
}
}
- return sb.toString();
}
public String toString() {
StringBuilder sb = new StringBuilder();
- sb.append(formatTag(this, 0));
+ formatTag(this, 0, sb);
return sb.toString();
}
diff --git
a/tools/common/src/test/java/org/apache/cxf/tools/util/FileWriterUtilTest.java
b/tools/common/src/test/java/org/apache/cxf/tools/util/FileWriterUtilTest.java
index a262565..1189682 100644
---
a/tools/common/src/test/java/org/apache/cxf/tools/util/FileWriterUtilTest.java
+++
b/tools/common/src/test/java/org/apache/cxf/tools/util/FileWriterUtilTest.java
@@ -18,66 +18,36 @@
*/
package org.apache.cxf.tools.util;
+
import java.io.File;
-import java.io.IOException;
+import java.io.Writer;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
public class FileWriterUtilTest {
- private void cleanDir(File dir) {
- try {
- for (File fl : dir.listFiles()) {
- if (fl.isDirectory()) {
- cleanDir(fl);
- } else {
- fl.delete();
- }
- }
- } catch (Exception ex) {
- //ignore
- }
- dir.delete();
- }
+ @Rule
+ public TemporaryFolder targetDir = new TemporaryFolder();
@Test
public void testGetFile() throws Exception {
- FileWriterUtil fileWriter = null;
- String tmpDir = System.getProperty("java.io.tmpdir");
- File targetDir = new File(tmpDir + File.separator + "target");
- try {
- targetDir.mkdirs();
- fileWriter = new FileWriterUtil(targetDir.getAbsolutePath(), null);
- fileWriter.getWriter("com.iona.test", "A.java");
- String packPath = "/com/iona/test/A.java".replace('/',
File.separatorChar);
- String path = targetDir.getAbsolutePath() + packPath;
- assertNotNull(new File(path).getName());
- } catch (IOException e) {
- e.printStackTrace();
- } finally {
- cleanDir(targetDir);
+ FileWriterUtil fileWriter = new
FileWriterUtil(targetDir.getRoot().getAbsolutePath(), null);
+ try (Writer w = fileWriter.getWriter("com.iona.test", "A.java")) {
+ assertTrue(new File(targetDir.getRoot(),
"/com/iona/test/A.java").canWrite());
}
-
}
@Test
public void testGetWriter() throws Exception {
- FileWriterUtil fileWriter = null;
- String tmpDir = System.getProperty("java.io.tmpdir");
- File targetDir = new File(tmpDir + File.separator + "target");
-
- try {
- targetDir.mkdirs();
- fileWriter = new FileWriterUtil(targetDir.getAbsolutePath(), null);
- assertNotNull(fileWriter.getWriter("com.iona.test.SAMPLE",
"A.java"));
- } catch (IOException e) {
- e.printStackTrace();
- } finally {
- cleanDir(targetDir);
+ FileWriterUtil fileWriter = new
FileWriterUtil(targetDir.getRoot().getAbsolutePath(), null);
+ try (Writer w = fileWriter.getWriter("com.iona.test.SAMPLE",
"A.java")) {
+ assertNotNull(w);
}
}
-
}
\ No newline at end of file
