rife2/bld-pmd
rife2/bld-pmd
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make sure the PmdAnalysis is closed

Browse source
This commit is contained in:
Erik C. Thauvin 2025-06-01 10:22:24 -07:00
parent a5f479189e
commit e56791fdb0
Signed by: erik
GPG key ID: 776702A6A2DA330E
4 changed files with 54 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/main/java/rife/bld/extension/PmdOperation.java
View file

@ -22,6 +22,7 @@ import net.sourceforge.pmd.lang.LanguageVersion;
import net.sourceforge.pmd.lang.rule.RulePriority;
import net.sourceforge.pmd.reporting.Report;
import rife.bld.BaseProject;
import rife.bld.extension.pmd.PmdAnalysisResults;
import rife.bld.operations.AbstractOperation;
import rife.bld.operations.exceptions.ExitStatusException;
@ -804,10 +805,9 @@ public class PmdOperation extends AbstractOperation<PmdOperation> {
* @return the number of violations
* @throws ExitStatusException if an error occurs
*/
@SuppressWarnings("PMD.CloseResource")
public PmdAnalysisResults performPmdAnalysis(String commandName, PMDConfiguration config)
throws ExitStatusException {
var pmd = PmdAnalysis.create(config);
try (var pmd = PmdAnalysis.create(config)) {
var report = pmd.performAnalysisAndCollectReport();
if (LOGGER.isLoggable(Level.INFO) && !silent()) {
@ -822,15 +822,12 @@ public class PmdOperation extends AbstractOperation<PmdOperation> {
throw new ExitStatusException(ExitStatusException.EXIT_FAILURE);
}
int rulesChecked = 0;
var rulesChecked = 0;
var rules = pmd.getRulesets();
if (!rules.isEmpty()) {
for (var rule : rules) {
rulesChecked += rule.getRules().size();
}
if (LOGGER.isLoggable(Level.INFO) && !silent()) {
LOGGER.info(String.format("[%s] %d rules were checked.", commandName, rulesChecked));
}
}
var result = new PmdAnalysisResults(
@ -842,24 +839,33 @@ public class PmdOperation extends AbstractOperation<PmdOperation> {
rulesChecked
);
if (result.processingErrors() > 0 && LOGGER.isLoggable(Level.WARNING) && !silent()) {
if (!silent()) {
if (LOGGER.isLoggable(Level.INFO)) {
LOGGER.info(String.format("[%s] %d rules were checked.", commandName, result.rulesChecked()));
}
if (LOGGER.isLoggable(Level.WARNING)) {
if (result.processingErrors() > 0) {
for (var err : report.getProcessingErrors()) {
LOGGER.warning(String.format("[%s] %s", commandName, err.getMsg()));
}
}
if (result.configurationErrors() > 0 && LOGGER.isLoggable(Level.WARNING) && !silent()) {
if (result.configurationErrors() > 0) {
for (var err : report.getConfigurationErrors()) {
LOGGER.warning(String.format("[%s] %s", commandName, err.issue()));
}
}
}
if (LOGGER.isLoggable(Level.FINEST) && !silent()) {
if (LOGGER.isLoggable(Level.FINEST)) {
LOGGER.finest(result.toString());
}
}
return result;
}
}
/**
* Prepend the specified classpath like string to the current ClassLoader of the configuration. If no ClassLoader

2
src/main/java/rife/bld/extension/PmdAnalysisResults.java → src/main/java/rife/bld/extension/pmd/PmdAnalysisResults.java
View file

@ -14,7 +14,7 @@
* limitations under the License.
*/
package rife.bld.extension;
package rife.bld.extension.pmd;
/**
* Represents the results of a PMD analysis, containing various counts

2
src/test/java/rife/bld/extension/PmdOperationTests.java
View file

@ -622,6 +622,8 @@ class PmdOperationTests {
assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME)).violations())
.as(ANALYSIS_FAILURE).isGreaterThan(0);
assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME)).configurationErrors())
.as(ANALYSIS_FAILURE).isGreaterThan(0);
}
@Test

2
src/test/java/rife/bld/extension/PmdAnalysisResultsTests.java → src/test/java/rife/bld/extension/pmd/PmdAnalysisResultsTests.java
View file

@ -14,7 +14,7 @@
* limitations under the License.
*/
package rife.bld.extension;
package rife.bld.extension.pmd;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;