Skip to content

fix: PropertyResolverUtils retains a JsonNode when reading an ExtensionProperty annotation #3235

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
Mattias-Sehlstedt wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: PropertyResolverUtils retains a JsonNode when reading an ExtensionProperty annotation #3235

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
7 changes: 6 additions & 1 deletion ...-openapi-starter-common/src/main/java/org/springdoc/core/utils/PropertyResolverUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,12 @@ public Map<String, Object> resolveExtensions(Locale locale, Map<String, Object>
Map<String, Object> valueResolved = new HashMap<>();
valueAsMap.forEach((key1, value1) -> {
String key1Resolved = resolve(key1.toString(), locale);
String value1Resolved = resolve(value1.toString(), locale);
Object value1Resolved;
if (value1 instanceof String valueAsString) {
value1Resolved = resolve(valueAsString, locale);
} else {
value1Resolved = value1;
}
valueResolved.put(key1Resolved, value1Resolved);
});
extensionsResolved.put(keyResolved, valueResolved);
Expand Down
10 changes: 7 additions & 3 deletions ...i-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app213/HelloController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@
name = "uri",
value = "${api.extensions.properties.uri}/testcontroller/getTest"),
@ExtensionProperty(name = "passthroughBehavior", value = "${api.extensions.properties.passthroughBehavior}"),
@ExtensionProperty(name = "connectionType", value = "${api.extensions.properties.connectionType}") }) },

@ExtensionProperty(name = "connectionType", value = "${api.extensions.properties.connectionType}")
})
},
title = "${api.info.title}",
version = "${api.info.version}",
description = "${api.info.description}",
Expand All @@ -57,7 +58,10 @@ public class HelloController {
name = "uri",
value = "${api.extensions.properties.uri}/testcontroller/getTest"),
@ExtensionProperty(name = "passthroughBehavior", value = "${api.extensions.properties.passthroughBehavior}"),
@ExtensionProperty(name = "connectionType", value = "${api.extensions.properties.connectionType}") }) })
@ExtensionProperty(name = "connectionType", value = "${api.extensions.properties.connectionType}") ,
@ExtensionProperty(name = "jsonProperty", parseValue = true, value = "{ \"key\": \"value\", \"key2\": \"value2\" }")
})
})

public PersonDTO queryMyDto() {
// This return a PageImpl with the data, the method parameter 'query' is a pojo containg filter properties
Expand Down
10 changes: 7 additions & 3 deletions ...i-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app213/HelloController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@
name = "uri",
value = "${api.extensions.properties.uri}/testcontroller/getTest"),
@ExtensionProperty(name = "passthroughBehavior", value = "${api.extensions.properties.passthroughBehavior}"),
@ExtensionProperty(name = "connectionType", value = "${api.extensions.properties.connectionType}") }) },

@ExtensionProperty(name = "connectionType", value = "${api.extensions.properties.connectionType}")
})
},
title = "${api.info.title}",
version = "${api.info.version}",
description = "${api.info.description}",
Expand All @@ -57,7 +58,10 @@ public class HelloController {
name = "uri",
value = "${api.extensions.properties.uri}/testcontroller/getTest"),
@ExtensionProperty(name = "passthroughBehavior", value = "${api.extensions.properties.passthroughBehavior}"),
@ExtensionProperty(name = "connectionType", value = "${api.extensions.properties.connectionType}") }) })
@ExtensionProperty(name = "connectionType", value = "${api.extensions.properties.connectionType}"),
@ExtensionProperty(name = "jsonProperty", parseValue = true, value = "{ \"key\": \"value\", \"key2\": \"value2\" }")
})
})

public PersonDTO queryMyDto() {
// This return a PageImpl with the data, the method parameter 'query' is a pojo containg filter properties
Expand Down
6 changes: 5 additions & 1 deletion springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app213.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@
"type": "http_proxy",
"httpMethod": "GET",
"uri": "http://my-vpc/nlb-link/testcontroller/getTest",
"connectionType": "VPC_LINK"
"connectionType": "VPC_LINK",
"jsonProperty" : {
"key" : "value",
"key2" : "value2"
}
}
}
}
Expand Down
6 changes: 5 additions & 1 deletion springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app213.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@
"type": "http_proxy",
"httpMethod": "GET",
"uri": "http://my-vpc/nlb-link/testcontroller/getTest",
"connectionType": "VPC_LINK"
"connectionType": "VPC_LINK",
"jsonProperty" : {
"key" : "value",
"key2" : "value2"
}
}
}
}
Expand Down