Skip to content

Commit 0e70d7d

Browse files
stick-istick-i
authored
feat: support jakarta (#44)
2 parents b290dec + ec723bc commit 0e70d7d

File tree

95 files changed

+2084
-893
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+2084
-893
lines changed

‎.editorconfig

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ end_of_line = crlf
44
indent_size = 4
55
indent_style = space
66
insert_final_newline = false
7-
max_line_length = 120
7+
max_line_length = 150
88
tab_width = 4
99
ij_continuation_indent_size = 8
1010
ij_formatter_off_tag = @formatter:off
@@ -35,7 +35,6 @@ ij_css_use_double_quotes = true
3535
ij_css_value_alignment = do_not_align
3636

3737
[*.java]
38-
max_line_length = 150
3938
ij_smart_tabs = true
4039
ij_visual_guides = 100
4140
ij_java_align_consecutive_assignments = false

‎.github/workflows/mvn-test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ jobs:
1111
- uses: actions/setup-java@v4
1212
with:
1313
distribution: 'zulu'
14-
java-version: '8'
14+
java-version: '11'
1515
cache: maven
1616

1717
- run: |
1818
java -version
1919
mvn -v
2020
2121
- run: mvn verify
22-
- run: mvn clean test jacoco:report coveralls:report -DrepoToken="${{secrets.COVERALLS_TOKEN}}"
22+
- run: mvn clean test coveralls:report -DrepoToken="${{secrets.COVERALLS_TOKEN}}" -f pom.xml

‎.run/jacoco_report.run.xml

-46
This file was deleted.

‎pom.xml

+101-73
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,19 @@
66
<modelVersion>4.0.0</modelVersion>
77

88
<groupId>cn.sticki</groupId>
9-
<artifactId>spel-validator</artifactId>
10-
<version>0.3.0-beta</version>
11-
<packaging>jar</packaging>
9+
<artifactId>spel-validator-root</artifactId>
10+
<version>0.4.0-beta</version>
11+
<packaging>pom</packaging>
12+
13+
<modules>
14+
<module>spel-validator-core</module>
15+
<module>spel-validator-constrain</module>
16+
<module>spel-validator-javax</module>
17+
<module>spel-validator-jakarta</module>
18+
<module>spel-validator-test-report</module>
19+
<module>spel-validator-test</module>
20+
</modules>
21+
1222
<name>Spel Validator</name>
1323
<url>https://github.com/stick-i/spel-validator</url>
1424

@@ -54,78 +64,93 @@
5464
<maven.compiler.source>8</maven.compiler.source>
5565
<maven.compiler.target>8</maven.compiler.target>
5666
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
57-
</properties>
58-
59-
<dependencies>
60-
<dependency>
61-
<groupId>javax.validation</groupId>
62-
<artifactId>validation-api</artifactId>
63-
<version>2.0.1.Final</version>
64-
<optional>true</optional>
65-
</dependency>
66-
67-
<dependency>
68-
<groupId>org.springframework</groupId>
69-
<artifactId>spring-context</artifactId>
70-
<version>5.3.30</version>
71-
<optional>true</optional>
72-
</dependency>
73-
74-
<dependency>
75-
<groupId>org.jetbrains</groupId>
76-
<artifactId>annotations</artifactId>
77-
<version>24.0.1</version>
78-
<optional>true</optional>
79-
</dependency>
80-
81-
<dependency>
82-
<groupId>org.projectlombok</groupId>
83-
<artifactId>lombok</artifactId>
84-
<version>1.18.30</version>
85-
<optional>true</optional>
86-
</dependency>
8767

88-
<dependency>
89-
<groupId>org.slf4j</groupId>
90-
<artifactId>slf4j-api</artifactId>
91-
<version>2.0.11</version>
92-
<optional>true</optional>
93-
</dependency>
94-
95-
<!-- ===== for test ===== -->
96-
97-
<dependency>
98-
<groupId>org.junit.jupiter</groupId>
99-
<artifactId>junit-jupiter</artifactId>
100-
<version>5.8.1</version>
101-
<scope>test</scope>
102-
<optional>true</optional>
103-
</dependency>
104-
105-
<dependency>
106-
<groupId>org.hibernate.validator</groupId>
107-
<artifactId>hibernate-validator</artifactId>
108-
<version>6.2.5.Final</version>
109-
<scope>test</scope>
110-
<optional>true</optional>
111-
</dependency>
112-
113-
<dependency>
114-
<groupId>org.glassfish</groupId>
115-
<artifactId>javax.el</artifactId>
116-
<version>3.0.0</version>
117-
<scope>test</scope>
118-
<optional>true</optional>
119-
</dependency>
68+
<spel-validator.version>0.4.0-beta</spel-validator.version>
69+
<hibernate-validator.version>6.2.5.Final</hibernate-validator.version>
70+
<spring.version>5.3.31</spring.version>
71+
<javax-el.version>3.0.0</javax-el.version>
72+
<jakarta-el.version>4.0.2</jakarta-el.version>
73+
<lombok.version>1.18.30</lombok.version>
74+
<slf4j.version>2.0.11</slf4j.version>
75+
<junit.version>5.8.1</junit.version>
76+
<logback.version>1.3.14</logback.version>
77+
<jetbrains.version>24.0.1</jetbrains.version>
78+
</properties>
12079

121-
<dependency>
122-
<groupId>ch.qos.logback</groupId>
123-
<artifactId>logback-classic</artifactId>
124-
<version>1.3.14</version>
125-
<scope>test</scope>
126-
<optional>true</optional>
127-
</dependency>
128-
</dependencies>
80+
<dependencyManagement>
81+
<dependencies>
82+
<dependency>
83+
<groupId>cn.sticki</groupId>
84+
<artifactId>spel-validator-core</artifactId>
85+
<version>${spel-validator.version}</version>
86+
</dependency>
87+
<dependency>
88+
<groupId>cn.sticki</groupId>
89+
<artifactId>spel-validator-constrain</artifactId>
90+
<version>${spel-validator.version}</version>
91+
</dependency>
92+
<dependency>
93+
<groupId>cn.sticki</groupId>
94+
<artifactId>spel-validator-javax</artifactId>
95+
<version>${spel-validator.version}</version>
96+
</dependency>
97+
<dependency>
98+
<groupId>cn.sticki</groupId>
99+
<artifactId>spel-validator-jakarta</artifactId>
100+
<version>${spel-validator.version}</version>
101+
</dependency>
102+
<dependency>
103+
<groupId>cn.sticki</groupId>
104+
<artifactId>spel-validator-test</artifactId>
105+
<version>${spel-validator.version}</version>
106+
</dependency>
107+
<dependency>
108+
<groupId>org.springframework</groupId>
109+
<artifactId>spring-context</artifactId>
110+
<version>${spring.version}</version>
111+
</dependency>
112+
<dependency>
113+
<groupId>org.hibernate.validator</groupId>
114+
<artifactId>hibernate-validator</artifactId>
115+
<version>${hibernate-validator.version}</version>
116+
</dependency>
117+
<dependency>
118+
<groupId>org.glassfish</groupId>
119+
<artifactId>javax.el</artifactId>
120+
<version>${javax-el.version}</version>
121+
</dependency>
122+
<dependency>
123+
<groupId>org.glassfish</groupId>
124+
<artifactId>jakarta.el</artifactId>
125+
<version>${jakarta-el.version}</version>
126+
</dependency>
127+
<dependency>
128+
<groupId>org.projectlombok</groupId>
129+
<artifactId>lombok</artifactId>
130+
<version>${lombok.version}</version>
131+
</dependency>
132+
<dependency>
133+
<groupId>org.slf4j</groupId>
134+
<artifactId>slf4j-api</artifactId>
135+
<version>${slf4j.version}</version>
136+
</dependency>
137+
<dependency>
138+
<groupId>org.junit.jupiter</groupId>
139+
<artifactId>junit-jupiter</artifactId>
140+
<version>${junit.version}</version>
141+
</dependency>
142+
<dependency>
143+
<groupId>ch.qos.logback</groupId>
144+
<artifactId>logback-classic</artifactId>
145+
<version>${logback.version}</version>
146+
</dependency>
147+
<dependency>
148+
<groupId>org.jetbrains</groupId>
149+
<artifactId>annotations</artifactId>
150+
<version>${jetbrains.version}</version>
151+
</dependency>
152+
</dependencies>
153+
</dependencyManagement>
129154

130155
<build>
131156
<plugins>
@@ -182,6 +207,9 @@
182207
<groupId>com.github.hazendaz.maven</groupId>
183208
<artifactId>coveralls-maven-plugin</artifactId>
184209
<version>4.5.0-M2</version>
210+
<configuration>
211+
<jacocoReports>${project.basedir}/spel-validator-test-report/target/site/jacoco-aggregate/jacoco.xml</jacocoReports>
212+
</configuration>
185213
</plugin>
186214
</plugins>
187215
</build>

‎spel-validator-constrain/README.md

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# 模块说明
2+
3+
此模块内包含了一些常用的约束校验器，用于校验对象的属性是否符合预期。
4+
5+
同时这些校验器的测试用例也在此模块中。
6+
7+
刚开始这些约束器都是在 `-core` 模块里的。
8+
但是由于这些约束器的测试工具依赖了 `-core` 模块，然后 `-core` 模块又依赖了 `-test`，这样就形成了循环依赖，导致编译不通过。
9+
所以将这些约束器单独提取出来，放到一个新的模块中。
10+
11+
至于为什么需要将 `-test` 独立出来，可以看看 `-test` 模块的 [README.md](../spel-validator-test/README.md) 文件。

‎spel-validator-constrain/pom.xml

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
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>
6+
<parent>
7+
<groupId>cn.sticki</groupId>
8+
<artifactId>spel-validator-root</artifactId>
9+
<version>0.4.0-beta</version>
10+
</parent>
11+
12+
<artifactId>spel-validator-constrain</artifactId>
13+
14+
<properties>
15+
<maven.compiler.source>8</maven.compiler.source>
16+
<maven.compiler.target>8</maven.compiler.target>
17+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18+
</properties>
19+
20+
<dependencies>
21+
<dependency>
22+
<groupId>cn.sticki</groupId>
23+
<artifactId>spel-validator-core</artifactId>
24+
</dependency>
25+
26+
<dependency>
27+
<groupId>cn.sticki</groupId>
28+
<artifactId>spel-validator-test</artifactId>
29+
<scope>test</scope>
30+
</dependency>
31+
</dependencies>
32+
33+
</project>

‎src/main/java/cn/sticki/validator/spel/constrain/SpelAssert.java ‎spel-validator-constrain/src/main/java/cn/sticki/spel/validator/constrain/SpelAssert.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
package cn.sticki.validator.spel.constrain;
1+
package cn.sticki.spel.validator.constrain;
22

3-
import cn.sticki.validator.spel.SpelConstraint;
4-
import cn.sticki.validator.spel.SpelValid;
5-
import cn.sticki.validator.spel.constraintvalidator.SpelAssertValidator;
3+
import cn.sticki.spel.validator.constraintvalidator.SpelAssertValidator;
4+
import cn.sticki.spel.validator.core.SpelConstraint;
65
import org.intellij.lang.annotations.Language;
76

87
import java.lang.annotation.*;

‎src/main/java/cn/sticki/validator/spel/constrain/SpelMax.java ‎spel-validator-constrain/src/main/java/cn/sticki/spel/validator/constrain/SpelMax.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
package cn.sticki.validator.spel.constrain;
1+
package cn.sticki.spel.validator.constrain;
22

3-
import cn.sticki.validator.spel.SpelConstraint;
4-
import cn.sticki.validator.spel.SpelValid;
5-
import cn.sticki.validator.spel.constraintvalidator.SpelMaxValidator;
3+
import cn.sticki.spel.validator.constraintvalidator.SpelMaxValidator;
4+
import cn.sticki.spel.validator.core.SpelConstraint;
65
import org.intellij.lang.annotations.Language;
76

87
import java.lang.annotation.Documented;

‎src/main/java/cn/sticki/validator/spel/constrain/SpelMin.java ‎spel-validator-constrain/src/main/java/cn/sticki/spel/validator/constrain/SpelMin.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
package cn.sticki.validator.spel.constrain;
1+
package cn.sticki.spel.validator.constrain;
22

3-
import cn.sticki.validator.spel.SpelConstraint;
4-
import cn.sticki.validator.spel.SpelValid;
5-
import cn.sticki.validator.spel.constraintvalidator.SpelMinValidator;
3+
import cn.sticki.spel.validator.constraintvalidator.SpelMinValidator;
4+
import cn.sticki.spel.validator.core.SpelConstraint;
65
import org.intellij.lang.annotations.Language;
76

87
import java.lang.annotation.Documented;

‎src/main/java/cn/sticki/validator/spel/constrain/SpelNotBlank.java ‎spel-validator-constrain/src/main/java/cn/sticki/spel/validator/constrain/SpelNotBlank.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
package cn.sticki.validator.spel.constrain;
1+
package cn.sticki.spel.validator.constrain;
22

3-
import cn.sticki.validator.spel.SpelConstraint;
4-
import cn.sticki.validator.spel.SpelValid;
5-
import cn.sticki.validator.spel.constraintvalidator.SpelNotBlankValidator;
3+
import cn.sticki.spel.validator.constraintvalidator.SpelNotBlankValidator;
4+
import cn.sticki.spel.validator.core.SpelConstraint;
65
import org.intellij.lang.annotations.Language;
76

87
import java.lang.annotation.Documented;

‎src/main/java/cn/sticki/validator/spel/constrain/SpelNotEmpty.java ‎spel-validator-constrain/src/main/java/cn/sticki/spel/validator/constrain/SpelNotEmpty.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
package cn.sticki.validator.spel.constrain;
1+
package cn.sticki.spel.validator.constrain;
22

3-
import cn.sticki.validator.spel.SpelConstraint;
4-
import cn.sticki.validator.spel.SpelValid;
5-
import cn.sticki.validator.spel.constraintvalidator.SpelNotEmptyValidator;
3+
import cn.sticki.spel.validator.constraintvalidator.SpelNotEmptyValidator;
4+
import cn.sticki.spel.validator.core.SpelConstraint;
65
import org.intellij.lang.annotations.Language;
76

87
import java.lang.annotation.Documented;

‎src/main/java/cn/sticki/validator/spel/constrain/SpelNotNull.java ‎spel-validator-constrain/src/main/java/cn/sticki/spel/validator/constrain/SpelNotNull.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
package cn.sticki.validator.spel.constrain;
1+
package cn.sticki.spel.validator.constrain;
22

3-
import cn.sticki.validator.spel.SpelConstraint;
4-
import cn.sticki.validator.spel.SpelValid;
5-
import cn.sticki.validator.spel.constraintvalidator.SpelNotNullValidator;
3+
import cn.sticki.spel.validator.constraintvalidator.SpelNotNullValidator;
4+
import cn.sticki.spel.validator.core.SpelConstraint;
65
import org.intellij.lang.annotations.Language;
76

87
import java.lang.annotation.Documented;

0 commit comments

Comments
 (0)