From b5c160006a77432e39e79883049d0b0311124de4 Mon Sep 17 00:00:00 2001 From: LakshanWeerasinghe Date: Fri, 4 Oct 2024 17:56:53 +0530 Subject: [PATCH] Add concurrency nodes to get available nodes list --- .../core/AvailableNodesGenerator.java | 9 +++-- .../available_nodes/config/connector1.json | 38 +++++++++++++++++++ .../available_nodes/config/connector2.json | 38 +++++++++++++++++++ .../available_nodes/config/force_assign.json | 38 +++++++++++++++++++ .../available_nodes/config/foreach1.json | 38 +++++++++++++++++++ .../available_nodes/config/function1.json | 38 +++++++++++++++++++ .../available_nodes/config/function2.json | 38 +++++++++++++++++++ .../available_nodes/config/function3.json | 38 +++++++++++++++++++ .../available_nodes/config/lock1.json | 38 +++++++++++++++++++ .../available_nodes/config/match1.json | 38 +++++++++++++++++++ .../available_nodes/config/match2.json | 38 +++++++++++++++++++ .../available_nodes/config/method1.json | 38 +++++++++++++++++++ .../config/on_fail_clause1.json | 38 +++++++++++++++++++ .../available_nodes/config/transaction1.json | 38 +++++++++++++++++++ .../available_nodes/config/transaction2.json | 38 +++++++++++++++++++ .../available_nodes/config/while1.json | 38 +++++++++++++++++++ 16 files changed, 576 insertions(+), 3 deletions(-) diff --git a/flow-model-generator/modules/flow-model-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/AvailableNodesGenerator.java b/flow-model-generator/modules/flow-model-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/AvailableNodesGenerator.java index 5e2688d3..793f415b 100644 --- a/flow-model-generator/modules/flow-model-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/AvailableNodesGenerator.java +++ b/flow-model-generator/modules/flow-model-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/AvailableNodesGenerator.java @@ -170,11 +170,14 @@ private void setDefaultNodes() { .node(NodeKind.PANIC) .stepOut(); // TODO: Uncomment when concurrency is implemented -// .stepIn(Category.Name.CONCURRENCY) -// .node(NodeKind.TRANSACTION) + this.rootBuilder + .stepIn(Category.Name.CONCURRENCY) + .node(NodeKind.TRANSACTION) + .node(NodeKind.COMMIT) + .node(NodeKind.ROLLBACK) // .node(NodeKind.LOCK) // .node(NodeKind.START) -// .stepOut(); + .stepOut(); } private void setStopNode(NonTerminalNode node) { diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/connector1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/connector1.json index f253bca7..8074c512 100644 --- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/connector1.json +++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/connector1.json @@ -426,6 +426,44 @@ } ] }, + { + "metadata": { + "label": "Concurrency", + "description": "Concurrency nodes" + }, + "items": [ + { + "metadata": { + "label": "Transaction", + "description": "Handle transaction." + }, + "codedata": { + "node": "TRANSACTION" + }, + "enabled": true + }, + { + "metadata": { + "label": "Commit", + "description": "Commit transaction" + }, + "codedata": { + "node": "COMMIT" + }, + "enabled": true + }, + { + "metadata": { + "label": "Rollback", + "description": "Rollback the transaction" + }, + "codedata": { + "node": "ROLLBACK" + }, + "enabled": true + } + ] + }, { "metadata": { "label": "Logging" diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/connector2.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/connector2.json index 3aa9e4ec..95d02779 100644 --- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/connector2.json +++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/connector2.json @@ -2028,6 +2028,44 @@ } ] }, + { + "metadata": { + "label": "Concurrency", + "description": "Concurrency nodes" + }, + "items": [ + { + "metadata": { + "label": "Transaction", + "description": "Handle transaction." + }, + "codedata": { + "node": "TRANSACTION" + }, + "enabled": true + }, + { + "metadata": { + "label": "Commit", + "description": "Commit transaction" + }, + "codedata": { + "node": "COMMIT" + }, + "enabled": true + }, + { + "metadata": { + "label": "Rollback", + "description": "Rollback the transaction" + }, + "codedata": { + "node": "ROLLBACK" + }, + "enabled": true + } + ] + }, { "metadata": { "label": "Logging" diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/force_assign.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/force_assign.json index c1820018..d39c52fe 100644 --- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/force_assign.json +++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/force_assign.json @@ -127,6 +127,44 @@ } ] }, + { + "metadata": { + "label": "Concurrency", + "description": "Concurrency nodes" + }, + "items": [ + { + "metadata": { + "label": "Transaction", + "description": "Handle transaction." + }, + "codedata": { + "node": "TRANSACTION" + }, + "enabled": true + }, + { + "metadata": { + "label": "Commit", + "description": "Commit transaction" + }, + "codedata": { + "node": "COMMIT" + }, + "enabled": true + }, + { + "metadata": { + "label": "Rollback", + "description": "Rollback the transaction" + }, + "codedata": { + "node": "ROLLBACK" + }, + "enabled": true + } + ] + }, { "metadata": { "label": "Logging" diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/foreach1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/foreach1.json index 86d103fe..8afd3bed 100644 --- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/foreach1.json +++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/foreach1.json @@ -213,6 +213,44 @@ } ] }, + { + "metadata": { + "label": "Concurrency", + "description": "Concurrency nodes" + }, + "items": [ + { + "metadata": { + "label": "Transaction", + "description": "Handle transaction." + }, + "codedata": { + "node": "TRANSACTION" + }, + "enabled": true + }, + { + "metadata": { + "label": "Commit", + "description": "Commit transaction" + }, + "codedata": { + "node": "COMMIT" + }, + "enabled": true + }, + { + "metadata": { + "label": "Rollback", + "description": "Rollback the transaction" + }, + "codedata": { + "node": "ROLLBACK" + }, + "enabled": true + } + ] + }, { "metadata": { "label": "Logging" diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/function1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/function1.json index b48e981c..18f7ff00 100644 --- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/function1.json +++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/function1.json @@ -193,6 +193,44 @@ } ] }, + { + "metadata": { + "label": "Concurrency", + "description": "Concurrency nodes" + }, + "items": [ + { + "metadata": { + "label": "Transaction", + "description": "Handle transaction." + }, + "codedata": { + "node": "TRANSACTION" + }, + "enabled": true + }, + { + "metadata": { + "label": "Commit", + "description": "Commit transaction" + }, + "codedata": { + "node": "COMMIT" + }, + "enabled": true + }, + { + "metadata": { + "label": "Rollback", + "description": "Rollback the transaction" + }, + "codedata": { + "node": "ROLLBACK" + }, + "enabled": true + } + ] + }, { "metadata": { "label": "Logging" diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/function2.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/function2.json index 24c1d17f..3812911d 100644 --- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/function2.json +++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/function2.json @@ -193,6 +193,44 @@ } ] }, + { + "metadata": { + "label": "Concurrency", + "description": "Concurrency nodes" + }, + "items": [ + { + "metadata": { + "label": "Transaction", + "description": "Handle transaction." + }, + "codedata": { + "node": "TRANSACTION" + }, + "enabled": true + }, + { + "metadata": { + "label": "Commit", + "description": "Commit transaction" + }, + "codedata": { + "node": "COMMIT" + }, + "enabled": true + }, + { + "metadata": { + "label": "Rollback", + "description": "Rollback the transaction" + }, + "codedata": { + "node": "ROLLBACK" + }, + "enabled": true + } + ] + }, { "metadata": { "label": "Logging" diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/function3.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/function3.json index 1a9f7d9e..eabd86ed 100644 --- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/function3.json +++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/function3.json @@ -183,6 +183,44 @@ } ] }, + { + "metadata": { + "label": "Concurrency", + "description": "Concurrency nodes" + }, + "items": [ + { + "metadata": { + "label": "Transaction", + "description": "Handle transaction." + }, + "codedata": { + "node": "TRANSACTION" + }, + "enabled": true + }, + { + "metadata": { + "label": "Commit", + "description": "Commit transaction" + }, + "codedata": { + "node": "COMMIT" + }, + "enabled": true + }, + { + "metadata": { + "label": "Rollback", + "description": "Rollback the transaction" + }, + "codedata": { + "node": "ROLLBACK" + }, + "enabled": true + } + ] + }, { "metadata": { "label": "Logging" diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/lock1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/lock1.json index 6beab611..204fa8c6 100644 --- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/lock1.json +++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/lock1.json @@ -193,6 +193,44 @@ } ] }, + { + "metadata": { + "label": "Concurrency", + "description": "Concurrency nodes" + }, + "items": [ + { + "metadata": { + "label": "Transaction", + "description": "Handle transaction." + }, + "codedata": { + "node": "TRANSACTION" + }, + "enabled": true + }, + { + "metadata": { + "label": "Commit", + "description": "Commit transaction" + }, + "codedata": { + "node": "COMMIT" + }, + "enabled": true + }, + { + "metadata": { + "label": "Rollback", + "description": "Rollback the transaction" + }, + "codedata": { + "node": "ROLLBACK" + }, + "enabled": true + } + ] + }, { "metadata": { "label": "Logging" diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/match1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/match1.json index 4ac9a99c..14e2c1e5 100644 --- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/match1.json +++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/match1.json @@ -193,6 +193,44 @@ } ] }, + { + "metadata": { + "label": "Concurrency", + "description": "Concurrency nodes" + }, + "items": [ + { + "metadata": { + "label": "Transaction", + "description": "Handle transaction." + }, + "codedata": { + "node": "TRANSACTION" + }, + "enabled": true + }, + { + "metadata": { + "label": "Commit", + "description": "Commit transaction" + }, + "codedata": { + "node": "COMMIT" + }, + "enabled": true + }, + { + "metadata": { + "label": "Rollback", + "description": "Rollback the transaction" + }, + "codedata": { + "node": "ROLLBACK" + }, + "enabled": true + } + ] + }, { "metadata": { "label": "Logging" diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/match2.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/match2.json index 0329de1d..807a1210 100644 --- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/match2.json +++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/match2.json @@ -193,6 +193,44 @@ } ] }, + { + "metadata": { + "label": "Concurrency", + "description": "Concurrency nodes" + }, + "items": [ + { + "metadata": { + "label": "Transaction", + "description": "Handle transaction." + }, + "codedata": { + "node": "TRANSACTION" + }, + "enabled": true + }, + { + "metadata": { + "label": "Commit", + "description": "Commit transaction" + }, + "codedata": { + "node": "COMMIT" + }, + "enabled": true + }, + { + "metadata": { + "label": "Rollback", + "description": "Rollback the transaction" + }, + "codedata": { + "node": "ROLLBACK" + }, + "enabled": true + } + ] + }, { "metadata": { "label": "Logging" diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/method1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/method1.json index f20ca3d4..6b6a2b31 100644 --- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/method1.json +++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/method1.json @@ -183,6 +183,44 @@ } ] }, + { + "metadata": { + "label": "Concurrency", + "description": "Concurrency nodes" + }, + "items": [ + { + "metadata": { + "label": "Transaction", + "description": "Handle transaction." + }, + "codedata": { + "node": "TRANSACTION" + }, + "enabled": true + }, + { + "metadata": { + "label": "Commit", + "description": "Commit transaction" + }, + "codedata": { + "node": "COMMIT" + }, + "enabled": true + }, + { + "metadata": { + "label": "Rollback", + "description": "Rollback the transaction" + }, + "codedata": { + "node": "ROLLBACK" + }, + "enabled": true + } + ] + }, { "metadata": { "label": "Logging" diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/on_fail_clause1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/on_fail_clause1.json index f5ce612a..840d8f10 100644 --- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/on_fail_clause1.json +++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/on_fail_clause1.json @@ -193,6 +193,44 @@ } ] }, + { + "metadata": { + "label": "Concurrency", + "description": "Concurrency nodes" + }, + "items": [ + { + "metadata": { + "label": "Transaction", + "description": "Handle transaction." + }, + "codedata": { + "node": "TRANSACTION" + }, + "enabled": true + }, + { + "metadata": { + "label": "Commit", + "description": "Commit transaction" + }, + "codedata": { + "node": "COMMIT" + }, + "enabled": true + }, + { + "metadata": { + "label": "Rollback", + "description": "Rollback the transaction" + }, + "codedata": { + "node": "ROLLBACK" + }, + "enabled": true + } + ] + }, { "metadata": { "label": "Logging" diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/transaction1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/transaction1.json index c9a5963b..9f962a1c 100644 --- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/transaction1.json +++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/transaction1.json @@ -193,6 +193,44 @@ } ] }, + { + "metadata": { + "label": "Concurrency", + "description": "Concurrency nodes" + }, + "items": [ + { + "metadata": { + "label": "Transaction", + "description": "Handle transaction." + }, + "codedata": { + "node": "TRANSACTION" + }, + "enabled": true + }, + { + "metadata": { + "label": "Commit", + "description": "Commit transaction" + }, + "codedata": { + "node": "COMMIT" + }, + "enabled": true + }, + { + "metadata": { + "label": "Rollback", + "description": "Rollback the transaction" + }, + "codedata": { + "node": "ROLLBACK" + }, + "enabled": true + } + ] + }, { "metadata": { "label": "Logging" diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/transaction2.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/transaction2.json index f5ce612a..840d8f10 100644 --- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/transaction2.json +++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/transaction2.json @@ -193,6 +193,44 @@ } ] }, + { + "metadata": { + "label": "Concurrency", + "description": "Concurrency nodes" + }, + "items": [ + { + "metadata": { + "label": "Transaction", + "description": "Handle transaction." + }, + "codedata": { + "node": "TRANSACTION" + }, + "enabled": true + }, + { + "metadata": { + "label": "Commit", + "description": "Commit transaction" + }, + "codedata": { + "node": "COMMIT" + }, + "enabled": true + }, + { + "metadata": { + "label": "Rollback", + "description": "Rollback the transaction" + }, + "codedata": { + "node": "ROLLBACK" + }, + "enabled": true + } + ] + }, { "metadata": { "label": "Logging" diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/while1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/while1.json index 7266a6d3..b5907199 100644 --- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/while1.json +++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/available_nodes/config/while1.json @@ -213,6 +213,44 @@ } ] }, + { + "metadata": { + "label": "Concurrency", + "description": "Concurrency nodes" + }, + "items": [ + { + "metadata": { + "label": "Transaction", + "description": "Handle transaction." + }, + "codedata": { + "node": "TRANSACTION" + }, + "enabled": true + }, + { + "metadata": { + "label": "Commit", + "description": "Commit transaction" + }, + "codedata": { + "node": "COMMIT" + }, + "enabled": true + }, + { + "metadata": { + "label": "Rollback", + "description": "Rollback the transaction" + }, + "codedata": { + "node": "ROLLBACK" + }, + "enabled": true + } + ] + }, { "metadata": { "label": "Logging"