Skip to content

Commit a5b2ff4

Browse files
wing328wing328
committed
fix tests
1 parent 9bba993 commit a5b2ff4

39 files changed

Lines changed: 140 additions & 214 deletions

File tree

‎modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,6 +1221,7 @@ public void shouldAddValidAnnotationIntoCollectionWhenBeanValidationIsEnabled_is
12211221
codegen.additionalProperties().put(SpringCodegen.PERFORM_BEANVALIDATION, "true");
12221222
codegen.additionalProperties().put(CodegenConstants.MODEL_PACKAGE, "xyz.model");
12231223
codegen.additionalProperties().put(CodegenConstants.API_PACKAGE, "xyz.controller");
1224+
codegen.additionalProperties().put("useSpringBoot3", false);
12241225

12251226
ClientOptInput input = new ClientOptInput()
12261227
.openAPI(openAPI)
@@ -2148,6 +2149,7 @@ public void testTypeMappings() {
21482149
@Test
21492150
public void testImportMappings() {
21502151
final SpringCodegen codegen = new SpringCodegen();
2152+
codegen.additionalProperties().put("useSpringBoot3", false);
21512153
codegen.processOpts();
21522154
Assert.assertEquals(codegen.importMapping().get("org.springframework.core.io.Resource"), "org.springframework.core.io.Resource");
21532155
Assert.assertEquals(codegen.importMapping().get("DateTimeFormat"), "org.springframework.format.annotation.DateTimeFormat");
@@ -2512,6 +2514,8 @@ public void paramObjectImportForDifferentSpringBootVersions_issue14077() throws
25122514
additionalProperties.put(DOCUMENTATION_PROVIDER, "springdoc");
25132515
additionalProperties.put(SpringCodegen.INTERFACE_ONLY, "true");
25142516
additionalProperties.put(SpringCodegen.SKIP_DEFAULT_INTERFACE, "true");
2517+
additionalProperties.put("useSpringBoot3", false);
2518+
25152519
Map<String, File> files = generateFromContract("src/test/resources/2_0/petstore-with-spring-pageable.yaml", SPRING_BOOT, additionalProperties);
25162520

25172521
JavaFileAssert.assertThat(files.get("PetApi.java"))
@@ -2767,6 +2771,7 @@ public void requiredFieldShouldIncludeNotNullAnnotation_issue13365() throws IOEx
27672771
codegen.additionalProperties().put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, "false");
27682772
codegen.additionalProperties().put(CodegenConstants.SERIALIZATION_LIBRARY, "jackson");
27692773
codegen.additionalProperties().put(SpringCodegen.USE_TAGS, "true");
2774+
codegen.additionalProperties().put("useSpringBoot3", false);
27702775

27712776
Map<String, File> files = generateFiles(codegen, "src/test/resources/bugs/issue_13365.yml");
27722777

@@ -2865,6 +2870,7 @@ public void requiredFieldShouldIncludeNotNullAnnotationWithBeanValidationTrue_is
28652870
codegen.additionalProperties().put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, "false");
28662871
codegen.additionalProperties().put(CodegenConstants.SERIALIZATION_LIBRARY, "jackson");
28672872
codegen.additionalProperties().put(SpringCodegen.USE_TAGS, "true");
2873+
codegen.additionalProperties().put("useSpringBoot3", false);
28682874

28692875
Map<String, File> files = generateFiles(codegen, "src/test/resources/bugs/issue_13365.yml");
28702876

‎samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApiController.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
import org.springframework.web.multipart.MultipartFile;
2020
import org.springframework.web.context.request.NativeWebRequest;
2121

22-
import javax.validation.constraints.*;
23-
import javax.validation.Valid;
22+
import jakarta.validation.constraints.*;
23+
import jakarta.validation.Valid;
2424

2525
import java.util.List;
2626
import java.util.Map;
2727
import java.util.Optional;
28-
import javax.annotation.Generated;
28+
import jakarta.annotation.Generated;
2929

30-
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
30+
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT")
3131
@Controller
3232
@RequestMapping("${openapi.byRefOrValue.base-path:}")
3333
public class BarApiController implements BarApi {

‎samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApiController.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import org.openapitools.model.Foo;
44
import org.openapitools.model.FooRefOrValue;
5+
import org.springframework.lang.Nullable;
56

67

78
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,15 +20,15 @@
1920
import org.springframework.web.multipart.MultipartFile;
2021
import org.springframework.web.context.request.NativeWebRequest;
2122

22-
import javax.validation.constraints.*;
23-
import javax.validation.Valid;
23+
import jakarta.validation.constraints.*;
24+
import jakarta.validation.Valid;
2425

2526
import java.util.List;
2627
import java.util.Map;
2728
import java.util.Optional;
28-
import javax.annotation.Generated;
29+
import jakarta.annotation.Generated;
2930

30-
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
31+
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT")
3132
@Controller
3233
@RequestMapping("${openapi.byRefOrValue.base-path:}")
3334
public class FooApiController implements FooApi {

‎samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelFile.java‎

Lines changed: 0 additions & 84 deletions
This file was deleted.

‎samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApiController.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
import org.springframework.web.multipart.MultipartFile;
1919
import org.springframework.web.context.request.NativeWebRequest;
2020

21-
import javax.validation.constraints.*;
22-
import javax.validation.Valid;
21+
import jakarta.validation.constraints.*;
22+
import jakarta.validation.Valid;
2323

2424
import java.util.List;
2525
import java.util.Map;
2626
import java.util.Optional;
27-
import javax.annotation.Generated;
27+
import jakarta.annotation.Generated;
2828

29-
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
29+
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT")
3030
@Controller
3131
@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
3232
public class AnotherFakeApiController implements AnotherFakeApi {

‎samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import java.time.LocalDate;
99
import java.util.Map;
1010
import org.openapitools.model.ModelApiResponse;
11+
import org.springframework.lang.Nullable;
1112
import java.time.OffsetDateTime;
1213
import org.openapitools.model.OuterComposite;
1314
import org.openapitools.model.ResponseObjectWithDifferentFieldNames;
@@ -30,15 +31,15 @@
3031
import org.springframework.web.multipart.MultipartFile;
3132
import org.springframework.web.context.request.NativeWebRequest;
3233

33-
import javax.validation.constraints.*;
34-
import javax.validation.Valid;
34+
import jakarta.validation.constraints.*;
35+
import jakarta.validation.Valid;
3536

3637
import java.util.List;
3738
import java.util.Map;
3839
import java.util.Optional;
39-
import javax.annotation.Generated;
40+
import jakarta.annotation.Generated;
4041

41-
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
42+
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT")
4243
@Controller
4344
@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
4445
public class FakeApiController implements FakeApi {

‎samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
import org.springframework.web.multipart.MultipartFile;
1919
import org.springframework.web.context.request.NativeWebRequest;
2020

21-
import javax.validation.constraints.*;
22-
import javax.validation.Valid;
21+
import jakarta.validation.constraints.*;
22+
import jakarta.validation.Valid;
2323

2424
import java.util.List;
2525
import java.util.Map;
2626
import java.util.Optional;
27-
import javax.annotation.Generated;
27+
import jakarta.annotation.Generated;
2828

29-
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
29+
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT")
3030
@Controller
3131
@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
3232
public class FakeClassnameTestApiController implements FakeClassnameTestApi {

‎samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApiController.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.openapitools.api;
22

33
import org.openapitools.model.ModelApiResponse;
4+
import org.springframework.lang.Nullable;
45
import org.openapitools.model.Pet;
56
import java.util.Set;
67

@@ -20,15 +21,15 @@
2021
import org.springframework.web.multipart.MultipartFile;
2122
import org.springframework.web.context.request.NativeWebRequest;
2223

23-
import javax.validation.constraints.*;
24-
import javax.validation.Valid;
24+
import jakarta.validation.constraints.*;
25+
import jakarta.validation.Valid;
2526

2627
import java.util.List;
2728
import java.util.Map;
2829
import java.util.Optional;
29-
import javax.annotation.Generated;
30+
import jakarta.annotation.Generated;
3031

31-
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
32+
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT")
3233
@Controller
3334
@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
3435
public class PetApiController implements PetApi {

‎samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApiController.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
import org.springframework.web.multipart.MultipartFile;
2020
import org.springframework.web.context.request.NativeWebRequest;
2121

22-
import javax.validation.constraints.*;
23-
import javax.validation.Valid;
22+
import jakarta.validation.constraints.*;
23+
import jakarta.validation.Valid;
2424

2525
import java.util.List;
2626
import java.util.Map;
2727
import java.util.Optional;
28-
import javax.annotation.Generated;
28+
import jakarta.annotation.Generated;
2929

30-
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
30+
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT")
3131
@Controller
3232
@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
3333
public class StoreApiController implements StoreApi {

‎samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApiController.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
import org.springframework.web.multipart.MultipartFile;
2020
import org.springframework.web.context.request.NativeWebRequest;
2121

22-
import javax.validation.constraints.*;
23-
import javax.validation.Valid;
22+
import jakarta.validation.constraints.*;
23+
import jakarta.validation.Valid;
2424

2525
import java.util.List;
2626
import java.util.Map;
2727
import java.util.Optional;
28-
import javax.annotation.Generated;
28+
import jakarta.annotation.Generated;
2929

30-
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
30+
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT")
3131
@Controller
3232
@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
3333
public class UserApiController implements UserApi {

0 commit comments

Comments
 (0)