Commit 2b497b6a authored by Phillip Webb's avatar Phillip Webb

Merge branch '2.3.x' into 2.4.x

Closes gh-24670
parents c014bb98 848ed65f
...@@ -45,6 +45,9 @@ class OperationMethodParameterTests { ...@@ -45,6 +45,9 @@ class OperationMethodParameterTests {
private Method exampleMetaJsr305 = ReflectionUtils.findMethod(getClass(), "exampleMetaJsr305", String.class, private Method exampleMetaJsr305 = ReflectionUtils.findMethod(getClass(), "exampleMetaJsr305", String.class,
String.class); String.class);
private Method exampleJsr305NonNull = ReflectionUtils.findMethod(getClass(), "exampleJsr305NonNull", String.class,
String.class);
@Test @Test
void getNameShouldReturnName() { void getNameShouldReturnName() {
OperationMethodParameter parameter = new OperationMethodParameter("name", this.example.getParameters()[0]); OperationMethodParameter parameter = new OperationMethodParameter("name", this.example.getParameters()[0]);
...@@ -83,16 +86,22 @@ class OperationMethodParameterTests { ...@@ -83,16 +86,22 @@ class OperationMethodParameterTests {
assertThat(parameter.isMandatory()).isFalse(); assertThat(parameter.isMandatory()).isFalse();
} }
void example(String one, @Nullable String two) { public void isMandatoryWhenJsrNonnullAnnotationShouldReturnTrue() {
OperationMethodParameter parameter = new OperationMethodParameter("name",
this.exampleJsr305NonNull.getParameters()[1]);
assertThat(parameter.isMandatory()).isTrue();
}
void example(String one, @Nullable String two) {
} }
void exampleJsr305(String one, @javax.annotation.Nullable String two) { void exampleJsr305(String one, @javax.annotation.Nullable String two) {
} }
void exampleMetaJsr305(String one, @MetaNullable String two) { void exampleMetaJsr305(String one, @MetaNullable String two) {
}
void exampleJsr305NonNull(String one, @javax.annotation.Nonnull String two) {
} }
@TypeQualifier @TypeQualifier
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment