fix(flow-translator): leave inbound-gateway reply-channel as a standalone node

Author: a-asaad

flow-translator/flow-translator-lib/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.codice.keip</groupId>
     <artifactId>flow-translator-lib</artifactId>
-    <version>0.4.0</version>
+    <version>0.4.1</version>
 
     <packaging>jar</packaging>
 

flow-translator/flow-translator-lib/src/main/java/org/codice/keip/flow/xml/spring/ChannelEdgeBuilder.java

@@ -53,12 +53,15 @@ class ChannelEdgeBuilder {
 
   private final Map<String, EipNode> channelNodes;
 
+  private final Map<String, EipNode> nonChannelNodes;
+
   private final GuavaGraph.Builder graphBuilder;
 
   ChannelEdgeBuilder(Collection<EipNode> nodes) {
     this.nodes = nodes;
     this.channelConnections = new HashMap<>();
     this.channelNodes = new HashMap<>();
+    this.nonChannelNodes = new HashMap<>();
     this.graphBuilder = GuavaGraph.newBuilder();
   }
 
@@ -70,6 +73,7 @@ GuavaGraph buildGraph() {
         continue;
       }
 
+      nonChannelNodes.put(node.id(), node);
       Set<String> channelAttrNames = processChannelAttributes(node);
       processContentBasedRouters(node);
       Map<String, Object> filtered = filterChannelAttributes(node.attributes(), channelAttrNames);
@@ -213,9 +217,17 @@ private void disambiguateReplyConnection(
    *   <li>The channel type is NOT a direct channel (e.g. pub-sub, queue, etc.)
    *   <li>The channel has multiple incoming connections
    *   <li>The channel has multiple outgoing connections
+   *   <li>The channel is a reply-channel for an 'inbound_request_reply' node.
    * </ul>
    */
   private boolean isStandaloneChannelNode(EipNode node, ChannelConnections connections) {
+    if (connections.outgoing().size() == 1) {
+      EipNode target = nonChannelNodes.get(connections.outgoing().getFirst().node());
+      if (target != null && target.connectionType().equals(ConnectionType.INBOUND_REQUEST_REPLY)) {
+        return true;
+      }
+    }
+
     boolean isDirectChannel = node.eipId().equals(DIRECT_CHANNEL) && node.children().isEmpty();
     return !isDirectChannel || connections.incoming.size() > 1 || connections.outgoing.size() > 1;
   }

flow-translator/flow-translator-lib/src/test/groovy/org/codice/keip/flow/xml/spring/ChannelEdgeBuilderTest.groovy

@@ -208,13 +208,15 @@ class ChannelEdgeBuilderTest extends Specification {
         def graph = new ChannelEdgeBuilder(nodes).buildGraph()
 
         then:
-        graph.traverse().count() == 3
+        graph.traverse().count() == 4
 
         def ec = new EdgeChecker(graph)
+        EipNode chan3 = nodes.getLast() as EipNode
 
-        ec.check(gateway, [t2], [t1])
+        ec.check(gateway, [chan3], [t1])
         ec.check(t1, [gateway], [t2])
-        ec.check(t2, [t1], [gateway])
+        ec.check(t2, [t1], [chan3])
+        ec.check(chan3, [t2], [gateway])
     }
 
     def "test content-based routers with a 'mapping' child"() {

flow-translator/flow-translator-webapp/pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>org.codice.keip</groupId>
     <artifactId>flow-translator-webapp</artifactId>
-    <version>0.4.1</version>
+    <version>0.4.2</version>
 
     <packaging>jar</packaging>
 
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>org.codice.keip</groupId>
             <artifactId>flow-translator-lib</artifactId>
-            <version>0.4.0</version>
+            <version>0.4.1</version>
         </dependency>
         <dependency>
             <groupId>org.codice.keip.xsd</groupId>