Skip to content

Commit cdfaf63

Browse files
committed
Restentpoints with same name get mix up. Fixes #2876
1 parent ee5ab03 commit cdfaf63

File tree

4 files changed

+118
-39
lines changed

4 files changed

+118
-39
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/*
2+
*
3+
* *
4+
* * *
5+
* * * *
6+
* * * * *
7+
* * * * * * Copyright 2019-2025 the original author or authors.
8+
* * * * * *
9+
* * * * * * Licensed under the Apache License, Version 2.0 (the "License");
10+
* * * * * * you may not use this file except in compliance with the License.
11+
* * * * * * You may obtain a copy of the License at
12+
* * * * * *
13+
* * * * * * https://www.apache.org/licenses/LICENSE-2.0
14+
* * * * * *
15+
* * * * * * Unless required by applicable law or agreed to in writing, software
16+
* * * * * * distributed under the License is distributed on an "AS IS" BASIS,
17+
* * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18+
* * * * * * See the License for the specific language governing permissions and
19+
* * * * * * limitations under the License.
20+
* * * * *
21+
* * * *
22+
* * *
23+
* *
24+
*
25+
*/
26+
27+
package test.org.springdoc.api.v31.app240;
28+
29+
import test.org.springdoc.api.v31.AbstractSpringDocTest;
30+
31+
import org.springframework.boot.autoconfigure.SpringBootApplication;
32+
33+
public class SpringDocApp240Test extends AbstractSpringDocTest {
34+
35+
@SpringBootApplication
36+
static class SpringDocTestApp {
37+
38+
}
39+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/*
2+
*
3+
* *
4+
* * *
5+
* * * *
6+
* * * * *
7+
* * * * * * Copyright 2019-2025 the original author or authors.
8+
* * * * * *
9+
* * * * * * Licensed under the Apache License, Version 2.0 (the "License");
10+
* * * * * * you may not use this file except in compliance with the License.
11+
* * * * * * You may obtain a copy of the License at
12+
* * * * * *
13+
* * * * * * https://www.apache.org/licenses/LICENSE-2.0
14+
* * * * * *
15+
* * * * * * Unless required by applicable law or agreed to in writing, software
16+
* * * * * * distributed under the License is distributed on an "AS IS" BASIS,
17+
* * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18+
* * * * * * See the License for the specific language governing permissions and
19+
* * * * * * limitations under the License.
20+
* * * * *
21+
* * * *
22+
* * *
23+
* *
24+
*
25+
*/
26+
27+
package test.org.springdoc.api.v31.app240;
28+
29+
import io.swagger.v3.oas.annotations.Operation;
30+
import jakarta.servlet.http.HttpServletRequest;
31+
32+
import org.springframework.web.bind.annotation.PostMapping;
33+
import org.springframework.web.bind.annotation.RestController;
34+
35+
@RestController
36+
public class WildcardController {
37+
@PostMapping("/**")
38+
@Operation(summary = "My Wildcard Operation")
39+
public String getItem(HttpServletRequest request) {
40+
return request.getPathInfo();
41+
}
42+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"openapi": "3.1.0",
3+
"info": {
4+
"title": "OpenAPI definition",
5+
"version": "v0"
6+
},
7+
"servers": [
8+
{
9+
"url": "http://localhost",
10+
"description": "Generated server url"
11+
}
12+
],
13+
"paths": {
14+
"/**": {
15+
"post": {
16+
"tags": [
17+
"wildcard-controller"
18+
],
19+
"summary": "My Wildcard Operation",
20+
"operationId": "getItem",
21+
"responses": {
22+
"200": {
23+
"description": "OK",
24+
"content": {
25+
"*/*": {
26+
"schema": {
27+
"type": "string"
28+
}
29+
}
30+
}
31+
}
32+
}
33+
}
34+
}
35+
},
36+
"components": {}
37+
}

Diff for: springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app241.json

-39
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
<<<<<<< HEAD
32
"openapi": "3.1.0",
43
"info": {
54
"title": "OpenAPI definition",
@@ -150,41 +149,3 @@
150149
},
151150
"components": {}
152151
}
153-
=======
154-
"openapi": "3.1.0",
155-
"info": {
156-
"title": "OpenAPI definition",
157-
"version": "v0"
158-
},
159-
"servers": [
160-
{
161-
"url": "http://localhost",
162-
"description": "Generated server url"
163-
}
164-
],
165-
"paths": {
166-
"/**": {
167-
"post": {
168-
"tags": [
169-
"wildcard-controller"
170-
],
171-
"summary": "My Wildcard Operation",
172-
"operationId": "getItem",
173-
"responses": {
174-
"200": {
175-
"description": "OK",
176-
"content": {
177-
"*/*": {
178-
"schema": {
179-
"type": "string"
180-
}
181-
}
182-
}
183-
}
184-
}
185-
}
186-
}
187-
},
188-
"components": {}
189-
}
190-
>>>>>>> origin/main

0 commit comments

Comments
 (0)