Skip to content

1.0.11 #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vasilenkoalexey merged 2 commits into from
Dec 24, 2025
Merged

1.0.11 #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef7a531
hotfix export drawio
Dec 23, 2025
54565ba
changelog
Dec 24, 2025
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
72 changes: 36 additions & 36 deletions c4-server/src/main/java/ru/beeatlas/c4/utils/MxExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,16 @@

package ru.beeatlas.c4.utils;

import java.util.ArrayDeque;
import java.util.Collection;
import java.util.Collections;
import java.util.Deque;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Stack;
import java.util.UUID;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -70,7 +74,7 @@ public GroupBoundary(String name, String fullName) {
}
public String name;
public String fullName;
public HashMap<String, GroupBoundary> groupBoundaries = new HashMap<>();
public Map<String, GroupBoundary> groupBoundaries = new HashMap<>();
public int minX = Integer.MAX_VALUE;
public int minY = Integer.MAX_VALUE;
public int maxX = Integer.MIN_VALUE;
Expand All @@ -79,8 +83,8 @@ public GroupBoundary(String name, String fullName) {

private class SoftwareSystemBoundary {
SoftwareSystem softwareSystem;
public HashSet<GroupBoundary> groupBoundaries = new HashSet<>();
public LinkedList<Element> elements = new LinkedList<>();
public Set<GroupBoundary> groupBoundaries = new HashSet<>();
public List<Element> elements = new LinkedList<>();
public SoftwareSystemBoundary(SoftwareSystem softwareSystem) {
this.softwareSystem = softwareSystem;
}
Expand All @@ -92,18 +96,18 @@ private class DeploymentNodeBoundary {
public int maxX = Integer.MIN_VALUE;
public int maxY = Integer.MIN_VALUE;
public DeploymentNode deploymentNode;
public HashSet<GroupBoundary> groupBoundaries = new HashSet<>();
public LinkedList<Element> elements = new LinkedList<>();
public LinkedList<DeploymentNodeBoundary> deploymentNodes = new LinkedList<>();
public Set<GroupBoundary> groupBoundaries = new HashSet<>();
public List<Element> elements = new LinkedList<>();
public List<DeploymentNodeBoundary> deploymentNodes = new LinkedList<>();
public DeploymentNodeBoundary(DeploymentNode deploymentNode) {
this.deploymentNode = deploymentNode;
}
}

private class ContainerBoundary {
Container container;
public HashSet<GroupBoundary> groupBoundaries = new HashSet<>();
public LinkedList<Element> elements = new LinkedList<>();
public Set<GroupBoundary> groupBoundaries = new HashSet<>();
public List<Element> elements = new LinkedList<>();
public ContainerBoundary(Container container) {
this.container = container;
}
Expand All @@ -113,7 +117,7 @@ public ContainerBoundary(Container container) {
private LinkedList<SoftwareSystemBoundary> softwareSystemBoundaries = new LinkedList<>();
private LinkedList<ContainerBoundary> containerBoundaries = new LinkedList<>();
private LinkedList<DeploymentNodeBoundary> deploymentNodeBoundaries = new LinkedList<>();
private Stack<DeploymentNodeBoundary> deploymentNodeBoundaryStack = new Stack<>();
private Deque<DeploymentNodeBoundary> deploymentNodeBoundaryStack = new ArrayDeque<>();

private int clusterInternalMargin = 25;

Expand Down Expand Up @@ -253,8 +257,7 @@ private void writeSoftwareSystemBoundary(SoftwareSystemBoundary softwareSystemBo
int maxY = Integer.MIN_VALUE;
for(Element e : softwareSystemBoundary.elements) {
ElementView ev = view.getElementView(e);
if (e instanceof StaticStructureElementInstance) {
StaticStructureElementInstance elementInstance = (StaticStructureElementInstance)e;
if (e instanceof StaticStructureElementInstance elementInstance) {
e = elementInstance.getElement();
}
ElementStyle es = view.getViewSet().getConfiguration().getStyles().findElementStyle(e);
Expand Down Expand Up @@ -331,8 +334,7 @@ private void writeContainerBoundary(ContainerBoundary containerBoundary, ModelVi
int maxY = Integer.MIN_VALUE;
for(Element e : containerBoundary.elements) {
ElementView ev = view.getElementView(e);
if (e instanceof StaticStructureElementInstance) {
StaticStructureElementInstance elementInstance = (StaticStructureElementInstance)e;
if (e instanceof StaticStructureElementInstance elementInstance) {
e = elementInstance.getElement();
}
ElementStyle es = view.getViewSet().getConfiguration().getStyles().findElementStyle(e);
Expand Down Expand Up @@ -445,7 +447,7 @@ protected void startGroupBoundary(ModelView view, String group, IndentingWriter
String groupSeparator = view.getModel().getProperties().getOrDefault(GROUP_SEPARATOR_PROPERTY_NAME, "");
String[] groups = (groupSeparator.isEmpty()) ? Collections.singletonList(group).toArray(String[]::new) : group.split(groupSeparator);
String fullName = "";
HashMap<String, GroupBoundary> groupBoundariesRoot = groupBoundaries;
Map<String, GroupBoundary> groupBoundariesRoot = groupBoundaries;
for(String groupName : groups) {
GroupBoundary gb = groupBoundariesRoot.get(groupName);
fullName += groupName;
Expand All @@ -459,7 +461,7 @@ protected void startGroupBoundary(ModelView view, String group, IndentingWriter
if(containerBoundary != null) {
containerBoundary.groupBoundaries.add(gb);
}
if(deploymentNodeBoundaryStack.empty() == false) {
if(deploymentNodeBoundaryStack.isEmpty() == false) {
DeploymentNodeBoundary deploymentNodeBoundary = deploymentNodeBoundaryStack.peek();
deploymentNodeBoundary.groupBoundaries.add(gb);
}
Expand All @@ -474,9 +476,8 @@ protected void startGroupBoundary(ModelView view, String group, IndentingWriter
if(ge.getGroup() == null) {
continue;
}
Element e = (Element)ev.getElement();
if (e instanceof StaticStructureElementInstance) {
StaticStructureElementInstance elementInstance = (StaticStructureElementInstance)e;
Element e = ev.getElement();
if (e instanceof StaticStructureElementInstance elementInstance) {
e = elementInstance.getElement();
}
ElementStyle es = view.getViewSet().getConfiguration().getStyles().findElementStyle(e);
Expand Down Expand Up @@ -526,7 +527,7 @@ protected void endContainerBoundary(ModelView view, IndentingWriter writer) {
protected void startDeploymentNodeBoundary(DeploymentView view, DeploymentNode deploymentNode, IndentingWriter writer) {
DeploymentNodeBoundary newDeploymentNodeBoundary = new DeploymentNodeBoundary(deploymentNode);

if(deploymentNodeBoundaryStack.empty() == true) {
if(deploymentNodeBoundaryStack.isEmpty() == true) {
deploymentNodeBoundaries.add(newDeploymentNodeBoundary);
} else {
DeploymentNodeBoundary deploymentNodeBoundary = deploymentNodeBoundaryStack.peek();
Expand Down Expand Up @@ -604,8 +605,7 @@ private void updateDeploymentNodeBoundary(DeploymentNodeBoundary deploymentNodeB
}
for(Element e : deploymentNodeBoundary.elements) {
ElementView ev = view.getElementView(e);
if (e instanceof StaticStructureElementInstance) {
StaticStructureElementInstance elementInstance = (StaticStructureElementInstance)e;
if (e instanceof StaticStructureElementInstance elementInstance) {
e = elementInstance.getElement();
}
ElementStyle es = view.getViewSet().getConfiguration().getStyles().findElementStyle(e);
Expand Down Expand Up @@ -643,7 +643,7 @@ protected void writeElement(ModelView view, Element element, IndentingWriter wri
if(containerBoundary != null) {
containerBoundary.elements.add(element);
}
if(deploymentNodeBoundaryStack.empty() == false) {
if(deploymentNodeBoundaryStack.isEmpty() == false) {
DeploymentNodeBoundary deploymentNodeBoundary = deploymentNodeBoundaryStack.peek();
deploymentNodeBoundary.elements.add(element);
}
Expand All @@ -652,8 +652,7 @@ protected void writeElement(ModelView view, Element element, IndentingWriter wri
ElementView ev = view.getElementView(element);
String id = element.getId();

if (element instanceof StaticStructureElementInstance) {
StaticStructureElementInstance elementInstance = (StaticStructureElementInstance)element;
if (element instanceof StaticStructureElementInstance elementInstance) {
element = elementInstance.getElement();
}

Expand Down Expand Up @@ -682,7 +681,6 @@ protected void writeElement(ModelView view, Element element, IndentingWriter wri
values.put("descriptionFontSize", String.valueOf(descriptionFontSize));
values.put("color", color);
values.put("background", background);
values.put("metadataFontSize", String.valueOf(metadataFontSize));
values.put("stroke", stroke);
values.put("x", String.valueOf(ev.getX()));
values.put("y", String.valueOf(ev.getY()));
Expand Down Expand Up @@ -783,7 +781,7 @@ private void person(IndentingWriter writer, Map<String, String> values) {

private void box(IndentingWriter writer, Map<String, String> values) {
String technology = values.get("c4Technology");
String label = (technology.isEmpty())
String label = (StringUtils.isNullOrEmpty(technology))
? "<font style=\"font-size:${nameFontSize}px\"><b>%c4Name%</b></font><div>[%c4Type%]</div><br><div><font style=\"font-size:${descriptionFontSize}px\" color=\"${color}\">%c4Description%</font></div>"
: "<font style=\"font-size:${nameFontSize}px\"><b>%c4Name%</b></font><div>[%c4Type%: %c4Technology%]</div><br><div><font style=\"font-size:${descriptionFontSize}px\" color=\"${color}\">%c4Description%</font></div>";
label = new StringSubstitutor(values).replace(label);
Expand All @@ -802,7 +800,7 @@ private void box(IndentingWriter writer, Map<String, String> values) {

private void roundedBox(IndentingWriter writer, Map<String, String> values) {
String technology = values.get("c4Technology");
String label = (technology.isEmpty())
String label = (StringUtils.isNullOrEmpty(technology))
? "<font style=\"font-size:${nameFontSize}px\"><b>%c4Name%</b></font><div>[%c4Type%]</div><br><div><font style=\"font-size:${descriptionFontSize}px\" color=\"${color}\">%c4Description%</font></div>"
: "<font style=\"font-size:${nameFontSize}px\"><b>%c4Name%</b></font><div>[%c4Type%: %c4Technology%]</div><br><div><font style=\"font-size:${descriptionFontSize}px\" color=\"${color}\">%c4Description%</font></div>";
label = new StringSubstitutor(values).replace(label);
Expand All @@ -824,7 +822,7 @@ private void hexagon(IndentingWriter writer, Map<String, String> values) {
int height = (int) (HEXAGON_RATIO * width);
values.put("height", String.valueOf(height));
String technology = values.get("c4Technology");
String label = (technology.isEmpty())
String label = (StringUtils.isNullOrEmpty(technology))
? "<font style=\"font-size:${nameFontSize}px\"><b>%c4Name%</b></font><div>[%c4Type%]</div><br><div><font style=\"font-size:${descriptionFontSize}px\" color=\"${color}\">%c4Description%</font></div>"
: "<font style=\"font-size:${nameFontSize}px\"><b>%c4Name%</b></font><div>[%c4Type%: %c4Technology%]</div><br><div><font style=\"font-size:${descriptionFontSize}px\" color=\"${color}\">%c4Description%</font></div>";
label = new StringSubstitutor(values).replace(label);
Expand All @@ -843,7 +841,7 @@ private void hexagon(IndentingWriter writer, Map<String, String> values) {

private void cylinder(IndentingWriter writer, Map<String, String> values) {
String technology = values.get("c4Technology");
String label = (technology.isEmpty())
String label = (StringUtils.isNullOrEmpty(technology))
? "<font style=\"font-size:${nameFontSize}px\"><b>%c4Name%</b></font><div>[%c4Type%]</div><br><div><font style=\"font-size:${descriptionFontSize}px\" color=\"${color}\">%c4Description%</font></div>"
: "<font style=\"font-size:${nameFontSize}px\"><b>%c4Name%</b></font><div>[%c4Type%: %c4Technology%]</div><br><div><font style=\"font-size:${descriptionFontSize}px\" color=\"${color}\">%c4Description%</font></div>";
label = new StringSubstitutor(values).replace(label);
Expand All @@ -862,7 +860,7 @@ private void cylinder(IndentingWriter writer, Map<String, String> values) {

private void pipe(IndentingWriter writer, Map<String, String> values) {
String technology = values.get("c4Technology");
String label = (technology.isEmpty())
String label = (StringUtils.isNullOrEmpty(technology))
? "<font style=\"font-size:${nameFontSize}px\"><b>%c4Name%</b></font><div>[%c4Type%]</div><br><div><font style=\"font-size:${descriptionFontSize}px\" color=\"${color}\">%c4Description%</font></div>"
: "<font style=\"font-size:${nameFontSize}px\"><b>%c4Name%</b></font><div>[%c4Type%: %c4Technology%]</div><br><div><font style=\"font-size:${descriptionFontSize}px\" color=\"${color}\">%c4Description%</font></div>";
label = new StringSubstitutor(values).replace(label);
Expand All @@ -881,7 +879,7 @@ private void pipe(IndentingWriter writer, Map<String, String> values) {

private void webBrowser(IndentingWriter writer, Map<String, String> values) {
String technology = values.get("c4Technology");
String label = (technology.isEmpty())
String label = (StringUtils.isNullOrEmpty(technology))
? "<font style=\"font-size:${nameFontSize}px\"><b>%c4Name%</b></font><div>[%c4Type%]</div><br><div><font style=\"font-size:${descriptionFontSize}px\" color=\"${color}\">%c4Description%</font></div>"
: "<font style=\"font-size:${nameFontSize}px\"><b>%c4Name%</b></font><div>[%c4Type%: %c4Technology%]</div><br><div><font style=\"font-size:${descriptionFontSize}px\" color=\"${color}\">%c4Description%</font></div>";
label = new StringSubstitutor(values).replace(label);
Expand Down Expand Up @@ -932,12 +930,12 @@ protected void writeRelationship(ModelView view, RelationshipView relationshipVi

if (relationshipView.getRelationship().getSource() instanceof DeploymentNode || relationshipView.getRelationship().getDestination() instanceof DeploymentNode) {
source = relationshipView.getRelationship().getSource();
if (source instanceof DeploymentNode) {
source = findElementInside((DeploymentNode)source, view);
if (source instanceof DeploymentNode deploymentNode) {
source = findElementInside(deploymentNode, view);
}
destination = relationshipView.getRelationship().getDestination();
if (destination instanceof DeploymentNode) {
destination = findElementInside((DeploymentNode)destination, view);
if (destination instanceof DeploymentNode deploymentNode) {
destination = findElementInside(deploymentNode, view);
}
} else {
source = relationshipView.getRelationship().getSource();
Expand All @@ -962,7 +960,9 @@ protected void writeRelationship(ModelView view, RelationshipView relationshipVi
values.put("c4Technology", technology == null ? "" : technology);
values.put("c4Description", description == null ? "" : description);
values.put("source", source.getId());
values.put("target", destination.getId());
if(destination != null) {
values.put("target", destination.getId());
}
String label = "";
if(!StringUtils.isNullOrEmpty(description)) {
if(!StringUtils.isNullOrEmpty(technology)) {
Expand Down
4 changes: 4 additions & 0 deletions extension/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change Log

## 1.0.11

- Hot fix for drawio export

## 1.0.9 - 1.0.10

- Export styles and properties to drawio
Expand Down
2 changes: 1 addition & 1 deletion extension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"license": "Apache-2.0",
"icon": "images/logo.png",
"version": "1.0.10",
"version": "1.0.11",
"engines": {
"vscode": "^1.73.0"
},
Expand Down