Skip to content

Fixes after sync #61

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
vpelikh merged 6 commits into from
Jul 24, 2026
Merged

Fixes after sync #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
be8fb37
Replace Strings.CS references with String.contains to fix build
vpelikh Jul 24, 2026
49344d4
Update PropertyNamingStrategyConverter to tools.jackson API
vpelikh Jul 24, 2026
f0e1d9a
Remove stale MCP UI assets (old builds)
vpelikh Jul 24, 2026
7f72b3f
Migrate test com.fasterxml.jackson imports to tools.jackson in HelloC…
vpelikh Jul 24, 2026
168bf5a
Fix app18 expected result: remove minimum from persons7 schema
vpelikh Jul 24, 2026
0a0cc4c
Fix expected JSON results for app20/app25/app26 kotlin tests
vpelikh Jul 24, 2026
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
1 change: 0 additions & 1 deletion springdoc-openapi-starter-common-mcp/src/main/resources/mcp-ui/assets/index-Cq1GlPUU.css
View file
Open in desktop

This file was deleted.

84 changes: 0 additions & 84 deletions springdoc-openapi-starter-common-mcp/src/main/resources/mcp-ui/assets/index-CscgqDf2.js
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...ngdoc-openapi-starter-common/src/main/java/org/springdoc/api/AbstractOpenApiResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ protected void calculatePath(HandlerMethod handlerMethod, RouterOperation router
// allow for customisation
operation = customizeOperation(operation, components, handlerMethod);

if (Strings.CS.contains(operationPath, "*")) {
if (operationPath.contains("*")) {
Matcher matcher = PATH_PATTERN.matcher(operationPath);
while (matcher.find()) {
String pathParam = matcher.group(1);
Expand Down Expand Up @@ -1409,7 +1409,7 @@ private PathItem buildPathItem(RequestMethod requestMethod, Operation operation,
if (ParameterIn.PATH.toString().equals(parameter.getIn())) {
// check it's present in the path
String name = parameter.getName();
if (!Strings.CS.containsAny(operationPath, "{" + name + "}", "{*" + name + "}"))
if (!operationPath.contains("{" + name + "}") && !operationPath.contains("{*" + name + "}"))
paramIt.remove();
}
}
Expand Down
10 changes: 5 additions & 5 deletions ...r-common/src/main/java/org/springdoc/core/converters/PropertyNamingStrategyConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
import java.util.List;
import java.util.Map;

import com.fasterxml.jackson.databind.BeanDescription;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition;
import tools.jackson.databind.BeanDescription;
import tools.jackson.databind.JavaType;
import tools.jackson.databind.ObjectMapper;
import tools.jackson.databind.introspect.BeanPropertyDefinition;
import io.swagger.v3.core.converter.AnnotatedType;
import io.swagger.v3.core.converter.ModelConverter;
import io.swagger.v3.core.converter.ModelConverterContext;
Expand Down Expand Up @@ -122,7 +122,7 @@ public Schema resolve(AnnotatedType type, ModelConverterContext context, Iterato
private void renameClobberedProperties(Schema<?> schema, ObjectMapper mapper, JavaType javaType) {
BeanDescription beanDescription;
try {
beanDescription = mapper.getSerializationConfig().introspect(javaType);
beanDescription = mapper._serializationContext().introspectBeanDescription(javaType);
}
catch (Exception e) {
return;
Expand Down
4 changes: 2 additions & 2 deletions ...i-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app269/HelloController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package test.org.springdoc.api.v31.app269;

import com.fasterxml.jackson.databind.PropertyNamingStrategies;
import com.fasterxml.jackson.databind.annotation.JsonNaming;
import tools.jackson.databind.PropertyNamingStrategies;
import tools.jackson.databind.annotation.JsonNaming;

import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
Expand Down
1 change: 0 additions & 1 deletion ...openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app18.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@
"schema": {
"type": "integer",
"format": "int32",
"minimum": 0,
"exclusiveMinimum": 0
}
}
Expand Down
19 changes: 10 additions & 9 deletions ...i-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.0.1/app20.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,7 @@
"content": {
"*/*": {
"schema": {
"oneOf": [
{
"$ref": "#/components/schemas/Circle"
},
{
"$ref": "#/components/schemas/Square"
}
]
"$ref": "#/components/schemas/Shape"
}
}
}
Expand Down Expand Up @@ -75,7 +68,15 @@
},
"discriminator": {
"propertyName": "type"
}
},
"oneOf": [
{
"$ref": "#/components/schemas/Circle"
},
{
"$ref": "#/components/schemas/Square"
}
]
},
"Square": {
"required": [
Expand Down
83 changes: 26 additions & 57 deletions ...i-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app25.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,61 +1,30 @@
{
"openapi": "3.1.0",
"info": {
"title": "OpenAPI definition",
"version": "v0"
},
"servers": [
{
"url": "http://localhost",
"description": "Generated server url"
}
],
"paths": {
"/null-key": {
"get": {
"tags": [
"null-key-controller"
],
"operationId": "getNullKey",
"responses": {
"200": {
"description": "OK",
"content": {
"*/*": {
"schema": {
"$ref": "#/components/schemas/OuterResponse"
}
}
}
}
}
}
}
},
"components": {
"schemas": {
"OuterResponse": {
"type": "object",
"properties": {
"contractAddress": {
"type": "string"
},
"chainType": {
"type": "string",
"enum": [
"ETH"
]
},
"success": {
"type": "boolean"
}
},
"required": [
"chainType",
"contractAddress",
"success"
]
}
"openapi": "3.1.0",
"info": {
"title": "OpenAPI definition",
"version": "v0"
},
"servers": [
{
"url": "http://localhost",
"description": "Generated server url"
}
],
"paths": {
"/null-key": {
"get": {
"tags": [
"null-key-controller"
],
"operationId": "getNullKey",
"responses": {
"200": {
"description": "OK",
"content": {}
}
}
}
}
},
"components": {}
}
22 changes: 10 additions & 12 deletions ...i-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app26.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,7 @@
"content": {
"*/*": {
"schema": {
"oneOf": [
{
"$ref": "#/components/schemas/Circle"
},
{
"$ref": "#/components/schemas/Square"
}
]
"$ref": "#/components/schemas/Shape"
}
}
}
Expand Down Expand Up @@ -71,12 +64,17 @@
"discriminator": {
"propertyName": "type"
},
"oneOf": [
{
"$ref": "#/components/schemas/Circle"
},
{
"$ref": "#/components/schemas/Square"
}
],
"properties": {
"label": {
"type": [
"string",
"null"
]
"type": "string"
}
}
},
Expand Down
Loading