Skip to content

Commit ef5aec2

Browse files
stick-istick-i
committed
feat: 项目分离为多模块 core、javax、jakarta，目的是支持不同环境。
1 parent e69ac88 commit ef5aec2

File tree

66 files changed

+756
-458
lines changed

Some content is hidden

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

66 files changed

+756
-458
lines changed

‎pom.xml

+74-72
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,16 @@
66
<modelVersion>4.0.0</modelVersion>
77

88
<groupId>cn.sticki</groupId>
9-
<artifactId>spel-validator</artifactId>
9+
<artifactId>spel-validator-root</artifactId>
1010
<version>0.4.0-beta</version>
11-
<packaging>jar</packaging>
11+
<packaging>pom</packaging>
12+
13+
<modules>
14+
<module>spel-validator-core</module>
15+
<module>spel-validator-javax</module>
16+
<module>spel-validator-jakarta</module>
17+
</modules>
18+
1219
<name>Spel Validator</name>
1320
<url>https://github.com/stick-i/spel-validator</url>
1421

@@ -54,78 +61,73 @@
5461
<maven.compiler.source>8</maven.compiler.source>
5562
<maven.compiler.target>8</maven.compiler.target>
5663
<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>
8064

81-
<dependency>
82-
<groupId>org.projectlombok</groupId>
83-
<artifactId>lombok</artifactId>
84-
<version>1.18.30</version>
85-
<optional>true</optional>
86-
</dependency>
87-
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>
65+
<spel-validator.version>0.4.0-beta</spel-validator.version>
66+
<hibernate-validator.version>6.2.5.Final</hibernate-validator.version>
67+
<spring.version>5.3.31</spring.version>
68+
<javax-el.version>3.0.0</javax-el.version>
69+
<jakarta-el.version>4.0.2</jakarta-el.version>
70+
<lombok.version>1.18.30</lombok.version>
71+
<slf4j.version>2.0.11</slf4j.version>
72+
<junit.version>5.8.1</junit.version>
73+
<logback.version>1.3.14</logback.version>
74+
<jetbrains.version>24.0.1</jetbrains.version>
75+
</properties>
12076

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>
77+
<dependencyManagement>
78+
<dependencies>
79+
<dependency>
80+
<groupId>cn.sticki</groupId>
81+
<artifactId>spel-validator-core</artifactId>
82+
<version>${spel-validator.version}</version>
83+
</dependency>
84+
<dependency>
85+
<groupId>org.springframework</groupId>
86+
<artifactId>spring-context</artifactId>
87+
<version>${spring.version}</version>
88+
</dependency>
89+
<dependency>
90+
<groupId>org.hibernate.validator</groupId>
91+
<artifactId>hibernate-validator</artifactId>
92+
<version>${hibernate-validator.version}</version>
93+
</dependency>
94+
<dependency>
95+
<groupId>org.glassfish</groupId>
96+
<artifactId>javax.el</artifactId>
97+
<version>${javax-el.version}</version>
98+
</dependency>
99+
<dependency>
100+
<groupId>org.glassfish</groupId>
101+
<artifactId>jakarta.el</artifactId>
102+
<version>${jakarta-el.version}</version>
103+
</dependency>
104+
<dependency>
105+
<groupId>org.projectlombok</groupId>
106+
<artifactId>lombok</artifactId>
107+
<version>${lombok.version}</version>
108+
</dependency>
109+
<dependency>
110+
<groupId>org.slf4j</groupId>
111+
<artifactId>slf4j-api</artifactId>
112+
<version>${slf4j.version}</version>
113+
</dependency>
114+
<dependency>
115+
<groupId>org.junit.jupiter</groupId>
116+
<artifactId>junit-jupiter</artifactId>
117+
<version>${junit.version}</version>
118+
</dependency>
119+
<dependency>
120+
<groupId>ch.qos.logback</groupId>
121+
<artifactId>logback-classic</artifactId>
122+
<version>${logback.version}</version>
123+
</dependency>
124+
<dependency>
125+
<groupId>org.jetbrains</groupId>
126+
<artifactId>annotations</artifactId>
127+
<version>${jetbrains.version}</version>
128+
</dependency>
129+
</dependencies>
130+
</dependencyManagement>
129131

130132
<build>
131133
<plugins>

‎spel-validator-core/pom.xml

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
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-core</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>org.springframework</groupId>
23+
<artifactId>spring-context</artifactId>
24+
</dependency>
25+
26+
<dependency>
27+
<groupId>org.jetbrains</groupId>
28+
<artifactId>annotations</artifactId>
29+
</dependency>
30+
31+
<dependency>
32+
<groupId>org.projectlombok</groupId>
33+
<artifactId>lombok</artifactId>
34+
</dependency>
35+
36+
<dependency>
37+
<groupId>org.slf4j</groupId>
38+
<artifactId>slf4j-api</artifactId>
39+
</dependency>
40+
</dependencies>
41+
42+
</project>

‎src/main/java/cn/sticki/validator/spel/SpelConstraint.java ‎spel-validator-core/src/main/java/cn/sticki/spel/validator/core/SpelConstraint.java

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

33
import java.lang.annotation.*;
44

@@ -22,8 +22,8 @@
2222
* <p>
2323
* 这里有一些定义约束的例子，可以参考：
2424
* <ul>
25-
* <li>{@link cn.sticki.validator.spel.constrain.SpelAssert}</li>
26-
* <li>{@link cn.sticki.validator.spel.constrain.SpelNotNull}</li>
25+
* <li>{@link cn.sticki.spel.validator.core.constrain.SpelAssert}</li>
26+
* <li>{@link cn.sticki.spel.validator.core.constrain.SpelNotNull}</li>
2727
* </ul>
2828
*
2929
* @author 阿杆

‎src/main/java/cn/sticki/validator/spel/SpelConstraintValidator.java ‎spel-validator-core/src/main/java/cn/sticki/spel/validator/core/SpelConstraintValidator.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package cn.sticki.validator.spel;
1+
package cn.sticki.spel.validator.core;
22

3-
import cn.sticki.validator.spel.result.FieldValidResult;
3+
import cn.sticki.spel.validator.core.result.FieldValidResult;
44

55
import java.lang.annotation.Annotation;
66
import java.lang.reflect.Field;

‎src/main/java/cn/sticki/validator/spel/SpelValidExecutor.java ‎spel-validator-core/src/main/java/cn/sticki/spel/validator/core/SpelValidExecutor.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package cn.sticki.validator.spel;
2-
3-
import cn.sticki.validator.spel.exception.SpelNotSupportedTypeException;
4-
import cn.sticki.validator.spel.exception.SpelValidatorException;
5-
import cn.sticki.validator.spel.manager.AnnotationMethodManager;
6-
import cn.sticki.validator.spel.parse.SpelParser;
7-
import cn.sticki.validator.spel.result.FieldValidResult;
8-
import cn.sticki.validator.spel.result.ObjectValidResult;
1+
package cn.sticki.spel.validator.core;
2+
3+
import cn.sticki.spel.validator.core.exception.SpelNotSupportedTypeException;
4+
import cn.sticki.spel.validator.core.exception.SpelValidatorException;
5+
import cn.sticki.spel.validator.core.manager.AnnotationMethodManager;
6+
import cn.sticki.spel.validator.core.parse.SpelParser;
7+
import cn.sticki.spel.validator.core.result.FieldValidResult;
8+
import cn.sticki.spel.validator.core.result.ObjectValidResult;
99
import lombok.extern.slf4j.Slf4j;
1010
import org.jetbrains.annotations.NotNull;
1111
import org.jetbrains.annotations.Nullable;

‎src/main/java/cn/sticki/validator/spel/constrain/SpelAssert.java ‎spel-validator-core/src/main/java/cn/sticki/spel/validator/core/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.core.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.core.SpelConstraint;
4+
import cn.sticki.spel.validator.core.constraintvalidator.SpelAssertValidator;
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-core/src/main/java/cn/sticki/spel/validator/core/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.core.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.core.SpelConstraint;
4+
import cn.sticki.spel.validator.core.constraintvalidator.SpelMaxValidator;
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-core/src/main/java/cn/sticki/spel/validator/core/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.core.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.core.SpelConstraint;
4+
import cn.sticki.spel.validator.core.constraintvalidator.SpelMinValidator;
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-core/src/main/java/cn/sticki/spel/validator/core/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.core.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.core.SpelConstraint;
4+
import cn.sticki.spel.validator.core.constraintvalidator.SpelNotBlankValidator;
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-core/src/main/java/cn/sticki/spel/validator/core/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.core.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.core.SpelConstraint;
4+
import cn.sticki.spel.validator.core.constraintvalidator.SpelNotEmptyValidator;
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-core/src/main/java/cn/sticki/spel/validator/core/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.core.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.core.SpelConstraint;
4+
import cn.sticki.spel.validator.core.constraintvalidator.SpelNotNullValidator;
65
import org.intellij.lang.annotations.Language;
76

87
import java.lang.annotation.Documented;

‎src/main/java/cn/sticki/validator/spel/constrain/SpelNull.java ‎spel-validator-core/src/main/java/cn/sticki/spel/validator/core/constrain/SpelNull.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.core.constrain;
22

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

87
import java.lang.annotation.Documented;

‎src/main/java/cn/sticki/validator/spel/constrain/SpelSize.java ‎spel-validator-core/src/main/java/cn/sticki/spel/validator/core/constrain/SpelSize.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.core.constrain;
22

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

87
import java.lang.annotation.Documented;

‎src/main/java/cn/sticki/validator/spel/constraintvalidator/AbstractSpelNumberCompareValidator.java ‎spel-validator-core/src/main/java/cn/sticki/spel/validator/core/constraintvalidator/AbstractSpelNumberCompareValidator.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package cn.sticki.validator.spel.constraintvalidator;
1+
package cn.sticki.spel.validator.core.constraintvalidator;
22

3-
import cn.sticki.validator.spel.SpelConstraintValidator;
4-
import cn.sticki.validator.spel.exception.SpelParserException;
5-
import cn.sticki.validator.spel.parse.SpelParser;
6-
import cn.sticki.validator.spel.result.FieldValidResult;
3+
import cn.sticki.spel.validator.core.SpelConstraintValidator;
4+
import cn.sticki.spel.validator.core.exception.SpelParserException;
5+
import cn.sticki.spel.validator.core.parse.SpelParser;
6+
import cn.sticki.spel.validator.core.result.FieldValidResult;
77

88
import java.lang.annotation.Annotation;
99
import java.util.Collections;

‎src/main/java/cn/sticki/validator/spel/constraintvalidator/SpelAssertValidator.java ‎spel-validator-core/src/main/java/cn/sticki/spel/validator/core/constraintvalidator/SpelAssertValidator.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package cn.sticki.validator.spel.constraintvalidator;
1+
package cn.sticki.spel.validator.core.constraintvalidator;
22

3-
import cn.sticki.validator.spel.SpelConstraintValidator;
4-
import cn.sticki.validator.spel.constrain.SpelAssert;
5-
import cn.sticki.validator.spel.exception.SpelArgumentException;
6-
import cn.sticki.validator.spel.parse.SpelParser;
7-
import cn.sticki.validator.spel.result.FieldValidResult;
3+
import cn.sticki.spel.validator.core.SpelConstraintValidator;
4+
import cn.sticki.spel.validator.core.constrain.SpelAssert;
5+
import cn.sticki.spel.validator.core.exception.SpelArgumentException;
6+
import cn.sticki.spel.validator.core.parse.SpelParser;
7+
import cn.sticki.spel.validator.core.result.FieldValidResult;
88

99
import java.lang.reflect.Field;
1010

‎src/main/java/cn/sticki/validator/spel/constraintvalidator/SpelMaxValidator.java ‎spel-validator-core/src/main/java/cn/sticki/spel/validator/core/constraintvalidator/SpelMaxValidator.java

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

3-
import cn.sticki.validator.spel.constrain.SpelMax;
4-
import cn.sticki.validator.spel.result.FieldValidResult;
5-
import cn.sticki.validator.spel.util.NumberComparatorUtil;
3+
import cn.sticki.spel.validator.core.constrain.SpelMax;
4+
import cn.sticki.spel.validator.core.result.FieldValidResult;
5+
import cn.sticki.spel.validator.core.util.NumberComparatorUtil;
66

77
import java.lang.reflect.Field;
88

0 commit comments

Comments
 (0)