Apex Editor using Spring Boot

Changed Apex Editor to use Spring Boot (MVC)
Changed all tests to use JUnit 5
Added more tests for policy upload feature
Updated JS files to reflect JSON encoding change
Added Apex Editor README
Changed rest path to /policy/gui/v1/apex/editor

Issue-ID: POLICY-3896
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I10f1ee3c40244a822a7032b4b24cb02060698fc3

15 files changed, 258 insertions, 303 deletions

diff --git a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexAjax.test.js b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexAjax.test.js
index dadbaa0..362a1f9 100644
--- a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexAjax.test.js
+++ b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexAjax.test.js
@@ -1,6 +1,6 @@
 /*
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2020-2021 Nordix Foundation
+ *  Copyright (C) 2020-2022 Nordix Foundation
  *  ================================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -29,12 +29,9 @@ beforeEach(() => {
         port: 'port',
         username: 'username',
         password: 'password',
-        messages: {
-            message: ''
-        },
+        messages: [''],
         content: ['01', '02'],
-        result: 'ok',
-        ok: true
+        result: 'SUCCESS'
     };
 });
 
@@ -72,12 +69,10 @@ test('Test ajax_getWithKeyInfo success', (done) => {
         });
         done();
     });
-    data.messages = {
-        message: [
-            '{"apexKeyInfo": {"UUID": "UUID1", "description": "description1", "key":{"name": "name1", "version":' +
-            ' "version1"}}, "objectType": {"key": {"name": "name1", "version": "version1"}}}'
-        ]
-    };
+    data.messages = [
+        '{"apexKeyInfo": {"UUID": "UUID1", "description": "description1", "key":{"name": "name1", "version":' +
+        ' "version1"}}, "objectType": {"key": {"name": "name1", "version": "version1"}}}'
+    ];
     const jqXHR = {status: 200, responseText: ""};
 
     $.ajax = jest.fn().mockImplementation((args) => {
@@ -98,12 +93,10 @@ test('Test ajax_getWithKeyInfo with custom key success', (done) => {
         });
         done();
     });
-    data.messages = {
-        message: [
-            '{"apexKeyInfo": {"UUID": "UUID1", "description": "description1", "key":{"name": "name1",' +
-            ' "version": "version1"}}, "objectType": {"customKey": {"name": "name1", "version": "version1"}}}'
-        ]
-    };
+    data.messages = [
+        '{"apexKeyInfo": {"UUID": "UUID1", "description": "description1", "key":{"name": "name1",' +
+        ' "version": "version1"}}, "objectType": {"customKey": {"name": "name1", "version": "version1"}}}'
+    ];
     const jqXHR = {status: 200, responseText: ""};
 
     $.ajax = jest.fn().mockImplementation((args) => {
diff --git a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexContextAlbumEditForm.test.js b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexContextAlbumEditForm.test.js
index 8d2976d..e5268fe 100644
--- a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexContextAlbumEditForm.test.js
+++ b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexContextAlbumEditForm.test.js
@@ -24,14 +24,12 @@ const keyInformationTab_reset = require('../ApexKeyInformationTab');
 const formUtils_generateDescription = require('../ApexFormUtils');
 
 let data = {
-   messages: {
-      message: [
-         '{"apexContextSchema": {"key":{"name": "name1", "version": "version1"}}, "apexTask":{"key":{"name": "name1", "version": "version1"}},' +
-         '"apexContextAlbum":{"key":{"name": "name1", "version": "version1"},"itemSchema":{}},"apexEvent":{"key":{"name": "name1", "version": "version1"}},' +
-         '"apexPolicy":{"policyKey":{"name": "name1", "version": "version1"}}, "apexKeyInfo":{"key":{"name": "name1", "version": "version1"}}}'
-      ]
-   },
-   ok: true
+   messages: [
+      '{"apexContextSchema": {"key":{"name": "name1", "version": "version1"}}, "apexTask":{"key":{"name": "name1", "version": "version1"}},' +
+      '"apexContextAlbum":{"key":{"name": "name1", "version": "version1"},"itemSchema":{}},"apexEvent":{"key":{"name": "name1", "version": "version1"}},' +
+      '"apexPolicy":{"policyKey":{"name": "name1", "version": "version1"}}, "apexKeyInfo":{"key":{"name": "name1", "version": "version1"}}}'
+   ],
+   result: 'SUCCESS'
 };
 
 test('Test mock_editContextAlbumForm_activate', () => {
@@ -167,4 +165,4 @@ test('Test Submit Pressed with page', () => {
    const mock_activate = jest.fn(mod.editContextAlbumForm_submitPressed);
    mock_activate();
    expect(mock_activate).toBeCalled();
-});
\ No newline at end of file
+});
diff --git a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexContextSchemaEditForm.test.js b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexContextSchemaEditForm.test.js
index 87b4f82..70f5fde 100644
--- a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexContextSchemaEditForm.test.js
+++ b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexContextSchemaEditForm.test.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2020-2021 Nordix Foundation.
+ *  Copyright (C) 2020-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,10 +26,8 @@ const apexAjax = require('../ApexAjax');
 const formUtils_generateDescription = require('../ApexFormUtils');
 
 let data = {
-    messages: {
-        message: []
-    },
-    ok: true
+    messages: [],
+    result: 'SUCCESS'
 };
 const contextSchema = {
     name: 'testName',
@@ -107,4 +105,4 @@ test('Test Submit Pressed', () => {
     const mock_activate = jest.fn(mod.editContextSchemaForm_submitPressed);
     mock_activate();
     expect(mock_activate).toBeCalled();
-});
\ No newline at end of file
+});
diff --git a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexContextSchemaTab.test.js b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexContextSchemaTab.test.js
index 3883bd5..9c7ca8c 100644
--- a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexContextSchemaTab.test.js
+++ b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexContextSchemaTab.test.js
@@ -1,6 +1,6 @@
 /*
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2020-2021 Nordix Foundation.
+ *  Copyright (C) 2020-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,14 +21,12 @@
 const mod = require('../ApexContextSchemaTab');
 
 let data = {
-    messages: {
-        message: [
-            '{"apexContextSchema": {"key":{"name": "name1", "version": "version1"}}, "apexTask":{"key":{"name": "name1", "version": "version1"}},' +
-            '"apexContextAlbum":{"key":{"name": "name1", "version": "version1"}},"apexEvent":{"key":{"name": "name1", "version": "version1"}},' +
-            '"apexPolicy":{"policyKey":{"name": "name1", "version": "version1"}}, "apexKeyInfo":{"key":{"name": "name1", "version": "version1"}}}'
-        ]
-    },
-    ok: true
+    messages: [
+        '{"apexContextSchema": {"key":{"name": "name1", "version": "version1"}}, "apexTask":{"key":{"name": "name1", "version": "version1"}},' +
+        '"apexContextAlbum":{"key":{"name": "name1", "version": "version1"}},"apexEvent":{"key":{"name": "name1", "version": "version1"}},' +
+        '"apexPolicy":{"policyKey":{"name": "name1", "version": "version1"}}, "apexKeyInfo":{"key":{"name": "name1", "version": "version1"}}}'
+    ],
+    result: 'SUCCESS'
 };
 
 test('Test activateContextSchema', () => {
@@ -51,4 +49,4 @@ test('Test reset', () => {
     const mock_deactivate = jest.fn(mod.contextSchemaTab_reset);
     mock_deactivate();
     expect(mock_deactivate).toBeCalledWith();
-});
\ No newline at end of file
+});
diff --git a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexEventEditForm.test.js b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexEventEditForm.test.js
index 48573e8..c1ac98b 100644
--- a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexEventEditForm.test.js
+++ b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexEventEditForm.test.js
@@ -25,14 +25,12 @@ const formUtils_generateDescription = require('../ApexFormUtils');
 const keyInformationTab_reset = require('../ApexKeyInformationTab');
 
 let data = {
-   messages: {
-      message: [
-         '{"apexContextSchema": {"key":{"name": "name1", "version": "version1"}}, "apexTask":{"key":{"name": "name1", "version": "version1"}},' +
-         '"apexContextAlbum":{"key":{"name": "name1", "version": "version1"}},"apexEvent":{"key":{"name": "name1", "version": "version1"}},' +
-         '"apexPolicy":{"policyKey":{"name": "name1", "version": "version1"}}, "apexKeyInfo":{"key":{"name": "name1", "version": "version1"}}}'
-      ]
-   },
-   ok: true
+   messages: [
+      '{"apexContextSchema": {"key":{"name": "name1", "version": "version1"}}, "apexTask":{"key":{"name": "name1", "version": "version1"}},' +
+      '"apexContextAlbum":{"key":{"name": "name1", "version": "version1"}},"apexEvent":{"key":{"name": "name1", "version": "version1"}},' +
+      '"apexPolicy":{"policyKey":{"name": "name1", "version": "version1"}}, "apexKeyInfo":{"key":{"name": "name1", "version": "version1"}}}'
+   ],
+   result: 'SUCCESS'
 };
 
 const contextSchema = {
diff --git a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexEventTab.test.js b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexEventTab.test.js
index 16042af..50d1101 100644
--- a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexEventTab.test.js
+++ b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexEventTab.test.js
@@ -1,6 +1,6 @@
 /*
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2020-2021 Nordix Foundation.
+ *  Copyright (C) 2020-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,17 +34,14 @@ test('Test activate', () => {
         port: 'port',
         username: 'username',
         password: 'password',
-        messages: {
-            message: [
-                '{"apexEvent" : {"key": {"name": "name1", "version":"version1"}, "nameSpace":"nameSpace1",' +
-                ' "source":"source1", "target":"target1", "parameter": ' +
-                '{"entry": [{"key": "key1", "value": {"optional":"optional", "fieldSchemaKey": ' +
-                '{"name": "name2", "version":"version2"}}}]}}}'
-            ]
-        },
+        messages: [
+            '{"apexEvent" : {"key": {"name": "name1", "version":"version1"}, "nameSpace":"nameSpace1",' +
+            ' "source":"source1", "target":"target1", "parameter": ' +
+            '{"entry": [{"key": "key1", "value": {"optional":"optional", "fieldSchemaKey": ' +
+            '{"name": "name2", "version":"version2"}}}]}}}'
+        ],
         content: ['01', '02'],
-        result: 'ok',
-        ok: true
+        result: 'SUCCESS'
     };
 
     $.ajax = jest.fn().mockImplementation((args) => {
diff --git a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexFiles.test.js b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexFiles.test.js
index f5be3cc..9e2307a 100644
--- a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexFiles.test.js
+++ b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexFiles.test.js
@@ -1,6 +1,6 @@
 /*
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2020-2021 Nordix Foundation
+ *  Copyright (C) 2020-2022 Nordix Foundation
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,14 +22,12 @@ const mod = require('../ApexFiles');
 const resultForm_activate = require('../ApexResultForm');
 
 let data = {
-    messages: {
-       message: [
-          '{"apexContextSchema": {"key":{"name": "name1", "version": "version1"}}, "apexTask":{"key":{"name": "name1", "version": "version1"}},' +
-          '"apexContextAlbum":{"key":{"name": "name1", "version": "version1"},"itemSchema":{}},"apexEvent":{"key":{"name": "name1", "version": "version1"}},' +
-          '"apexPolicy":{"policyKey":{"name": "name1", "version": "version1"}}, "apexKeyInfo":{"key":{"name": "name1", "version": "version1"}}}'
-       ]
-    },
-    ok: true
+    messages: [
+       '{"apexContextSchema": {"key":{"name": "name1", "version": "version1"}}, "apexTask":{"key":{"name": "name1", "version": "version1"}},' +
+       '"apexContextAlbum":{"key":{"name": "name1", "version": "version1"},"itemSchema":{}},"apexEvent":{"key":{"name": "name1", "version": "version1"}},' +
+       '"apexPolicy":{"policyKey":{"name": "name1", "version": "version1"}}, "apexKeyInfo":{"key":{"name": "name1", "version": "version1"}}}'
+    ],
+    result: 'SUCCESS'
  };
 
 test('test files_open', () => {
@@ -54,4 +52,4 @@ test('Test files_upload', () => {
     const upload = jest.fn(mod.files_fileUpload);
     upload();
     expect(upload).toBeCalled();
-});
\ No newline at end of file
+});
diff --git a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexKeyInformationTab.test.js b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexKeyInformationTab.test.js
index 2dcc7c2..fb49214 100644
--- a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexKeyInformationTab.test.js
+++ b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexKeyInformationTab.test.js
@@ -1,6 +1,6 @@
 /*
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation
+ *  Copyright (C) 2021-2022 Nordix Foundation
  *  ================================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -28,15 +28,12 @@ test("Test keyInformationTab_activate", () => {
         port: 'port',
         username: 'username',
         password: 'password',
-        messages: {
-            message: [
-                '{"apexKeyInfo": {"UUID": "UUID1", "description": "description1", "key":{"name": "name1", "version":' +
-                ' "version1"}}, "objectType": {"key": {"name": "name1", "version": "version1"}}}'
-            ]
-        },
+        messages: [
+            '{"apexKeyInfo": {"UUID": "UUID1", "description": "description1", "key":{"name": "name1", "version":' +
+            ' "version1"}}, "objectType": {"key": {"name": "name1", "version": "version1"}}}'
+        ],
         content: ['01', '02'],
-        result: 'ok',
-        ok: true
+        result: 'SUCCESS'
     };
     $.ajax = jest.fn().mockImplementation((args) => {
         args.success(data, null, null);
diff --git a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexMain.test.js b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexMain.test.js
index 13fd658..c825370 100644
--- a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexMain.test.js
+++ b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexMain.test.js
@@ -30,21 +30,18 @@ const keyInformationTab = require('../ApexKeyInformationTab');
 require('../../dist/js/jquery-ui-1.12.1/jquery-ui.js');
 
 const data = {
-    messages: {
-        message: [
-            '{' +
-            '    "apexArtifactKey": {' +
-            '        "key": {' +
-            '            "name": "name1",' +
-            '            "version": "version1"' +
-            '        }' +
-            '    }' +
-            '}'
-        ]
-    },
+    messages: [
+        '{' +
+        '    "apexArtifactKey": {' +
+        '        "key": {' +
+        '            "name": "name1",' +
+        '            "version": "version1"' +
+        '        }' +
+        '    }' +
+        '}'
+    ],
     content: ['01', '02'],
-    result: 'ok',
-    ok: true
+    result: 'SUCCESS'
 };
 
 const jqXHR = { status: 200, responseText: "" };
@@ -85,7 +82,7 @@ test('Test main_getRestRootURL false', () => {
     const mock_main_getRestRootURL = jest.fn(mod.main_getRestRootURL);
     mock_main_getRestRootURL();
     expect(mock_main_getRestRootURL).toBeCalled();
-    expect(document.documentElement.innerHTML).toEqual('<head></head><body><div class="ebInlineMessage-description" id="statusMessageTable"><tr><td> REST root URL set to: http://localhost/apexservices/editor/false</td></tr></div></body>');
+    expect(document.documentElement.innerHTML).toEqual('<head></head><body><div class="ebInlineMessage-description" id="statusMessageTable"><tr><td> REST root URL set to: http://localhost/policy/gui/v1/apex/editor/false</td></tr></div></body>');
 });
 
 test('Test clearLocalStorage', () => {
diff --git a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexModelHandling.test.js b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexModelHandling.test.js
index 2144506..8b2055f 100644
--- a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexModelHandling.test.js
+++ b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexModelHandling.test.js
@@ -1,6 +1,6 @@
 /*
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2020-2021 Nordix Foundation.
+ *  Copyright (C) 2020-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,14 +32,11 @@ test('Test modelHandling_analyse', (done) => {
       port: 'port',
       username: 'username',
       password: 'password',
-      messages: {
-         message: [
-            '{"apexKeyInfo": null}'
-         ]
-      },
+      messages: [
+         '{"apexKeyInfo": null}'
+      ],
       content: ['01'],
-      result: 'ok',
-      ok: true
+      result: 'SUCCESS'
    };
    const expectedMessage  = '{"apexKeyInfo": null}';
    document.body.innerHTML = '<div id="mainArea"></div>';
@@ -65,16 +62,13 @@ test('Test modelHandling_validate', (done) => {
       port: 'port',
       username: 'username',
       password: 'password',
-      messages: {
-         message: [
-            '{"apexKeyInfo": null}',
-            '{"apexPolicy": null}',
-            '{"apexEvent": null}'
-         ]
-      },
+      messages: [
+         '{"apexKeyInfo": null}',
+         '{"apexPolicy": null}',
+         '{"apexEvent": null}'
+      ],
       content: ['01'],
-      result: 'ok',
-      ok: true
+      result: 'SUCCESS'
    };
 
    const expectedMessage  = '{"apexPolicy": null}\n{"apexEvent": null}\n';
diff --git a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexPageControl.test.js b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexPageControl.test.js
index b414bb1..f9e2a65 100644
--- a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexPageControl.test.js
+++ b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexPageControl.test.js
@@ -1,6 +1,6 @@
 /*
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
+ *  Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,10 +40,8 @@ test('Test showPlaceholder hide', () => {
 
 test('Test pageControl_status', () => {
    let data = {
-      messages: {
-         message: []
-      },
-      ok: true
+      messages: [],
+      result: 'SUCCESS'
    };
    const mock_activate = jest.fn(mod.pageControl_status);
    mock_activate(data);
@@ -52,9 +50,7 @@ test('Test pageControl_status', () => {
 
 test('Test pageControl_status when data is not present', () => {
    let data = {
-      messages: {
-         message: []
-      }
+      messages: []
    };
    const mock_activate = jest.fn(mod.pageControl_status);
    mock_activate(data);
@@ -113,4 +109,4 @@ test('Test pageControl_readyMode', () => {
    const mock_activate = jest.fn(mod.pageControl_readyMode);
    mock_activate();
    expect(mock_activate).toBeCalled();
-});
\ No newline at end of file
+});
diff --git a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexPolicyEditForm.test.js b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexPolicyEditForm.test.js
index 24af346..fc92934 100644
--- a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexPolicyEditForm.test.js
+++ b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexPolicyEditForm.test.js
@@ -30,14 +30,12 @@ const policy = {
     uuid: 'testUUID'
 }
 let data = {
-    messages: {
-        message: [
-            '{"apexContextSchema": {"key":{"name": "name1", "version": "version1"}}, "apexTask":{"key":{"name": "name1", "version": "version1"}},' +
-            '"apexContextAlbum":{"key":{"name": "name1", "version": "version1"}},"apexEvent":{"key":{"name": "name1", "version": "version1"}},' +
-            '"apexPolicy":{"policyKey":{"name": "name1", "version": "version1"}}, "apexKeyInfo":{"key":{"name": "name1", "version": "version1"}}}'
-        ]
-    },
-    ok: true
+    messages: [
+        '{"apexContextSchema": {"key":{"name": "name1", "version": "version1"}}, "apexTask":{"key":{"name": "name1", "version": "version1"}},' +
+        '"apexContextAlbum":{"key":{"name": "name1", "version": "version1"}},"apexEvent":{"key":{"name": "name1", "version": "version1"}},' +
+        '"apexPolicy":{"policyKey":{"name": "name1", "version": "version1"}}, "apexKeyInfo":{"key":{"name": "name1", "version": "version1"}}}'
+    ],
+    result: 'SUCCESS'
 };
 
 test('Test Create Policy', () => {
diff --git a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexPolicyTab.test.js b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexPolicyTab.test.js
index 4136fd6..58714c6 100644
--- a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexPolicyTab.test.js
+++ b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexPolicyTab.test.js
@@ -1,6 +1,6 @@
 /*
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2020-2021 Nordix Foundation
+ *  Copyright (C) 2020-2022 Nordix Foundation
  *  ================================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -33,157 +33,154 @@ test('Test policyTab_activate', () => {
         port: 'port',
         username: 'username',
         password: 'password',
-        messages: {
-            message: [
-                '{' +
-                '    "apexPolicy": {' +
-                '        "policyKey": {' +
-                '            "name": "name1",' +
-                '            "version": "version1"' +
-                '        },' +
-                '        "template": "template1",' +
-                '        "firstState": "key11",' +
-                '        "state": {' +
-                '            "entry": [' +
-                '                {' +
-                '                    "key": "key1",' +
-                '                    "value": {' +
-                '                        "trigger": {' +
-                '                            "name": "name2",' +
-                '                            "version": "version2"' +
-                '                        },' +
-                '                        "taskReferences": {' +
-                '                            "entry": [' +
-                '                                {' +
-                '                                    "key": {' +
-                '                                        "name": "name3",' +
-                '                                        "version": "version3"' +
-                '                                    },' +
-                '                                    "version": "version2",' +
-                '                                    "value": {' +
-                '                                        "outputType": "outputType1",' +
-                '                                        "output": {' +
-                '                                            "localName": "localName1"' +
-                '                                        }' +
-                '                                    }' +
-                '                                }' +
-                '                            ]' +
-                '                        },' +
-                '                        "defaultTask": {' +
-                '                            "name": "name4",' +
-                '                            "version": "version4"' +
-                '                        },' +
-                '                        "taskSelectionLogic": {' +
-                '                            "logicFlavour": "logicFlavour1"' +
-                '                        },' +
-                '                        "stateOutputs": {' +
-                '                            "entry": [' +
-                '                                {' +
-                '                                    "key": "key2",' +
-                '                                    "value": {' +
-                '                                        "nextState": {' +
-                '                                            "localName": "localName2"' +
-                '                                        },' +
-                '                                        "outgoingEvent": {' +
-                '                                            "name": "name4",' +
-                '                                            "version": "version4"' +
-                '                                        }' +
-                '                                    }' +
-                '                                }' +
-                '                            ]' +
-                '                        },' +
-                '                        "stateFinalizerLogicMap": {' +
-                '                            "entry": [' +
-                '                                {' +
-                '                                    "key": "key3",' +
-                '                                    "value": {' +
-                '                                        "logicFlavour": "logicFlavour2"' +
-                '                                    }' +
-                '                                }' +
-                '                            ]' +
-                '                        },' +
-                '                        "contextAlbumReference": [' +
-                '                            {' +
-                '                                "name": "name5",' +
-                '                                "version": "version5"' +
-                '                            }' +
-                '                        ]' +
-                '                    }' +
-                '                },' +
-                '                {' +
-                '                    "key": "key11",' +
-                '                    "value": {' +
-                '                        "trigger": {' +
-                '                            "name": "name12",' +
-                '                            "version": "version12"' +
-                '                        },' +
-                '                        "taskReferences": {' +
-                '                            "entry": [' +
-                '                                {' +
-                '                                    "key": {' +
-                '                                        "name": "name13",' +
-                '                                        "version": "version13"' +
-                '                                    },' +
-                '                                    "version": "version12",' +
-                '                                    "value": {' +
-                '                                        "outputType": "outputType11",' +
-                '                                        "output": {' +
-                '                                            "localName": "localName11"' +
-                '                                        }' +
-                '                                    }' +
-                '                                }' +
-                '                            ]' +
-                '                        },' +
-                '                        "defaultTask": {' +
-                '                            "name": "name14",' +
-                '                            "version": "version14"' +
-                '                        },' +
-                '                        "taskSelectionLogic": {' +
-                '                            "logicFlavour": "logicFlavour11"' +
-                '                        },' +
-                '                        "stateOutputs": {' +
-                '                            "entry": [' +
-                '                                {' +
-                '                                    "key": "key12",' +
-                '                                    "value": {' +
-                '                                        "nextState": {' +
-                '                                            "localName": "localName12"' +
-                '                                        },' +
-                '                                        "outgoingEvent": {' +
-                '                                            "name": "name14",' +
-                '                                            "version": "version14"' +
-                '                                        }' +
-                '                                    }' +
-                '                                }' +
-                '                            ]' +
-                '                        },' +
-                '                        "stateFinalizerLogicMap": {' +
-                '                            "entry": [' +
-                '                                {' +
-                '                                    "key": "key13",' +
-                '                                    "value": {' +
-                '                                        "logicFlavour": "logicFlavour12"' +
-                '                                    }' +
-                '                                }' +
-                '                            ]' +
-                '                        },' +
-                '                        "contextAlbumReference": [' +
-                '                            {' +
-                '                                "name": "name15",' +
-                '                                "version": "version15"' +
-                '                            }' +
-                '                        ]' +
-                '                    }' +
-                '                }' +
-                '            ]' +
-                '        }' +
-                '    }' +
-                '}'
-            ]
-        },
+        messages: [
+            '{' +
+            '    "apexPolicy": {' +
+            '        "policyKey": {' +
+            '            "name": "name1",' +
+            '            "version": "version1"' +
+            '        },' +
+            '        "template": "template1",' +
+            '        "firstState": "key11",' +
+            '        "state": {' +
+            '            "entry": [' +
+            '                {' +
+            '                    "key": "key1",' +
+            '                    "value": {' +
+            '                        "trigger": {' +
+            '                            "name": "name2",' +
+            '                            "version": "version2"' +
+            '                        },' +
+            '                        "taskReferences": {' +
+            '                            "entry": [' +
+            '                                {' +
+            '                                    "key": {' +
+            '                                        "name": "name3",' +
+            '                                        "version": "version3"' +
+            '                                    },' +
+            '                                    "version": "version2",' +
+            '                                    "value": {' +
+            '                                        "outputType": "outputType1",' +
+            '                                        "output": {' +
+            '                                            "localName": "localName1"' +
+            '                                        }' +
+            '                                    }' +
+            '                                }' +
+            '                            ]' +
+            '                        },' +
+            '                        "defaultTask": {' +
+            '                            "name": "name4",' +
+            '                            "version": "version4"' +
+            '                        },' +
+            '                        "taskSelectionLogic": {' +
+            '                            "logicFlavour": "logicFlavour1"' +
+            '                        },' +
+            '                        "stateOutputs": {' +
+            '                            "entry": [' +
+            '                                {' +
+            '                                    "key": "key2",' +
+            '                                    "value": {' +
+            '                                        "nextState": {' +
+            '                                            "localName": "localName2"' +
+            '                                        },' +
+            '                                        "outgoingEvent": {' +
+            '                                            "name": "name4",' +
+            '                                            "version": "version4"' +
+            '                                        }' +
+            '                                    }' +
+            '                                }' +
+            '                            ]' +
+            '                        },' +
+            '                        "stateFinalizerLogicMap": {' +
+            '                            "entry": [' +
+            '                                {' +
+            '                                    "key": "key3",' +
+            '                                    "value": {' +
+            '                                        "logicFlavour": "logicFlavour2"' +
+            '                                    }' +
+            '                                }' +
+            '                            ]' +
+            '                        },' +
+            '                        "contextAlbumReference": [' +
+            '                            {' +
+            '                                "name": "name5",' +
+            '                                "version": "version5"' +
+            '                            }' +
+            '                        ]' +
+            '                    }' +
+            '                },' +
+            '                {' +
+            '                    "key": "key11",' +
+            '                    "value": {' +
+            '                        "trigger": {' +
+            '                            "name": "name12",' +
+            '                            "version": "version12"' +
+            '                        },' +
+            '                        "taskReferences": {' +
+            '                            "entry": [' +
+            '                                {' +
+            '                                    "key": {' +
+            '                                        "name": "name13",' +
+            '                                        "version": "version13"' +
+            '                                    },' +
+            '                                    "version": "version12",' +
+            '                                    "value": {' +
+            '                                        "outputType": "outputType11",' +
+            '                                        "output": {' +
+            '                                            "localName": "localName11"' +
+            '                                        }' +
+            '                                    }' +
+            '                                }' +
+            '                            ]' +
+            '                        },' +
+            '                        "defaultTask": {' +
+            '                            "name": "name14",' +
+            '                            "version": "version14"' +
+            '                        },' +
+            '                        "taskSelectionLogic": {' +
+            '                            "logicFlavour": "logicFlavour11"' +
+            '                        },' +
+            '                        "stateOutputs": {' +
+            '                            "entry": [' +
+            '                                {' +
+            '                                    "key": "key12",' +
+            '                                    "value": {' +
+            '                                        "nextState": {' +
+            '                                            "localName": "localName12"' +
+            '                                        },' +
+            '                                        "outgoingEvent": {' +
+            '                                            "name": "name14",' +
+            '                                            "version": "version14"' +
+            '                                        }' +
+            '                                    }' +
+            '                                }' +
+            '                            ]' +
+            '                        },' +
+            '                        "stateFinalizerLogicMap": {' +
+            '                            "entry": [' +
+            '                                {' +
+            '                                    "key": "key13",' +
+            '                                    "value": {' +
+            '                                        "logicFlavour": "logicFlavour12"' +
+            '                                    }' +
+            '                                }' +
+            '                            ]' +
+            '                        },' +
+            '                        "contextAlbumReference": [' +
+            '                            {' +
+            '                                "name": "name15",' +
+            '                                "version": "version15"' +
+            '                            }' +
+            '                        ]' +
+            '                    }' +
+            '                }' +
+            '            ]' +
+            '        }' +
+            '    }' +
+            '}'
+        ],
         content: ['01', '02'],
-        result: 'ok',
-        ok: true
+        result: 'SUCCESS'
     };
 
     $.ajax = jest.fn().mockImplementation((args) => {
diff --git a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexTaskEditForm.test.js b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexTaskEditForm.test.js
index e9fcc9b..5e2d2ae 100644
--- a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexTaskEditForm.test.js
+++ b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexTaskEditForm.test.js
@@ -41,14 +41,12 @@ const task = {
 };
 
 let data = {
-   messages: {
-      message: [
-         '{"apexContextSchema": {"key":{"name": "name1", "version": "version1"}}, "apexTask":{"key":{"name": "name1", "version": "version1"}},' +
-         '"apexContextAlbum":{"key":{"name": "name1", "version": "version1"}},"apexEvent":{"key":{"name": "name1", "version": "version1"}},' +
-         '"apexPolicy":{"policyKey":{"name": "name1", "version": "version1"}}, "apexKeyInfo":{"key":{"name": "name1", "version": "version1"}}}'
-      ]
-   },
-   ok: true
+   messages: [
+      '{"apexContextSchema": {"key":{"name": "name1", "version": "version1"}}, "apexTask":{"key":{"name": "name1", "version": "version1"}},' +
+      '"apexContextAlbum":{"key":{"name": "name1", "version": "version1"}},"apexEvent":{"key":{"name": "name1", "version": "version1"}},' +
+      '"apexPolicy":{"policyKey":{"name": "name1", "version": "version1"}}, "apexKeyInfo":{"key":{"name": "name1", "version": "version1"}}}'
+   ],
+   result: 'SUCCESS'
 };
 
  let contextAlbumReference = {
diff --git a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexTaskTab.test.js b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexTaskTab.test.js
index f593bd8..bf5faee 100644
--- a/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexTaskTab.test.js
+++ b/gui-editors/gui-editor-apex/src/main/webapp/js/__test__/ApexTaskTab.test.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2020-2021 Nordix Foundation.
+ *  Copyright (C) 2020-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,18 +21,16 @@
 const mod = require('../ApexTaskTab');
 
 let data = {
-   messages: {
-      message: [
-         '{"apexContextSchema": {"key":{"name": "name1", "version": "version1"}}, "apexTask":{"key":{"name": "name1", "version": "version1"},' +
-         '"taskLogic":{"logicFlavour":"logicFlavour"},"inputFields":{"entry": [{"key":"","value":{"fieldSchemaKey":{"name":"name"}}}]},' +
-         '"outputFields":{"entry": [{"key":"","value":{"fieldSchemaKey":{"name":"name"}}}]},' +
-         '"taskParameters":{"entry": [{"key":"","value":{"fieldSchemaKey":{"name":"name"}}}]},'+
-         '"contextAlbumReference":[{"name":"name", "version":"version"}]},'+
-         '"apexContextAlbum":{"key":{"name": "name1", "version": "version1"}},"apexEvent":{"key":{"name": "name1", "version": "version1"}},' +
-         '"apexPolicy":{"policyKey":{"name": "name1", "version": "version1"}}, "apexKeyInfo":{"key":{"name": "name1", "version": "version1"}}}'
-      ]
-   },
-   ok: true
+   messages: [
+      '{"apexContextSchema": {"key":{"name": "name1", "version": "version1"}}, "apexTask":{"key":{"name": "name1", "version": "version1"},' +
+      '"taskLogic":{"logicFlavour":"logicFlavour"},"inputFields":{"entry": [{"key":"","value":{"fieldSchemaKey":{"name":"name"}}}]},' +
+      '"outputFields":{"entry": [{"key":"","value":{"fieldSchemaKey":{"name":"name"}}}]},' +
+      '"taskParameters":{"entry": [{"key":"","value":{"fieldSchemaKey":{"name":"name"}}}]},'+
+      '"contextAlbumReference":[{"name":"name", "version":"version"}]},'+
+      '"apexContextAlbum":{"key":{"name": "name1", "version": "version1"}},"apexEvent":{"key":{"name": "name1", "version": "version1"}},' +
+      '"apexPolicy":{"policyKey":{"name": "name1", "version": "version1"}}, "apexKeyInfo":{"key":{"name": "name1", "version": "version1"}}}'
+   ],
+   result: 'SUCCESS'
 };
 
 test('test dom : taskTab_activate', () => {
@@ -49,4 +47,4 @@ test('test reset', () => {
    const reset_mock = jest.fn(mod.taskTab_reset);
    reset_mock();
    expect(reset_mock).toBeCalled();
-});
\ No newline at end of file
+});