builder: meet level 2 naming
* remove duplicate string literal
This commit is contained in:
parent
a804775f1a
commit
c88b820c5f
2 changed files with 7 additions and 5 deletions
|
@ -25,7 +25,7 @@
|
||||||
<checkstyle.version>7.3</checkstyle.version>
|
<checkstyle.version>7.3</checkstyle.version>
|
||||||
<sevntu-checkstyle-maven-plugin.version>1.22.0</sevntu-checkstyle-maven-plugin.version>
|
<sevntu-checkstyle-maven-plugin.version>1.22.0</sevntu-checkstyle-maven-plugin.version>
|
||||||
<kemitix-checkstyle-ruleset.version>2.0.0-SNAPSHOT</kemitix-checkstyle-ruleset.version>
|
<kemitix-checkstyle-ruleset.version>2.0.0-SNAPSHOT</kemitix-checkstyle-ruleset.version>
|
||||||
<kemitix-checkstyle-ruleset.level>1-layout</kemitix-checkstyle-ruleset.level>
|
<kemitix-checkstyle-ruleset.level>2-naming</kemitix-checkstyle-ruleset.level>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
|
|
|
@ -49,6 +49,8 @@ import java.util.stream.Stream;
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
class CheckstyleWriter implements CommandLineRunner {
|
class CheckstyleWriter implements CommandLineRunner {
|
||||||
|
|
||||||
|
private static final String NEWLINE = "\n";
|
||||||
|
|
||||||
private final OutputProperties outputProperties;
|
private final OutputProperties outputProperties;
|
||||||
|
|
||||||
private final TemplateProperties templateProperties;
|
private final TemplateProperties templateProperties;
|
||||||
|
@ -72,14 +74,14 @@ class CheckstyleWriter implements CommandLineRunner {
|
||||||
.filter(rule -> RuleParent.CHECKER.equals(rule.getParent()))
|
.filter(rule -> RuleParent.CHECKER.equals(rule.getParent()))
|
||||||
.filter(rule -> ruleLevel.compareTo(rule.getLevel()) >= 0)
|
.filter(rule -> ruleLevel.compareTo(rule.getLevel()) >= 0)
|
||||||
.map(this::formatRuleAsModule)
|
.map(this::formatRuleAsModule)
|
||||||
.collect(Collectors.joining("\n"));
|
.collect(Collectors.joining(NEWLINE));
|
||||||
val treeWalkerRules = rulesProperties.getRules()
|
val treeWalkerRules = rulesProperties.getRules()
|
||||||
.stream()
|
.stream()
|
||||||
.filter(Rule::isEnabled)
|
.filter(Rule::isEnabled)
|
||||||
.filter(rule -> RuleParent.TREEWALKER.equals(rule.getParent()))
|
.filter(rule -> RuleParent.TREEWALKER.equals(rule.getParent()))
|
||||||
.filter(rule -> ruleLevel.compareTo(rule.getLevel()) >= 0)
|
.filter(rule -> ruleLevel.compareTo(rule.getLevel()) >= 0)
|
||||||
.map(this::formatRuleAsModule)
|
.map(this::formatRuleAsModule)
|
||||||
.collect(Collectors.joining("\n"));
|
.collect(Collectors.joining(NEWLINE));
|
||||||
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
@ -91,7 +93,7 @@ class CheckstyleWriter implements CommandLineRunner {
|
||||||
val bytes = Files.readAllBytes(checkstyleXmlTemplate);
|
val bytes = Files.readAllBytes(checkstyleXmlTemplate);
|
||||||
val template = new String(bytes);
|
val template = new String(bytes);
|
||||||
val output = Arrays.asList(String.format(template, checkerRules, treeWalkerRules)
|
val output = Arrays.asList(String.format(template, checkerRules, treeWalkerRules)
|
||||||
.split("\n"));
|
.split(NEWLINE));
|
||||||
Files.write(xmlFile, output, StandardCharsets.UTF_8, StandardOpenOption.TRUNCATE_EXISTING);
|
Files.write(xmlFile, output, StandardCharsets.UTF_8, StandardOpenOption.TRUNCATE_EXISTING);
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
|
@ -111,6 +113,6 @@ class CheckstyleWriter implements CommandLineRunner {
|
||||||
private String formatProperties(final Map<String, String> properties) {
|
private String formatProperties(final Map<String, String> properties) {
|
||||||
return MapStream.of(properties)
|
return MapStream.of(properties)
|
||||||
.map((k, v) -> String.format("<property name=\"%s\" value=\"%s\"/>", k, v))
|
.map((k, v) -> String.format("<property name=\"%s\" value=\"%s\"/>", k, v))
|
||||||
.collect(Collectors.joining("\n"));
|
.collect(Collectors.joining(NEWLINE));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue