Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,13 @@ As a result, the following GraphQL mutations have been removed `exposeRequiremen
=== Dependency update

- [releng] As of version 2026.5.0, SysON now requires **Java 21** or later.
- [releng] Update to https://github.com/eclipse-sirius/sirius-web[Sirius Web 2026.3.1]
- [releng] Update to https://github.com/eclipse-sirius/sirius-web[Sirius Web 2026.3.2]
- [releng] Update to `jacoco-maven-plugin` 0.8.14.
- [releng] Update to `maven-checkstyle-plugin` 3.6.0 and CheckStyle 3.13.0.
- [releng] Update to lexical 0.42.0
- [releng] Update to https://vite.dev/blog/announcing-vite8[Vite 8.0.1] and @vitejs/plugin-react 6.0.1
- [releng] Update to https://github.com/spring-projects/spring-boot/releases/tag/v4.0.5[Spring Boot 4.0.5]
- [releng] Update to `com.tngtech.archunit:archunit-junit5` 1.4.1

=== Bug fixes

Expand Down
6 changes: 3 additions & 3 deletions backend/application/syson-application-configuration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.5.11</version>
<version>4.0.5</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.syson</groupId>
Expand All @@ -29,7 +29,7 @@

<properties>
<java.version>21</java.version>
<sirius.web.version>2026.3.1</sirius.web.version>
<sirius.web.version>2026.3.2</sirius.web.version>
</properties>

<repositories>
Expand Down Expand Up @@ -114,7 +114,7 @@
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<artifactId>testcontainers-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2025 Obeo.
* Copyright (c) 2025, 2026 Obeo.
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
Expand All @@ -12,10 +12,6 @@
*******************************************************************************/
package org.eclipse.syson.application.migration;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.databind.node.TextNode;

import java.util.Objects;

import org.eclipse.sirius.components.collaborative.representations.migration.IRepresentationMigrationParticipant;
Expand All @@ -25,6 +21,9 @@
import org.eclipse.syson.sysml.util.ElementUtil;
import org.springframework.stereotype.Service;

import tools.jackson.databind.JsonNode;
import tools.jackson.databind.node.ObjectNode;

/**
* Diagram migration participant used to migrate SysON diagrams with diagram elements having "targetObjectId" pointing
* to standard libraries Elements previous to 2025.8.0.
Expand Down Expand Up @@ -66,8 +65,8 @@ public String getKind() {

@Override
public void replaceJsonNode(IEditingContext editingContext, ObjectNode root, String currentAttribute, JsonNode currentValue) {
if (currentAttribute.equals("targetObjectId") && currentValue instanceof TextNode textNode) {
String oldId = textNode.asText();
if (currentAttribute.equals("targetObjectId") && currentValue.isString()) {
String oldId = currentValue.asString();
var optElement = this.objectSearchService.getObject(editingContext, oldId)
.filter(Element.class::isInstance)
.map(Element.class::cast);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2025 Obeo.
* Copyright (c) 2025, 2026 Obeo.
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
Expand All @@ -12,13 +12,15 @@
*******************************************************************************/
package org.eclipse.syson.application.nodes;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;

import org.eclipse.sirius.components.collaborative.diagrams.api.ICustomNodeStyleDeserializer;
import org.eclipse.sirius.components.diagrams.INodeStyle;
import org.springframework.stereotype.Service;

import tools.jackson.core.JacksonException;
import tools.jackson.core.JsonParser;
import tools.jackson.databind.DeserializationContext;
import tools.jackson.databind.node.ObjectNode;

/**
* Use to correctly deserialize custom node style.
*
Expand All @@ -33,7 +35,7 @@ public boolean canHandle(String type) {
}

@Override
public INodeStyle handle(ObjectMapper mapper, String root) throws JsonProcessingException {
return mapper.readValue(root, SysMLImportedPackageNodeStyle.class);
public INodeStyle handle(ObjectNode root, JsonParser jsonParser, DeserializationContext context) throws JacksonException {
return context.readTreeAsValue(root, SysMLImportedPackageNodeStyle.class);
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2025 Obeo.
* Copyright (c) 2025, 2026 Obeo.
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
Expand All @@ -12,13 +12,15 @@
*******************************************************************************/
package org.eclipse.syson.application.nodes;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;

import org.eclipse.sirius.components.collaborative.diagrams.api.ICustomNodeStyleDeserializer;
import org.eclipse.sirius.components.diagrams.INodeStyle;
import org.springframework.stereotype.Service;

import tools.jackson.core.JacksonException;
import tools.jackson.core.JsonParser;
import tools.jackson.databind.DeserializationContext;
import tools.jackson.databind.node.ObjectNode;

/**
* Use to correctly deserialize custom node style.
*
Expand All @@ -33,7 +35,7 @@ public boolean canHandle(String type) {
}

@Override
public INodeStyle handle(ObjectMapper mapper, String root) throws JsonProcessingException {
return mapper.readValue(root, SysMLNoteNodeStyle.class);
public INodeStyle handle(ObjectNode root, JsonParser jsonParser, DeserializationContext context) throws JacksonException {
return context.readTreeAsValue(root, SysMLNoteNodeStyle.class);
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2025 Obeo.
* Copyright (c) 2025, 2026 Obeo.
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
Expand All @@ -12,13 +12,15 @@
*******************************************************************************/
package org.eclipse.syson.application.nodes;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;

import org.eclipse.sirius.components.collaborative.diagrams.api.ICustomNodeStyleDeserializer;
import org.eclipse.sirius.components.diagrams.INodeStyle;
import org.springframework.stereotype.Service;

import tools.jackson.core.JacksonException;
import tools.jackson.core.JsonParser;
import tools.jackson.databind.DeserializationContext;
import tools.jackson.databind.node.ObjectNode;

/**
* Use to correctly deserialize custom node style.
*
Expand All @@ -33,7 +35,7 @@ public boolean canHandle(String type) {
}

@Override
public INodeStyle handle(ObjectMapper mapper, String root) throws JsonProcessingException {
return mapper.readValue(root, SysMLPackageNodeStyle.class);
public INodeStyle handle(ObjectNode root, JsonParser jsonParser, DeserializationContext context) throws JacksonException {
return context.readTreeAsValue(root, SysMLPackageNodeStyle.class);
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2025 Obeo.
* Copyright (c) 2025, 2026 Obeo.
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
Expand All @@ -12,13 +12,15 @@
*******************************************************************************/
package org.eclipse.syson.application.nodes;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;

import org.eclipse.sirius.components.collaborative.diagrams.api.ICustomNodeStyleDeserializer;
import org.eclipse.sirius.components.diagrams.INodeStyle;
import org.springframework.stereotype.Service;

import tools.jackson.core.JacksonException;
import tools.jackson.core.JsonParser;
import tools.jackson.databind.DeserializationContext;
import tools.jackson.databind.node.ObjectNode;

/**
* Use to correctly deserialize custom node style.
*
Expand All @@ -33,7 +35,7 @@ public boolean canHandle(String type) {
}

@Override
public INodeStyle handle(ObjectMapper mapper, String root) throws JsonProcessingException {
return mapper.readValue(root, SysMLViewFrameNodeStyle.class);
public INodeStyle handle(ObjectNode root, JsonParser jsonParser, DeserializationContext context) throws JacksonException {
return context.readTreeAsValue(root, SysMLViewFrameNodeStyle.class);
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2025 Obeo.
* Copyright (c) 2025, 2026 Obeo.
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
Expand All @@ -12,8 +12,6 @@
*******************************************************************************/
package org.eclipse.syson.application.nodes.graphql;

import com.fasterxml.jackson.databind.ObjectMapper;

import java.util.Objects;
import java.util.concurrent.CompletableFuture;

Expand All @@ -25,6 +23,7 @@
import org.eclipse.syson.application.nodes.dto.EditSysMLImportedPackageNodeAppearanceInput;

import graphql.schema.DataFetchingEnvironment;
import tools.jackson.databind.ObjectMapper;

/**
* The data fetcher used to edit the appearance of a SysMLImportedPackage node.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2025 Obeo.
* Copyright (c) 2025, 2026 Obeo.
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
Expand All @@ -12,8 +12,6 @@
*******************************************************************************/
package org.eclipse.syson.application.nodes.graphql;

import com.fasterxml.jackson.databind.ObjectMapper;

import java.util.Objects;
import java.util.concurrent.CompletableFuture;

Expand All @@ -25,6 +23,7 @@
import org.eclipse.syson.application.nodes.dto.EditSysMLNoteNodeAppearanceInput;

import graphql.schema.DataFetchingEnvironment;
import tools.jackson.databind.ObjectMapper;

/**
* The data fetcher used to edit the appearance of a SysMLNote node.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2025 Obeo.
* Copyright (c) 2025, 2026 Obeo.
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
Expand All @@ -12,8 +12,6 @@
*******************************************************************************/
package org.eclipse.syson.application.nodes.graphql;

import com.fasterxml.jackson.databind.ObjectMapper;

import java.util.Objects;
import java.util.concurrent.CompletableFuture;

Expand All @@ -25,6 +23,7 @@
import org.eclipse.syson.application.nodes.dto.EditSysMLPackageNodeAppearanceInput;

import graphql.schema.DataFetchingEnvironment;
import tools.jackson.databind.ObjectMapper;

/**
* The data fetcher used to edit the appearance of a SysMLPackage node.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2025 Obeo.
* Copyright (c) 2025, 2026 Obeo.
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
Expand All @@ -12,8 +12,6 @@
*******************************************************************************/
package org.eclipse.syson.application.nodes.graphql;

import com.fasterxml.jackson.databind.ObjectMapper;

import java.util.Objects;
import java.util.concurrent.CompletableFuture;

Expand All @@ -25,6 +23,7 @@
import org.eclipse.syson.application.nodes.dto.EditSysMLViewFrameNodeAppearanceInput;

import graphql.schema.DataFetchingEnvironment;
import tools.jackson.databind.ObjectMapper;

/**
* The data fetcher used to edit the appearance of a SysMLViewFrame node.
Expand Down
10 changes: 5 additions & 5 deletions backend/application/syson-application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.5.11</version>
<version>4.0.5</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.syson</groupId>
Expand All @@ -29,7 +29,7 @@

<properties>
<java.version>21</java.version>
<sirius.web.version>2026.3.1</sirius.web.version>
<sirius.web.version>2026.3.2</sirius.web.version>
</properties>

<repositories>
Expand Down Expand Up @@ -182,17 +182,17 @@
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>postgresql</artifactId>
<artifactId>testcontainers-postgresql</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>elasticsearch</artifactId>
<artifactId>testcontainers-elasticsearch</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<artifactId>testcontainers-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<!-- Import test jar to access org.eclipse.syson.sysml.util -->
Expand Down
Loading
Loading