From 47011bfad3de4e6df4f07b80bb725936c9afecf0 Mon Sep 17 00:00:00 2001 From: Jimmy Praet Date: Mon, 16 Mar 2026 14:42:23 +0100 Subject: [PATCH] Move Spring Boot integration tests to it subpackage Extracted from #306. --- .../belgif-rest-problem-spring-boot-3-it/pom.xml | 4 ++-- .../belgif/rest/problem/{ => it}/Application.java | 2 +- .../rest/problem/{ => it}/BackendController.java | 3 ++- .../io/github/belgif/rest/problem/it}/Client.java | 2 +- .../rest/problem/it}/ControllerInterface.java | 2 +- .../rest/problem/{ => it}/FrontendController.java | 5 ++++- .../problem/{ => it}/OpenApiValidationConfig.java | 2 +- .../problem/it}/OpenApiValidationController.java | 14 +++++++------- .../RestProblemOpenApiValidationSpringBoot3IT.java | 3 +-- .../{ => it}/RestProblemSpringBoot3ExtIT.java | 3 +-- .../problem/{ => it}/RestProblemSpringBoot3IT.java | 3 +-- .../belgif-rest-problem-spring-boot-4-it/pom.xml | 4 ++-- .../belgif/rest/problem/{ => it}/Application.java | 2 +- .../rest/problem/{ => it}/BackendController.java | 3 ++- .../io/github/belgif/rest/problem/it}/Client.java | 2 +- .../rest/problem/it}/ControllerInterface.java | 2 +- .../rest/problem/{ => it}/FrontendController.java | 5 ++++- .../problem/{ => it}/OpenApiValidationConfig.java | 2 +- .../problem/it}/OpenApiValidationController.java | 12 +++++++----- .../RestProblemOpenApiValidationSpringBoot4IT.java | 3 +-- .../{ => it}/RestProblemSpringBoot4ExtIT.java | 3 +-- .../problem/{ => it}/RestProblemSpringBoot4IT.java | 3 +-- 22 files changed, 44 insertions(+), 40 deletions(-) rename belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/{ => it}/Application.java (87%) rename belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/{ => it}/BackendController.java (94%) rename belgif-rest-problem-it/{belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem => belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/it}/Client.java (62%) rename belgif-rest-problem-it/{belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem => belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/it}/ControllerInterface.java (95%) rename belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/{ => it}/FrontendController.java (98%) rename belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/{ => it}/OpenApiValidationConfig.java (97%) rename belgif-rest-problem-it/{belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem => belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/it}/OpenApiValidationController.java (71%) rename belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/test/java/io/github/belgif/rest/problem/{ => it}/RestProblemOpenApiValidationSpringBoot3IT.java (85%) rename belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/test/java/io/github/belgif/rest/problem/{ => it}/RestProblemSpringBoot3ExtIT.java (87%) rename belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/test/java/io/github/belgif/rest/problem/{ => it}/RestProblemSpringBoot3IT.java (88%) rename belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/{ => it}/Application.java (87%) rename belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/{ => it}/BackendController.java (94%) rename belgif-rest-problem-it/{belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem => belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/it}/Client.java (62%) rename belgif-rest-problem-it/{belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem => belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/it}/ControllerInterface.java (95%) rename belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/{ => it}/FrontendController.java (98%) rename belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/{ => it}/OpenApiValidationConfig.java (97%) rename belgif-rest-problem-it/{belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem => belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/it}/OpenApiValidationController.java (71%) rename belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/test/java/io/github/belgif/rest/problem/{ => it}/RestProblemOpenApiValidationSpringBoot4IT.java (85%) rename belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/test/java/io/github/belgif/rest/problem/{ => it}/RestProblemSpringBoot4ExtIT.java (87%) rename belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/test/java/io/github/belgif/rest/problem/{ => it}/RestProblemSpringBoot4IT.java (88%) diff --git a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/pom.xml b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/pom.xml index e19b6479..bfd3afee 100644 --- a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/pom.xml +++ b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/pom.xml @@ -87,8 +87,8 @@ ${project.basedir}/../belgif-rest-problem-it-common/src/main/resources/openapi.yaml spring - io.github.belgif.rest.problem.openapi.validation.sb3.api - io.github.belgif.rest.problem.openapi.validation.sb3.model + io.github.belgif.rest.problem.it.openapi.validation.sb3.api + io.github.belgif.rest.problem.it.openapi.validation.sb3.model REF_AS_PARENT_IN_ALLOF=true false diff --git a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/Application.java b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/it/Application.java similarity index 87% rename from belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/Application.java rename to belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/it/Application.java index 39f16429..72206306 100644 --- a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/Application.java +++ b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/it/Application.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem; +package io.github.belgif.rest.problem.it; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/BackendController.java b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/it/BackendController.java similarity index 94% rename from belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/BackendController.java rename to belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/it/BackendController.java index b3d6af05..8a627e80 100644 --- a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/BackendController.java +++ b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/it/BackendController.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem; +package io.github.belgif.rest.problem.it; import java.net.URI; @@ -9,6 +9,7 @@ import com.acme.custom.CustomProblem; +import io.github.belgif.rest.problem.BadRequestProblem; import io.github.belgif.rest.problem.api.Problem; import io.github.belgif.rest.problem.it.model.JacksonModel; diff --git a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/Client.java b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/it/Client.java similarity index 62% rename from belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/Client.java rename to belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/it/Client.java index 0a4f64af..bbc54c9d 100644 --- a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/Client.java +++ b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/it/Client.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem; +package io.github.belgif.rest.problem.it; public enum Client { diff --git a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/ControllerInterface.java b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/it/ControllerInterface.java similarity index 95% rename from belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/ControllerInterface.java rename to belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/it/ControllerInterface.java index 3d39fd72..60516423 100644 --- a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/ControllerInterface.java +++ b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/it/ControllerInterface.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem; +package io.github.belgif.rest.problem.it; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; diff --git a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/FrontendController.java b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/it/FrontendController.java similarity index 98% rename from belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/FrontendController.java rename to belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/it/FrontendController.java index 1a4ca8e3..69e08e6e 100644 --- a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/FrontendController.java +++ b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/it/FrontendController.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem; +package io.github.belgif.rest.problem.it; import java.net.URI; @@ -26,6 +26,9 @@ import com.acme.custom.CustomProblem; +import io.github.belgif.rest.problem.BadRequestProblem; +import io.github.belgif.rest.problem.DefaultProblem; +import io.github.belgif.rest.problem.ServiceUnavailableProblem; import io.github.belgif.rest.problem.api.Input; import io.github.belgif.rest.problem.api.Problem; import io.github.belgif.rest.problem.i18n.I18N; diff --git a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/OpenApiValidationConfig.java b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/it/OpenApiValidationConfig.java similarity index 97% rename from belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/OpenApiValidationConfig.java rename to belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/it/OpenApiValidationConfig.java index b6ecd1fd..b40769d3 100644 --- a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/OpenApiValidationConfig.java +++ b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/it/OpenApiValidationConfig.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem; +package io.github.belgif.rest.problem.it; import java.util.Collections; diff --git a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/OpenApiValidationController.java b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/it/OpenApiValidationController.java similarity index 71% rename from belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/OpenApiValidationController.java rename to belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/it/OpenApiValidationController.java index 1d3f6a2a..8c5cfc6a 100644 --- a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/OpenApiValidationController.java +++ b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/it/OpenApiValidationController.java @@ -1,15 +1,15 @@ -package io.github.belgif.rest.problem; +package io.github.belgif.rest.problem.it; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import io.github.belgif.rest.problem.openapi.validation.sb4.api.MyFirstPathApi; -import io.github.belgif.rest.problem.openapi.validation.sb4.api.MyHeaderPathApi; -import io.github.belgif.rest.problem.openapi.validation.sb4.api.MyQueryPathApi; -import io.github.belgif.rest.problem.openapi.validation.sb4.model.MyRequestBodySchema; -import io.github.belgif.rest.problem.openapi.validation.sb4.model.PostOperationWithAllOfSchemaRequest; -import io.github.belgif.rest.problem.openapi.validation.sb4.model.PostOperationWithOneOfSchemaRequest; +import io.github.belgif.rest.problem.it.openapi.validation.sb3.api.MyFirstPathApi; +import io.github.belgif.rest.problem.it.openapi.validation.sb3.api.MyHeaderPathApi; +import io.github.belgif.rest.problem.it.openapi.validation.sb3.api.MyQueryPathApi; +import io.github.belgif.rest.problem.it.openapi.validation.sb3.model.MyRequestBodySchema; +import io.github.belgif.rest.problem.it.openapi.validation.sb3.model.PostOperationWithAllOfSchemaRequest; +import io.github.belgif.rest.problem.it.openapi.validation.sb3.model.PostOperationWithOneOfSchemaRequest; @RestController @RequestMapping("/openapi-validation") diff --git a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/test/java/io/github/belgif/rest/problem/RestProblemOpenApiValidationSpringBoot3IT.java b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/test/java/io/github/belgif/rest/problem/it/RestProblemOpenApiValidationSpringBoot3IT.java similarity index 85% rename from belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/test/java/io/github/belgif/rest/problem/RestProblemOpenApiValidationSpringBoot3IT.java rename to belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/test/java/io/github/belgif/rest/problem/it/RestProblemOpenApiValidationSpringBoot3IT.java index fcf01eef..4310f8ee 100644 --- a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/test/java/io/github/belgif/rest/problem/RestProblemOpenApiValidationSpringBoot3IT.java +++ b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/test/java/io/github/belgif/rest/problem/it/RestProblemOpenApiValidationSpringBoot3IT.java @@ -1,10 +1,9 @@ -package io.github.belgif.rest.problem; +package io.github.belgif.rest.problem.it; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.test.annotation.DirtiesContext; -import io.github.belgif.rest.problem.it.AbstractOpenApiValidationSpringBootIT; import io.restassured.RestAssured; import io.restassured.specification.RequestSpecification; diff --git a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/test/java/io/github/belgif/rest/problem/RestProblemSpringBoot3ExtIT.java b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/test/java/io/github/belgif/rest/problem/it/RestProblemSpringBoot3ExtIT.java similarity index 87% rename from belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/test/java/io/github/belgif/rest/problem/RestProblemSpringBoot3ExtIT.java rename to belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/test/java/io/github/belgif/rest/problem/it/RestProblemSpringBoot3ExtIT.java index 565266ad..75c8f388 100644 --- a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/test/java/io/github/belgif/rest/problem/RestProblemSpringBoot3ExtIT.java +++ b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/test/java/io/github/belgif/rest/problem/it/RestProblemSpringBoot3ExtIT.java @@ -1,11 +1,10 @@ -package io.github.belgif.rest.problem; +package io.github.belgif.rest.problem.it; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ActiveProfiles; -import io.github.belgif.rest.problem.it.AbstractRestProblemExtIT; import io.restassured.RestAssured; import io.restassured.specification.RequestSpecification; diff --git a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/test/java/io/github/belgif/rest/problem/RestProblemSpringBoot3IT.java b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/test/java/io/github/belgif/rest/problem/it/RestProblemSpringBoot3IT.java similarity index 88% rename from belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/test/java/io/github/belgif/rest/problem/RestProblemSpringBoot3IT.java rename to belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/test/java/io/github/belgif/rest/problem/it/RestProblemSpringBoot3IT.java index 6675d0f0..7cb4174f 100644 --- a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/test/java/io/github/belgif/rest/problem/RestProblemSpringBoot3IT.java +++ b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/test/java/io/github/belgif/rest/problem/it/RestProblemSpringBoot3IT.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem; +package io.github.belgif.rest.problem.it; import java.util.Arrays; import java.util.stream.Stream; @@ -7,7 +7,6 @@ import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.test.annotation.DirtiesContext; -import io.github.belgif.rest.problem.it.AbstractRestProblemSpringBootIT; import io.restassured.RestAssured; import io.restassured.specification.RequestSpecification; diff --git a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/pom.xml b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/pom.xml index 86ec535a..29dc77c4 100644 --- a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/pom.xml +++ b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/pom.xml @@ -104,8 +104,8 @@ ${project.basedir}/../belgif-rest-problem-it-common/src/main/resources/openapi.yaml spring - io.github.belgif.rest.problem.openapi.validation.sb4.api - io.github.belgif.rest.problem.openapi.validation.sb4.model + io.github.belgif.rest.problem.it.openapi.validation.sb4.api + io.github.belgif.rest.problem.it.openapi.validation.sb4.model REF_AS_PARENT_IN_ALLOF=true false diff --git a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/Application.java b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/it/Application.java similarity index 87% rename from belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/Application.java rename to belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/it/Application.java index 39f16429..72206306 100644 --- a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/Application.java +++ b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/it/Application.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem; +package io.github.belgif.rest.problem.it; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/BackendController.java b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/it/BackendController.java similarity index 94% rename from belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/BackendController.java rename to belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/it/BackendController.java index b3d6af05..8a627e80 100644 --- a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/BackendController.java +++ b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/it/BackendController.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem; +package io.github.belgif.rest.problem.it; import java.net.URI; @@ -9,6 +9,7 @@ import com.acme.custom.CustomProblem; +import io.github.belgif.rest.problem.BadRequestProblem; import io.github.belgif.rest.problem.api.Problem; import io.github.belgif.rest.problem.it.model.JacksonModel; diff --git a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/Client.java b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/it/Client.java similarity index 62% rename from belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/Client.java rename to belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/it/Client.java index 0a4f64af..bbc54c9d 100644 --- a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/Client.java +++ b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/it/Client.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem; +package io.github.belgif.rest.problem.it; public enum Client { diff --git a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/ControllerInterface.java b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/it/ControllerInterface.java similarity index 95% rename from belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/ControllerInterface.java rename to belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/it/ControllerInterface.java index 3d39fd72..60516423 100644 --- a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/ControllerInterface.java +++ b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/it/ControllerInterface.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem; +package io.github.belgif.rest.problem.it; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; diff --git a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/FrontendController.java b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/it/FrontendController.java similarity index 98% rename from belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/FrontendController.java rename to belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/it/FrontendController.java index 8821242d..1494824e 100644 --- a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/FrontendController.java +++ b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/it/FrontendController.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem; +package io.github.belgif.rest.problem.it; import java.net.URI; @@ -26,6 +26,9 @@ import com.acme.custom.CustomProblem; +import io.github.belgif.rest.problem.BadRequestProblem; +import io.github.belgif.rest.problem.DefaultProblem; +import io.github.belgif.rest.problem.ServiceUnavailableProblem; import io.github.belgif.rest.problem.api.Input; import io.github.belgif.rest.problem.api.Problem; import io.github.belgif.rest.problem.i18n.I18N; diff --git a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/OpenApiValidationConfig.java b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/it/OpenApiValidationConfig.java similarity index 97% rename from belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/OpenApiValidationConfig.java rename to belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/it/OpenApiValidationConfig.java index 97506597..2ef7ca3c 100644 --- a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/OpenApiValidationConfig.java +++ b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/it/OpenApiValidationConfig.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem; +package io.github.belgif.rest.problem.it; import java.util.Collections; diff --git a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/OpenApiValidationController.java b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/it/OpenApiValidationController.java similarity index 71% rename from belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/OpenApiValidationController.java rename to belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/it/OpenApiValidationController.java index 5d61539b..cf0fc1e9 100644 --- a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/src/main/java/io/github/belgif/rest/problem/OpenApiValidationController.java +++ b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/main/java/io/github/belgif/rest/problem/it/OpenApiValidationController.java @@ -1,13 +1,15 @@ -package io.github.belgif.rest.problem; +package io.github.belgif.rest.problem.it; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import io.github.belgif.rest.problem.openapi.validation.sb3.api.*; -import io.github.belgif.rest.problem.openapi.validation.sb3.model.MyRequestBodySchema; -import io.github.belgif.rest.problem.openapi.validation.sb3.model.PostOperationWithAllOfSchemaRequest; -import io.github.belgif.rest.problem.openapi.validation.sb3.model.PostOperationWithOneOfSchemaRequest; +import io.github.belgif.rest.problem.it.openapi.validation.sb4.api.MyFirstPathApi; +import io.github.belgif.rest.problem.it.openapi.validation.sb4.api.MyHeaderPathApi; +import io.github.belgif.rest.problem.it.openapi.validation.sb4.api.MyQueryPathApi; +import io.github.belgif.rest.problem.it.openapi.validation.sb4.model.MyRequestBodySchema; +import io.github.belgif.rest.problem.it.openapi.validation.sb4.model.PostOperationWithAllOfSchemaRequest; +import io.github.belgif.rest.problem.it.openapi.validation.sb4.model.PostOperationWithOneOfSchemaRequest; @RestController @RequestMapping("/openapi-validation") diff --git a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/test/java/io/github/belgif/rest/problem/RestProblemOpenApiValidationSpringBoot4IT.java b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/test/java/io/github/belgif/rest/problem/it/RestProblemOpenApiValidationSpringBoot4IT.java similarity index 85% rename from belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/test/java/io/github/belgif/rest/problem/RestProblemOpenApiValidationSpringBoot4IT.java rename to belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/test/java/io/github/belgif/rest/problem/it/RestProblemOpenApiValidationSpringBoot4IT.java index 863d2502..d20c375d 100644 --- a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/test/java/io/github/belgif/rest/problem/RestProblemOpenApiValidationSpringBoot4IT.java +++ b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/test/java/io/github/belgif/rest/problem/it/RestProblemOpenApiValidationSpringBoot4IT.java @@ -1,10 +1,9 @@ -package io.github.belgif.rest.problem; +package io.github.belgif.rest.problem.it; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.test.annotation.DirtiesContext; -import io.github.belgif.rest.problem.it.AbstractOpenApiValidationSpringBootIT; import io.restassured.RestAssured; import io.restassured.specification.RequestSpecification; diff --git a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/test/java/io/github/belgif/rest/problem/RestProblemSpringBoot4ExtIT.java b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/test/java/io/github/belgif/rest/problem/it/RestProblemSpringBoot4ExtIT.java similarity index 87% rename from belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/test/java/io/github/belgif/rest/problem/RestProblemSpringBoot4ExtIT.java rename to belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/test/java/io/github/belgif/rest/problem/it/RestProblemSpringBoot4ExtIT.java index 8e7b2551..638e3455 100644 --- a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/test/java/io/github/belgif/rest/problem/RestProblemSpringBoot4ExtIT.java +++ b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/test/java/io/github/belgif/rest/problem/it/RestProblemSpringBoot4ExtIT.java @@ -1,11 +1,10 @@ -package io.github.belgif.rest.problem; +package io.github.belgif.rest.problem.it; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ActiveProfiles; -import io.github.belgif.rest.problem.it.AbstractRestProblemExtIT; import io.restassured.RestAssured; import io.restassured.specification.RequestSpecification; diff --git a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/test/java/io/github/belgif/rest/problem/RestProblemSpringBoot4IT.java b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/test/java/io/github/belgif/rest/problem/it/RestProblemSpringBoot4IT.java similarity index 88% rename from belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/test/java/io/github/belgif/rest/problem/RestProblemSpringBoot4IT.java rename to belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/test/java/io/github/belgif/rest/problem/it/RestProblemSpringBoot4IT.java index b2928c16..6c9b01df 100644 --- a/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/test/java/io/github/belgif/rest/problem/RestProblemSpringBoot4IT.java +++ b/belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/src/test/java/io/github/belgif/rest/problem/it/RestProblemSpringBoot4IT.java @@ -1,4 +1,4 @@ -package io.github.belgif.rest.problem; +package io.github.belgif.rest.problem.it; import java.util.Arrays; import java.util.stream.Stream; @@ -7,7 +7,6 @@ import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.test.annotation.DirtiesContext; -import io.github.belgif.rest.problem.it.AbstractRestProblemSpringBootIT; import io.restassured.RestAssured; import io.restassured.specification.RequestSpecification;