Skip to content

Commit 9c0a395

Browse files
stick-istick-i
committed
build: 调整模块关系，独立出 constrain 模块，调整测试用例位置
1 parent cb7c5c6 commit 9c0a395

Some content is hidden

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

41 files changed

+123
-104
lines changed

‎pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
<modules>
1414
<module>spel-validator-core</module>
15+
<module>spel-validator-constrain</module>
1516
<module>spel-validator-javax</module>
1617
<module>spel-validator-jakarta</module>
1718
<module>spel-validator-test-report</module>
@@ -83,6 +84,11 @@
8384
<artifactId>spel-validator-core</artifactId>
8485
<version>${spel-validator.version}</version>
8586
</dependency>
87+
<dependency>
88+
<groupId>cn.sticki</groupId>
89+
<artifactId>spel-validator-constrain</artifactId>
90+
<version>${spel-validator.version}</version>
91+
</dependency>
8692
<dependency>
8793
<groupId>cn.sticki</groupId>
8894
<artifactId>spel-validator-javax</artifactId>

‎spel-validator-constrain/README.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# 模块说明
2+
3+
此模块内包含了一些常用的约束校验器，用于校验对象的属性是否符合预期。
4+
5+
同时这些校验器的测试用例也在此模块中。

‎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>

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

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

3+
import cn.sticki.spel.validator.constraintvalidator.SpelAssertValidator;
34
import cn.sticki.spel.validator.core.SpelConstraint;
4-
import cn.sticki.spel.validator.core.constraintvalidator.SpelAssertValidator;
55
import org.intellij.lang.annotations.Language;
66

77
import java.lang.annotation.*;

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

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

3+
import cn.sticki.spel.validator.constraintvalidator.SpelMaxValidator;
34
import cn.sticki.spel.validator.core.SpelConstraint;
4-
import cn.sticki.spel.validator.core.constraintvalidator.SpelMaxValidator;
55
import org.intellij.lang.annotations.Language;
66

77
import java.lang.annotation.Documented;

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

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

3+
import cn.sticki.spel.validator.constraintvalidator.SpelMinValidator;
34
import cn.sticki.spel.validator.core.SpelConstraint;
4-
import cn.sticki.spel.validator.core.constraintvalidator.SpelMinValidator;
55
import org.intellij.lang.annotations.Language;
66

77
import java.lang.annotation.Documented;

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

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

3+
import cn.sticki.spel.validator.constraintvalidator.SpelNotBlankValidator;
34
import cn.sticki.spel.validator.core.SpelConstraint;
4-
import cn.sticki.spel.validator.core.constraintvalidator.SpelNotBlankValidator;
55
import org.intellij.lang.annotations.Language;
66

77
import java.lang.annotation.Documented;

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

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

3+
import cn.sticki.spel.validator.constraintvalidator.SpelNotEmptyValidator;
34
import cn.sticki.spel.validator.core.SpelConstraint;
4-
import cn.sticki.spel.validator.core.constraintvalidator.SpelNotEmptyValidator;
55
import org.intellij.lang.annotations.Language;
66

77
import java.lang.annotation.Documented;

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

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

3+
import cn.sticki.spel.validator.constraintvalidator.SpelNotNullValidator;
34
import cn.sticki.spel.validator.core.SpelConstraint;
4-
import cn.sticki.spel.validator.core.constraintvalidator.SpelNotNullValidator;
55
import org.intellij.lang.annotations.Language;
66

77
import java.lang.annotation.Documented;

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

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

3+
import cn.sticki.spel.validator.constraintvalidator.SpelNullValidator;
34
import cn.sticki.spel.validator.core.SpelConstraint;
4-
import cn.sticki.spel.validator.core.constraintvalidator.SpelNullValidator;
55
import org.intellij.lang.annotations.Language;
66

77
import java.lang.annotation.Documented;

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

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

3+
import cn.sticki.spel.validator.constraintvalidator.SpelSizeValidator;
34
import cn.sticki.spel.validator.core.SpelConstraint;
4-
import cn.sticki.spel.validator.core.constraintvalidator.SpelSizeValidator;
55
import org.intellij.lang.annotations.Language;
66

77
import java.lang.annotation.Documented;

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

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

33
import cn.sticki.spel.validator.core.SpelConstraintValidator;
44
import cn.sticki.spel.validator.core.exception.SpelParserException;

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

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

3+
import cn.sticki.spel.validator.constrain.SpelAssert;
34
import cn.sticki.spel.validator.core.SpelConstraintValidator;
4-
import cn.sticki.spel.validator.core.constrain.SpelAssert;
55
import cn.sticki.spel.validator.core.exception.SpelArgumentException;
66
import cn.sticki.spel.validator.core.parse.SpelParser;
77
import cn.sticki.spel.validator.core.result.FieldValidResult;

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

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

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

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

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

3-
import cn.sticki.spel.validator.core.constrain.SpelMin;
3+
import cn.sticki.spel.validator.constrain.SpelMin;
44
import cn.sticki.spel.validator.core.result.FieldValidResult;
55
import cn.sticki.spel.validator.core.util.NumberComparatorUtil;
66

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

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

3+
import cn.sticki.spel.validator.constrain.SpelNotBlank;
34
import cn.sticki.spel.validator.core.SpelConstraintValidator;
4-
import cn.sticki.spel.validator.core.constrain.SpelNotBlank;
55
import cn.sticki.spel.validator.core.result.FieldValidResult;
66
import org.springframework.util.StringUtils;
77

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

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

3+
import cn.sticki.spel.validator.constrain.SpelNotEmpty;
34
import cn.sticki.spel.validator.core.SpelConstraintValidator;
4-
import cn.sticki.spel.validator.core.constrain.SpelNotEmpty;
55
import cn.sticki.spel.validator.core.result.FieldValidResult;
66
import cn.sticki.spel.validator.core.util.CalcLengthUtil;
77

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

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

3+
import cn.sticki.spel.validator.constrain.SpelNotNull;
34
import cn.sticki.spel.validator.core.SpelConstraintValidator;
4-
import cn.sticki.spel.validator.core.constrain.SpelNotNull;
55
import cn.sticki.spel.validator.core.result.FieldValidResult;
66

77
import java.lang.reflect.Field;

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

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

3+
import cn.sticki.spel.validator.constrain.SpelNull;
34
import cn.sticki.spel.validator.core.SpelConstraintValidator;
4-
import cn.sticki.spel.validator.core.constrain.SpelNull;
55
import cn.sticki.spel.validator.core.result.FieldValidResult;
66

77
import java.lang.reflect.Field;

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

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

3+
import cn.sticki.spel.validator.constrain.SpelSize;
34
import cn.sticki.spel.validator.core.SpelConstraintValidator;
4-
import cn.sticki.spel.validator.core.constrain.SpelSize;
55
import cn.sticki.spel.validator.core.parse.SpelParser;
66
import cn.sticki.spel.validator.core.result.FieldValidResult;
77
import cn.sticki.spel.validator.core.util.CalcLengthUtil;

‎spel-validator-test/src/test/java/cn/sticki/spel/validator/core/ConstrainTest.java ‎spel-validator-constrain/src/test/java/cn/sticki/spel/validator/constrain/ConstrainTest.java

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

3-
import cn.sticki.spel.validator.core.bean.*;
3+
import cn.sticki.spel.validator.constrain.bean.*;
44
import cn.sticki.spel.validator.test.util.BaseSpelValidator;
55
import org.junit.jupiter.api.Assertions;
66
import org.junit.jupiter.api.Test;

‎spel-validator-test/src/test/java/cn/sticki/spel/validator/core/bean/SpelAssertTestBean.java ‎spel-validator-constrain/src/test/java/cn/sticki/spel/validator/constrain/bean/SpelAssertTestBean.java

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

3-
import cn.sticki.spel.validator.core.constrain.SpelAssert;
3+
import cn.sticki.spel.validator.constrain.SpelAssert;
44
import cn.sticki.spel.validator.test.util.ID;
55
import cn.sticki.spel.validator.test.util.VerifyFailedField;
66
import cn.sticki.spel.validator.test.util.VerifyObject;

‎spel-validator-test/src/test/java/cn/sticki/spel/validator/core/bean/SpelMaxTestBean.java ‎spel-validator-constrain/src/test/java/cn/sticki/spel/validator/constrain/bean/SpelMaxTestBean.java

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

3-
import cn.sticki.spel.validator.core.constrain.SpelMax;
3+
import cn.sticki.spel.validator.constrain.SpelMax;
44
import cn.sticki.spel.validator.test.util.ID;
55
import cn.sticki.spel.validator.test.util.VerifyFailedField;
66
import cn.sticki.spel.validator.test.util.VerifyObject;

‎spel-validator-test/src/test/java/cn/sticki/spel/validator/core/bean/SpelMinTestBean.java ‎spel-validator-constrain/src/test/java/cn/sticki/spel/validator/constrain/bean/SpelMinTestBean.java

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

3-
import cn.sticki.spel.validator.core.constrain.SpelMin;
3+
import cn.sticki.spel.validator.constrain.SpelMin;
44
import cn.sticki.spel.validator.test.util.ID;
55
import cn.sticki.spel.validator.test.util.VerifyFailedField;
66
import cn.sticki.spel.validator.test.util.VerifyObject;

‎spel-validator-test/src/test/java/cn/sticki/spel/validator/core/bean/SpelNotBlankTestBean.java ‎spel-validator-constrain/src/test/java/cn/sticki/spel/validator/constrain/bean/SpelNotBlankTestBean.java

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

3-
import cn.sticki.spel.validator.core.constrain.SpelNotBlank;
3+
import cn.sticki.spel.validator.constrain.SpelNotBlank;
44
import cn.sticki.spel.validator.test.util.VerifyFailedField;
55
import cn.sticki.spel.validator.test.util.VerifyObject;
66
import lombok.Data;

‎spel-validator-test/src/test/java/cn/sticki/spel/validator/core/bean/SpelNotEmptyTestBean.java ‎spel-validator-constrain/src/test/java/cn/sticki/spel/validator/constrain/bean/SpelNotEmptyTestBean.java

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

3-
import cn.sticki.spel.validator.core.constrain.SpelNotEmpty;
3+
import cn.sticki.spel.validator.constrain.SpelNotEmpty;
44
import cn.sticki.spel.validator.test.util.ID;
55
import cn.sticki.spel.validator.test.util.VerifyFailedField;
66
import cn.sticki.spel.validator.test.util.VerifyObject;

‎spel-validator-test/src/test/java/cn/sticki/spel/validator/core/bean/SpelNotNullTestBean.java ‎spel-validator-constrain/src/test/java/cn/sticki/spel/validator/constrain/bean/SpelNotNullTestBean.java

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

3-
import cn.sticki.spel.validator.core.constrain.SpelNotNull;
3+
import cn.sticki.spel.validator.constrain.SpelNotNull;
44
import cn.sticki.spel.validator.test.util.ID;
55
import cn.sticki.spel.validator.test.util.VerifyFailedField;
66
import cn.sticki.spel.validator.test.util.VerifyObject;

‎spel-validator-test/src/test/java/cn/sticki/spel/validator/core/bean/SpelNullTestBean.java ‎spel-validator-constrain/src/test/java/cn/sticki/spel/validator/constrain/bean/SpelNullTestBean.java

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

3-
import cn.sticki.spel.validator.core.constrain.SpelNull;
3+
import cn.sticki.spel.validator.constrain.SpelNull;
44
import cn.sticki.spel.validator.test.util.ID;
55
import cn.sticki.spel.validator.test.util.VerifyFailedField;
66
import cn.sticki.spel.validator.test.util.VerifyObject;

‎spel-validator-test/src/test/java/cn/sticki/spel/validator/core/bean/SpelSizeTestBean.java ‎spel-validator-constrain/src/test/java/cn/sticki/spel/validator/constrain/bean/SpelSizeTestBean.java

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

3-
import cn.sticki.spel.validator.core.constrain.SpelSize;
3+
import cn.sticki.spel.validator.constrain.SpelSize;
44
import cn.sticki.spel.validator.test.util.ID;
55
import cn.sticki.spel.validator.test.util.VerifyFailedField;
66
import cn.sticki.spel.validator.test.util.VerifyObject;

‎spel-validator-test/src/test/java/cn/sticki/spel/validator/core/OtherTest.java ‎spel-validator-core/src/test/java/cn/sticki/spel/validator/core/OtherTest.java

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

3-
import cn.sticki.spel.validator.core.constrain.SpelAssert;
43
import cn.sticki.spel.validator.core.exception.SpelArgumentException;
54
import cn.sticki.spel.validator.core.exception.SpelParserException;
65
import cn.sticki.spel.validator.core.manager.AnnotationMethodManager;
@@ -34,10 +33,10 @@ void testException() {
3433

3534
@Test
3635
void testAnnotationMethodManager() {
37-
Method abc = AnnotationMethodManager.get(SpelAssert.class, "abc");
36+
Method abc = AnnotationMethodManager.get(SpelConstraint.class, "abc");
3837
Assertions.assertNull(abc);
3938

40-
Method assertTrue = AnnotationMethodManager.get(SpelAssert.class, "assertTrue");
39+
Method assertTrue = AnnotationMethodManager.get(SpelConstraint.class, "validatedBy");
4140
Assertions.assertNotNull(assertTrue);
4241
}
4342

‎spel-validator-test/src/test/java/cn/sticki/spel/validator/core/SpelParserTest.java ‎spel-validator-core/src/test/java/cn/sticki/spel/validator/core/SpelParserTest.java

File renamed without changes.

‎spel-validator-test/src/test/resources/logback-test.xml ‎spel-validator-core/src/test/resources/logback-test.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
<!-- 为特定的包或类设置日志级别 -->
2020
<logger name="cn.sticki" level="info"/>
2121
<!-- <logger name="cn.sticki" level="debug"/> -->
22-
<logger name="cn.sticki.validator.spel.parse.SpelParser" level="error"/>
22+
<!-- <logger name="cn.sticki.validator.spel.parse.SpelParser" level="error"/> -->
2323
</configuration>

‎spel-validator-jakarta/pom.xml

+4-18
Original file line numberDiff line numberDiff line change
@@ -15,37 +15,23 @@
1515
<maven.compiler.source>8</maven.compiler.source>
1616
<maven.compiler.target>8</maven.compiler.target>
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18-
<hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
1918
</properties>
2019

2120
<dependencies>
2221
<dependency>
2322
<groupId>cn.sticki</groupId>
24-
<artifactId>spel-validator-core</artifactId>
23+
<artifactId>spel-validator-constrain</artifactId>
2524
</dependency>
2625

2726
<dependency>
2827
<groupId>org.hibernate.validator</groupId>
2928
<artifactId>hibernate-validator</artifactId>
30-
</dependency>
31-
32-
<!-- ===== for test ===== -->
33-
34-
<dependency>
35-
<groupId>org.junit.jupiter</groupId>
36-
<artifactId>junit-jupiter</artifactId>
37-
<scope>test</scope>
29+
<version>8.0.1.Final</version>
3830
</dependency>
3931

4032
<dependency>
41-
<groupId>org.glassfish</groupId>
42-
<artifactId>jakarta.el</artifactId>
43-
<scope>test</scope>
44-
</dependency>
45-
46-
<dependency>
47-
<groupId>ch.qos.logback</groupId>
48-
<artifactId>logback-classic</artifactId>
33+
<groupId>cn.sticki</groupId>
34+
<artifactId>spel-validator-test</artifactId>
4935
<scope>test</scope>
5036
</dependency>
5137
</dependencies>

0 commit comments

Comments
 (0)