Skip to content

Commit 8d17e5f

Browse files
mcharfadimcharfadi
committed
[6262] Upgrade to Spring Boot 4
Bug: #6262 Signed-off-by: Michaël Charfadi <michael.charfadi@obeosoft.com>
1 parent 0c71b11 commit 8d17e5f

File tree

87 files changed

+380
-390
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+380
-390
lines changed

‎CHANGELOG.adoc‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,16 @@
1919

2020
=== Breaking changes
2121

22+
- https://github.com/eclipse-sirius/sirius-web/issues/6262[#6262] [core] `ICustomNodeStyleDeserializer` `handle` method have been modified to `INodeStyle handle(ObjectMapper mapper, String root) throws JsonProcessingException;`
23+
`IRepresentationDeserializer` `handle` method have been modified to `Optional<IRepresentation> handle(JsonParser jsonParser, DeserializationContext context, ObjectNode root);`
24+
The switch to Spring Boot 4.0 also come with a switch to Jackson 3, see the official https://github.com/FasterXML/jackson/blob/main/jackson3/MIGRATING_TO_JACKSON_3.md[documentation] for more details.
25+
Your custom deserializers and migration services will probably be impacted.
2226

2327

2428

2529
=== Dependency update
2630

31+
- [releng] Switch to Spring Boot 4.0
2732

2833

2934

@@ -112,6 +117,11 @@ An example can be found with `EllipseNodeConverter.ts`.
112117
- https://github.com/eclipse-sirius/sirius-web/issues/5982[#5982] [tree] Add the ability to trigger context menu entries using key bindings.
113118
The `TreeItemContextMenuEntryBuilder` subclasses now require a list of key bindings.
114119
`IKeyBindingConverter` and `KeyBindingConverter` have been moved from their respective packages to `org.eclipse.sirius.components.view.emf`.
120+
- https://github.com/eclipse-sirius/sirius-web/issues/6262[#6262] [core] `ICustomNodeStyleDeserializer` `handle` method have been modified to `INodeStyle handle(ObjectMapper mapper, String root) throws JsonProcessingException;`
121+
`IRepresentationDeserializer` `handle` method have been modified to `Optional<IRepresentation> handle(JsonParser jsonParser, DeserializationContext context, ObjectNode root);`
122+
The switch to Spring Boot 4.0 also come with a switch to Jackson 3, see the official https://github.com/FasterXML/jackson/blob/main/jackson3/MIGRATING_TO_JACKSON_3.md[documentation] for more details.
123+
Your custom deserializers and migration services will probably be impacted.
124+
115125

116126

117127
=== Dependency update

‎packages/browser/backend/sirius-components-browser-graphql/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
<dependencies>
3232
<dependency>
33-
<groupId>com.fasterxml.jackson.core</groupId>
33+
<groupId>tools.jackson.core</groupId>
3434
<artifactId>jackson-databind</artifactId>
3535
</dependency>
3636
<dependency>

‎packages/charts/backend/sirius-components-charts-graphql/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
<dependencies>
3232
<dependency>
33-
<groupId>com.fasterxml.jackson.core</groupId>
33+
<groupId>tools.jackson.core</groupId>
3434
<artifactId>jackson-databind</artifactId>
3535
</dependency>
3636
<dependency>

‎packages/core/backend/sirius-components-collaborative/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<artifactId>reactor-core</artifactId>
3535
</dependency>
3636
<dependency>
37-
<groupId>com.fasterxml.jackson.core</groupId>
37+
<groupId>tools.jackson.core</groupId>
3838
<artifactId>jackson-databind</artifactId>
3939
</dependency>
4040
<dependency>

‎packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/representations/migration/IRepresentationMigrationParticipant.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2024, 2025 Obeo.
2+
* Copyright (c) 2024, 2026 Obeo.
33
* This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License v2.0
55
* which accompanies this distribution, and is available at
@@ -12,11 +12,9 @@
1212
*******************************************************************************/
1313
package org.eclipse.sirius.components.collaborative.representations.migration;
1414

15-
16-
import com.fasterxml.jackson.databind.JsonNode;
17-
import com.fasterxml.jackson.databind.node.ObjectNode;
18-
1915
import org.eclipse.sirius.components.core.api.IEditingContext;
16+
import tools.jackson.databind.JsonNode;
17+
import tools.jackson.databind.node.ObjectNode;
2018

2119
/**
2220
* Interface of IRepresentationMigrationParticipant.

‎packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/representations/migration/RepresentationMigrationService.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2024, 2025 Obeo.
2+
* Copyright (c) 2024, 2026 Obeo.
33
* This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License v2.0
55
* which accompanies this distribution, and is available at
@@ -12,15 +12,14 @@
1212
*******************************************************************************/
1313
package org.eclipse.sirius.components.collaborative.representations.migration;
1414

15-
import com.fasterxml.jackson.databind.JsonNode;
16-
import com.fasterxml.jackson.databind.ObjectMapper;
17-
import com.fasterxml.jackson.databind.node.ObjectNode;
18-
1915
import java.util.ArrayList;
2016
import java.util.List;
2117
import java.util.Objects;
2218

2319
import org.eclipse.sirius.components.core.api.IEditingContext;
20+
import tools.jackson.databind.JsonNode;
21+
import tools.jackson.databind.ObjectMapper;
22+
import tools.jackson.databind.node.ObjectNode;
2423

2524
/**
2625
* Used to manipulate the Json content before deserialization.
@@ -44,16 +43,17 @@ public void parseProperties(ObjectNode root, ObjectMapper mapper) {
4443
}
4544

4645
List<String> attributes = new ArrayList<>();
47-
root.fieldNames().forEachRemaining(attributes::add);
46+
root.properties().forEach(entry -> attributes.add(entry.getKey()));
47+
4848
for (String attribute : attributes) {
4949
var currentNode = root.get(attribute);
5050

51-
if (currentNode.isObject() && currentNode.isContainerNode()) {
51+
if (currentNode.isObject() && currentNode.isContainer()) {
5252
this.parseProperties((ObjectNode) currentNode, mapper);
5353
}
54-
if (currentNode.isArray() && currentNode.isContainerNode()) {
54+
if (currentNode.isArray() && currentNode.isContainer()) {
5555
for (JsonNode objNode : currentNode) {
56-
if (objNode.isContainerNode()) {
56+
if (objNode.isContainer()) {
5757
this.parseProperties((ObjectNode) objNode, mapper);
5858
}
5959
}

‎packages/core/backend/sirius-components-core-graphql/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
<dependencies>
3232
<dependency>
33-
<groupId>com.fasterxml.jackson.core</groupId>
33+
<groupId>tools.jackson.core</groupId>
3434
<artifactId>jackson-databind</artifactId>
3535
</dependency>
3636
<dependency>

‎packages/deck/backend/sirius-components-deck-graphql/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
<dependencies>
3232
<dependency>
33-
<groupId>com.fasterxml.jackson.core</groupId>
33+
<groupId>tools.jackson.core</groupId>
3434
<artifactId>jackson-databind</artifactId>
3535
</dependency>
3636
<dependency>

‎packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/NodeStyleStdDeserializerProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2019, 2025 Obeo.
2+
* Copyright (c) 2019, 2026 Obeo.
33
* This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License v2.0
55
* which accompanies this distribution, and is available at

‎packages/diagrams/backend/sirius-components-diagrams-graphql/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
<dependencies>
3232
<dependency>
33-
<groupId>com.fasterxml.jackson.core</groupId>
33+
<groupId>tools.jackson.core</groupId>
3434
<artifactId>jackson-databind</artifactId>
3535
</dependency>
3636
<dependency>

0 commit comments

Comments
 (0)