Skip to content

Commit 329db50

Browse files
committed
Fix sonar indicated smells
1 parent 63a282e commit 329db50

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

dsl/src/main/java/be/sddevelopment/validation/dsl/rules/CsvRuleSpec.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ public record CsvRuleSpec(
1515
Function<String, RuleSpecificationAppender<CsvFile>> ruleBuilder
1616
) {
1717

18+
public static final String DEFAULT_PARAMETER_SEPARATOR = ",";
19+
1820
public Optional<RuleSpecificationAppender<CsvFile>> toRule(String line) {
1921
return accepts(line) ? ofNullable(ruleBuilder().apply(line)) : empty();
2022
}
@@ -27,7 +29,7 @@ static List<String> parametersFrom(String line) {
2729
String[] rawParameters = line.substring(line.indexOf('(') + 1, line.indexOf(')'))
2830
.trim()
2931
.replace("'", "")
30-
.split(CsvValidationRules.DEFAULT_PARAMETER_SEPARATOR);
32+
.split(DEFAULT_PARAMETER_SEPARATOR);
3133
return Stream.of(rawParameters).map(String::trim).toList();
3234
}
3335
}

dsl/src/main/java/be/sddevelopment/validation/dsl/rules/CsvValidationRules.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
public final class CsvValidationRules {
1919

20-
public static final String DEFAULT_PARAMETER_SEPARATOR = ",";
2120
private static final List<CsvRuleSpec> BASE_RULE_SPECIFICATIONS = List.of(
2221
new CsvRuleSpec("Field", CsvValidationRules::createFieldExistsRule),
2322
new CsvRuleSpec("Distinct", CsvValidationRules::createFieldDistinctnessRule),
@@ -113,7 +112,7 @@ public static CsvValidationRules defaultRules() {
113112
}
114113

115114
public void addRuleSpecification(CsvRuleSpec csvRuleSpec) {
116-
if(isKnownSpecification(csvRuleSpec.ruleName())) {
115+
if (isKnownSpecification(csvRuleSpec.ruleName())) {
117116
throw new IllegalStateException("Rule specification '%s' is already registered".formatted(csvRuleSpec.ruleName()));
118117
}
119118
this.knownRuleSpecifications.add(csvRuleSpec);

dsl/src/test/java/be/sddevelopment/validation/dsl/CsvFileTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void containsFileNameAfterParsing() throws Exception {
5757

5858
var result = CsvFile.fromFile(dataFile);
5959

60-
assertThat(result).satisfies(CsvFile::isNotEmpty);
60+
assertThat(result).matches(CsvFile::isNotEmpty);
6161
assertThat(result.fileIdentifier()).contains("STARWARS_INPUT_DATA.csv");
6262
}
6363

@@ -169,7 +169,7 @@ void passesWhenExpectedRecordsArePresent() throws Exception {
169169
assertThat(dataFile).exists().isRegularFile().hasExtension("csv");
170170

171171
var fileToValidate = CsvFile.fromFile(dataFile);
172-
assertThat(fileToValidate).isNotNull().satisfies(CsvFile::isNotEmpty);
172+
assertThat(fileToValidate).isNotNull().matches(CsvFile::isNotEmpty);
173173

174174
var result = THE_DROIDS_WE_ARE_LOOKING_FOR.constrain(fileToValidate);
175175

@@ -194,7 +194,7 @@ void failsWhenExpectedRecordsAreNotPresent() throws Exception {
194194
Han Solo,180,80,brown,fair,brown,29BBY,male,Corellia,Human
195195
""".lines().toList()
196196
);
197-
assertThat(fileToValidate).isNotNull().satisfies(CsvFile::isNotEmpty);
197+
assertThat(fileToValidate).isNotNull().matches(CsvFile::isNotEmpty);
198198

199199
var result = THE_DROIDS_WE_ARE_LOOKING_FOR.constrain(fileToValidate);
200200
assertThatExceptionOfType(InvalidObjectException.class)

0 commit comments

Comments
 (0)