diagramrest - change result to xml (#219)

Signed-off-by: Tihomir Surdilovic <[email protected]>

Author: tsurdilo

diagram-rest/src/main/java/io/serverlessworkflow/reactive_api_rest/Application.java renamed to diagram-rest/src/main/java/io/serverlessworkflow/diagramrest/Application.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.reactive_api_rest;
+package io.serverlessworkflow.diagramrest;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

diagram-rest/src/main/java/io/serverlessworkflow/reactive_api_rest/ServerlessRequest.java renamed to diagram-rest/src/main/java/io/serverlessworkflow/diagramrest/DiagramRequest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.reactive_api_rest;
+package io.serverlessworkflow.diagramrest;
 
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Component;
@@ -22,7 +22,7 @@
 import reactor.core.publisher.Mono;
 
 @Component
-public class ServerlessRequest {
+public class DiagramRequest {
 
   /**
    * Get the SVG diagram of a workflow from API Request
@@ -32,12 +32,12 @@ public class ServerlessRequest {
    */
   public Mono<ServerResponse> getDiagramSVGFromWorkFlow(ServerRequest sRequest) {
     return ServerResponse.ok()
-        .contentType(MediaType.APPLICATION_JSON)
+        .contentType(MediaType.APPLICATION_XML)
         .body(
             sRequest
                 .bodyToMono(String.class)
-                .flatMap(ServerlesRequestHelper::getSvg)
+                .flatMap(DiagramRequestHelper::getSvg)
                 .onErrorMap(e -> new IllegalArgumentException(e.getMessage())),
-            ServerlessWorkFlowResponse.class);
+            String.class);
   }
 }

diagram-rest/src/main/java/io/serverlessworkflow/reactive_api_rest/ServerlesRequestHelper.java renamed to diagram-rest/src/main/java/io/serverlessworkflow/diagramrest/DiagramRequestHelper.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.reactive_api_rest;
+package io.serverlessworkflow.diagramrest;
 
 import io.serverlessworkflow.api.Workflow;
 import io.serverlessworkflow.api.interfaces.WorkflowDiagram;
@@ -22,14 +22,12 @@
 import reactor.core.publisher.Mono;
 
 @Component
-public class ServerlesRequestHelper {
+public class DiagramRequestHelper {
 
-  public static Mono<ServerlessWorkFlowResponse> getSvg(String workFlow) {
+  public static Mono<String> getSvg(String workFlow) {
     String diagramSVG;
     Workflow workflow = Workflow.fromSource(workFlow);
 
-    ServerlessWorkFlowResponse response = new ServerlessWorkFlowResponse();
-
     WorkflowDiagram workflowDiagram =
         new WorkflowDiagramImpl()
             .showLegend(true)
@@ -39,12 +37,8 @@ public static Mono<ServerlessWorkFlowResponse> getSvg(String workFlow) {
     try {
       diagramSVG = workflowDiagram.getSvgDiagram();
     } catch (Exception e) {
-      response.setResponse(e.getMessage());
-      return Mono.just(response);
+      return Mono.just(e.getMessage());
     }
-
-    response.setResponse(diagramSVG);
-
-    return Mono.just(response);
+    return Mono.just(diagramSVG);
   }
 }

diagram-rest/src/main/java/io/serverlessworkflow/reactive_api_rest/RouterRest.java renamed to diagram-rest/src/main/java/io/serverlessworkflow/diagramrest/RouterRest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.reactive_api_rest;
+package io.serverlessworkflow.diagramrest;
 
 import static org.springframework.web.reactive.function.server.RequestPredicates.POST;
 import static org.springframework.web.reactive.function.server.RouterFunctions.route;
@@ -26,7 +26,7 @@
 @Configuration
 public class RouterRest implements RouterRestInterface {
   @Bean
-  public RouterFunction<ServerResponse> servelessRouterFunction(ServerlessRequest serverlessRequest) {
+  public RouterFunction<ServerResponse> diagramRouterFunction(DiagramRequest serverlessRequest) {
     return route(POST("/diagram"),
             serverlessRequest::getDiagramSVGFromWorkFlow);
   }

diagram-rest/src/main/java/io/serverlessworkflow/reactive_api_rest/RouterRestInterface.java renamed to diagram-rest/src/main/java/io/serverlessworkflow/diagramrest/RouterRestInterface.java

@@ -13,15 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.reactive_api_rest;
+package io.serverlessworkflow.diagramrest;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import org.springdoc.core.annotations.RouterOperation;
 import org.springdoc.core.annotations.RouterOperations;
-import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.reactive.function.server.RouterFunction;
 import org.springframework.web.reactive.function.server.ServerResponse;
@@ -32,9 +31,9 @@ public interface RouterRestInterface {
       value = {
         @RouterOperation(
             path = "/diagram",
-            produces = {MediaType.APPLICATION_JSON_VALUE},
+            produces = {"application/xml"},
             method = RequestMethod.POST,
-            beanClass = ServerlessRequest.class,
+            beanClass = DiagramRequest.class,
             beanMethod = "getDiagramSVGFromWorkFlow",
             operation =
                 @Operation(
@@ -46,11 +45,11 @@ public interface RouterRestInterface {
                           content =
                               @Content(
                                   schema =
-                                      @Schema(implementation = ServerlessWorkFlowResponse.class)))
+                                      @Schema(implementation = String.class)))
                     }
                     ))
       })
-  RouterFunction<ServerResponse> servelessRouterFunction(ServerlessRequest serverlessRequest);
+  RouterFunction<ServerResponse> diagramRouterFunction(DiagramRequest serverlessRequest);
 
 
 }

diagram-rest/src/main/java/io/serverlessworkflow/reactive_api_rest/ServerlessWorkFlowResponse.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.reactive_api_rest;
+package io.serverlessworkflow.diagramrest;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -29,13 +29,13 @@
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {
         RouterRest.class,
-        ServerlessRequest.class,
-        ServerlesRequestHelper.class
+        DiagramRequest.class,
+        DiagramRequestHelper.class
 })
 @WebFluxTest
 class ServerlesRequestHelperTest {
 
-    private ServerlesRequestHelper serverlesRequestHelper;
+    private DiagramRequestHelper serverlesRequestHelper;
 
     public static final String input = "id: greeting\n" +
             "version: '1.0'\n" +
@@ -60,16 +60,15 @@ class ServerlesRequestHelperTest {
 
     @BeforeEach
     void setUp() {
-        serverlesRequestHelper = new ServerlesRequestHelper();
+        serverlesRequestHelper = new DiagramRequestHelper();
     }
 
     @Test
     void getSvg() {
-        Mono<ServerlessWorkFlowResponse> monoSvg = serverlesRequestHelper.getSvg(input);
-        monoSvg.subscribe(result -> { assertNotNull(result); assertNotNull(result.getResponse());});
+        Mono<String> monoSvg = serverlesRequestHelper.getSvg(input);
+        monoSvg.subscribe(result -> { assertNotNull(result); assertNotNull(result);});
         StepVerifier.create(monoSvg)
-                .expectNextMatches(serverlessWorkFlowResponse -> serverlessWorkFlowResponse.
-                        getResponse()
+                .expectNextMatches(serverlessWorkFlowResponse -> serverlessWorkFlowResponse
                         .contains("svg"))
                 .verifyComplete();
     }