Merge branch 'main' into interface-spectral-fix

finos · Apr 8, 2024 · 8df34d7 · 8df34d7
2 parents 689e636 + d380be8
commit 8df34d7
Show file tree

Hide file tree

Showing 8 changed files with 313 additions and 180 deletions.
diff --git a/docs/package-lock.json b/docs/package-lock.json
diff --git a/translator/README.md b/translator/README.md
@@ -9,6 +9,6 @@ The OpenAPI Specification is available at </v3/api-docs> (<http://localhost:8080
 
 ## Supported translations
 
-| Format         | Endpoint      | Description                                                                                                       |
-|----------------|---------------|-------------------------------------------------------------------------------------------------------------------|
-| Structurizr-C4 | /translate/c4 | Produces a Workspace json object with generated default views that can be imported into <https://structurizr.com> |
+| Format         | Endpoint      | Description                                                                                                        |
+|----------------|---------------|--------------------------------------------------------------------------------------------------------------------|
+| Structurizr-C4 | /translate/c4 | Produces a Workspace json object with generated default views that can be imported into <https://structurizr.com/> |
diff --git a/translator/src/main/java/org/finos/calmtranslator/controller/Translator.java b/translator/src/main/java/org/finos/calmtranslator/controller/Translator.java
@@ -1,7 +1,6 @@
 package org.finos.calmtranslator.controller;
 
 import com.structurizr.Workspace;
-import com.structurizr.util.WorkspaceUtils;
 import org.finos.calmtranslator.calm.Core;
 import org.finos.calmtranslator.translators.C4ModelTranslator;
 
@@ -24,12 +23,7 @@ public Translator(C4ModelTranslator c4ModelTranslator) {
 
 	@PostMapping("/c4")
 	@ResponseStatus(HttpStatus.CREATED)
-	public String c4Translation(
-			@RequestBody Core calmModel
-
-	) throws Exception {
-		// Currently a Structurizr json format
-		final Workspace workspace = c4ModelTranslator.translate(calmModel);
-		return WorkspaceUtils.toJson(workspace, true);
+	public Workspace c4Translation(@RequestBody Core calmModel) {
+		return c4ModelTranslator.translate(calmModel);
 	}
 }