Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/aliyun/tea/TeaModel.java
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ public void validate() {
minLength = validation.minLength();
maximum = validation.maximum();
minimum = validation.minimum();
if (!"".equals(pattern) || maxLength > 0 || minLength > 0 || maximum != Double.MAX_VALUE || minimum != Double.MIN_VALUE) {
if (!"".equals(pattern) || maxLength > 0 || minLength > 0 || maximum != Double.MAX_VALUE || minimum != -Double.MAX_VALUE) {
determineType(fields[i].getType(), object, pattern, maxLength, minLength, maximum, minimum, fields[i].getName());
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/aliyun/tea/Validation.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

double maximum() default Double.MAX_VALUE;

double minimum() default Double.MIN_VALUE;
double minimum() default -Double.MAX_VALUE;

boolean required() default false;
}
37 changes: 36 additions & 1 deletion src/test/java/com/aliyun/tea/TeaModelTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,10 @@ public static class ValidateParamModel extends TeaModel {
public Map<String, String> hasStringPattern = new HashMap<>();
@Validation(required = true)
public String requiredTrue = "test";
@Validation(maximum = 10)
public Long minNum;
@Validation(minimum = -10)
public Long maxNum;
}

@Test
Expand Down Expand Up @@ -558,6 +562,37 @@ public void validateTest() throws NoSuchMethodException {
} catch (Exception e) {
Assert.assertEquals("com.aliyun.tea.TeaModelTest$Hello.message regular match failed", e.getMessage());
}

try {
validateParamModel.requiredTrue = "test";
Hello[] hellos = new Hello[]{new Hello()};
hellos[0].message = "test";
validateParamModel.hasPattern.put("test", hellos);
validateParamModel.hasPattern.put("test", hellos);
validateParamModel.maxNum = Long.MAX_VALUE;
validateParamModel.minNum = Long.MIN_VALUE;
validateParamModel.validate();
} catch (Exception e) {
Assert.fail();
}

try {
validateParamModel.requiredTrue = "test";
validateParamModel.maxNum = -11L;
validateParamModel.validate();
Assert.fail();
} catch (Exception e) {
Assert.assertEquals("com.aliyun.tea.TeaModelTest$ValidateParamModel.maxNum less than minimum", e.getMessage());
}

try {
validateParamModel.requiredTrue = "test";
validateParamModel.minNum = 11L;
validateParamModel.validate();
Assert.fail();
} catch (Exception e) {
Assert.assertEquals("com.aliyun.tea.TeaModelTest$ValidateParamModel.minNum exceeds the maximum", e.getMessage());
}
}

@Test
Expand All @@ -566,7 +601,7 @@ public void buildMapTest() {
Assert.assertNull(TeaModel.buildMap(teaModel));

teaModel = new ValidateParamModel();
Assert.assertEquals(6, TeaModel.buildMap(teaModel).size());
Assert.assertEquals(8, TeaModel.buildMap(teaModel).size());
}

@Test
Expand Down