Skip to content
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
8ad1147
merge NoResourceFoundExceptionHandler into RoutingExceptionsHandler
pvdbosch Feb 23, 2026
8ba5f31
don't use Spring Boot's @ConfigurationProperties
pvdbosch Feb 23, 2026
663387b
[spring] specific java packages for server and client
pvdbosch Feb 23, 2026
ca4cd23
[spring] merge all spring common-* and *-core modules (WIP)
pvdbosch Feb 23, 2026
b69e65f
spring refactoring WIP:
pvdbosch Feb 23, 2026
ed3f0f0
spring refactoring WIP:
pvdbosch Feb 24, 2026
c654849
rename spring modules
pvdbosch Feb 24, 2026
bbba49f
minor cleanup
pvdbosch Feb 24, 2026
1e4f78f
fix module names in jacoco module
pvdbosch Feb 24, 2026
4881cc1
avoid exposing abstract classes to Spring users:
pvdbosch Feb 24, 2026
9e46f35
add EnableProblemModule for use in non-Spring-Boot
pvdbosch Feb 24, 2026
aee5235
- javadoc fixes
pvdbosch Feb 24, 2026
2080a17
instantiate beans within @Configuration classes instead of @Import of…
pvdbosch Feb 24, 2026
693e8fd
remove abstract classes for customizers in spring module, bc they're …
pvdbosch Feb 26, 2026
005f51c
change the way it-common-jakarta is generated, to improve integration…
pvdbosch Mar 3, 2026
6039da7
[spring-only] add missing parameterNameProvider config for bean valid…
pvdbosch Mar 3, 2026
b18fa5e
add integration test for spring-without-boot
pvdbosch Mar 3, 2026
a277652
EnableProblemModule: use enum to configure Jackson version
pvdbosch Mar 3, 2026
04b6033
update doc
pvdbosch Mar 3, 2026
a38c4f5
it-jakarta: transform beans.xml
pvdbosch Mar 3, 2026
1b0622f
Merge branch 'main' into feature/spring-without-boot
pvdbosch Mar 3, 2026
e5a8e3a
Merge branch 'main' into feature/spring-without-boot
jpraet Mar 3, 2026
570fc7c
Align minimal jackson3 version with the one in spring boot 4.0
pvdbosch Mar 3, 2026
a7f7e98
Cleanup referenced modules in bom and jacoco-aggregator
jpraet Mar 12, 2026
9c34d86
Merge branch 'main' into feature/spring-without-boot
jpraet Mar 12, 2026
9d5016f
Cleanup referenced modules in bom and jacoco-aggregator
jpraet Mar 12, 2026
2949573
Merge branch 'main' into feature/spring-without-boot
jpraet Mar 16, 2026
0c5115e
Merge branch 'main' into feature/spring-without-boot
jpraet Mar 16, 2026
6c8fc7f
Merge branch 'main' into feature/spring-without-boot
jpraet Mar 17, 2026
71faaca
handle PR feedback
pvdbosch Mar 18, 2026
6b7dcae
Update documentation
jpraet Mar 18, 2026
3e505ae
add "-starter" to spring-boot-3 module name
pvdbosch Mar 18, 2026
d56e52d
fix typo
pvdbosch Mar 20, 2026
8d19778
Activate integration tests for RestTemplate
jhemelhof Mar 24, 2026
bd75f24
Use MergedAnnotation methods for custom ImportSelector
jhemelhof Mar 24, 2026
f740e15
Replace useSpringBoot3 with useSpringBoot4
jhemelhof Mar 24, 2026
bdd4714
Merge branch 'main' into feature/spring-without-boot
jhemelhof Mar 24, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 6 additions & 6 deletions belgif-rest-problem-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
</dependency>
<dependency>
<groupId>io.github.belgif.rest.problem</groupId>
<artifactId>belgif-rest-problem-spring-boot-common</artifactId>
<artifactId>belgif-rest-problem-spring</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand All @@ -88,17 +88,17 @@
</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-client-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-server-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-4-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand All @@ -108,12 +108,12 @@
</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-server-spring-boot-4-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down
149 changes: 137 additions & 12 deletions belgif-rest-problem-it/belgif-rest-problem-it-common-jakarta/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,151 @@
<artifactId>belgif-rest-problem-it-common-jakarta</artifactId>
<name>${project.groupId}:${project.artifactId}</name>

<dependencies>
<dependency>
<groupId>io.github.belgif.rest.problem</groupId>
<artifactId>belgif-rest-problem</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.github.belgif.rest.problem</groupId>
<artifactId>belgif-rest-problem-apt</artifactId>
<version>${project.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<version>9.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${version.jackson.minimal}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${version.jackson3.minimal}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.transformer</groupId>
<artifactId>transformer-maven-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<id>unpack-core-sources</id>
<phase>generate-sources</phase>
<goals>
<goal>jar</goal>
<goal>unpack</goal>
</goals>
<configuration>
<artifact>
<groupId>io.github.belgif.rest.problem</groupId>
<artifactId>belgif-rest-problem-it-common</artifactId>
<version>${project.version}</version>
</artifact>
<rules>
<jakartaDefaults>true</jakartaDefaults>
</rules>
<artifactItems>
<artifactItem>
<groupId>io.github.belgif.rest.problem</groupId>
<artifactId>belgif-rest-problem-it-common</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
<outputDirectory>
${project.build.directory}/sources-to-transform
</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
<id>transform-to-jakarta</id>
<phase>generate-sources</phase>
<goals>
<goal>java</goal>
</goals>
<configuration>
<includePluginDependencies>true</includePluginDependencies>
<includeProjectDependencies>false</includeProjectDependencies>
<blockSystemExit>true</blockSystemExit>
<mainClass>
org.eclipse.transformer.cli.JakartaTransformerCLI
</mainClass>
<arguments>
<argument>
${project.build.directory}/sources-to-transform
</argument>
<argument>
${project.build.directory}/generated-sources/jakarta
</argument>
</arguments>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.eclipse.transformer</groupId>
<artifactId>org.eclipse.transformer.cli</artifactId>
Comment thread
jpraet marked this conversation as resolved.
Outdated
<version>1.0.0</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>add-transformed-sources</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>
${project.build.directory}/generated-sources/jakarta
</source>
</sources>
</configuration>
</execution>
<execution>
<id>add-resource</id>
<phase>generate-resources</phase>
<goals>
<goal>add-resource</goal>
</goals>
<configuration>
<resources>
<resource>
<directory> ${project.build.directory}/generated-sources/jakarta</directory>
<excludes>
<exclude>**/*.java</exclude>
<exclude>META-INF/MANIFEST.MF</exclude>
<exclude>META-INF/io.github.belgif.rest.problem/**</exclude>
</excludes>
</resource>
</resources>
</configuration>
</execution>
</executions>
Expand Down
17 changes: 17 additions & 0 deletions belgif-rest-problem-it/belgif-rest-problem-it-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,23 @@
<artifactId>belgif-rest-problem-it-common</artifactId>
<name>${project.groupId}:${project.artifactId}</name>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>io.github.belgif.rest.problem</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@
<configuration>
<inputSpec>${project.basedir}/../belgif-rest-problem-it-common/src/main/resources/openapi.yaml</inputSpec>
<generatorName>spring</generatorName>
<apiPackage>io.github.belgif.rest.problem.openapi.validation.sb3.api</apiPackage>
<modelPackage>io.github.belgif.rest.problem.openapi.validation.sb3.model</modelPackage>
<apiPackage>io.github.belgif.rest.problem.it.openapi.validation.sb3.api</apiPackage>
<modelPackage>io.github.belgif.rest.problem.it.openapi.validation.sb3.model</modelPackage>
<openapiNormalizer>REF_AS_PARENT_IN_ALLOF=true</openapiNormalizer>
<generateSupportingFiles>false</generateSupportingFiles>
<configOptions>
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.belgif.rest.problem;
package io.github.belgif.rest.problem.it;

import java.net.URI;

Expand All @@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.belgif.rest.problem;
package io.github.belgif.rest.problem.it;

public enum Client {

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.belgif.rest.problem;
package io.github.belgif.rest.problem.it;

import java.net.URI;

Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.belgif.rest.problem;
package io.github.belgif.rest.problem.it;

import java.util.Collections;

Expand Down
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -104,12 +104,13 @@
<configuration>
<inputSpec>${project.basedir}/../belgif-rest-problem-it-common/src/main/resources/openapi.yaml</inputSpec>
<generatorName>spring</generatorName>
<apiPackage>io.github.belgif.rest.problem.openapi.validation.sb4.api</apiPackage>
<modelPackage>io.github.belgif.rest.problem.openapi.validation.sb4.model</modelPackage>
<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>
<useSpringBoot4>true</useSpringBoot4>
<useJackson3>true</useJackson3>
<interfaceOnly>true</interfaceOnly>
<skipDefaultInterface>true</skipDefaultInterface>
<openApiNullable>false</openApiNullable>
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Loading