From 9833876720ff14517ee78bda557e6021df723800 Mon Sep 17 00:00:00 2001 From: "a.sreekumar" Date: Thu, 17 Sep 2020 12:02:19 +0100 Subject: Cleanup related to removal of legacy format support in APEX This review basically just removes all "policyModelFileName" occurences which are not used anymore. Change-Id: Ibac8ec776dd989a5d677ff27a99eb7a36110773f Issue-ID: POLICY-2835 Signed-off-by: a.sreekumar --- .../src/test/resources/prodcons/Context_AvroEventAlbum_file2file.json | 1 - .../src/test/resources/prodcons/Context_JavaEventAlbum_file2file.json | 1 - .../src/test/resources/prodcons/File2RESTJsonEventNoURL.json | 1 - .../src/test/resources/prodcons/LBPolicy_ExecModel_file2kafka.json | 1 - .../testdata/executionproperties/RESTEventBadHttpCodeFilter.json | 1 - .../src/test/resources/testdata/executionproperties/RESTEventBadUrl.json | 1 - .../testdata/executionproperties/RESTEventNoValueSetForTag.json | 1 - .../executionproperties/RESTHttpCodeFilterSetToMultiTagUrlOK.json | 1 - .../testdata/executionproperties/RESTHttpCodeFilterSetToTagUrlOK.json | 1 - .../test/resources/testdata/executionproperties/addProperty_conf.json | 1 - .../test/resources/testdata/executionproperties/definedToEmpty_conf.json | 1 - .../test/resources/testdata/executionproperties/emptyToDefined_conf.json | 1 - .../test/resources/testdata/executionproperties/emptyToEmpty_conf.json | 1 - .../src/test/resources/testdata/executionproperties/readOnly_conf.json | 1 - .../test/resources/testdata/executionproperties/removeProperty_conf.json | 1 - .../taskparameters/TaskParameterTestConfig_with_invalidTaskIds.json | 1 - .../testdata/taskparameters/TaskParameterTestConfig_with_noTaskIds.json | 1 - .../taskparameters/TaskParameterTestConfig_with_validTaskIds.json | 1 - 18 files changed, 18 deletions(-) (limited to 'testsuites/integration') diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Context_AvroEventAlbum_file2file.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Context_AvroEventAlbum_file2file.json index 19ea5fab7..de78870e9 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Context_AvroEventAlbum_file2file.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Context_AvroEventAlbum_file2file.json @@ -5,7 +5,6 @@ "id": 101, "instanceCount": 1, "deploymentPort": 12550, - "policyModelFileName": "/dev/null", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Context_JavaEventAlbum_file2file.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Context_JavaEventAlbum_file2file.json index ea877bd97..c302307f7 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Context_JavaEventAlbum_file2file.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/Context_JavaEventAlbum_file2file.json @@ -5,7 +5,6 @@ "id": 101, "instanceCount": 1, "deploymentPort": 12550, - "policyModelFileName": "/dev/null", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2RESTJsonEventNoURL.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2RESTJsonEventNoURL.json index 1749e406e..6cbc321fd 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2RESTJsonEventNoURL.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/File2RESTJsonEventNoURL.json @@ -15,7 +15,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "target/examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/LBPolicy_ExecModel_file2kafka.json b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/LBPolicy_ExecModel_file2kafka.json index 6bc7707da..eaad860f8 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/LBPolicy_ExecModel_file2kafka.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/prodcons/LBPolicy_ExecModel_file2kafka.json @@ -15,7 +15,6 @@ "id": 102, "instanceCount": 1, "deploymentPort": 12549, - "policyModelFileName": "target/examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTEventBadHttpCodeFilter.json b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTEventBadHttpCodeFilter.json index 253008b43..c68a8fea4 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTEventBadHttpCodeFilter.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTEventBadHttpCodeFilter.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "target/ExecutionPropertiesRestTestPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTEventBadUrl.json b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTEventBadUrl.json index bec3f9214..b89646d59 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTEventBadUrl.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTEventBadUrl.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "target/ExecutionPropertiesRestTestPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTEventNoValueSetForTag.json b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTEventNoValueSetForTag.json index a765fb5b2..ddcb10ea0 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTEventNoValueSetForTag.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTEventNoValueSetForTag.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "target/ExecutionPropertiesRestTestPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTHttpCodeFilterSetToMultiTagUrlOK.json b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTHttpCodeFilterSetToMultiTagUrlOK.json index 556ca234d..1be1a2d41 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTHttpCodeFilterSetToMultiTagUrlOK.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTHttpCodeFilterSetToMultiTagUrlOK.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "target/ExecutionPropertiesRestTestPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTHttpCodeFilterSetToTagUrlOK.json b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTHttpCodeFilterSetToTagUrlOK.json index 455d6f54e..22ab9e3bb 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTHttpCodeFilterSetToTagUrlOK.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/RESTHttpCodeFilterSetToTagUrlOK.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "target/ExecutionPropertiesRestTestPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/addProperty_conf.json b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/addProperty_conf.json index 22d1c5b27..5aa955e2f 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/addProperty_conf.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/addProperty_conf.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "ExecutionPropertiesTestPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/definedToEmpty_conf.json b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/definedToEmpty_conf.json index ec96b5cc4..6c1a9cad9 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/definedToEmpty_conf.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/definedToEmpty_conf.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "ExecutionPropertiesTestPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/emptyToDefined_conf.json b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/emptyToDefined_conf.json index a2ad6037a..ff8dabc6e 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/emptyToDefined_conf.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/emptyToDefined_conf.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "ExecutionPropertiesTestPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/emptyToEmpty_conf.json b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/emptyToEmpty_conf.json index e5d6d8373..ff8e06212 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/emptyToEmpty_conf.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/emptyToEmpty_conf.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "ExecutionPropertiesTestPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/readOnly_conf.json b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/readOnly_conf.json index 723d04450..a1fa088be 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/readOnly_conf.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/readOnly_conf.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "ExecutionPropertiesTestPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/removeProperty_conf.json b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/removeProperty_conf.json index fb4db38fc..e26307971 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/removeProperty_conf.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/executionproperties/removeProperty_conf.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 4, "deploymentPort": 12561, - "policyModelFileName": "ExecutionPropertiesTestPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/taskparameters/TaskParameterTestConfig_with_invalidTaskIds.json b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/taskparameters/TaskParameterTestConfig_with_invalidTaskIds.json index 0714f4b37..e0de87ff3 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/taskparameters/TaskParameterTestConfig_with_invalidTaskIds.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/taskparameters/TaskParameterTestConfig_with_invalidTaskIds.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 1, "deploymentPort": 12561, - "policyModelFileName": "target/TaskParametersTestPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/taskparameters/TaskParameterTestConfig_with_noTaskIds.json b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/taskparameters/TaskParameterTestConfig_with_noTaskIds.json index 217d6bda2..8458c32f9 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/taskparameters/TaskParameterTestConfig_with_noTaskIds.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/taskparameters/TaskParameterTestConfig_with_noTaskIds.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 1, "deploymentPort": 12561, - "policyModelFileName": "target/TaskParametersTestPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { diff --git a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/taskparameters/TaskParameterTestConfig_with_validTaskIds.json b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/taskparameters/TaskParameterTestConfig_with_validTaskIds.json index 0029374f9..f80b0113b 100644 --- a/testsuites/integration/integration-uservice-test/src/test/resources/testdata/taskparameters/TaskParameterTestConfig_with_validTaskIds.json +++ b/testsuites/integration/integration-uservice-test/src/test/resources/testdata/taskparameters/TaskParameterTestConfig_with_validTaskIds.json @@ -5,7 +5,6 @@ "id": 45, "instanceCount": 1, "deploymentPort": 12561, - "policyModelFileName": "target/TaskParametersTestPolicyModel.json", "engineParameters": { "executorParameters": { "JAVASCRIPT": { -- cgit 1.2.3-korg