Skip to content

Commit 4af89fc

Browse files
stijn-dejonghstijn-dejongh
committed
Further implementation of Specification DSL
1 parent 4af103c commit 4af89fc

File tree

23 files changed

+912
-209
lines changed

23 files changed

+912
-209
lines changed

‎core/sbom.xml‎

Lines changed: 216 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,216 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<bom xmlns="http://cyclonedx.org/schema/bom/1.6" version="1.1.0-SNAPSHOT">
3+
<metadata>
4+
<tools>
5+
<tool>
6+
<vendor>OpenRewrite by Moderne</vendor>
7+
<name>OpenRewrite CycloneDX</name>
8+
<version>8.32.0</version>
9+
</tool>
10+
</tools>
11+
<component bom-ref="pkg:maven/be.sddevelopment.validation/[email protected]">
12+
<group>be.sddevelopment.validation</group>
13+
<name>core</name>
14+
<version>1.1.0-SNAPSHOT</version>
15+
<purl>pkg:maven/be.sddevelopment.validation/[email protected]</purl>
16+
</component>
17+
</metadata>
18+
<components>
19+
<component bom-ref="pkg:maven/be.sddevelopment.commons/[email protected]">
20+
<group>be.sddevelopment.commons</group>
21+
<name>commons-kernel</name>
22+
<version>1.0.1</version>
23+
<scope>required</scope>
24+
<licenses/>
25+
<purl>pkg:maven/be.sddevelopment.commons/[email protected]</purl>
26+
</component>
27+
<component bom-ref="pkg:maven/be.sddevelopment.commons/[email protected]">
28+
<group>be.sddevelopment.commons</group>
29+
<name>commons</name>
30+
<version>1.0.1</version>
31+
<scope>required</scope>
32+
<licenses/>
33+
<purl>pkg:maven/be.sddevelopment.commons/[email protected]</purl>
34+
</component>
35+
<component bom-ref="pkg:maven/com.google.guava/[email protected]">
36+
<group>com.google.guava</group>
37+
<name>guava</name>
38+
<version>33.3.0-jre</version>
39+
<scope>required</scope>
40+
<licenses/>
41+
<purl>pkg:maven/com.google.guava/[email protected]</purl>
42+
</component>
43+
<component bom-ref="pkg:maven/org.apache.commons/[email protected]">
44+
<group>org.apache.commons</group>
45+
<name>commons-lang3</name>
46+
<version>3.14.0</version>
47+
<scope>required</scope>
48+
<licenses/>
49+
<purl>pkg:maven/org.apache.commons/[email protected]</purl>
50+
</component>
51+
<component bom-ref="pkg:maven/org.apache.logging.log4j/[email protected]">
52+
<group>org.apache.logging.log4j</group>
53+
<name>log4j-slf4j2-impl</name>
54+
<version>2.24.0</version>
55+
<scope>required</scope>
56+
<licenses>
57+
<license>
58+
<name>Apache-2.0</name>
59+
</license>
60+
</licenses>
61+
<purl>pkg:maven/org.apache.logging.log4j/[email protected]</purl>
62+
</component>
63+
<component bom-ref="pkg:maven/org.jspecify/[email protected]">
64+
<group>org.jspecify</group>
65+
<name>jspecify</name>
66+
<version>1.0.0</version>
67+
<scope>required</scope>
68+
<licenses>
69+
<license>
70+
<name>The Apache License, Version 2.0</name>
71+
</license>
72+
</licenses>
73+
<purl>pkg:maven/org.jspecify/[email protected]</purl>
74+
</component>
75+
<component bom-ref="pkg:maven/org.projectlombok/[email protected]">
76+
<group>org.projectlombok</group>
77+
<name>lombok</name>
78+
<version>1.18.32</version>
79+
<scope>required</scope>
80+
<licenses>
81+
<license>
82+
<name>The MIT License</name>
83+
</license>
84+
</licenses>
85+
<purl>pkg:maven/org.projectlombok/[email protected]</purl>
86+
</component>
87+
<component bom-ref="pkg:maven/com.google.guava/[email protected]">
88+
<group>com.google.guava</group>
89+
<name>failureaccess</name>
90+
<version>1.0.2</version>
91+
<scope>required</scope>
92+
<licenses/>
93+
<purl>pkg:maven/com.google.guava/[email protected]</purl>
94+
</component>
95+
<component bom-ref="pkg:maven/com.google.guava/[email protected]">
96+
<group>com.google.guava</group>
97+
<name>listenablefuture</name>
98+
<version>9999.0-empty-to-avoid-conflict-with-guava</version>
99+
<scope>required</scope>
100+
<licenses/>
101+
<purl>pkg:maven/com.google.guava/[email protected]</purl>
102+
</component>
103+
<component bom-ref="pkg:maven/com.google.code.findbugs/[email protected]">
104+
<group>com.google.code.findbugs</group>
105+
<name>jsr305</name>
106+
<version>3.0.2</version>
107+
<scope>required</scope>
108+
<licenses>
109+
<license>
110+
<name>The Apache Software License, Version 2.0</name>
111+
</license>
112+
</licenses>
113+
<purl>pkg:maven/com.google.code.findbugs/[email protected]</purl>
114+
</component>
115+
<component bom-ref="pkg:maven/org.checkerframework/[email protected]">
116+
<group>org.checkerframework</group>
117+
<name>checker-qual</name>
118+
<version>3.43.0</version>
119+
<scope>required</scope>
120+
<licenses>
121+
<license>
122+
<name>The MIT License</name>
123+
</license>
124+
</licenses>
125+
<purl>pkg:maven/org.checkerframework/[email protected]</purl>
126+
</component>
127+
<component bom-ref="pkg:maven/com.google.errorprone/[email protected]">
128+
<group>com.google.errorprone</group>
129+
<name>error_prone_annotations</name>
130+
<version>2.28.0</version>
131+
<scope>required</scope>
132+
<licenses>
133+
<license>
134+
<name>Apache 2.0</name>
135+
</license>
136+
</licenses>
137+
<purl>pkg:maven/com.google.errorprone/[email protected]</purl>
138+
</component>
139+
<component bom-ref="pkg:maven/com.google.j2objc/[email protected]">
140+
<group>com.google.j2objc</group>
141+
<name>j2objc-annotations</name>
142+
<version>3.0.0</version>
143+
<scope>required</scope>
144+
<licenses>
145+
<license>
146+
<name>Apache License, Version 2.0</name>
147+
</license>
148+
</licenses>
149+
<purl>pkg:maven/com.google.j2objc/[email protected]</purl>
150+
</component>
151+
<component bom-ref="pkg:maven/org.apache.logging.log4j/[email protected]">
152+
<group>org.apache.logging.log4j</group>
153+
<name>log4j-api</name>
154+
<version>2.24.0</version>
155+
<scope>required</scope>
156+
<licenses>
157+
<license>
158+
<name>Apache-2.0</name>
159+
</license>
160+
</licenses>
161+
<purl>pkg:maven/org.apache.logging.log4j/[email protected]</purl>
162+
</component>
163+
<component bom-ref="pkg:maven/org.slf4j/[email protected]">
164+
<group>org.slf4j</group>
165+
<name>slf4j-api</name>
166+
<version>2.0.16</version>
167+
<scope>required</scope>
168+
<licenses/>
169+
<purl>pkg:maven/org.slf4j/[email protected]</purl>
170+
</component>
171+
<component bom-ref="pkg:maven/org.apache.logging.log4j/[email protected]">
172+
<group>org.apache.logging.log4j</group>
173+
<name>log4j-core</name>
174+
<version>2.24.0</version>
175+
<scope>required</scope>
176+
<licenses>
177+
<license>
178+
<name>Apache-2.0</name>
179+
</license>
180+
</licenses>
181+
<purl>pkg:maven/org.apache.logging.log4j/[email protected]</purl>
182+
</component>
183+
</components>
184+
<dependencies>
185+
<dependency ref="pkg:maven/be.sddevelopment.commons/[email protected]"/>
186+
<dependency ref="pkg:maven/be.sddevelopment.commons/[email protected]">
187+
<dependency ref="pkg:maven/org.projectlombok/[email protected]"/>
188+
</dependency>
189+
<dependency ref="pkg:maven/com.google.guava/[email protected]">
190+
<dependency ref="pkg:maven/com.google.guava/[email protected]"/>
191+
<dependency ref="pkg:maven/com.google.guava/[email protected]"/>
192+
<dependency ref="pkg:maven/com.google.code.findbugs/[email protected]"/>
193+
<dependency ref="pkg:maven/org.checkerframework/[email protected]"/>
194+
<dependency ref="pkg:maven/com.google.errorprone/[email protected]"/>
195+
<dependency ref="pkg:maven/com.google.j2objc/[email protected]"/>
196+
</dependency>
197+
<dependency ref="pkg:maven/org.apache.commons/[email protected]"/>
198+
<dependency ref="pkg:maven/org.apache.logging.log4j/[email protected]">
199+
<dependency ref="pkg:maven/org.apache.logging.log4j/[email protected]"/>
200+
<dependency ref="pkg:maven/org.slf4j/[email protected]"/>
201+
<dependency ref="pkg:maven/org.apache.logging.log4j/[email protected]"/>
202+
</dependency>
203+
<dependency ref="pkg:maven/org.jspecify/[email protected]"/>
204+
<dependency ref="pkg:maven/org.projectlombok/[email protected]"/>
205+
<dependency ref="pkg:maven/com.google.guava/[email protected]"/>
206+
<dependency ref="pkg:maven/com.google.guava/[email protected]"/>
207+
<dependency ref="pkg:maven/com.google.code.findbugs/[email protected]"/>
208+
<dependency ref="pkg:maven/org.checkerframework/[email protected]"/>
209+
<dependency ref="pkg:maven/com.google.errorprone/[email protected]"/>
210+
<dependency ref="pkg:maven/com.google.j2objc/[email protected]"/>
211+
<dependency ref="pkg:maven/org.apache.logging.log4j/[email protected]"/>
212+
<dependency ref="pkg:maven/org.slf4j/[email protected]"/>
213+
<dependency ref="pkg:maven/org.apache.logging.log4j/[email protected]"/>
214+
</dependencies>
215+
</bom>
216+

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,8 @@
11
package be.sddevelopment.validation.specs.code_quality;
22

33
import be.sddevelopment.commons.testing.conventions.CodeConventions;
4-
import be.sddevelopment.commons.testing.naming.ReplaceUnderscoredCamelCasing;
5-
import com.tngtech.archunit.core.domain.JavaClass;
6-
import com.tngtech.archunit.core.domain.JavaClasses;
7-
import com.tngtech.archunit.core.domain.JavaConstructor;
84
import com.tngtech.archunit.junit.AnalyzeClasses;
9-
import com.tngtech.archunit.junit.ArchTest;
10-
import com.tngtech.archunit.lang.ArchCondition;
11-
import com.tngtech.archunit.lang.ArchRule;
12-
import com.tngtech.archunit.lang.ConditionEvents;
13-
import org.assertj.core.api.WithAssertions;
145
import org.junit.jupiter.api.DisplayName;
15-
import org.junit.jupiter.api.DisplayNameGeneration;
16-
17-
import java.lang.reflect.InvocationTargetException;
18-
import java.util.List;
19-
20-
import static com.tngtech.archunit.core.domain.JavaModifier.FINAL;
21-
import static com.tngtech.archunit.lang.SimpleConditionEvent.satisfied;
22-
import static com.tngtech.archunit.lang.SimpleConditionEvent.violated;
23-
import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses;
24-
import static com.tngtech.archunit.library.GeneralCodingRules.*;
25-
import static org.junit.platform.commons.util.ReflectionUtils.makeAccessible;
266

277
@DisplayName("Complies with code conventions")
288
@AnalyzeClasses(packages = "be.sddevelopment.validation.core")

‎docs/apidocs/be/sddevelopment/validation/dsl/FileValidatorParser.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<h1 title="Class FileValidatorParser" class="title">Class FileValidatorParser</h1>
7777
</div>
7878
<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/23/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
79-
<div class="inheritance">be.sddevelopment.validation.dsl.FileValidatorParser</div>
79+
<div class="inheritance">be.sddevelopment.validation.dsl.CsvFileSpecificationParser</div>
8080
</div>
8181
<section class="class-description" id="class-description">
8282
<div class="horizontal-scroll">

‎docs/apidocs/be/sddevelopment/validation/dsl/class-use/FileValidatorParser.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<!-- Generated by javadoc (23) on Thu Nov 21 06:49:00 CET 2024 -->
5-
<title>Uses of Class be.sddevelopment.validation.dsl.FileValidatorParser (modular-validators 1.1.0-SNAPSHOT API)</title>
5+
<title>Uses of Class be.sddevelopment.validation.dsl.CsvFileSpecificationParser (modular-validators 1.1.0-SNAPSHOT API)</title>
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
88
<meta name="dc.created" content="2024-11-21">
@@ -56,9 +56,9 @@
5656
<div class="main-grid">
5757
<main role="main">
5858
<div class="header">
59-
<h1 title="Uses of Class be.sddevelopment.validation.dsl.FileValidatorParser" class="title">Uses of Class<br>be.sddevelopment.validation.dsl.FileValidatorParser</h1>
59+
<h1 title="Uses of Class be.sddevelopment.validation.dsl.CsvFileSpecificationParser" class="title">Uses of Class<br>be.sddevelopment.validation.dsl.CsvFileSpecificationParser</h1>
6060
</div>
61-
No usage of be.sddevelopment.validation.dsl.FileValidatorParser
61+
No usage of be.sddevelopment.validation.dsl.CsvFileSpecificationParser
6262
<footer role="contentinfo">
6363
<hr>
6464
<p class="legal-copy"><small>Copyright &#169; 2024 <a href="https://www.sddevelopment.be">SD Development</a>. All rights reserved.</small></p>

‎dsl/docs/apidocs/be/sddevelopment/validation/dsl/FileValidatorParser.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<h1 title="Class FileValidatorParser" class="title">Class FileValidatorParser</h1>
7777
</div>
7878
<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
79-
<div class="inheritance">be.sddevelopment.validation.dsl.FileValidatorParser</div>
79+
<div class="inheritance">be.sddevelopment.validation.dsl.CsvFileSpecificationParser</div>
8080
</div>
8181
<section class="class-description" id="class-description">
8282
<div class="horizontal-scroll">

‎dsl/docs/apidocs/be/sddevelopment/validation/dsl/class-use/FileValidatorParser.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<!-- Generated by javadoc (23) on Thu Nov 21 06:50:08 CET 2024 -->
5-
<title>Uses of Class be.sddevelopment.validation.dsl.FileValidatorParser (dsl 1.1.0-SNAPSHOT API)</title>
5+
<title>Uses of Class be.sddevelopment.validation.dsl.CsvFileSpecificationParser (dsl 1.1.0-SNAPSHOT API)</title>
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
88
<meta name="dc.created" content="2024-11-21">
@@ -56,9 +56,9 @@
5656
<div class="main-grid">
5757
<main role="main">
5858
<div class="header">
59-
<h1 title="Uses of Class be.sddevelopment.validation.dsl.FileValidatorParser" class="title">Uses of Class<br>be.sddevelopment.validation.dsl.FileValidatorParser</h1>
59+
<h1 title="Uses of Class be.sddevelopment.validation.dsl.CsvFileSpecificationParser" class="title">Uses of Class<br>be.sddevelopment.validation.dsl.CsvFileSpecificationParser</h1>
6060
</div>
61-
No usage of be.sddevelopment.validation.dsl.FileValidatorParser
61+
No usage of be.sddevelopment.validation.dsl.CsvFileSpecificationParser
6262
<footer role="contentinfo">
6363
<hr>
6464
<p class="legal-copy"><small>Copyright &#169; 2024 <a href="https://www.sddevelopment.be">SD Development</a>. All rights reserved.</small></p>

0 commit comments

Comments
 (0)