Skip to content

[6262] Switch to Spring Boot 4#6303

Merged
sbegaudeau merged 3 commits intomasterfrom
mch/rel/spring-boot-4
Apr 3, 2026
Merged

[6262] Switch to Spring Boot 4#6303
sbegaudeau merged 3 commits intomasterfrom
mch/rel/spring-boot-4

Conversation

@mcharfadi
Copy link
Copy Markdown
Contributor

Pull request template

General purpose

What is the main goal of this pull request?

  • Bug fixes
  • New features
  • Documentation
  • Cleanup
  • Tests
  • Build / releng

Project management

  • Has the pull request been added to the relevant project and milestone? (Only if you know that your work is part of a specific iteration such as the current one)
  • Have the priority: and pr: labels been added to the pull request? (In case of doubt, start with the labels priority: low and pr: to review later)
  • Have the relevant issues been added to the pull request?
  • Have the relevant labels been added to the issues? (area:, difficulty:, type:)
  • Have the relevant issues been added to the same project and milestone as the pull request?
  • Has the CHANGELOG.adoc been updated to reference the relevant issues?
  • Have the relevant API breaks been described in the CHANGELOG.adoc? (Including changes in the GraphQL API)
  • In case of a change with a visual impact, are there any screenshots in the CHANGELOG.adoc? For example in doc/screenshots/2022.5.0-my-new-feature.png

Architectural decision records (ADR)

  • Does the title of the commit contributing the ADR start with [doc]?
  • Are the ADRs mentioned in the relevant section of the CHANGELOG.adoc?

Dependencies

  • Are the new / upgraded dependencies mentioned in the relevant section of the CHANGELOG.adoc?
  • Are the new dependencies justified in the CHANGELOG.adoc?

Frontend

This section is not relevant if your contribution does not come with changes to the frontend.

General purpose

  • Is the code properly tested? (Plain old JavaScript tests for business code and tests based on React Testing Library for the components)

Typing

We need to improve the typing of our code, as such, we require every contribution to come with proper TypeScript typing for both changes contributing new files and those modifying existing files.
Please ensure that the following statements are true for each file created or modified (this may require you to improve code outside of your contribution).

  • Variables have a proper type
  • Functions’ arguments have a proper type
  • Functions’ return type are specified
  • Hooks are properly typed:
    • useMutation<DATA_TYPE, VARIABLE_TYPE>(…)
    • useQuery<DATA_TYPE, VARIABLE_TYPE>(…)
    • useSubscription<DATA_TYPE, VARIABLE_TYPE>(…)
    • useMachine<CONTEXT_TYPE, EVENTS_TYPE>(…)
    • useState<STATE_TYPE>(…)
  • All components have a proper typing for their props
  • No useless optional chaining with ?. (if the GraphQL API specifies that a field cannot be null, do not treat it has potentially null for example)
  • Nullable values have a proper type (for example let diagram: Diagram | null = null;)

Backend

This section is not relevant if your contribution does not come with changes to the backend.

General purpose

  • Are all the event handlers tested?
  • Are the event processor tested?
  • Is the business code (services) tested?
  • Are diagram layout changes tested?

Architecture

  • Are data structure classes properly separated from behavioral classes?
  • Are all the relevant fields final?
  • Is any data structure mutable? If so, please write a comment indicating why
  • Are behavioral classes either stateless or side effect free?

Review

How to test this PR?

Please describe here the various use cases to test this pull request

  • Has the Kiwi TCMS test suite been updated with tests for this contribution?

@mcharfadi mcharfadi added this to the 2026.5.0 milestone Mar 18, 2026
@mcharfadi
Copy link
Copy Markdown
Contributor Author

I'll organize the PR in several commits when it's building.

@mcharfadi mcharfadi linked an issue Mar 19, 2026 that may be closed by this pull request
@mcharfadi mcharfadi force-pushed the mch/rel/spring-boot-4 branch 9 times, most recently from a069a72 to 0ff863f Compare March 20, 2026 09:56
@mcharfadi mcharfadi changed the base branch from master to cooldown March 20, 2026 10:20
@mcharfadi mcharfadi force-pushed the mch/rel/spring-boot-4 branch 2 times, most recently from 5474553 to d3ebf77 Compare March 20, 2026 10:22
@mcharfadi mcharfadi force-pushed the mch/rel/spring-boot-4 branch 3 times, most recently from e99017c to 68cf7d3 Compare March 24, 2026 09:06
@mcharfadi
Copy link
Copy Markdown
Contributor Author

mcharfadi commented Mar 24, 2026

Here the most impacting changes :

  • Replace com.fasterxml import package to tools.jackson

  • Change the parameter of ICustomNodeStyleDeserializer and IRepresentationDeserializer handle method from
    INodeStyle handle(ObjectMapper mapper, String root) throws JsonProcessingException; to
    INodeStyle handle(ObjectNode root, JsonParser jsonParser, DeserializationContext context) throws JacksonException;
    Optional<IRepresentation> handle(JsonParser jsonParser, DeserializationContext context, ObjectNode root);

  • JsonProcessingException is replaced by JacksonException

  • The method used to parse JSON have been updated accordingly to the Jackson migration guide.

  • MapperFeature.SORT_PROPERTIES_ALPHABETICALLY & DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES have been disabled (as it were in Jackson 2) see ObjectMapperConfiguration

  • jackson-datatype-jsr310 has been remove since it's included with Jackson3

  • JacksonMappingProvider in tests has been removed since it's not compatible with Jackson 3

  • Rest Controllers have been updated to not pass explicitly null to the body of the ResponseEntity.

  • EObjectJsonSerializer has been updated and is now configured thanks to TestsConfigMapper instead of RestResponseSerializationCustomizer

  • org.springframework.boot.test.web.client.TestRestTemplate has been replaced by org.springframework.web.client.RestTemplate

  • StartMessage is now a record, as this class was not serializing correctly with Jackson3

  • "sirius-components-charts", code coverage was set to 84.0 because the constructor of Hierarchy was not called by Jackson during the tests.

Feel free to squash the commits into one

@mcharfadi mcharfadi force-pushed the mch/rel/spring-boot-4 branch 3 times, most recently from 91f6a5b to 8d17e5f Compare March 25, 2026 13:49
@mcharfadi mcharfadi changed the base branch from cooldown to master March 25, 2026 13:50
@mcharfadi mcharfadi marked this pull request as ready for review March 25, 2026 13:50
Copy link
Copy Markdown
Member

@pcdavid pcdavid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment thread CHANGELOG.adoc Outdated

=== Dependency update

- [releng] Switch to Spring Boot 4.0
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mention the exact version number.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm now using 4.0.0 in the pom.xml

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason not to switch directly to 4.0.5?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll add a commit to switch to 4.0.5 since it should be just a single line to change.

Comment on lines +37 to +38
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-liquibase</artifactId>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can't upgrade to liquibase 5.x

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I forced the use of liquibase 4 in dependency management

package org.eclipse.sirius.web.papaya.representations.table;

import com.fasterxml.jackson.databind.ObjectMapper;
import tools.jackson.databind.ObjectMapper;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Imports need to be re-ordered

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@mcharfadi mcharfadi force-pushed the mch/rel/spring-boot-4 branch 2 times, most recently from b5c6b1d to 29cfe14 Compare March 30, 2026 08:21
@sbegaudeau sbegaudeau force-pushed the mch/rel/spring-boot-4 branch from 29cfe14 to ab91632 Compare April 3, 2026 13:37
Copy link
Copy Markdown
Member

@sbegaudeau sbegaudeau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems good, I've rebased it and handled the conflicts. I'll wait for the build to see the result and merge it if I don't encounter any issue. I'll try to add a couple of minor PRs too and perform a new release soon to open the possibility for downstream projects to switch to Spring Boot 4 too.

@sbegaudeau sbegaudeau force-pushed the mch/rel/spring-boot-4 branch 2 times, most recently from aee5a7b to cb8a8ac Compare April 3, 2026 14:56
mcharfadi and others added 3 commits April 3, 2026 17:46
Bug: #6262
Signed-off-by: Michaël Charfadi <michael.charfadi@obeosoft.com>
Signed-off-by: Stéphane Bégaudeau <stephane.begaudeau@obeo.fr>
Signed-off-by: Stéphane Bégaudeau <stephane.begaudeau@obeo.fr>
@sbegaudeau sbegaudeau force-pushed the mch/rel/spring-boot-4 branch from 26acc48 to 157f593 Compare April 3, 2026 15:46
@sbegaudeau sbegaudeau merged commit 943e1a0 into master Apr 3, 2026
3 of 4 checks passed
@sbegaudeau sbegaudeau deleted the mch/rel/spring-boot-4 branch April 3, 2026 15:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Switch to Spring Boot 4

3 participants