Skip to content

Support any nullable annotation for mark argument or field as nullable #3666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+408 −7
Open

Support any nullable annotation for mark argument or field as nullable #3666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions spring-ai-model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,13 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
<scope>test</scope>
</dependency>

</dependencies>

</project>
6 changes: 4 additions & 2 deletions ...g-ai-model/src/main/java/org/springframework/ai/util/json/schema/JsonSchemaGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.lang.reflect.Parameter;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Stream;

Expand Down Expand Up @@ -213,8 +214,9 @@ private static boolean isMethodParameterRequired(Method method, int index) {
|| schemaAnnotation.requiredMode() == Schema.RequiredMode.AUTO || schemaAnnotation.required();
}

var nullableAnnotation = parameter.getAnnotation(Nullable.class);
if (nullableAnnotation != null) {
var nullableAnnotationPresent = Arrays.stream(parameter.getAnnotations())
.anyMatch(ann -> ann.annotationType().getSimpleName().equals("Nullable"));
if (nullableAnnotationPresent) {
return false;
}

Expand Down
4 changes: 3 additions & 1 deletion ...-ai-model/src/main/java/org/springframework/ai/util/json/schema/SpringAiSchemaModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package org.springframework.ai.util.json.schema;

import java.lang.annotation.Annotation;
import java.util.stream.Stream;

import com.fasterxml.jackson.annotation.JsonProperty;
Expand Down Expand Up @@ -104,7 +105,8 @@ private boolean checkRequired(MemberScope<?, ?> member) {
|| schemaAnnotation.requiredMode() == Schema.RequiredMode.AUTO || schemaAnnotation.required();
}

var nullableAnnotation = member.getAnnotationConsideringFieldAndGetter(Nullable.class);
var nullableAnnotation = member.getAnnotationConsideringFieldAndGetter(Annotation.class,
ann -> ann.annotationType().getSimpleName().equals("Nullable"));
if (nullableAnnotation != null) {
return false;
}
Expand Down
Loading