Add PlantUML no-metadata option (#1611)

* Add 'no-metadata' argument * Add PlantUML no-metadata option to documentation * Add smoke test for PlantUML 'no-metadata' option fixes #1610
yuzutech · Aug 13, 2023 · a7b6b36 · a7b6b36
1 parent 5adac1c
commit a7b6b36
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/ci/tests/smoke.js b/ci/tests/smoke.js
@@ -19,6 +19,7 @@ const tests = [
   { engine: 'mermaid', file: 'contribute.mmd', options: {}, outputFormat: ['svg'] },
   { engine: 'bpmn', file: 'example.bpmn', options: {}, outputFormat: ['svg'] },
   { engine: 'plantuml', file: 'architecture.puml', options: {}, outputFormat: ['svg', 'pdf', 'png', 'txt'] },
+  { engine: 'plantuml', file: 'architecture.puml', options: { 'no-metadata': 'true' }, outputFormat: ['svg', 'png'] },
   { engine: 'svgbob', file: 'cloud.bob', options: {}, outputFormat: ['svg'] },
   { engine: 'nomnoml', file: 'pirate.nomnoml', options: {}, outputFormat: ['svg'] },
   { engine: 'packetdiag', file: 'packet.diag', options: {}, outputFormat: ['svg', 'png'] },

diff --git a/docs/modules/setup/pages/diagram-options.adoc b/docs/modules/setup/pages/diagram-options.adoc
@@ -182,6 +182,10 @@ The complete list of options is available in Mermaid source code at: https://git
 
 |Use a specific theme (it will prepend the `!theme` directive in your diagram)
 
+|no-metadata
+|_flag_ +
+empty string ("")
+|Do not save the diagram's source code in the generated SVG/PNG metadata
 |===
 
 == Structurizr
@@ -233,7 +237,7 @@ The complete list of options is available in Mermaid source code at: https://git
 
 |stroke-width
 |_any_ +
-*`2`* 
+*`2`*
 |Stroke width for all lines
 
 |===

diff --git a/server/src/main/java/io/kroki/server/service/PlantumlCommand.java b/server/src/main/java/io/kroki/server/service/PlantumlCommand.java
@@ -69,16 +69,20 @@ public byte[] handle(int exitValue, byte[] stdout, byte[] stderr) {
 
   public byte[] convert(String source, FileFormat format, JsonObject options) throws IOException, InterruptedException {
     List<String> commands = new ArrayList<>();
-    String theme = options.getString("theme");
     commands.add(binPath);
     commands.add("-pipe");
     commands.add("-t" + (format == FileFormat.BASE64 ? FileFormat.PNG.getName() : format.getName()));
     commands.add("-timeout");
     commands.add(String.valueOf(this.convertTimeout.timeUnit().toSeconds(this.convertTimeout.duration())));
+    String theme = options.getString("theme");
     if (theme != null && !theme.isBlank()) {
       commands.add("-theme");
       commands.add(theme);
     }
+    String no_metadata = options.getString("no-metadata");
+    if (no_metadata != null) {
+      commands.add("-nometadata");
+    }
     byte[] result = commander.execute(source.getBytes(), commands.toArray(new String[0]));
     if (format == FileFormat.BASE64) {
       final String encodedBytes = "data:image/png;base64," + Base64.getUrlEncoder().encodeToString(result).replaceAll("\\s", "");