From b2b3076941501f6d8c25a3b0462c100755078595 Mon Sep 17 00:00:00 2001 From: Benjamin Einaudi Date: Mon, 30 Mar 2026 22:47:46 +0200 Subject: [PATCH] fixes(spring) Fixes @Nullable annotation * remove findbug dependency as spring generator set its import to 'org.springframework.lang.Nullable' * for springboot 4, use 'org.jspecify.annotations.Nullable' as spring one is Deprecated --- .../codegen/languages/SpringCodegen.java | 6 +++- .../libraries/spring-boot/pom-sb3.mustache | 6 ---- .../libraries/spring-boot/pom-sb4.mustache | 6 ---- .../libraries/spring-boot/pom.mustache | 6 ---- .../libraries/spring-cloud/pom-sb3.mustache | 8 ----- .../libraries/spring-cloud/pom-sb4.mustache | 8 ----- .../libraries/spring-cloud/pom.mustache | 8 ----- .../spring-http-interface/pom-sb3.mustache | 6 ---- .../spring-http-interface/pom-sb4.mustache | 6 ---- .../java/spring/SpringCodegenTest.java | 36 +++++++++++++++++++ .../client/petstore/spring-cloud-auth/pom.xml | 6 ---- .../petstore/spring-cloud-date-time/pom.xml | 6 ---- .../petstore/spring-cloud-deprecated/pom.xml | 6 ---- .../spring-cloud-feign-without-url/pom.xml | 6 ---- .../client/petstore/spring-cloud-tags/pom.xml | 6 ---- samples/client/petstore/spring-cloud/pom.xml | 6 ---- .../pom.xml | 6 ---- .../pom.xml | 6 ---- .../spring-http-interface-reactive/pom.xml | 6 ---- .../pom.xml | 6 ---- .../java/org/openapitools/api/FakeApi.java | 2 +- .../java/org/openapitools/api/PetApi.java | 2 +- .../model/AdditionalPropertiesAnyTypeDto.java | 2 +- .../model/AdditionalPropertiesArrayDto.java | 2 +- .../model/AdditionalPropertiesBooleanDto.java | 2 +- .../model/AdditionalPropertiesClassDto.java | 2 +- .../model/AdditionalPropertiesIntegerDto.java | 2 +- .../model/AdditionalPropertiesNumberDto.java | 2 +- .../model/AdditionalPropertiesObjectDto.java | 2 +- .../model/AdditionalPropertiesStringDto.java | 2 +- .../org/openapitools/model/AnimalDto.java | 2 +- .../openapitools/model/ApiResponseDto.java | 2 +- .../model/ArrayOfArrayOfNumberOnlyDto.java | 2 +- .../model/ArrayOfNumberOnlyDto.java | 2 +- .../org/openapitools/model/ArrayTestDto.java | 2 +- .../org/openapitools/model/BigCatDto.java | 2 +- .../openapitools/model/CapitalizationDto.java | 2 +- .../java/org/openapitools/model/CatDto.java | 2 +- .../org/openapitools/model/CategoryDto.java | 2 +- .../model/ChildWithNullableDto.java | 2 +- .../org/openapitools/model/ClassModelDto.java | 2 +- .../org/openapitools/model/ClientDto.java | 2 +- .../model/ContainerDefaultValueDto.java | 2 +- .../java/org/openapitools/model/DogDto.java | 2 +- .../org/openapitools/model/EnumArraysDto.java | 2 +- .../org/openapitools/model/EnumTestDto.java | 2 +- .../java/org/openapitools/model/FileDto.java | 2 +- .../model/FileSchemaTestClassDto.java | 2 +- .../org/openapitools/model/FormatTestDto.java | 2 +- .../model/HasOnlyReadOnlyDto.java | 2 +- .../java/org/openapitools/model/ListDto.java | 2 +- .../org/openapitools/model/MapTestDto.java | 2 +- ...ertiesAndAdditionalPropertiesClassDto.java | 2 +- .../model/Model200ResponseDto.java | 2 +- .../java/org/openapitools/model/NameDto.java | 2 +- .../model/NullableMapPropertyDto.java | 2 +- .../org/openapitools/model/NumberOnlyDto.java | 2 +- .../java/org/openapitools/model/OrderDto.java | 2 +- .../openapitools/model/OuterCompositeDto.java | 2 +- .../model/ParentWithNullableDto.java | 2 +- .../java/org/openapitools/model/PetDto.java | 2 +- .../openapitools/model/ReadOnlyFirstDto.java | 2 +- ...ponseObjectWithDifferentFieldNamesDto.java | 2 +- .../org/openapitools/model/ReturnDto.java | 2 +- .../model/SpecialModelNameDto.java | 2 +- .../java/org/openapitools/model/TagDto.java | 2 +- .../model/TypeHolderDefaultDto.java | 2 +- .../model/TypeHolderExampleDto.java | 2 +- .../java/org/openapitools/model/UserDto.java | 2 +- .../org/openapitools/model/XmlItemDto.java | 2 +- .../pom.xml | 6 ---- .../petstore/spring-http-interface/pom.xml | 6 ---- .../spring-cloud-3-with-optional/pom.xml | 6 ---- .../client/petstore/spring-cloud-3/pom.xml | 6 ---- .../spring-cloud-4-with-optional/pom.xml | 6 ---- .../java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/model/Category.java | 2 +- .../openapitools/model/ModelApiResponse.java | 2 +- .../java/org/openapitools/model/Order.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 2 +- .../java/org/openapitools/model/User.java | 2 +- .../petstore/spring-cloud-async/pom.xml | 6 ---- .../petstore/spring-cloud-date-time/pom.xml | 6 ---- .../petstore/spring-cloud-http-basic/pom.xml | 6 ---- .../spring-cloud-oas3-fakeapi/pom.xml | 6 ---- .../spring-cloud-spring-pageable/pom.xml | 6 ---- .../client/petstore/spring-cloud/pom.xml | 6 ---- .../pom.xml | 6 ---- .../client/petstore/spring-stubs/pom.xml | 6 ---- .../spring-boot-oneof-interface/pom.xml | 6 ---- .../petstore/spring-boot-oneof-sealed/pom.xml | 6 ---- .../server/petstore/spring-boot-oneof/pom.xml | 6 ---- .../petstore/spring-boot-springdoc/pom.xml | 6 ---- .../pom.xml | 6 ---- .../server/petstore/springboot-3/pom.xml | 6 ---- .../server/petstore/springboot-4/pom.xml | 6 ---- .../java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/model/Category.java | 2 +- .../openapitools/model/ModelApiResponse.java | 2 +- .../java/org/openapitools/model/Order.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 2 +- .../java/org/openapitools/model/User.java | 2 +- .../petstore/springboot-delegate/pom.xml | 6 ---- .../springboot-implicitHeaders/pom.xml | 6 ---- .../server/petstore/springboot-source/pom.xml | 6 ---- .../server/petstore/springboot/pom.xml | 6 ---- .../pom.xml | 6 ---- .../petstore/spring-boot-nullable-set/pom.xml | 6 ---- .../springboot-api-response-examples/pom.xml | 6 ---- .../pom.xml | 6 ---- .../springboot-beanvalidation/pom.xml | 6 ---- .../springboot-builtin-validation/pom.xml | 6 ---- .../petstore/springboot-delegate-j8/pom.xml | 6 ---- .../pom.xml | 6 ---- .../petstore/springboot-delegate/pom.xml | 6 ---- .../springboot-file-delegate-optional/pom.xml | 6 ---- .../pom.xml | 6 ---- .../springboot-implicitHeaders/pom.xml | 6 ---- .../pom.xml | 6 ---- .../petstore/springboot-lombok-data/pom.xml | 6 ---- .../springboot-lombok-tostring/pom.xml | 6 ---- .../pom.xml | 6 ---- .../pom.xml | 6 ---- .../petstore/springboot-reactive/pom.xml | 6 ---- .../pom.xml | 6 ---- .../pom.xml | 6 ---- .../pom.xml | 6 ---- .../springboot-spring-pageable/pom.xml | 6 ---- .../springboot-spring-provide-args/pom.xml | 6 ---- .../petstore/springboot-useoptional/pom.xml | 6 ---- .../petstore/springboot-virtualan/pom.xml | 6 ---- .../springboot-x-implements-skip/pom.xml | 6 ---- samples/server/petstore/springboot/pom.xml | 6 ---- 135 files changed, 105 insertions(+), 485 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java index 9b109320c5f1..7e9263787773 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java @@ -553,7 +553,11 @@ public void processOpts() { importMapping.put("JsonDeserialize", (useJackson3 ? JACKSON3_PACKAGE : JACKSON2_PACKAGE) + ".databind.annotation.JsonDeserialize"); typeMapping.put("file", "org.springframework.core.io.Resource"); - importMapping.put("Nullable", "org.springframework.lang.Nullable"); + if(isUseSpringBoot4()){ + importMapping.put("Nullable", "org.jspecify.annotations.Nullable"); + } else { + importMapping.put("Nullable", "org.springframework.lang.Nullable"); + } importMapping.put("org.springframework.core.io.Resource", "org.springframework.core.io.Resource"); importMapping.put("DateTimeFormat", "org.springframework.format.annotation.DateTimeFormat"); importMapping.put("ParameterObject", "org.springdoc.api.annotations.ParameterObject"); diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom-sb3.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom-sb3.mustache index 747c9272cc1a..e2a947223616 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom-sb3.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom-sb3.mustache @@ -158,12 +158,6 @@ {{/swagger2AnnotationLibrary}} {{/springDocDocumentationProvider}} - - - com.google.code.findbugs - jsr305 - 3.0.2 - {{#withXml}} diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom-sb4.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom-sb4.mustache index fc288bbb36c0..2f699ffe9b72 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom-sb4.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom-sb4.mustache @@ -162,12 +162,6 @@ {{/swagger2AnnotationLibrary}} {{/springDocDocumentationProvider}} - - - com.google.code.findbugs - jsr305 - 3.0.2 - {{#withXml}} diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache index cd5507ade824..a37afab8dcf7 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache @@ -173,12 +173,6 @@ {{/swagger2AnnotationLibrary}} {{/springDocDocumentationProvider}} - - - com.google.code.findbugs - jsr305 - 3.0.2 - {{#withXml}} diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb3.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb3.mustache index d62bb06bf8a9..89b4c6fb74e4 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb3.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb3.mustache @@ -84,14 +84,6 @@ {{/swagger2AnnotationLibrary}} {{/springDocDocumentationProvider}} - - - com.google.code.findbugs - jsr305 - {{^parentOverridden}} - 3.0.2 - {{/parentOverridden}} - org.springframework.cloud spring-cloud-starter-openfeign diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb4.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb4.mustache index 849ed1f2690f..fb0b1c2fb6ab 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb4.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb4.mustache @@ -84,14 +84,6 @@ {{/swagger2AnnotationLibrary}} {{/springDocDocumentationProvider}} - - - com.google.code.findbugs - jsr305 - {{^parentOverridden}} - 3.0.2 - {{/parentOverridden}} - org.springframework.cloud spring-cloud-starter-openfeign diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache index bc7f1e537373..9d04f98dad71 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache @@ -99,14 +99,6 @@ {{/swagger2AnnotationLibrary}} {{/springDocDocumentationProvider}} - - - com.google.code.findbugs - jsr305 - {{^parentOverridden}} - 3.0.2 - {{/parentOverridden}} - org.springframework.cloud spring-cloud-starter-openfeign diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-http-interface/pom-sb3.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-http-interface/pom-sb3.mustache index 7a131774517c..0b8953b52928 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-http-interface/pom-sb3.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-http-interface/pom-sb3.mustache @@ -57,12 +57,6 @@ org.springframework.boot spring-boot-starter-{{#reactive}}webflux{{/reactive}}{{^reactive}}web{{/reactive}} - - - com.google.code.findbugs - jsr305 - 3.0.2 - jakarta.validation jakarta.validation-api diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-http-interface/pom-sb4.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-http-interface/pom-sb4.mustache index e617a22895ac..169df0efe524 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-http-interface/pom-sb4.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-http-interface/pom-sb4.mustache @@ -57,12 +57,6 @@ org.springframework.boot spring-boot-starter-{{#reactive}}web{{/reactive}}{{^reactive}}rest{{/reactive}}client - - - com.google.code.findbugs - jsr305 - 3.0.2 - jakarta.validation jakarta.validation-api diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index 648c8f798c6e..bc2b197b7492 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -6488,6 +6488,42 @@ public void shouldAddNullableImportForArrayTypeModels() throws IOException { .hasImports("org.springframework.lang.Nullable"); } + @Test + public void shouldAddNullableImportForArrayTypeModelsForSpringBoot4() throws IOException { + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + + final OpenAPI openAPI = TestUtils.parseFlattenSpec( + "src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml"); + final SpringCodegen codegen = new SpringCodegen(); + codegen.setOpenAPI(openAPI); + codegen.setOutputDir(output.getAbsolutePath()); + codegen.additionalProperties().put(INTERFACE_ONLY, "true"); + codegen.additionalProperties().put(CodegenConstants.GENERATE_ALIAS_AS_MODEL, "true"); + codegen.additionalProperties().put(SpringCodegen.USE_SPRING_BOOT4, "true"); + codegen.additionalProperties().put(SpringCodegen.USE_JACKSON_3, "true"); + codegen.additionalProperties().put(SpringCodegen.OPENAPI_NULLABLE, "false"); + + ClientOptInput input = new ClientOptInput(); + input.openAPI(openAPI); + input.config(codegen); + + DefaultGenerator generator = new DefaultGenerator(); + generator.setGenerateMetadata(false); + generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "true"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); + + Map files = generator.opts(input).generate().stream() + .collect(Collectors.toMap(File::getName, Function.identity())); + + // AnimalFarm is an array-type model with no properties (issue #22788) + JavaFileAssert.assertThat(files.get("AnimalFarm.java")) + .hasImports("org.jspecify.annotations.Nullable"); + JavaFileAssert.assertThat(files.get("Pet.java")) + .hasImports("org.jspecify.annotations.Nullable"); + } + @Test public void shouldRefuseJackson3WithoutSpringboot4() throws IOException { File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); diff --git a/samples/client/petstore/spring-cloud-auth/pom.xml b/samples/client/petstore/spring-cloud-auth/pom.xml index 841153595bca..2706fa7c9a6b 100644 --- a/samples/client/petstore/spring-cloud-auth/pom.xml +++ b/samples/client/petstore/spring-cloud-auth/pom.xml @@ -35,12 +35,6 @@ - - - com.google.code.findbugs - jsr305 - 3.0.2 - org.springframework.cloud spring-cloud-starter-openfeign diff --git a/samples/client/petstore/spring-cloud-date-time/pom.xml b/samples/client/petstore/spring-cloud-date-time/pom.xml index b86575249930..f91f14ee0ae3 100644 --- a/samples/client/petstore/spring-cloud-date-time/pom.xml +++ b/samples/client/petstore/spring-cloud-date-time/pom.xml @@ -55,12 +55,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - org.springframework.cloud spring-cloud-starter-openfeign diff --git a/samples/client/petstore/spring-cloud-deprecated/pom.xml b/samples/client/petstore/spring-cloud-deprecated/pom.xml index 0ce3a9096537..8d5ca2b05d8d 100644 --- a/samples/client/petstore/spring-cloud-deprecated/pom.xml +++ b/samples/client/petstore/spring-cloud-deprecated/pom.xml @@ -55,12 +55,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - org.springframework.cloud spring-cloud-starter-openfeign diff --git a/samples/client/petstore/spring-cloud-feign-without-url/pom.xml b/samples/client/petstore/spring-cloud-feign-without-url/pom.xml index 45fe6dbca254..2b5baf938da8 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/pom.xml +++ b/samples/client/petstore/spring-cloud-feign-without-url/pom.xml @@ -42,12 +42,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - org.springframework.cloud spring-cloud-starter-openfeign diff --git a/samples/client/petstore/spring-cloud-tags/pom.xml b/samples/client/petstore/spring-cloud-tags/pom.xml index 56dbabf50387..0372fd7b12ca 100644 --- a/samples/client/petstore/spring-cloud-tags/pom.xml +++ b/samples/client/petstore/spring-cloud-tags/pom.xml @@ -55,12 +55,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - org.springframework.cloud spring-cloud-starter-openfeign diff --git a/samples/client/petstore/spring-cloud/pom.xml b/samples/client/petstore/spring-cloud/pom.xml index 45fe6dbca254..2b5baf938da8 100644 --- a/samples/client/petstore/spring-cloud/pom.xml +++ b/samples/client/petstore/spring-cloud/pom.xml @@ -42,12 +42,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - org.springframework.cloud spring-cloud-starter-openfeign diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/pom.xml b/samples/client/petstore/spring-http-interface-noResponseEntity/pom.xml index 877bb4bb4ab2..47113f507682 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/pom.xml +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/pom.xml @@ -48,12 +48,6 @@ org.springframework.boot spring-boot-starter-web - - - com.google.code.findbugs - jsr305 - 3.0.2 - jakarta.validation jakarta.validation-api diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/pom.xml b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/pom.xml index c76e0e85dde0..7c1d6bc98821 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/pom.xml +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/pom.xml @@ -48,12 +48,6 @@ org.springframework.boot spring-boot-starter-webflux - - - com.google.code.findbugs - jsr305 - 3.0.2 - jakarta.validation jakarta.validation-api diff --git a/samples/client/petstore/spring-http-interface-reactive/pom.xml b/samples/client/petstore/spring-http-interface-reactive/pom.xml index d1730827004b..76a124a8b12b 100644 --- a/samples/client/petstore/spring-http-interface-reactive/pom.xml +++ b/samples/client/petstore/spring-http-interface-reactive/pom.xml @@ -48,12 +48,6 @@ org.springframework.boot spring-boot-starter-webflux - - - com.google.code.findbugs - jsr305 - 3.0.2 - jakarta.validation jakarta.validation-api diff --git a/samples/client/petstore/spring-http-interface-springboot-4/pom.xml b/samples/client/petstore/spring-http-interface-springboot-4/pom.xml index a93c0ff47b6b..5b3f1989af2d 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/pom.xml +++ b/samples/client/petstore/spring-http-interface-springboot-4/pom.xml @@ -48,12 +48,6 @@ org.springframework.boot spring-boot-starter-restclient - - - com.google.code.findbugs - jsr305 - 3.0.2 - jakarta.validation jakarta.validation-api diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/api/FakeApi.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/api/FakeApi.java index 5bf8b2abbe5b..d424468ea01a 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/api/FakeApi.java @@ -12,7 +12,7 @@ import org.openapitools.model.FileSchemaTestClassDto; import java.time.LocalDate; import java.util.Map; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import org.openapitools.model.OuterCompositeDto; import org.openapitools.model.UserDto; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/api/PetApi.java index b121a4f88bfd..2887f138b984 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/api/PetApi.java @@ -6,7 +6,7 @@ package org.openapitools.api; import org.openapitools.model.ApiResponseDto; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import org.openapitools.model.PetDto; import org.openapitools.model.ResponseObjectWithDifferentFieldNamesDto; import java.util.Set; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java index 5e8882696067..529d7a160823 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java index 486be9fc9bb0..e7cbd579b62a 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import java.util.List; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java index b4a4863f9172..93c253cd7a8f 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java index ad28a52f27f0..c9754e642977 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java @@ -9,7 +9,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java index b0e5250ae25e..59a95096b84f 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java index e01354ea35a0..f6eab249f958 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import java.math.BigDecimal; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java index 37613977b53c..b5008f608734 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import java.util.Map; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java index f01857266951..c4db1c2e2837 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AnimalDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AnimalDto.java index 29f5f0f0462f..eec85d3a4db5 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AnimalDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AnimalDto.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ApiResponseDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ApiResponseDto.java index 16eb742472f7..bb198f3d4409 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ApiResponseDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ApiResponseDto.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java index fba537365c6b..cf56e534c5a5 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java @@ -9,7 +9,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java index 291d663818d7..ba42ac6d0b82 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java @@ -9,7 +9,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayTestDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayTestDto.java index 311c30a1ce5d..00d7363a7ba5 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayTestDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayTestDto.java @@ -8,8 +8,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.jspecify.annotations.Nullable; import org.openapitools.model.ReadOnlyFirstDto; -import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/BigCatDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/BigCatDto.java index 7d07f26eb8f7..950bf105b0b5 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/BigCatDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/BigCatDto.java @@ -9,8 +9,8 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import org.jspecify.annotations.Nullable; import org.openapitools.model.CatDto; -import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/CapitalizationDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/CapitalizationDto.java index 91f96559ae53..55b3fc18e9d9 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/CapitalizationDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/CapitalizationDto.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/CatDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/CatDto.java index c5ddec3572b6..74cd9a06db81 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/CatDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/CatDto.java @@ -8,8 +8,8 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; +import org.jspecify.annotations.Nullable; import org.openapitools.model.AnimalDto; -import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/CategoryDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/CategoryDto.java index 0cc9c763aa88..52a248c79bed 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/CategoryDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/CategoryDto.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ChildWithNullableDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ChildWithNullableDto.java index 1de41e162ad9..4e55058a81ea 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ChildWithNullableDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ChildWithNullableDto.java @@ -9,8 +9,8 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import org.jspecify.annotations.Nullable; import org.openapitools.model.ParentWithNullableDto; -import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ClassModelDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ClassModelDto.java index ed908711a80e..bcf02447993e 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ClassModelDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ClassModelDto.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ClientDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ClientDto.java index 548fd8b4cba6..f7311e70b68e 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ClientDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ClientDto.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index 9204ed982b6e..99629b4154ab 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -8,7 +8,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/DogDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/DogDto.java index 63a0e175628a..06ae313f5613 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/DogDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/DogDto.java @@ -8,8 +8,8 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; +import org.jspecify.annotations.Nullable; import org.openapitools.model.AnimalDto; -import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/EnumArraysDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/EnumArraysDto.java index aedca549d50a..67472b608e85 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/EnumArraysDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/EnumArraysDto.java @@ -9,7 +9,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/EnumTestDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/EnumTestDto.java index 21a0e98ba6e4..5063b21d081c 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/EnumTestDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/EnumTestDto.java @@ -6,8 +6,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import org.jspecify.annotations.Nullable; import org.openapitools.model.OuterEnumDto; -import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/FileDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/FileDto.java index 646ed1d9f18b..6b18533e40ed 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/FileDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/FileDto.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java index 46226dd697ac..bbe8346a94b5 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java @@ -8,8 +8,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.jspecify.annotations.Nullable; import org.openapitools.model.FileDto; -import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/FormatTestDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/FormatTestDto.java index a69735b50df4..e42af4fabf5c 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/FormatTestDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/FormatTestDto.java @@ -10,8 +10,8 @@ import java.time.OffsetDateTime; import java.util.Arrays; import java.util.UUID; +import org.jspecify.annotations.Nullable; import org.springframework.format.annotation.DateTimeFormat; -import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java index b78124498faf..17bd8c5f3718 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ListDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ListDto.java index b9131308c8a3..dd0beaf12774 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ListDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ListDto.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/MapTestDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/MapTestDto.java index e5a6a7b65ce9..9b14beb6e5e0 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/MapTestDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/MapTestDto.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java index 9871fcf2ef75..3d68891cc805 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java @@ -9,9 +9,9 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; +import org.jspecify.annotations.Nullable; import org.openapitools.model.AnimalDto; import org.springframework.format.annotation.DateTimeFormat; -import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/Model200ResponseDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/Model200ResponseDto.java index aeed72d91cb3..bbd39aeef5cf 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/Model200ResponseDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/Model200ResponseDto.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/NameDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/NameDto.java index 8d37d18a66bd..957a207d40fd 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/NameDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/NameDto.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/NullableMapPropertyDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/NullableMapPropertyDto.java index 547ddd4a3f27..4f7e0c148049 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/NullableMapPropertyDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/NullableMapPropertyDto.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import java.util.HashMap; import java.util.Map; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/NumberOnlyDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/NumberOnlyDto.java index fb8d4ec2b098..4213e1166a24 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/NumberOnlyDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/NumberOnlyDto.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import java.math.BigDecimal; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/OrderDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/OrderDto.java index 27c574f0db63..f83b8da5a761 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/OrderDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/OrderDto.java @@ -7,8 +7,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.time.OffsetDateTime; +import org.jspecify.annotations.Nullable; import org.springframework.format.annotation.DateTimeFormat; -import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/OuterCompositeDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/OuterCompositeDto.java index 814a33403b27..534ee1f866e1 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/OuterCompositeDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/OuterCompositeDto.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import java.math.BigDecimal; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ParentWithNullableDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ParentWithNullableDto.java index 0b7b8a5f8d56..224bdfb5bb9d 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ParentWithNullableDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ParentWithNullableDto.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/PetDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/PetDto.java index 356f8201de97..4334ba15e5a7 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/PetDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/PetDto.java @@ -11,9 +11,9 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; +import org.jspecify.annotations.Nullable; import org.openapitools.model.CategoryDto; import org.openapitools.model.TagDto; -import org.springframework.lang.Nullable; import tools.jackson.databind.annotation.JsonDeserialize; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java index a0f17acab1e8..df42f8ce49f9 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java index 6044c47b38b8..a5bdc207a35e 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ReturnDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ReturnDto.java index d739b3b637dc..b73200a64d6e 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ReturnDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ReturnDto.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/SpecialModelNameDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/SpecialModelNameDto.java index 6eb785b7f45e..59a620077a49 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/SpecialModelNameDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/SpecialModelNameDto.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TagDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TagDto.java index 626b0139cc6d..9023b97ef2bf 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TagDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TagDto.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java index 9d6913e1d188..962da91559d2 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java @@ -9,7 +9,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderExampleDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderExampleDto.java index 0e5e68324faf..2ac326daad1c 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderExampleDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderExampleDto.java @@ -9,7 +9,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/UserDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/UserDto.java index 02f16056115b..e26fb676c157 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/UserDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/UserDto.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/XmlItemDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/XmlItemDto.java index 79cebb4ce455..8c2105897fa4 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/XmlItemDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/XmlItemDto.java @@ -9,7 +9,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/pom.xml b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/pom.xml index c760ff228884..dee9090794df 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/pom.xml +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/pom.xml @@ -48,12 +48,6 @@ org.springframework.boot spring-boot-starter-web - - - com.google.code.findbugs - jsr305 - 3.0.2 - jakarta.validation jakarta.validation-api diff --git a/samples/client/petstore/spring-http-interface/pom.xml b/samples/client/petstore/spring-http-interface/pom.xml index da42f71e5d16..42473bb19ca5 100644 --- a/samples/client/petstore/spring-http-interface/pom.xml +++ b/samples/client/petstore/spring-http-interface/pom.xml @@ -48,12 +48,6 @@ org.springframework.boot spring-boot-starter-web - - - com.google.code.findbugs - jsr305 - 3.0.2 - jakarta.validation jakarta.validation-api diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/pom.xml b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/pom.xml index a5e92da91c25..1a3fcb47aeee 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/pom.xml @@ -35,12 +35,6 @@ - - - com.google.code.findbugs - jsr305 - 3.0.2 - org.springframework.cloud spring-cloud-starter-openfeign diff --git a/samples/openapi3/client/petstore/spring-cloud-3/pom.xml b/samples/openapi3/client/petstore/spring-cloud-3/pom.xml index ac2935acc6ae..ffd30847b1d8 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-3/pom.xml @@ -42,12 +42,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - org.springframework.cloud spring-cloud-starter-openfeign diff --git a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/pom.xml b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/pom.xml index 27f38067f339..59d5d2f44d67 100644 --- a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/pom.xml @@ -35,12 +35,6 @@ - - - com.google.code.findbugs - jsr305 - 3.0.2 - org.springframework.cloud spring-cloud-starter-openfeign diff --git a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/api/PetApi.java index c9ec0c43a98e..f4dca07146b4 100644 --- a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/api/PetApi.java @@ -6,7 +6,7 @@ package org.openapitools.api; import org.openapitools.model.ModelApiResponse; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import org.openapitools.model.Pet; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Category.java index d201b4ecf409..5b2ec96a8906 100644 --- a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Category.java @@ -4,7 +4,7 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; import jakarta.validation.constraints.*; diff --git a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/ModelApiResponse.java index af7e89a1abec..a6f21d17628d 100644 --- a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; import jakarta.validation.constraints.*; diff --git a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Order.java index 3e28994fb4d8..2d82d98f0383 100644 --- a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Order.java @@ -6,8 +6,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; import java.time.OffsetDateTime; +import org.jspecify.annotations.Nullable; import org.springframework.format.annotation.DateTimeFormat; -import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; import jakarta.validation.constraints.*; diff --git a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Pet.java index 08591cdc2a01..76f3965f2b25 100644 --- a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Pet.java @@ -8,9 +8,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.jspecify.annotations.Nullable; import org.openapitools.model.Category; import org.openapitools.model.Tag; -import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; import jakarta.validation.constraints.*; diff --git a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Tag.java index c3973bfc312c..ceb4c4ad5eba 100644 --- a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Tag.java @@ -4,7 +4,7 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; import jakarta.validation.constraints.*; diff --git a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/User.java index 0ba6f48dda07..0aa64d4c533c 100644 --- a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/User.java @@ -4,7 +4,7 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; import jakarta.validation.constraints.*; diff --git a/samples/openapi3/client/petstore/spring-cloud-async/pom.xml b/samples/openapi3/client/petstore/spring-cloud-async/pom.xml index f3b72e646d42..618ea78b72f3 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-async/pom.xml @@ -42,12 +42,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - org.springframework.cloud spring-cloud-starter-openfeign diff --git a/samples/openapi3/client/petstore/spring-cloud-date-time/pom.xml b/samples/openapi3/client/petstore/spring-cloud-date-time/pom.xml index 010dbd8260b1..e70a4b121185 100644 --- a/samples/openapi3/client/petstore/spring-cloud-date-time/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-date-time/pom.xml @@ -55,12 +55,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - org.springframework.cloud spring-cloud-starter-openfeign diff --git a/samples/openapi3/client/petstore/spring-cloud-http-basic/pom.xml b/samples/openapi3/client/petstore/spring-cloud-http-basic/pom.xml index 8b26eb565eb0..3c3f05ce8743 100644 --- a/samples/openapi3/client/petstore/spring-cloud-http-basic/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-http-basic/pom.xml @@ -55,12 +55,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - org.springframework.cloud spring-cloud-starter-openfeign diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/pom.xml b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/pom.xml index 4b0de5dfbac9..ac9cfdfe8bc8 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/pom.xml @@ -55,12 +55,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - org.springframework.cloud spring-cloud-starter-openfeign diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/pom.xml b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/pom.xml index 8490ab53b454..764be5d9be76 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/pom.xml @@ -42,12 +42,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - org.springframework.cloud spring-cloud-starter-openfeign diff --git a/samples/openapi3/client/petstore/spring-cloud/pom.xml b/samples/openapi3/client/petstore/spring-cloud/pom.xml index 4b0de5dfbac9..ac9cfdfe8bc8 100644 --- a/samples/openapi3/client/petstore/spring-cloud/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud/pom.xml @@ -55,12 +55,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - org.springframework.cloud spring-cloud-starter-openfeign diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/pom.xml b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/pom.xml index f6fa348c989a..29913883345e 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/pom.xml +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/pom.xml @@ -51,12 +51,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/openapi3/client/petstore/spring-stubs/pom.xml b/samples/openapi3/client/petstore/spring-stubs/pom.xml index f6fa348c989a..29913883345e 100644 --- a/samples/openapi3/client/petstore/spring-stubs/pom.xml +++ b/samples/openapi3/client/petstore/spring-stubs/pom.xml @@ -51,12 +51,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/pom.xml b/samples/openapi3/server/petstore/spring-boot-oneof-interface/pom.xml index a0a962318342..233e8b17c2cf 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/pom.xml +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/pom.xml @@ -45,12 +45,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/pom.xml b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/pom.xml index f8de9a11ed55..f6ba9ea847b0 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/pom.xml +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/pom.xml @@ -45,12 +45,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/pom.xml b/samples/openapi3/server/petstore/spring-boot-oneof/pom.xml index a0a962318342..233e8b17c2cf 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/pom.xml +++ b/samples/openapi3/server/petstore/spring-boot-oneof/pom.xml @@ -45,12 +45,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/pom.xml b/samples/openapi3/server/petstore/spring-boot-springdoc/pom.xml index 69fdbec1c11f..0d24004ddce3 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/pom.xml +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/pom.xml @@ -44,12 +44,6 @@ springdoc-openapi-starter-webmvc-api ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/pom.xml b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/pom.xml index 3ef4d514f59a..c14674f585ff 100644 --- a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/pom.xml +++ b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/pom.xml @@ -45,12 +45,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - jakarta.xml.bind diff --git a/samples/openapi3/server/petstore/springboot-3/pom.xml b/samples/openapi3/server/petstore/springboot-3/pom.xml index 3ef4d514f59a..c14674f585ff 100644 --- a/samples/openapi3/server/petstore/springboot-3/pom.xml +++ b/samples/openapi3/server/petstore/springboot-3/pom.xml @@ -45,12 +45,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - jakarta.xml.bind diff --git a/samples/openapi3/server/petstore/springboot-4/pom.xml b/samples/openapi3/server/petstore/springboot-4/pom.xml index b4092ff77bd1..3a5e5df0412c 100644 --- a/samples/openapi3/server/petstore/springboot-4/pom.xml +++ b/samples/openapi3/server/petstore/springboot-4/pom.xml @@ -49,12 +49,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - jakarta.xml.bind diff --git a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/PetApi.java index b0306a4a77d4..1358489cef9c 100644 --- a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/PetApi.java @@ -6,7 +6,7 @@ package org.openapitools.api; import org.openapitools.model.ModelApiResponse; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import org.openapitools.model.Pet; import io.swagger.v3.oas.annotations.ExternalDocumentation; import io.swagger.v3.oas.annotations.Operation; diff --git a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Category.java index f9279346f77b..d42883274edb 100644 --- a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Category.java @@ -4,7 +4,7 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; import jakarta.validation.constraints.*; diff --git a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/ModelApiResponse.java index 4e757adbaf53..fa1450ff1ec9 100644 --- a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; import jakarta.validation.constraints.*; diff --git a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Order.java index 76eead7f0a53..b0c40883096f 100644 --- a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Order.java @@ -6,8 +6,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; import java.time.OffsetDateTime; +import org.jspecify.annotations.Nullable; import org.springframework.format.annotation.DateTimeFormat; -import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; import jakarta.validation.constraints.*; diff --git a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Pet.java index 74808312e975..ca9acfced761 100644 --- a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Pet.java @@ -8,9 +8,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.jspecify.annotations.Nullable; import org.openapitools.model.Category; import org.openapitools.model.Tag; -import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; import jakarta.validation.constraints.*; diff --git a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Tag.java index da4113d0fdad..a93a2bed9e59 100644 --- a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Tag.java @@ -4,7 +4,7 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; import jakarta.validation.constraints.*; diff --git a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/User.java index 628a2ef968b7..50d79d9c811f 100644 --- a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/User.java @@ -4,7 +4,7 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; import jakarta.validation.constraints.*; diff --git a/samples/openapi3/server/petstore/springboot-delegate/pom.xml b/samples/openapi3/server/petstore/springboot-delegate/pom.xml index e34f192b80a4..107ec620ad5b 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/pom.xml +++ b/samples/openapi3/server/petstore/springboot-delegate/pom.xml @@ -45,12 +45,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/pom.xml b/samples/openapi3/server/petstore/springboot-implicitHeaders/pom.xml index 0078c0b8c319..77c269f01818 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/pom.xml +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/pom.xml @@ -45,12 +45,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/openapi3/server/petstore/springboot-source/pom.xml b/samples/openapi3/server/petstore/springboot-source/pom.xml index 2bc76fe3a161..447393fd09c9 100644 --- a/samples/openapi3/server/petstore/springboot-source/pom.xml +++ b/samples/openapi3/server/petstore/springboot-source/pom.xml @@ -47,12 +47,6 @@ org.webjars webjars-locator-core - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/openapi3/server/petstore/springboot/pom.xml b/samples/openapi3/server/petstore/springboot/pom.xml index edcc06a2d5be..8cb4bf15c48a 100644 --- a/samples/openapi3/server/petstore/springboot/pom.xml +++ b/samples/openapi3/server/petstore/springboot/pom.xml @@ -45,12 +45,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/pom.xml b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/pom.xml index 3d905e985a1b..161b86d7b3cf 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/pom.xml +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/pom.xml @@ -51,12 +51,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/server/petstore/spring-boot-nullable-set/pom.xml b/samples/server/petstore/spring-boot-nullable-set/pom.xml index 949c78411e78..36b5609a2f22 100644 --- a/samples/server/petstore/spring-boot-nullable-set/pom.xml +++ b/samples/server/petstore/spring-boot-nullable-set/pom.xml @@ -51,12 +51,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/server/petstore/springboot-api-response-examples/pom.xml b/samples/server/petstore/springboot-api-response-examples/pom.xml index cee6bb279c38..ce344e050b54 100644 --- a/samples/server/petstore/springboot-api-response-examples/pom.xml +++ b/samples/server/petstore/springboot-api-response-examples/pom.xml @@ -45,12 +45,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/pom.xml b/samples/server/petstore/springboot-beanvalidation-no-nullable/pom.xml index 393bb8c2e9a4..8c5c5f0a9d31 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/pom.xml +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/pom.xml @@ -45,12 +45,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/server/petstore/springboot-beanvalidation/pom.xml b/samples/server/petstore/springboot-beanvalidation/pom.xml index b76b58b1d201..2329e0f7a350 100644 --- a/samples/server/petstore/springboot-beanvalidation/pom.xml +++ b/samples/server/petstore/springboot-beanvalidation/pom.xml @@ -44,12 +44,6 @@ springdoc-openapi-starter-webmvc-api ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/server/petstore/springboot-builtin-validation/pom.xml b/samples/server/petstore/springboot-builtin-validation/pom.xml index 2c829a6e47a5..e994745cf833 100644 --- a/samples/server/petstore/springboot-builtin-validation/pom.xml +++ b/samples/server/petstore/springboot-builtin-validation/pom.xml @@ -44,12 +44,6 @@ springdoc-openapi-starter-webmvc-api ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/server/petstore/springboot-delegate-j8/pom.xml b/samples/server/petstore/springboot-delegate-j8/pom.xml index aba8532b7cc0..4dd894095578 100644 --- a/samples/server/petstore/springboot-delegate-j8/pom.xml +++ b/samples/server/petstore/springboot-delegate-j8/pom.xml @@ -45,12 +45,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/pom.xml b/samples/server/petstore/springboot-delegate-no-response-entity/pom.xml index 65019036aa1a..8900e59f5bd5 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/pom.xml +++ b/samples/server/petstore/springboot-delegate-no-response-entity/pom.xml @@ -45,12 +45,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/server/petstore/springboot-delegate/pom.xml b/samples/server/petstore/springboot-delegate/pom.xml index b78297fe0622..612b9c002da0 100644 --- a/samples/server/petstore/springboot-delegate/pom.xml +++ b/samples/server/petstore/springboot-delegate/pom.xml @@ -45,12 +45,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/server/petstore/springboot-file-delegate-optional/pom.xml b/samples/server/petstore/springboot-file-delegate-optional/pom.xml index 99d20b89958d..e281eb83b435 100644 --- a/samples/server/petstore/springboot-file-delegate-optional/pom.xml +++ b/samples/server/petstore/springboot-file-delegate-optional/pom.xml @@ -45,12 +45,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/pom.xml b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/pom.xml index d829c9f3f8e3..d33bc32ef243 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/pom.xml +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/pom.xml @@ -37,12 +37,6 @@ org.springframework.data spring-data-commons - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/server/petstore/springboot-implicitHeaders/pom.xml b/samples/server/petstore/springboot-implicitHeaders/pom.xml index 1e5ea32cf09d..01c7e4d7e2fe 100644 --- a/samples/server/petstore/springboot-implicitHeaders/pom.xml +++ b/samples/server/petstore/springboot-implicitHeaders/pom.xml @@ -45,12 +45,6 @@ springdoc-openapi-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/server/petstore/springboot-include-http-request-context/pom.xml b/samples/server/petstore/springboot-include-http-request-context/pom.xml index 6089c02bc9e9..dccafbe221d4 100644 --- a/samples/server/petstore/springboot-include-http-request-context/pom.xml +++ b/samples/server/petstore/springboot-include-http-request-context/pom.xml @@ -45,12 +45,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/server/petstore/springboot-lombok-data/pom.xml b/samples/server/petstore/springboot-lombok-data/pom.xml index 60bfd64abd73..5be8d6ee1913 100644 --- a/samples/server/petstore/springboot-lombok-data/pom.xml +++ b/samples/server/petstore/springboot-lombok-data/pom.xml @@ -51,12 +51,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/server/petstore/springboot-lombok-tostring/pom.xml b/samples/server/petstore/springboot-lombok-tostring/pom.xml index 0fd3624764f2..a58c48a36d0f 100644 --- a/samples/server/petstore/springboot-lombok-tostring/pom.xml +++ b/samples/server/petstore/springboot-lombok-tostring/pom.xml @@ -51,12 +51,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/server/petstore/springboot-petstore-with-api-response-examples/pom.xml b/samples/server/petstore/springboot-petstore-with-api-response-examples/pom.xml index 7304acac02f9..dc530b769513 100644 --- a/samples/server/petstore/springboot-petstore-with-api-response-examples/pom.xml +++ b/samples/server/petstore/springboot-petstore-with-api-response-examples/pom.xml @@ -45,12 +45,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/pom.xml b/samples/server/petstore/springboot-reactive-noResponseEntity/pom.xml index 8463d8b6a9bf..81c5873158fd 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/pom.xml +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/pom.xml @@ -45,12 +45,6 @@ springdoc-openapi-starter-webflux-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/server/petstore/springboot-reactive/pom.xml b/samples/server/petstore/springboot-reactive/pom.xml index 182329c8a5bc..4b7564696c28 100644 --- a/samples/server/petstore/springboot-reactive/pom.xml +++ b/samples/server/petstore/springboot-reactive/pom.xml @@ -45,12 +45,6 @@ springdoc-openapi-starter-webflux-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/pom.xml b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/pom.xml index bdf5b0f319c9..768d1b07c0fa 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/pom.xml +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/pom.xml @@ -45,12 +45,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/pom.xml b/samples/server/petstore/springboot-spring-pageable-delegatePattern/pom.xml index 8cdc1f91cd8d..9a4e4e8586ac 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/pom.xml +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/pom.xml @@ -45,12 +45,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/pom.xml b/samples/server/petstore/springboot-spring-pageable-without-j8/pom.xml index 6ce9737205a4..212f0c421b7e 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/pom.xml +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/pom.xml @@ -45,12 +45,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/server/petstore/springboot-spring-pageable/pom.xml b/samples/server/petstore/springboot-spring-pageable/pom.xml index db1d5ebecd22..1ce84e319d92 100644 --- a/samples/server/petstore/springboot-spring-pageable/pom.xml +++ b/samples/server/petstore/springboot-spring-pageable/pom.xml @@ -45,12 +45,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/server/petstore/springboot-spring-provide-args/pom.xml b/samples/server/petstore/springboot-spring-provide-args/pom.xml index ebdb692608f9..16ce6919b1dc 100644 --- a/samples/server/petstore/springboot-spring-provide-args/pom.xml +++ b/samples/server/petstore/springboot-spring-provide-args/pom.xml @@ -45,12 +45,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/server/petstore/springboot-useoptional/pom.xml b/samples/server/petstore/springboot-useoptional/pom.xml index c4c681cd6b52..e90340e051a4 100644 --- a/samples/server/petstore/springboot-useoptional/pom.xml +++ b/samples/server/petstore/springboot-useoptional/pom.xml @@ -45,12 +45,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/server/petstore/springboot-virtualan/pom.xml b/samples/server/petstore/springboot-virtualan/pom.xml index a2e65e991f55..9a0a2d30fee2 100644 --- a/samples/server/petstore/springboot-virtualan/pom.xml +++ b/samples/server/petstore/springboot-virtualan/pom.xml @@ -46,12 +46,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/server/petstore/springboot-x-implements-skip/pom.xml b/samples/server/petstore/springboot-x-implements-skip/pom.xml index 6089c02bc9e9..dccafbe221d4 100644 --- a/samples/server/petstore/springboot-x-implements-skip/pom.xml +++ b/samples/server/petstore/springboot-x-implements-skip/pom.xml @@ -45,12 +45,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/samples/server/petstore/springboot/pom.xml b/samples/server/petstore/springboot/pom.xml index 6089c02bc9e9..dccafbe221d4 100644 --- a/samples/server/petstore/springboot/pom.xml +++ b/samples/server/petstore/springboot/pom.xml @@ -45,12 +45,6 @@ springdoc-openapi-starter-webmvc-ui ${springdoc.version} - - - com.google.code.findbugs - jsr305 - 3.0.2 - com.fasterxml.jackson.datatype jackson-datatype-jsr310