Support for Spring without Spring Boot

.github/dependabot.yml

@@ -20,6 +20,7 @@ updates:
       - dependency-name: "org.jboss.weld:weld-junit5"
       - dependency-name: "org.hibernate.validator:hibernate-validator"
       - dependency-name: "com.fasterxml.jackson.core:jackson-databind"
+      - dependency-name: "tools.jackson.core:jackson-databind"
     groups:
       maven:
         patterns:

belgif-rest-problem-bom/pom.xml

@@ -63,17 +63,7 @@
       </dependency>
       <dependency>
         <groupId>io.github.belgif.rest.problem</groupId>
-        <artifactId>belgif-rest-problem-spring-boot-common</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.belgif.rest.problem</groupId>
-        <artifactId>belgif-rest-problem-spring-boot-common-client</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.belgif.rest.problem</groupId>
-        <artifactId>belgif-rest-problem-spring-boot-common-server</artifactId>
+        <artifactId>belgif-rest-problem-spring</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -83,37 +73,32 @@
       </dependency>
       <dependency>
         <groupId>io.github.belgif.rest.problem</groupId>
-        <artifactId>belgif-rest-problem-spring-boot-3-core</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.belgif.rest.problem</groupId>
-        <artifactId>belgif-rest-problem-spring-boot-3-client</artifactId>
+        <artifactId>belgif-rest-problem-spring-boot-3-starter</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>io.github.belgif.rest.problem</groupId>
-        <artifactId>belgif-rest-problem-spring-boot-3-server</artifactId>
+        <artifactId>belgif-rest-problem-spring-boot-3-client-starter</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>io.github.belgif.rest.problem</groupId>
-        <artifactId>belgif-rest-problem-spring-boot-4</artifactId>
+        <artifactId>belgif-rest-problem-spring-boot-3-server-starter</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>io.github.belgif.rest.problem</groupId>
-        <artifactId>belgif-rest-problem-spring-boot-4-core</artifactId>
+        <artifactId>belgif-rest-problem-spring-boot-4-starter</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>io.github.belgif.rest.problem</groupId>
-        <artifactId>belgif-rest-problem-spring-boot-4-client</artifactId>
+        <artifactId>belgif-rest-problem-spring-boot-4-client-starter</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>io.github.belgif.rest.problem</groupId>
-        <artifactId>belgif-rest-problem-spring-boot-4-server</artifactId>
+        <artifactId>belgif-rest-problem-spring-boot-4-server-starter</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>

belgif-rest-problem-it/belgif-rest-problem-spring-boot-3-it/pom.xml

@@ -32,7 +32,7 @@
   <dependencies>
     <dependency>
       <groupId>io.github.belgif.rest.problem</groupId>
-      <artifactId>belgif-rest-problem-spring-boot-3</artifactId>
+      <artifactId>belgif-rest-problem-spring-boot-3-starter</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

belgif-rest-problem-it/belgif-rest-problem-spring-boot-4-it/pom.xml

@@ -32,7 +32,7 @@
   <dependencies>
     <dependency>
       <groupId>io.github.belgif.rest.problem</groupId>
-      <artifactId>belgif-rest-problem-spring-boot-4</artifactId>
+      <artifactId>belgif-rest-problem-spring-boot-4-starter</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
@@ -109,7 +109,8 @@
               <openapiNormalizer>REF_AS_PARENT_IN_ALLOF=true</openapiNormalizer>
               <generateSupportingFiles>false</generateSupportingFiles>
               <configOptions>
-                <useSpringBoot3>true</useSpringBoot3>
+                <useSpringBoot4>true</useSpringBoot4>
+                <useJackson3>true</useJackson3>
                 <interfaceOnly>true</interfaceOnly>
                 <skipDefaultInterface>true</skipDefaultInterface>
                 <openApiNullable>false</openApiNullable>

belgif-rest-problem-it/belgif-rest-problem-spring-it/pom.xml

@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>io.github.belgif.rest.problem</groupId>
+    <artifactId>belgif-rest-problem-it</artifactId>
+    <version>${revision}</version>
+  </parent>
+
+  <artifactId>belgif-rest-problem-spring-it</artifactId>
+  <name>${project.groupId}:${project.artifactId}</name>
+  <packaging>jar</packaging>
+
+  <properties>
+    <maven.compiler.release>17</maven.compiler.release>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-dependencies</artifactId>
+        <version>${version.spring.boot.4}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>io.github.belgif.rest.problem</groupId>
+      <artifactId>belgif-rest-problem-spring</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>tools.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.github.belgif.rest.problem</groupId>
+      <artifactId>belgif-rest-problem-validator</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.github.belgif.rest.problem</groupId>
+      <artifactId>belgif-rest-problem-it-common-jakarta</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate.validator</groupId>
+      <artifactId>hibernate-validator</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.validation</groupId>
+      <artifactId>jakarta.validation-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.atlassian.oai</groupId>
+      <artifactId>swagger-request-validator-spring-webmvc</artifactId>
+      <version>2.46.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-webmvc</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-validation</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-test</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webflux</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.rest-assured</groupId>
+      <artifactId>rest-assured</artifactId>
+      <version>6.0.0</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.openapitools</groupId>
+        <artifactId>openapi-generator-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+            <configuration>
+              <inputSpec>${project.basedir}/../belgif-rest-problem-it-common/src/main/resources/openapi.yaml</inputSpec>
+              <generatorName>spring</generatorName>
+              <apiPackage>io.github.belgif.rest.problem.it.openapi.validation.sb4.api</apiPackage>
+              <modelPackage>io.github.belgif.rest.problem.it.openapi.validation.sb4.model</modelPackage>
+              <openapiNormalizer>REF_AS_PARENT_IN_ALLOF=true</openapiNormalizer>
+              <generateSupportingFiles>false</generateSupportingFiles>
+              <configOptions>
+                <useSpringBoot3>true</useSpringBoot3>
+                <interfaceOnly>true</interfaceOnly>
+                <skipDefaultInterface>true</skipDefaultInterface>
+                <openApiNullable>false</openApiNullable>
+                <annotationLibrary>none</annotationLibrary>
+                <documentationProvider>none</documentationProvider>
+                <useBeanValidation>false</useBeanValidation>
+              </configOptions>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

belgif-rest-problem-it/belgif-rest-problem-spring-it/src/main/java/io/github/belgif/rest/problem/it/BackendController.java

@@ -0,0 +1,59 @@
+package io.github.belgif.rest.problem.it;
+
+import java.net.URI;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+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;
+
+@RestController
+@RequestMapping("/backend")
+public class BackendController {
+
+    @GetMapping("/ok")
+    public ResponseEntity<String> ok() {
+        return ResponseEntity.ok("OK");
+    }
+
+    @GetMapping("/badRequest")
+    public void badRequest() {
+        BadRequestProblem problem = new BadRequestProblem();
+        problem.setDetail("Bad Request from backend");
+        throw problem;
+    }
+
+    @GetMapping("/custom")
+    public void custom() {
+        throw new CustomProblem("value from backend");
+    }
+
+    @GetMapping("/unmapped")
+    public void unmapped() {
+        Problem unmapped = new Problem(URI.create("urn:problem-type:belgif:test:unmapped"), "Unmapped problem", 400) {
+        };
+        unmapped.setDetail("Unmapped problem from backend");
+        throw unmapped;
+    }
+
+    @GetMapping("/applicationJsonProblem")
+    public ResponseEntity<BadRequestProblem> applicationJsonProblem() {
+        BadRequestProblem problem = new BadRequestProblem();
+        problem.setDetail("Bad Request with application/json media type from backend");
+        return ResponseEntity.badRequest().body(problem);
+    }
+
+    @GetMapping("/jacksonMismatchedInput")
+    public ResponseEntity<JacksonModel> mismatchedInput() {
+        JacksonModel model = new JacksonModel(null);
+        model.setDescription("description");
+        return ResponseEntity.ok(model);
+    }
+
+}

belgif-rest-problem-it/belgif-rest-problem-spring-it/src/main/java/io/github/belgif/rest/problem/it/Client.java

@@ -0,0 +1,7 @@
+package io.github.belgif.rest.problem.it;
+
+public enum Client {
+
+    REST_TEMPLATE, WEB_CLIENT, REST_CLIENT
+
+}

belgif-rest-problem-it/belgif-rest-problem-spring-it/src/main/java/io/github/belgif/rest/problem/it/ControllerInterface.java

@@ -0,0 +1,24 @@
+package io.github.belgif.rest.problem.it;
+
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Positive;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+@Validated
+@Controller
+public interface ControllerInterface {
+
+    @GetMapping("/beanValidation/pathParameter/inherited/{param}")
+    ResponseEntity<String> beanValidationPathParameterInherited(
+            @PathVariable("param") @Positive @NotNull Integer p);
+
+    @GetMapping("/beanValidation/pathParameter/overridden/{param}")
+    ResponseEntity<String> beanValidationPathParameterOverridden(
+            @PathVariable("param") @Positive @NotNull Integer p);
+
+}