feat: Merge View (RDFA-344)

README.md

@@ -36,7 +36,8 @@ For the complete documentation, see the [docs site](https://rdfarchitect.soptim.
 
 - Import and export RDF schemas and CIM extensions
 - Visualize class structures via UML diagrams
-- create custom diagrams containing classes from different packages or even profiles
+- Create custom diagrams containing classes from different packages or even profiles
+- Merge View — Visualize and inspect classes from multiple profiles across a dataset in a single unified diagram
 - Edit classes, attributes, associations, enum entries, and notes
 - Share diagrams as a complete, read-friendly reference of classes, relations, notes, and constraints
 - Schema migration between CIM versions and extensions

backend/src/main/java/org/rdfarchitect/api/controller/datasets/diagrams/CrossProfileDiagramColorRestController.java

@@ -0,0 +1,95 @@
+/*
+ *    Copyright (c) 2024-2026 SOPTIM AG
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ *
+ */
+
+package org.rdfarchitect.api.controller.datasets.diagrams;
+
+import io.swagger.v3.oas.annotations.Parameter;
+
+import lombok.RequiredArgsConstructor;
+
+import org.rdfarchitect.api.dto.crossProfileDiagram.CrossProfileDiagramColorDataDTO;
+import org.rdfarchitect.services.diagrams.CrossProfileColorUseCase;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/datasets/{datasetName}/crossprofilediagramColors")
+@RequiredArgsConstructor
+public class CrossProfileDiagramColorRestController {
+
+    private static final Logger logger =
+            LoggerFactory.getLogger(CrossProfileDiagramColorRestController.class);
+
+    private final CrossProfileColorUseCase colorUseCase;
+
+    @GetMapping
+    public CrossProfileDiagramColorDataDTO getCrossProfileColors(
+            @Parameter(description = "The name/url of the inquirer.")
+                    @RequestHeader(
+                            value = HttpHeaders.ORIGIN,
+                            required = false,
+                            defaultValue = "unknown")
+                    String originURL,
+            @Parameter(description = "The literal name of the dataset.") @PathVariable
+                    String datasetName) {
+        logger.info(
+                "Received GET request: \"/api/datasets/{{}}/crossprofilediagramColors\" from \"{}\"",
+                datasetName,
+                originURL);
+
+        var result = colorUseCase.getCrossProfileColors(datasetName);
+
+        logger.info(
+                "Sending response to GET request: \"/api/datasets/{{}}/crossprofilediagramColors\" from \"{}\"",
+                datasetName,
+                originURL);
+        return result;
+    }
+
+    @PutMapping
+    public void updateCrossProfileColors(
+            @Parameter(description = "The name/url of the inquirer.")
+                    @RequestHeader(
+                            value = HttpHeaders.ORIGIN,
+                            required = false,
+                            defaultValue = "unknown")
+                    String originURL,
+            @Parameter(description = "The literal name of the dataset.") @PathVariable
+                    String datasetName,
+            @RequestBody CrossProfileDiagramColorDataDTO colorData) {
+
+        logger.info(
+                "Received PUT request: \"/api/datasets/{{}}/crossprofilediagramColors\" from \"{}\"",
+                datasetName,
+                originURL);
+
+        colorUseCase.replaceCrossProfileColors(datasetName, colorData);
+
+        logger.info(
+                "Sending response to PUT request: \"/api/datasets/{{}}/crossprofilediagramColors\" from \"{}\"",
+                datasetName,
+                originURL);
+    }
+}

backend/src/main/java/org/rdfarchitect/api/controller/datasets/diagrams/CrossProfileDiagramIDController.java

@@ -0,0 +1,65 @@
+/*
+ *    Copyright (c) 2024-2026 SOPTIM AG
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ *
+ */
+
+package org.rdfarchitect.api.controller.datasets.diagrams;
+
+import io.swagger.v3.oas.annotations.Parameter;
+
+import lombok.RequiredArgsConstructor;
+
+import org.rdfarchitect.database.DatabasePort;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/datasets/{datasetName}/crossprofilediagramID")
+@RequiredArgsConstructor
+public class CrossProfileDiagramIDController {
+
+    private static final Logger logger =
+            LoggerFactory.getLogger(CrossProfileDiagramIDController.class);
+
+    private final DatabasePort databasePort;
+
+    @GetMapping
+    public String getCrossProfileRenderingData(
+            @Parameter(description = "The name/url of the inquirer.")
+                    @RequestHeader(
+                            value = HttpHeaders.ORIGIN,
+                            required = false,
+                            defaultValue = "unknown")
+                    String originURL,
+            @Parameter(description = "The literal name of the dataset.") @PathVariable
+                    String datasetName) {
+        logger.info(
+                "Received GET request: \"/api/datasets/{{}}/crossprofilediagram\" from \"{}\"",
+                datasetName,
+                originURL);
+
+        logger.info(
+                "Sending response to GET request: \"/api/datasets/{{}}/crossprofilediagram\" from \"{}\"",
+                datasetName,
+                originURL);
+        return databasePort.getCrossProfileDiagramUUID(datasetName).toString();
+    }
+}

backend/src/main/java/org/rdfarchitect/api/controller/datasets/diagrams/CrossProfileDiagramRenderingRestController.java

@@ -0,0 +1,86 @@
+/*
+ *    Copyright (c) 2024-2026 SOPTIM AG
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ *
+ */
+
+package org.rdfarchitect.api.controller.datasets.diagrams;
+
+import io.swagger.v3.oas.annotations.Parameter;
+
+import lombok.RequiredArgsConstructor;
+
+import org.rdfarchitect.api.dto.rendering.RenderingDataDTO;
+import org.rdfarchitect.database.DatabasePort;
+import org.rdfarchitect.models.cim.rendering.RenderCIMCollectionUseCase;
+import org.rdfarchitect.services.diagrams.GetCustomDiagramsUseCase;
+import org.rdfarchitect.services.rendering.DiagramToCIMCollectionConverterUseCase;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/datasets/{datasetName}/crossprofilediagramRendering")
+@RequiredArgsConstructor
+public class CrossProfileDiagramRenderingRestController {
+
+    private static final Logger logger =
+            LoggerFactory.getLogger(CrossProfileDiagramRenderingRestController.class);
+
+    private final DiagramToCIMCollectionConverterUseCase converter;
+
+    private final RenderCIMCollectionUseCase renderer;
+
+    private final GetCustomDiagramsUseCase getCustomDiagramsUseCase;
+
+    private final DatabasePort databasePort;
+
+    @GetMapping
+    public RenderingDataDTO getCrossProfileRenderingData(
+            @Parameter(description = "The name/url of the inquirer.")
+                    @RequestHeader(
+                            value = HttpHeaders.ORIGIN,
+                            required = false,
+                            defaultValue = "unknown")
+                    String originURL,
+            @Parameter(description = "The literal name of the dataset.") @PathVariable
+                    String datasetName) {
+        logger.info(
+                "Received GET request: \"/api/datasets/{{}}/crossprofilediagramRendering\" from \"{}\"",
+                datasetName,
+                originURL);
+
+        var crossProfileDiagram =
+                getCustomDiagramsUseCase.getCrossProfileDiagram(datasetName, true, true);
+
+        var cimCollection = converter.convert(crossProfileDiagram);
+
+        var result =
+                renderer.renderGlobalUML(
+                        cimCollection,
+                        datasetName,
+                        databasePort.getCrossProfileDiagramUUID(datasetName));
+
+        logger.info(
+                "Sending response to GET request: \"/api/datasets/{{}}/crossprofilediagramRendering\" from \"{}\"",
+                datasetName,
+                originURL);
+        return result;
+    }
+}

backend/src/main/java/org/rdfarchitect/api/controller/datasets/diagrams/CrossProfileDiagramRestController.java

@@ -0,0 +1,68 @@
+/*
+ *    Copyright (c) 2024-2026 SOPTIM AG
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ *
+ */
+
+package org.rdfarchitect.api.controller.datasets.diagrams;
+
+import io.swagger.v3.oas.annotations.Parameter;
+
+import lombok.RequiredArgsConstructor;
+
+import org.rdfarchitect.api.dto.crossProfileDiagram.CrossProfileDiagramDTO;
+import org.rdfarchitect.services.diagrams.GetCustomDiagramsUseCase;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/datasets/{datasetName}/crossprofilediagram")
+@RequiredArgsConstructor
+public class CrossProfileDiagramRestController {
+
+    private static final Logger logger =
+            LoggerFactory.getLogger(CrossProfileDiagramRestController.class);
+
+    private final GetCustomDiagramsUseCase getCustomDiagramsUseCase;
+
+    @GetMapping
+    public CrossProfileDiagramDTO getCrossProfileRenderingData(
+            @Parameter(description = "The name/url of the inquirer.")
+                    @RequestHeader(
+                            value = HttpHeaders.ORIGIN,
+                            required = false,
+                            defaultValue = "unknown")
+                    String originURL,
+            @Parameter(description = "The literal name of the dataset.") @PathVariable
+                    String datasetName) {
+        logger.info(
+                "Received GET request: \"/api/datasets/{{}}/crossprofilediagram\" from \"{}\"",
+                datasetName,
+                originURL);
+
+        var result = getCustomDiagramsUseCase.getCrossProfileDiagram(datasetName, false, false);
+
+        logger.info(
+                "Sending response to GET request: \"/api/datasets/{{}}/crossprofilediagram\" from \"{}\"",
+                datasetName,
+                originURL);
+        return result;
+    }
+}

backend/src/main/java/org/rdfarchitect/api/dto/ClassUMLAdaptedMapper.java

@@ -54,6 +54,7 @@ public interface ClassUMLAdaptedMapper {
     List<ClassUMLAdaptedDTO> toDTOList(List<CIMClassUMLAdapted> cimClassList);
 
     @Mapping(target = "uri", source = ".")
+    @Mapping(target = "graphUri", ignore = true)
     CIMClassUMLAdapted toCIMObject(ClassUMLAdaptedDTO dto);
 
     List<CIMClassUMLAdapted> toCIMObjectList(List<ClassUMLAdaptedDTO> dtoList);

backend/src/main/java/org/rdfarchitect/api/dto/association/AssociationMapper.java

@@ -48,6 +48,8 @@ public interface AssociationMapper {
     @Mapping(target = "uri", source = "dto")
     @Mapping(target = "domain", source = "dto")
     @Mapping(target = "inverseRoleName", expression = "java(buildInverseRoleName(inverseUri))")
+    @Mapping(target = "graphUri", ignore = true)
+    @Mapping(target = "color", ignore = true)
     CIMAssociation toCIMObject(AssociationDTO dto, String inverseUri);
 
     default String toDomain(URI value) {

backend/src/main/java/org/rdfarchitect/api/dto/attributes/AttributeMapper.java

@@ -67,6 +67,8 @@ default String map(URI value) {
                     "java(new CIMSStereotype(\"http://iec.ch/TC57/NonStandard/UML#attribute\"))")
     @Mapping(target = "fixedValue", source = ".")
     @Mapping(target = "defaultValue", source = ".")
+    @Mapping(target = "graphUri", ignore = true)
+    @Mapping(target = "color", ignore = true)
     CIMAttribute toCIMObject(AttributeDTO dto);
 
     List<CIMAttribute> toCIMObjectList(List<AttributeDTO> dtoList);

backend/src/main/java/org/rdfarchitect/api/dto/crossProfileDiagram/ClassSourceDTO.java

@@ -0,0 +1,30 @@
+/*
+ *    Copyright (c) 2024-2026 SOPTIM AG
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ *
+ */
+
+package org.rdfarchitect.api.dto.crossProfileDiagram;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.UUID;
+
+@Data
+@AllArgsConstructor
+public class ClassSourceDTO {
+    private UUID classUUID;
+    private String graphUri;
+}