Skip to content

Commit 06e62cb

Browse files
committed
Feature Request: Support @jakarta.annotation.Nonnull. Fixes #3046
1 parent 1a23016 commit 06e62cb

File tree

13 files changed

+29
-27
lines changed

13 files changed

+29
-27
lines changed

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/DelegatingMethodParameterCustomizer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626

2727
package org.springdoc.core.customizers;
2828

29+
import java.util.List;
30+
2931
import org.springframework.core.MethodParameter;
3032
import org.springframework.lang.Nullable;
3133

32-
import java.util.List;
33-
3434
/**
3535
* The interface Delegating method parameter customizer.
3636
*

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/extractor/MethodParameterPojoExtractor.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
import io.swagger.v3.core.util.PrimitiveType;
6565
import io.swagger.v3.oas.annotations.Parameter;
6666
import io.swagger.v3.oas.annotations.media.Schema;
67-
6867
import org.springdoc.core.utils.SchemaUtils;
6968

7069
import org.springframework.core.GenericTypeResolver;

springdoc-openapi-starter-common/src/test/java/org/springdoc/core/model/MethodAttributesTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
package org.springdoc.core.model;
22

3+
import java.lang.reflect.Method;
4+
import java.util.Locale;
5+
36
import org.junit.jupiter.api.Test;
47
import org.mockito.MockedStatic;
58
import org.mockito.Mockito;
69
import org.springdoc.core.models.MethodAttributes;
10+
711
import org.springframework.core.annotation.AnnotatedElementUtils;
812
import org.springframework.web.bind.annotation.RequestMapping;
913

10-
import java.lang.reflect.Method;
11-
import java.util.Locale;
12-
1314
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
1415
import static org.mockito.BDDMockito.given;
1516

springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerWelcomeCommon.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@
3434
import org.springdoc.core.properties.SwaggerUiConfigParameters;
3535
import org.springdoc.core.properties.SwaggerUiConfigProperties;
3636
import org.springdoc.ui.AbstractSwaggerWelcome;
37-
import org.springframework.web.util.ForwardedHeaderUtils;
3837
import reactor.core.publisher.Mono;
3938

4039
import org.springframework.http.HttpStatus;
4140
import org.springframework.http.server.reactive.ServerHttpRequest;
4241
import org.springframework.http.server.reactive.ServerHttpResponse;
42+
import org.springframework.web.util.ForwardedHeaderUtils;
4343
import org.springframework.web.util.UriComponentsBuilder;
4444

4545
import static org.springdoc.core.utils.Constants.DEFAULT_WEB_JARS_PREFIX_URL;

springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app34/SpringDocApp34Test.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,12 @@
2424
package test.org.springdoc.ui.app34;
2525

2626
import org.junit.jupiter.api.Test;
27+
import test.org.springdoc.ui.AbstractSpringDocTest;
2728

2829
import org.springframework.boot.autoconfigure.SpringBootApplication;
2930
import org.springframework.test.context.TestPropertySource;
3031
import org.springframework.test.web.reactive.server.EntityExchangeResult;
3132

32-
import test.org.springdoc.ui.AbstractSpringDocTest;
33-
3433
import static org.junit.jupiter.api.Assertions.assertFalse;
3534
import static org.junit.jupiter.api.Assertions.assertTrue;
3635

springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app52/HelloController.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,17 @@
2424

2525
package test.org.springdoc.api.v30.app52;
2626

27-
import org.springframework.http.MediaType;
28-
import org.springframework.web.bind.annotation.*;
29-
import org.springframework.web.multipart.MultipartFile;
30-
3127
import java.util.List;
3228
import java.util.Map;
3329

30+
import org.springframework.http.MediaType;
31+
import org.springframework.web.bind.annotation.PathVariable;
32+
import org.springframework.web.bind.annotation.PostMapping;
33+
import org.springframework.web.bind.annotation.RequestHeader;
34+
import org.springframework.web.bind.annotation.RequestPart;
35+
import org.springframework.web.bind.annotation.RestController;
36+
import org.springframework.web.multipart.MultipartFile;
37+
3438
@RestController
3539
public class HelloController {
3640

springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app219/HelloController.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,13 @@
2424

2525
package test.org.springdoc.api.v31.app219;
2626

27+
import test.org.springdoc.api.v30.app219.TestObject;
28+
2729
import org.springframework.http.ResponseEntity;
2830
import org.springframework.web.bind.annotation.RequestBody;
2931
import org.springframework.web.bind.annotation.RequestMapping;
3032
import org.springframework.web.bind.annotation.RequestMethod;
3133
import org.springframework.web.bind.annotation.RestController;
32-
import test.org.springdoc.api.v30.app219.TestObject;
3334

3435
@RestController
3536
@RequestMapping(value = "/api", produces = {"application/xml"}, consumes = {"application/json"})

springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app245/HelloController.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import io.swagger.v3.oas.annotations.extensions.Extension;
55
import io.swagger.v3.oas.annotations.extensions.ExtensionProperty;
66
import io.swagger.v3.oas.annotations.info.Info;
7+
78
import org.springframework.boot.autoconfigure.SpringBootApplication;
89
import org.springframework.web.bind.annotation.GetMapping;
910
import org.springframework.web.bind.annotation.RestController;

springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app245/SpringDocApp245Test.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
package test.org.springdoc.api.v31.app245;
22

3-
import static org.hamcrest.Matchers.is;
4-
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
5-
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
6-
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
7-
83
import org.junit.jupiter.api.Test;
4+
95
import org.springframework.beans.factory.annotation.Autowired;
106
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
117
import org.springframework.boot.test.context.SpringBootTest;
128
import org.springframework.test.web.servlet.MockMvc;
139

10+
import static org.hamcrest.Matchers.is;
11+
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
12+
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
13+
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
14+
1415
@SpringBootTest(properties = {
1516
"springdoc.version=v1",
1617
"git.build.time=2025-07-08T12:00:00Z"

springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app246/SpringDocApp246Test.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
import org.junit.jupiter.api.Test;
44
import org.springdoc.core.utils.Constants;
5+
import test.org.springdoc.api.v31.AbstractSpringDocV31Test;
6+
57
import org.springframework.boot.autoconfigure.SpringBootApplication;
68
import org.springframework.boot.test.context.SpringBootTest;
79
import org.springframework.test.context.TestPropertySource;
8-
import test.org.springdoc.api.v31.AbstractSpringDocV31Test;
910

1011
import static org.hamcrest.Matchers.is;
1112
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;

0 commit comments

Comments
 (0)