From 7eaa6117677c4200734ffa53818657929b0506c3 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 15 Nov 2019 16:42:11 +0100 Subject: [PATCH] Added rules for Catalogue-WS refs #18056 --- .../datamodel/validations/validators/TestRules.java | 9 ++++++--- src/test/resources/Catalogue-WS-UNKNOWN-rule.json | 12 ++++++++++++ src/test/resources/Catalogue-WS-UNKNOWN-values.csv | 2 ++ src/test/resources/Catalogue-WS-licenses-rule.json | 12 ++++++++++++ src/test/resources/Catalogue-WS-licenses-values.csv | 2 ++ .../resources/Catalogue-WS-organizations-rule.json | 12 ++++++++++++ .../resources/Catalogue-WS-organizations-values.csv | 4 ++++ .../resources/FullTextIndexNode-remaining-values.csv | 11 ----------- 8 files changed, 50 insertions(+), 14 deletions(-) create mode 100644 src/test/resources/Catalogue-WS-UNKNOWN-rule.json create mode 100644 src/test/resources/Catalogue-WS-UNKNOWN-values.csv create mode 100644 src/test/resources/Catalogue-WS-licenses-rule.json create mode 100644 src/test/resources/Catalogue-WS-licenses-values.csv create mode 100644 src/test/resources/Catalogue-WS-organizations-rule.json create mode 100644 src/test/resources/Catalogue-WS-organizations-values.csv delete mode 100644 src/test/resources/FullTextIndexNode-remaining-values.csv 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 153229f..ffb5de3 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 @@ -24,6 +24,9 @@ public class TestRules { "AuthorizationService-generate", "AuthorizationService-retrieve", "AuthorizationService-scopes", + "Catalogue-WS-licenses", + "Catalogue-WS-organizations", + "Catalogue-WS-UNKNOWN", "CkanConnector-connect", "CkanConnector-disconnect", "FullTextIndexNode-delete", @@ -54,10 +57,10 @@ public class TestRules { String[] splittedLine = line.split(","); boolean matched = matcherReplace.check(splittedLine[0],splittedLine[1],splittedLine[2]); if(matched) { - logger.info("{} -> {},{},{}", line, replacer.getServiceClass(), replacer.getServiceName(), replacer.getCalledMethod()); + logger.info("{} --> {},{},{}", line, replacer.getServiceClass(), replacer.getServiceName(), replacer.getCalledMethod()); } else { logger.error("{} does not match {}. This MUST not occur.", line, matcherReplace.getMultiMatcher().toString()); - throw new Exception(line + " does not match "+ matcherReplace.getMultiMatcher().toString() + ". This MUST not occur."); + throw new Exception(); } } @@ -68,7 +71,7 @@ public class TestRules { @Test public void testSingleRule() throws Exception { - testRule("FullTextIndexNode-listCollections"); + testRule("Catalogue-WS-licenses"); } } diff --git a/src/test/resources/Catalogue-WS-UNKNOWN-rule.json b/src/test/resources/Catalogue-WS-UNKNOWN-rule.json new file mode 100644 index 0000000..ab91b43 --- /dev/null +++ b/src/test/resources/Catalogue-WS-UNKNOWN-rule.json @@ -0,0 +1,12 @@ +{ + "match": { + "serviceClassRegex": "Data-Catalogue", + "serviceNameRegex": "Catalogue-WS", + "calledMethodRegex": "^\/rest$|^UNKNOWN$" + }, + "replace": { + "serviceClass": "Data-Catalogue", + "serviceName": "Catalogue-WS", + "calledMethod": "UNKNOWN" + } +} \ No newline at end of file diff --git a/src/test/resources/Catalogue-WS-UNKNOWN-values.csv b/src/test/resources/Catalogue-WS-UNKNOWN-values.csv new file mode 100644 index 0000000..52e3406 --- /dev/null +++ b/src/test/resources/Catalogue-WS-UNKNOWN-values.csv @@ -0,0 +1,2 @@ +Data-Catalogue,Catalogue-WS,/rest +Data-Catalogue,Catalogue-WS,UNKNOWN diff --git a/src/test/resources/Catalogue-WS-licenses-rule.json b/src/test/resources/Catalogue-WS-licenses-rule.json new file mode 100644 index 0000000..9809e1b --- /dev/null +++ b/src/test/resources/Catalogue-WS-licenses-rule.json @@ -0,0 +1,12 @@ +{ + "match": { + "serviceClassRegex": "Data-Catalogue", + "serviceNameRegex": "Catalogue-WS", + "calledMethodRegex": "^\/rest\/(api\/){0,1}licenses\/list" + }, + "replace": { + "serviceClass": "Data-Catalogue", + "serviceName": "Catalogue-WS", + "calledMethod": "/rest/api/licenses/list" + } +} \ No newline at end of file diff --git a/src/test/resources/Catalogue-WS-licenses-values.csv b/src/test/resources/Catalogue-WS-licenses-values.csv new file mode 100644 index 0000000..0c64d36 --- /dev/null +++ b/src/test/resources/Catalogue-WS-licenses-values.csv @@ -0,0 +1,2 @@ +Data-Catalogue,Catalogue-WS,/rest/licenses/list +Data-Catalogue,Catalogue-WS,/rest/api/licenses/list \ No newline at end of file diff --git a/src/test/resources/Catalogue-WS-organizations-rule.json b/src/test/resources/Catalogue-WS-organizations-rule.json new file mode 100644 index 0000000..d12fa3e --- /dev/null +++ b/src/test/resources/Catalogue-WS-organizations-rule.json @@ -0,0 +1,12 @@ +{ + "match": { + "serviceClassRegex": "Data-Catalogue", + "serviceNameRegex": "Catalogue-WS", + "calledMethodRegex": "^\/rest\/api\/organi(s|z)ation(s){0,1}\/list" + }, + "replace": { + "serviceClass": "Data-Catalogue", + "serviceName": "Catalogue-WS", + "calledMethod": "/rest/api/organizations/list" + } +} diff --git a/src/test/resources/Catalogue-WS-organizations-values.csv b/src/test/resources/Catalogue-WS-organizations-values.csv new file mode 100644 index 0000000..6baecbb --- /dev/null +++ b/src/test/resources/Catalogue-WS-organizations-values.csv @@ -0,0 +1,4 @@ +Data-Catalogue,Catalogue-WS,/rest/api/organisations/list +Data-Catalogue,Catalogue-WS,/rest/api/organizations/list +Data-Catalogue,Catalogue-WS,/rest/api/organisation/list +Data-Catalogue,Catalogue-WS,/rest/api/organization/list diff --git a/src/test/resources/FullTextIndexNode-remaining-values.csv b/src/test/resources/FullTextIndexNode-remaining-values.csv deleted file mode 100644 index 9a99260..0000000 --- a/src/test/resources/FullTextIndexNode-remaining-values.csv +++ /dev/null @@ -1,11 +0,0 @@ -Index,FullTextIndexNode,getJSONTransformer -Index,FullTextIndexNode,setJSONTransformer -Index,FullTextIndexNode,getAllCollectionFields -Index,FullTextIndexNode,setCollectionFieldsAlias -Index,FullTextIndexNode,/getCollectionFieldsAlias -Index,FullTextIndexNode,/collectionsDocCount -Index,FullTextIndexNode,/getCompleteCollectionInfo -Index,FullTextIndexNode,/setCompleteCollectionInfo -Index,FullTextIndexNode,/deleteCompleteCollectionInfo -Index,FullTextIndexNode,/insertWithRecID -Index,FullTextIndexNode,/reIndex \ No newline at end of file