Skip to content

Commit 62557f9

Browse files
stijn-dejonghstijn-dejongh
committed
Run rewrite recommendations and cleanup
1 parent af7bf26 commit 62557f9

File tree

5 files changed

+387
-382
lines changed

5 files changed

+387
-382
lines changed

‎core/pom.xml

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -2,79 +2,79 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5-
<modelVersion>4.0.0</modelVersion>
5+
<modelVersion>4.0.0</modelVersion>
66

7-
<parent>
8-
<groupId>be.sddevelopment</groupId>
9-
<artifactId>modular-validators</artifactId>
10-
<version>1.0.0-SNAPSHOT</version>
11-
<relativePath>../pom.xml</relativePath>
12-
</parent>
7+
<parent>
8+
<groupId>be.sddevelopment</groupId>
9+
<artifactId>modular-validators</artifactId>
10+
<version>1.0.0-SNAPSHOT</version>
11+
<relativePath>../pom.xml</relativePath>
12+
</parent>
1313

14-
<artifactId>core</artifactId>
14+
<artifactId>core</artifactId>
1515

1616

17-
<dependencies>
18-
<!-- BEGIN TEST SCOPE -->
19-
<dependency>
20-
<groupId>org.junit.jupiter</groupId>
21-
<artifactId>junit-jupiter-api</artifactId>
22-
<scope>test</scope>
23-
</dependency>
24-
<dependency>
25-
<groupId>org.junit.jupiter</groupId>
26-
<artifactId>junit-jupiter-engine</artifactId>
27-
<scope>test</scope>
28-
</dependency>
29-
<dependency>
30-
<groupId>org.assertj</groupId>
31-
<artifactId>assertj-core</artifactId>
32-
<scope>test</scope>
33-
</dependency>
34-
<dependency>
35-
<groupId>org.mockito</groupId>
36-
<artifactId>mockito-junit-jupiter</artifactId>
37-
<scope>test</scope>
38-
</dependency>
39-
<dependency>
40-
<groupId>net.bytebuddy</groupId>
41-
<artifactId>byte-buddy</artifactId>
42-
<scope>test</scope>
43-
</dependency>
44-
<dependency>
45-
<groupId>net.bytebuddy</groupId>
46-
<artifactId>byte-buddy-agent</artifactId>
47-
<scope>test</scope>
48-
</dependency>
49-
<dependency>
50-
<groupId>com.tngtech.archunit</groupId>
51-
<artifactId>archunit</artifactId>
52-
<scope>test</scope>
53-
</dependency>
54-
<dependency>
55-
<groupId>com.tngtech.archunit</groupId>
56-
<artifactId>archunit-junit5</artifactId>
57-
<scope>test</scope>
58-
</dependency>
59-
<dependency>
60-
<groupId>com.tngtech.archunit</groupId>
61-
<artifactId>archunit-junit5-engine</artifactId>
62-
<scope>test</scope>
63-
</dependency>
64-
<!-- END TEST SCOPE -->
17+
<dependencies>
18+
<!-- BEGIN TEST SCOPE -->
19+
<dependency>
20+
<groupId>org.junit.jupiter</groupId>
21+
<artifactId>junit-jupiter-api</artifactId>
22+
<scope>test</scope>
23+
</dependency>
24+
<dependency>
25+
<groupId>org.junit.jupiter</groupId>
26+
<artifactId>junit-jupiter-engine</artifactId>
27+
<scope>test</scope>
28+
</dependency>
29+
<dependency>
30+
<groupId>org.assertj</groupId>
31+
<artifactId>assertj-core</artifactId>
32+
<scope>test</scope>
33+
</dependency>
34+
<dependency>
35+
<groupId>org.mockito</groupId>
36+
<artifactId>mockito-junit-jupiter</artifactId>
37+
<scope>test</scope>
38+
</dependency>
39+
<dependency>
40+
<groupId>net.bytebuddy</groupId>
41+
<artifactId>byte-buddy</artifactId>
42+
<scope>test</scope>
43+
</dependency>
44+
<dependency>
45+
<groupId>net.bytebuddy</groupId>
46+
<artifactId>byte-buddy-agent</artifactId>
47+
<scope>test</scope>
48+
</dependency>
49+
<dependency>
50+
<groupId>com.tngtech.archunit</groupId>
51+
<artifactId>archunit</artifactId>
52+
<scope>test</scope>
53+
</dependency>
54+
<dependency>
55+
<groupId>com.tngtech.archunit</groupId>
56+
<artifactId>archunit-junit5</artifactId>
57+
<scope>test</scope>
58+
</dependency>
59+
<dependency>
60+
<groupId>com.tngtech.archunit</groupId>
61+
<artifactId>archunit-junit5-engine</artifactId>
62+
<scope>test</scope>
63+
</dependency>
64+
<!-- END TEST SCOPE -->
6565

66-
<dependency>
67-
<groupId>com.google.guava</groupId>
68-
<artifactId>guava</artifactId>
69-
</dependency>
70-
<dependency>
71-
<groupId>org.apache.commons</groupId>
72-
<artifactId>commons-lang3</artifactId>
73-
</dependency>
74-
<dependency>
75-
<groupId>org.apache.logging.log4j</groupId>
76-
<artifactId>log4j-slf4j2-impl</artifactId>
77-
</dependency>
78-
</dependencies>
66+
<dependency>
67+
<groupId>com.google.guava</groupId>
68+
<artifactId>guava</artifactId>
69+
</dependency>
70+
<dependency>
71+
<groupId>org.apache.commons</groupId>
72+
<artifactId>commons-lang3</artifactId>
73+
</dependency>
74+
<dependency>
75+
<groupId>org.apache.logging.log4j</groupId>
76+
<artifactId>log4j-slf4j2-impl</artifactId>
77+
</dependency>
78+
</dependencies>
7979

8080
</project>

‎core/src/test/java/be/sddevelopment/validation/specs/code_quality/CodeConventionsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ static boolean isInstantiatable(JavaClass classToCheck) {
7979
return false;
8080
}
8181
} catch (UnsupportedOperationException | InstantiationException |
82-
IllegalAccessException | InvocationTargetException e) {
82+
IllegalAccessException | InvocationTargetException e) {
8383
return false;
8484
}
8585
}

‎core/src/test/java/be/sddevelopment/validation/specs/usage/BasicUsageTest.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
package be.sddevelopment.validation.specs.usage;
22

33
import be.sddevelopment.validation.core.*;
4-
import com.google.common.collect.ImmutableList;
5-
import org.apache.commons.lang3.StringUtils;
64
import org.assertj.core.api.WithAssertions;
75
import org.junit.jupiter.api.DisplayName;
8-
import org.junit.jupiter.api.DisplayNameGeneration;
96
import org.junit.jupiter.api.Nested;
107
import org.junit.jupiter.api.Test;
118

@@ -14,7 +11,6 @@
1411
import java.util.List;
1512
import java.util.Objects;
1613
import java.util.UUID;
17-
import java.util.function.Predicate;
1814

1915
import static be.sddevelopment.validation.CheckedTestUtils.invalid;
2016
import static be.sddevelopment.validation.CheckedTestUtils.valid;
@@ -54,7 +50,8 @@ void canHandleBasicDateLogic() {
5450
.matches(Rationale::isPassing);
5551
}
5652

57-
private record DateBasedDummyObject(LocalDate localDate) {}
53+
private record DateBasedDummyObject(LocalDate localDate) {
54+
}
5855

5956
@Test
6057
void canHandleEmailValidation() {
@@ -80,7 +77,8 @@ private static boolean containsProhibitedAtoms(EmailContact emailContact) {
8077
.anyMatch(atom -> containsIgnoreCase(emailContact.email(), atom));
8178
}
8279

83-
private record EmailContact(UUID userIdentifier, String email, String name, String lastName) { }
80+
private record EmailContact(UUID userIdentifier, String email, String name, String lastName) {
81+
}
8482

8583
}
8684

‎dsl/pom.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5-
<modelVersion>4.0.0</modelVersion>
5+
<modelVersion>4.0.0</modelVersion>
66

7-
<parent>
8-
<groupId>be.sddevelopment</groupId>
9-
<artifactId>modular-validators</artifactId>
10-
<version>1.0.0-SNAPSHOT</version>
11-
<relativePath>../pom.xml</relativePath>
12-
</parent>
7+
<parent>
8+
<groupId>be.sddevelopment</groupId>
9+
<artifactId>modular-validators</artifactId>
10+
<version>1.0.0-SNAPSHOT</version>
11+
<relativePath>../pom.xml</relativePath>
12+
</parent>
1313

14-
<artifactId>dsl</artifactId>
14+
<artifactId>dsl</artifactId>
1515

16-
<properties>
17-
<maven.compiler.source>21</maven.compiler.source>
18-
<maven.compiler.target>21</maven.compiler.target>
19-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
20-
</properties>
16+
<properties>
17+
<maven.compiler.source>21</maven.compiler.source>
18+
<maven.compiler.target>21</maven.compiler.target>
19+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
20+
</properties>
2121

2222

2323
</project>

0 commit comments

Comments
 (0)