Skip to content

Replace instanceof check and cast with instanceof Foo foo #3979

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

Merged
merged 1 commit into from
Aug 5, 2025
Merged

Replace instanceof check and cast with instanceof Foo foo #3979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions spring-ai-model/src/main/java/org/springframework/ai/chat/prompt/PromptTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ public String render() {
// Process internal variables to handle Resources before rendering
Map<String, Object> processedVariables = new HashMap<>();
for (Entry<String, Object> entry : this.variables.entrySet()) {
if (entry.getValue() instanceof Resource) {
processedVariables.put(entry.getKey(), renderResource((Resource) entry.getValue()));
if (entry.getValue() instanceof Resource resource) {
processedVariables.put(entry.getKey(), renderResource(resource));
}
else {
processedVariables.put(entry.getKey(), entry.getValue());
Expand All @@ -126,8 +126,8 @@ public String render(Map<String, Object> additionalVariables) {
Map<String, Object> combinedVariables = new HashMap<>(this.variables);

for (Entry<String, Object> entry : additionalVariables.entrySet()) {
if (entry.getValue() instanceof Resource) {
combinedVariables.put(entry.getKey(), renderResource((Resource) entry.getValue()));
if (entry.getValue() instanceof Resource resource) {
combinedVariables.put(entry.getKey(), renderResource(resource));
}
else {
combinedVariables.put(entry.getKey(), entry.getValue());
Expand Down
4 changes: 2 additions & 2 deletions spring-ai-model/src/main/java/org/springframework/ai/util/json/JsonParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ private static boolean isValidJson(String input) {
* Converts a Java object to a JSON string if it's not already a valid JSON string.
*/
public static String toJson(@Nullable Object object) {
if (object instanceof String && isValidJson((String) object)) {
return (String) object;
if (object instanceof String str && isValidJson(str)) {
return str;
}
try {
return OBJECT_MAPPER.writeValueAsString(object);
Expand Down