phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pr-1401'

Browse Source
This commit is contained in:
Andreas Dangel
2018-10-26 18:29:06 +02:00
parent c35c2a0347 0d63925684
commit 1d48c49c81
24 changed files with 108 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidDuplicateLiteralsRule.java
View File

@ -17,7 +17,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import net.sourceforge.pmd.lang.java.ast.ASTAnnotation;
@ -116,17 +115,13 @@ public class AvoidDuplicateLiteralsRule extends AbstractJavaRule {
exceptions = p.parse(getProperty(EXCEPTION_LIST_DESCRIPTOR));
} else if (getProperty(EXCEPTION_FILE_DESCRIPTOR) != null) {
exceptions = new HashSet<>();
LineNumberReader reader = null;
try {
reader = getLineReader();
try (LineNumberReader reader = getLineReader()) {
String line;
while ((line = reader.readLine()) != null) {
exceptions.add(line);
}
} catch (IOException ioe) {
ioe.printStackTrace();
} finally {
IOUtils.closeQuietly(reader);
throw new RuntimeException(ioe);
}
}

5
pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ParserCornersTest.java
View File

@ -275,13 +275,10 @@ public class ParserCornersTest {
}
private String readAsString(String resource) {
InputStream in = ParserCornersTest.class.getResourceAsStream(resource);
try {
try (InputStream in = ParserCornersTest.class.getResourceAsStream(resource)) {
return IOUtils.toString(in, StandardCharsets.UTF_8);
} catch (IOException e) {
throw new RuntimeException(e);
} finally {
IOUtils.closeQuietly(in);
}
}