Skip to content

Fix mixed tab/space indentation introduced in PR #1's container-validation-annotation-leak fix #2

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

Draft
jaipilot wants to merge 1 commit into
base: jaipilot-campaign/springdoc-openapi-3322-head
Choose a base branch
from
Draft

Fix mixed tab/space indentation introduced in PR #1's container-validation-annotation-leak fix #2

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
2 changes: 1 addition & 1 deletion ...napi-starter-common/src/main/java/org/springdoc/core/service/GenericParameterService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ Schema calculateSchema(Components components, ParameterInfo parameterInfo, Reque
*/
private TypeAndTypeAnnotations resolveTypeAndTypeAnnotationsForParameter(MethodParameter methodParameter) {
if (methodParameter instanceof DelegatingMethodParameter delegatingMethodParameter
&& delegatingMethodParameter.getField() != null) {
&& delegatingMethodParameter.getField() != null) {
AnnotatedType annotated = delegatingMethodParameter.getField().getAnnotatedType();
Type type = GenericTypeResolver.resolveType(annotated.getType(), methodParameter.getContainingClass());
return new TypeAndTypeAnnotations(type, Arrays.asList(annotationsFromAnnotatedTypeArguments(annotated)));
Expand Down
20 changes: 10 additions & 10 deletions ...i-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app267/HelloController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@
@RestController
public class HelloController {

@GetMapping("/items")
public String list(@ParameterObject PersonQueryFilter criteria) {
return "ok";
}
@GetMapping("/items")
public String list(@ParameterObject PersonQueryFilter criteria) {
return "ok";
}

@GetMapping("/persons")
public String persons(
List<@Pattern(regexp = "^[a-zA-Z]$") String> middleNames,
List<@Pattern(regexp = "^\\d+$") String> phoneNumbers) {
return "ok";
}
@GetMapping("/persons")
public String persons(
List<@Pattern(regexp = "^[a-zA-Z]$") String> middleNames,
List<@Pattern(regexp = "^\\d+$") String> phoneNumbers) {
return "ok";
}
}
20 changes: 10 additions & 10 deletions ...i-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app267/HelloController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@
@RestController
public class HelloController {

@GetMapping("/items")
public String list(@ParameterObject PersonQueryFilter criteria) {
return "ok";
}
@GetMapping("/items")
public String list(@ParameterObject PersonQueryFilter criteria) {
return "ok";
}

@GetMapping("/persons")
public String persons(
List<@Pattern(regexp = "^[a-zA-Z]$") String> middleNames,
List<@Pattern(regexp = "^\\d+$") String> phoneNumbers) {
return "ok";
}
@GetMapping("/persons")
public String persons(
List<@Pattern(regexp = "^[a-zA-Z]$") String> middleNames,
List<@Pattern(regexp = "^\\d+$") String> phoneNumbers) {
return "ok";
}
}