From 4bdb6f8ae35de76026e5aa2a1b12b3b29debe9c8 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Tue, 31 Mar 2020 18:00:51 +0200 Subject: [PATCH] Fixed rules --- .../validations/validators/TestRules.java | 4 +- .../Catalogue-WS/Catalogue-WS-license.json | 12 +++++ .../Catalogue-WS/Catalogue-WS-licenses.csv | 11 ++++- .../rules/DataMiner/DataMiner-OTHER.csv | 2 - .../rules/DataMiner/DataMiner-OTHER.json | 2 +- ...ataMiner-execute.csv => DataMiner-all.csv} | 10 ++++ ...etCapabilities.json => DataMiner-all.json} | 4 +- .../DataMiner/DataMiner-describeProcess.csv | 1 - .../DataMiner/DataMiner-describeProcess.json | 12 ----- .../DataMiner/DataMiner-getCapabilities.csv | 1 - .../rules/DataMiner/DataMiner-getResult.csv | 2 - .../rules/DataMiner/DataMiner-getResult.json | 12 ----- .../rules/DataMiner/DataMiner-stop.csv | 2 - .../rules/DataMiner/DataMiner-stop.json | 12 ----- .../HomeLibraryWebapp-all.csv | 49 +++++++++++++++++++ 15 files changed, 86 insertions(+), 50 deletions(-) create mode 100644 src/test/resources/rules/Catalogue-WS/Catalogue-WS-license.json rename src/test/resources/rules/DataMiner/{DataMiner-execute.csv => DataMiner-all.csv} (95%) rename src/test/resources/rules/DataMiner/{DataMiner-getCapabilities.json => DataMiner-all.json} (59%) delete mode 100644 src/test/resources/rules/DataMiner/DataMiner-describeProcess.csv delete mode 100644 src/test/resources/rules/DataMiner/DataMiner-describeProcess.json delete mode 100644 src/test/resources/rules/DataMiner/DataMiner-getCapabilities.csv delete mode 100644 src/test/resources/rules/DataMiner/DataMiner-getResult.csv delete mode 100644 src/test/resources/rules/DataMiner/DataMiner-getResult.json delete mode 100644 src/test/resources/rules/DataMiner/DataMiner-stop.csv delete mode 100644 src/test/resources/rules/DataMiner/DataMiner-stop.json diff --git a/src/test/java/org/gcube/accounting/datamodel/validations/validators/TestRules.java b/src/test/java/org/gcube/accounting/datamodel/validations/validators/TestRules.java index b8fd8c9..f768a69 100644 --- a/src/test/java/org/gcube/accounting/datamodel/validations/validators/TestRules.java +++ b/src/test/java/org/gcube/accounting/datamodel/validations/validators/TestRules.java @@ -219,8 +219,8 @@ public class TestRules extends ContextTest { public void testSingleRule() throws Exception { allRules(); File rulesDirectory = getRulesDirectory(); - File rulesDirFile = new File(rulesDirectory, "SocialNetworking"); - File rulesFile = new File(rulesDirFile, "SocialNetworking-all.json"); + File rulesDirFile = new File(rulesDirectory, "DataMiner"); + File rulesFile = new File(rulesDirFile, "DataMiner-all.json"); testRule(rulesFile); } diff --git a/src/test/resources/rules/Catalogue-WS/Catalogue-WS-license.json b/src/test/resources/rules/Catalogue-WS/Catalogue-WS-license.json new file mode 100644 index 0000000..e028a48 --- /dev/null +++ b/src/test/resources/rules/Catalogue-WS/Catalogue-WS-license.json @@ -0,0 +1,12 @@ +{ + "match": { + "serviceClassRegex": "(Data-Catalogue)|(DataPublishing)", + "serviceNameRegex": "Catalogue-WS", + "calledMethodRegex": "^\/rest\/(api\/){0,1}licen(c|s)es\/(?(create|show|purge|delete))(\/{0,1})" + }, + "replace": { + "serviceClass": "DataPublishing", + "serviceName": "Catalogue-WS", + "calledMethod": "${Action}License" + } +} \ No newline at end of file diff --git a/src/test/resources/rules/Catalogue-WS/Catalogue-WS-licenses.csv b/src/test/resources/rules/Catalogue-WS/Catalogue-WS-licenses.csv index 96df74a..cb38080 100644 --- a/src/test/resources/rules/Catalogue-WS/Catalogue-WS-licenses.csv +++ b/src/test/resources/rules/Catalogue-WS/Catalogue-WS-licenses.csv @@ -3,4 +3,13 @@ Data-Catalogue,Catalogue-WS,/rest/api/licenses/list Data-Catalogue,Catalogue-WS,/rest/api/licences/list Data-Catalogue,Catalogue-WS,/rest/api/licenses/list/ Data-Catalogue,Catalogue-WS,/rest/api/licences/list -Data-Catalogue,Catalogue-WS,/rest/api/licenses/list/ \ No newline at end of file +Data-Catalogue,Catalogue-WS,/rest/api/licenses/list/ + +Data-Catalogue Catalogue-WS /rest/api/licenses/show + + + +Data-Catalogue Catalogue-WS /rest/api/namespaces/show +Data-Catalogue Catalogue-WS /rest/api/profiles/namespaces +Data-Catalogue Catalogue-WS /rest/api/profiles/profile +Data-Catalogue Catalogue-WS /rest/api/profiles/profile_names \ No newline at end of file diff --git a/src/test/resources/rules/DataMiner/DataMiner-OTHER.csv b/src/test/resources/rules/DataMiner/DataMiner-OTHER.csv index 6b79d72..5ee9728 100644 --- a/src/test/resources/rules/DataMiner/DataMiner-OTHER.csv +++ b/src/test/resources/rules/DataMiner/DataMiner-OTHER.csv @@ -1,5 +1,3 @@ -WPS,DataMiner,/WebProcessingService -WPS,DataMiner,WebProcessingService WPS,DataMiner,UNKNOWN WPS,DataMiner,OTHER WPS,DataMiner,gcube/resource/scopes \ No newline at end of file diff --git a/src/test/resources/rules/DataMiner/DataMiner-OTHER.json b/src/test/resources/rules/DataMiner/DataMiner-OTHER.json index fa75e10..db6346d 100644 --- a/src/test/resources/rules/DataMiner/DataMiner-OTHER.json +++ b/src/test/resources/rules/DataMiner/DataMiner-OTHER.json @@ -2,7 +2,7 @@ "match": { "serviceClassRegex": "(WPS)|(DataAnalysis)", "serviceNameRegex": "DataMiner", - "calledMethodRegex": "^\/{0,1}(WebProcessingService|UNKNOWN|OTHER|(gcube\/resource\/scopes)).*" + "calledMethodRegex": "^\/{0,1}(UNKNOWN|OTHER|(gcube\/resource\/scopes)).*" }, "replace": { "serviceClass": "DataAnalysis", diff --git a/src/test/resources/rules/DataMiner/DataMiner-execute.csv b/src/test/resources/rules/DataMiner/DataMiner-all.csv similarity index 95% rename from src/test/resources/rules/DataMiner/DataMiner-execute.csv rename to src/test/resources/rules/DataMiner/DataMiner-all.csv index fd4ca19..3b9f6e8 100644 --- a/src/test/resources/rules/DataMiner/DataMiner-execute.csv +++ b/src/test/resources/rules/DataMiner/DataMiner-all.csv @@ -1,3 +1,13 @@ +WPS,DataMiner,GetCapabilities +WPS,DataMiner,/GetCapabilities +WPS,DataMiner,RetrieveResultServlet +WPS,DataMiner,/RetrieveResultServlet +WPS,DataMiner,DescribeProcess +WPS,DataMiner,/DescribeProcess +WPS,DataMiner,WebProcessingService +WPS,DataMiner,/WebProcessingService +WPS,DataMiner,CancelComputationServlet +WPS,DataMiner,/CancelComputationServlet WPS,DataMiner,Execute WPS,DataMiner,Execute - org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.clusterers.DBSCAN WPS,DataMiner,Execute - org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.clusterers.KMEANS diff --git a/src/test/resources/rules/DataMiner/DataMiner-getCapabilities.json b/src/test/resources/rules/DataMiner/DataMiner-all.json similarity index 59% rename from src/test/resources/rules/DataMiner/DataMiner-getCapabilities.json rename to src/test/resources/rules/DataMiner/DataMiner-all.json index 71e64bd..fc2dbc6 100644 --- a/src/test/resources/rules/DataMiner/DataMiner-getCapabilities.json +++ b/src/test/resources/rules/DataMiner/DataMiner-all.json @@ -2,11 +2,11 @@ "match": { "serviceClassRegex": "(WPS)|(DataAnalysis)", "serviceNameRegex": "DataMiner", - "calledMethodRegex": "^/{0,1}GetCapabilities.*" + "calledMethodRegex": "^\/{0,1}(?(?!(UNKNOWN|OTHER|(gcube\/resource\/scopes))).*)" }, "replace": { "serviceClass": "DataAnalysis", "serviceName": "DataMiner", - "calledMethod": "getCapabilities" + "calledMethod": "${Method}" } } \ No newline at end of file diff --git a/src/test/resources/rules/DataMiner/DataMiner-describeProcess.csv b/src/test/resources/rules/DataMiner/DataMiner-describeProcess.csv deleted file mode 100644 index 6e4dc54..0000000 --- a/src/test/resources/rules/DataMiner/DataMiner-describeProcess.csv +++ /dev/null @@ -1 +0,0 @@ -WPS,DataMiner,DescribeProcess \ No newline at end of file diff --git a/src/test/resources/rules/DataMiner/DataMiner-describeProcess.json b/src/test/resources/rules/DataMiner/DataMiner-describeProcess.json deleted file mode 100644 index a07f5a7..0000000 --- a/src/test/resources/rules/DataMiner/DataMiner-describeProcess.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "match": { - "serviceClassRegex": "(WPS)|(DataAnalysis)", - "serviceNameRegex": "DataMiner", - "calledMethodRegex": "^/{0,1}DescribeProcess.*" - }, - "replace": { - "serviceClass": "DataAnalysis", - "serviceName": "DataMiner", - "calledMethod": "describeProcess" - } -} \ No newline at end of file diff --git a/src/test/resources/rules/DataMiner/DataMiner-getCapabilities.csv b/src/test/resources/rules/DataMiner/DataMiner-getCapabilities.csv deleted file mode 100644 index 59e964d..0000000 --- a/src/test/resources/rules/DataMiner/DataMiner-getCapabilities.csv +++ /dev/null @@ -1 +0,0 @@ -WPS,DataMiner,GetCapabilities \ No newline at end of file diff --git a/src/test/resources/rules/DataMiner/DataMiner-getResult.csv b/src/test/resources/rules/DataMiner/DataMiner-getResult.csv deleted file mode 100644 index 04ea22d..0000000 --- a/src/test/resources/rules/DataMiner/DataMiner-getResult.csv +++ /dev/null @@ -1,2 +0,0 @@ -WPS,DataMiner,/RetrieveResultServlet -WPS,DataMiner,RetrieveResultServlet \ No newline at end of file diff --git a/src/test/resources/rules/DataMiner/DataMiner-getResult.json b/src/test/resources/rules/DataMiner/DataMiner-getResult.json deleted file mode 100644 index 239b1fb..0000000 --- a/src/test/resources/rules/DataMiner/DataMiner-getResult.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "match": { - "serviceClassRegex": "(WPS)|(DataAnalysis)", - "serviceNameRegex": "DataMiner", - "calledMethodRegex": "^/{0,1}RetrieveResult.*" - }, - "replace": { - "serviceClass": "DataAnalysis", - "serviceName": "DataMiner", - "calledMethod": "getResult" - } -} \ No newline at end of file diff --git a/src/test/resources/rules/DataMiner/DataMiner-stop.csv b/src/test/resources/rules/DataMiner/DataMiner-stop.csv deleted file mode 100644 index c8e6152..0000000 --- a/src/test/resources/rules/DataMiner/DataMiner-stop.csv +++ /dev/null @@ -1,2 +0,0 @@ -WPS,DataMiner,/CancelComputationServlet -WPS,DataMiner,CancelComputationServlet \ No newline at end of file diff --git a/src/test/resources/rules/DataMiner/DataMiner-stop.json b/src/test/resources/rules/DataMiner/DataMiner-stop.json deleted file mode 100644 index f19bce7..0000000 --- a/src/test/resources/rules/DataMiner/DataMiner-stop.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "match": { - "serviceClassRegex": "(WPS)|(DataAnalysis)", - "serviceNameRegex": "DataMiner", - "calledMethodRegex": "^/{0,1}CancelComputation.*" - }, - "replace": { - "serviceClass": "DataAnalysis", - "serviceName": "DataMiner", - "calledMethod": "stop" - } -} \ No newline at end of file diff --git a/src/test/resources/rules/HomeLibraryWebapp/HomeLibraryWebapp-all.csv b/src/test/resources/rules/HomeLibraryWebapp/HomeLibraryWebapp-all.csv index c784ceb..7edbf1f 100644 --- a/src/test/resources/rules/HomeLibraryWebapp/HomeLibraryWebapp-all.csv +++ b/src/test/resources/rules/HomeLibraryWebapp/HomeLibraryWebapp-all.csv @@ -97,3 +97,52 @@ DataAccess,HomeLibraryWebapp,post/MoveToTrashIds DataAccess,HomeLibraryWebapp,post/RemoveItem DataAccess,HomeLibraryWebapp,post/SaveAccountingItem DataAccess,HomeLibraryWebapp,post/SaveItem +DataAccess,HomeLibraryWebapp,/CanAddChildren +DataAccess,HomeLibraryWebapp,/CanDelete +DataAccess,HomeLibraryWebapp,/CanModifyProperties +DataAccess,HomeLibraryWebapp,/CanReadNode +DataAccess,HomeLibraryWebapp,/CreateSession +DataAccess,HomeLibraryWebapp,/CreateUserServlet +DataAccess,HomeLibraryWebapp,/DeleteAcesServlet +DataAccess,HomeLibraryWebapp,/GetAccountingById +DataAccess,HomeLibraryWebapp,/GetDisplayNameServlet +DataAccess,HomeLibraryWebapp,/GetVersionServlet +DataAccess,HomeLibraryWebapp,/GroupMembershipServlet +DataAccess,HomeLibraryWebapp,/IsGroupServlet +DataAccess,HomeLibraryWebapp,/ListGroupsServlet +DataAccess,HomeLibraryWebapp,/ModifyAceServlet +DataAccess,HomeLibraryWebapp,/ReleaseSession +DataAccess,HomeLibraryWebapp,/SetVersionServlet +DataAccess,HomeLibraryWebapp,/UpdateGroupServlet +DataAccess,HomeLibraryWebapp,/acl/GetACL +DataAccess,HomeLibraryWebapp,/acl/GetACLByUser +DataAccess,HomeLibraryWebapp,/acl/GetEACL +DataAccess,HomeLibraryWebapp,/get/Clone +DataAccess,HomeLibraryWebapp,/get/Copy +DataAccess,HomeLibraryWebapp,/get/ExecuteQuery +DataAccess,HomeLibraryWebapp,/get/GetChildrenById +DataAccess,HomeLibraryWebapp,/get/GetChildrenCount +DataAccess,HomeLibraryWebapp,/get/GetItemById +DataAccess,HomeLibraryWebapp,/get/GetItemByPath +DataAccess,HomeLibraryWebapp,/get/GetParentsById +DataAccess,HomeLibraryWebapp,/get/IsLocked +DataAccess,HomeLibraryWebapp,/get/LockSession +DataAccess,HomeLibraryWebapp,/get/Move +DataAccess,HomeLibraryWebapp,/get/SearchItems +DataAccess,HomeLibraryWebapp,/get/UnlockSession +DataAccess,HomeLibraryWebapp,/post/ChangePrimaryType +DataAccess,HomeLibraryWebapp,/post/CreateFolder +DataAccess,HomeLibraryWebapp,/post/MoveToTrashIds +DataAccess,HomeLibraryWebapp,/post/RemoveItem +DataAccess,HomeLibraryWebapp,/post/SaveAccountingItem +DataAccess,HomeLibraryWebapp,/post/SaveItem +DataAccess,HomeLibraryWebapp,/rest/GetPublicLink +DataAccess,HomeLibraryWebapp,/rest/Upload +DataAccess,HomeLibraryWebapp,/trash/DeleteFromTrash +DataAccess,HomeLibraryWebapp,/trash/EmptyTrash +DataAccess,HomeLibraryWebapp,/versioning/GetCurrentVersion +DataAccess,HomeLibraryWebapp,/versioning/GetVersion +DataAccess,HomeLibraryWebapp,/versioning/RemoveVersion +DataAccess,HomeLibraryWebapp,/versioning/RestoreVersion +DataAccess,HomeLibraryWebapp,/versioning/SaveCurrentVersion +DataAccess,HomeLibraryWebapp,/versioning/VersionHistory \ No newline at end of file