kemitix/kemitix-checkstyle-ruleset
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bump classgraph from 4.2.9 to 4.2.12 (#133)

Browse source 
* Bump classgraph from 4.2.9 to 4.2.12

Bumps [classgraph](https://github.com/classgraph/classgraph) from 4.2.9 to 4.2.12.
- [Release notes](https://github.com/classgraph/classgraph/releases)
- [Commits](https://github.com/classgraph/classgraph/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Use try-with-resources to close ClassGraph's ScanResult

ClassGraph 4.2.10 highlighted the need to close the ScanResult over depending on
automated methods.

* [changelog] updated
This commit is contained in:
dependabot[bot] 2018-10-11 07:32:54 +01:00 committed by Paul Campbell
parent 007738b1eb
commit 2732c2ca47
3 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG
View file

@ -7,7 +7,7 @@ CHANGELOG
* Bump mockito-core from 2.22.0 to 2.23.0 (#129) * Bump mockito-core from 2.22.0 to 2.23.0 (#129)
* Bump kemitix-parent from 5.1.1 to 5.2.0 (#130) * Bump kemitix-parent from 5.1.1 to 5.2.0 (#130)
* [jenkins] Don't use verify profile with clean phase (#131) * [jenkins] Don't use verify profile with clean phase (#131)
* Bump classgraph from 4.2.8 to 4.2.9 (#132) * Bump classgraph from 4.2.8 to 4.2.12 (#132)(#133)
5.1.0 5.1.0
----- -----

2
builder/pom.xml
View file

@ -32,7 +32,7 @@
<mockito.version>2.23.0</mockito.version> <mockito.version>2.23.0</mockito.version>
<assertj.version>3.11.1</assertj.version> <assertj.version>3.11.1</assertj.version>
<conditional.version>0.7.0</conditional.version> <conditional.version>0.7.0</conditional.version>
<classgraph.version>4.2.9</classgraph.version> <classgraph.version>4.2.12</classgraph.version>
<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version> <maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
<kemitix.checkstyle.ruleset.version>${project.version}</kemitix.checkstyle.ruleset.version> <kemitix.checkstyle.ruleset.version>${project.version}</kemitix.checkstyle.ruleset.version>

16
builder/src/main/java/net/kemitix/checkstyle/ruleset/builder/ClassGraphPackageScanner.java
View file

@ -22,6 +22,7 @@
package net.kemitix.checkstyle.ruleset.builder; package net.kemitix.checkstyle.ruleset.builder;
import io.github.classgraph.ClassGraph; import io.github.classgraph.ClassGraph;
import io.github.classgraph.ScanResult;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
@ -37,16 +38,25 @@ import java.util.stream.Collectors;
@Service @Service
public class ClassGraphPackageScanner implements PackageScanner { public class ClassGraphPackageScanner implements PackageScanner {
private final ClassGraph classGraph = new ClassGraph();
@Override @Override
public final List<String> apply(final RuleSource ruleSource) { public final List<String> apply(final RuleSource ruleSource) {
final String basePackage = ruleSource.getBasePackage(); final String basePackage = ruleSource.getBasePackage();
return new ClassGraph() try (ScanResult scanResult = scanPackage(classGraph, basePackage)) {
.whitelistPackages(basePackage) return scanResult
.scan()
.getAllStandardClasses() .getAllStandardClasses()
.getNames() .getNames()
.stream() .stream()
.filter(packageName -> packageName.startsWith(basePackage)) .filter(packageName -> packageName.startsWith(basePackage))
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
}
private static ScanResult scanPackage(final ClassGraph classGraph, final String basePackage) {
return classGraph
.whitelistPackages(basePackage)
.scan();
}
} }