From 0f7fbaf79f480348c91134fd16f505a73d06037d Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 15 Nov 2019 15:59:46 +0100 Subject: [PATCH] Completed FullTextIndexNode refs #18054 --- .../validations/validators/TestRules.java | 17 ++++++++++---- .../FullTextIndexNode-delete-rule.json | 2 +- ...FullTextIndexNode-dropCollection-rule.json | 12 ++++++++++ ...ullTextIndexNode-dropCollection-values.csv | 2 ++ .../FullTextIndexNode-insert-rule.json | 2 +- ...ullTextIndexNode-listCollections-rule.json | 12 ++++++++++ ...llTextIndexNode-listCollections-values.csv | 2 ++ .../FullTextIndexNode-remaining-values.csv | 22 +++++++------------ .../FullTextIndexNode-search-rule.json | 12 ++++++++++ .../FullTextIndexNode-search-values.csv | 2 ++ 10 files changed, 65 insertions(+), 20 deletions(-) create mode 100644 src/test/resources/FullTextIndexNode-dropCollection-rule.json create mode 100644 src/test/resources/FullTextIndexNode-dropCollection-values.csv create mode 100644 src/test/resources/FullTextIndexNode-listCollections-rule.json create mode 100644 src/test/resources/FullTextIndexNode-listCollections-values.csv create mode 100644 src/test/resources/FullTextIndexNode-search-rule.json create mode 100644 src/test/resources/FullTextIndexNode-search-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 7f82f51..153229f 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 @@ -21,9 +21,18 @@ public class TestRules { public void testAllRules() throws Exception { String[] aggregationTests = new String[]{ - "AuthorizationService-generate", "AuthorizationService-retrieve", "AuthorizationService-scopes", - "TagMe-tag", "GeoNetwork-login", "CkanConnector-connect", "CkanConnector-disconnect", - "FullTextIndexNode-insert", "FullTextIndexNode-delete" + "AuthorizationService-generate", + "AuthorizationService-retrieve", + "AuthorizationService-scopes", + "CkanConnector-connect", + "CkanConnector-disconnect", + "FullTextIndexNode-delete", + "FullTextIndexNode-dropCollection", + "FullTextIndexNode-insert", + "FullTextIndexNode-listCollections", + "FullTextIndexNode-search", + "GeoNetwork-login", + "TagMe-tag" }; for(String aggregationTest : aggregationTests) { @@ -59,7 +68,7 @@ public class TestRules { @Test public void testSingleRule() throws Exception { - testRule("TagMe-tag"); + testRule("FullTextIndexNode-listCollections"); } } diff --git a/src/test/resources/FullTextIndexNode-delete-rule.json b/src/test/resources/FullTextIndexNode-delete-rule.json index 4c5ab73..c6a32e2 100644 --- a/src/test/resources/FullTextIndexNode-delete-rule.json +++ b/src/test/resources/FullTextIndexNode-delete-rule.json @@ -2,7 +2,7 @@ "match": { "serviceClassRegex": "Index", "serviceNameRegex": "FullTextIndexNode", - "calledMethodRegex": "^\/{0,1}delete\/.+\/.+" + "calledMethodRegex": "^\/{0,1}delete.*" }, "replace": { "serviceClass": "Index", diff --git a/src/test/resources/FullTextIndexNode-dropCollection-rule.json b/src/test/resources/FullTextIndexNode-dropCollection-rule.json new file mode 100644 index 0000000..e7379ca --- /dev/null +++ b/src/test/resources/FullTextIndexNode-dropCollection-rule.json @@ -0,0 +1,12 @@ +{ + "match": { + "serviceClassRegex": "Index", + "serviceNameRegex": "FullTextIndexNode", + "calledMethodRegex": "^\/{0,1}dropCollection.*" + }, + "replace": { + "serviceClass": "Index", + "serviceName": "FullTextIndexNode", + "calledMethod": "dropCollection" + } +} \ No newline at end of file diff --git a/src/test/resources/FullTextIndexNode-dropCollection-values.csv b/src/test/resources/FullTextIndexNode-dropCollection-values.csv new file mode 100644 index 0000000..04b3b18 --- /dev/null +++ b/src/test/resources/FullTextIndexNode-dropCollection-values.csv @@ -0,0 +1,2 @@ +Index,FullTextIndexNode,/dropCollection/3121eccdcbf9c6e982dcc5a2164b8b4029f51d8b1c448ddaf46316178d755c6f +Index,FullTextIndexNode,/dropCollection/67fa6009551977585b7a4c97666a4bdbf18b8f533ab0ab679eb496ffbc15b93d \ No newline at end of file diff --git a/src/test/resources/FullTextIndexNode-insert-rule.json b/src/test/resources/FullTextIndexNode-insert-rule.json index f4e7dd3..9fa24a8 100644 --- a/src/test/resources/FullTextIndexNode-insert-rule.json +++ b/src/test/resources/FullTextIndexNode-insert-rule.json @@ -2,7 +2,7 @@ "match": { "serviceClassRegex": "Index", "serviceNameRegex": "FullTextIndexNode", - "calledMethodRegex": "^\/{0,1}insert\/.+\/.+" + "calledMethodRegex": "^\/{0,1}insert.*" }, "replace": { "serviceClass": "Index", diff --git a/src/test/resources/FullTextIndexNode-listCollections-rule.json b/src/test/resources/FullTextIndexNode-listCollections-rule.json new file mode 100644 index 0000000..bfce58b --- /dev/null +++ b/src/test/resources/FullTextIndexNode-listCollections-rule.json @@ -0,0 +1,12 @@ +{ + "match": { + "serviceClassRegex": "Index", + "serviceNameRegex": "FullTextIndexNode", + "calledMethodRegex": "^\/{0,1}listCollections.*" + }, + "replace": { + "serviceClass": "Index", + "serviceName": "FullTextIndexNode", + "calledMethod": "listCollections" + } +} \ No newline at end of file diff --git a/src/test/resources/FullTextIndexNode-listCollections-values.csv b/src/test/resources/FullTextIndexNode-listCollections-values.csv new file mode 100644 index 0000000..74f510f --- /dev/null +++ b/src/test/resources/FullTextIndexNode-listCollections-values.csv @@ -0,0 +1,2 @@ +Index,FullTextIndexNode,/listCollections +Index,FullTextIndexNode,listCollections \ No newline at end of file diff --git a/src/test/resources/FullTextIndexNode-remaining-values.csv b/src/test/resources/FullTextIndexNode-remaining-values.csv index 9e4c90c..9a99260 100644 --- a/src/test/resources/FullTextIndexNode-remaining-values.csv +++ b/src/test/resources/FullTextIndexNode-remaining-values.csv @@ -1,17 +1,11 @@ Index,FullTextIndexNode,getJSONTransformer -Index,FullTextIndexNode,search -Index,FullTextIndexNode,setCollectionFieldsAlias Index,FullTextIndexNode,setJSONTransformer -Index,FullTextIndexNode,/collectionsDocCount -Index,FullTextIndexNode,/deleteCompleteCollectionInfo -Index,FullTextIndexNode,/dropCollection/3121eccdcbf9c6e982dcc5a2164b8b4029f51d8b1c448ddaf46316178d755c6f -Index,FullTextIndexNode,/dropCollection/67fa6009551977585b7a4c97666a4bdbf18b8f533ab0ab679eb496ffbc15b93d -Index,FullTextIndexNode,/getCollectionFieldsAlias -Index,FullTextIndexNode,/getCompleteCollectionInfo -Index,FullTextIndexNode,/insertWithRecID -Index,FullTextIndexNode,/listCollections -Index,FullTextIndexNode,/reIndex -Index,FullTextIndexNode,/search -Index,FullTextIndexNode,/setCompleteCollectionInfo Index,FullTextIndexNode,getAllCollectionFields -Index,FullTextIndexNode,listCollections +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 diff --git a/src/test/resources/FullTextIndexNode-search-rule.json b/src/test/resources/FullTextIndexNode-search-rule.json new file mode 100644 index 0000000..9f9505a --- /dev/null +++ b/src/test/resources/FullTextIndexNode-search-rule.json @@ -0,0 +1,12 @@ +{ + "match": { + "serviceClassRegex": "Index", + "serviceNameRegex": "FullTextIndexNode", + "calledMethodRegex": "^\/{0,1}search.*" + }, + "replace": { + "serviceClass": "Index", + "serviceName": "FullTextIndexNode", + "calledMethod": "search" + } +} \ No newline at end of file diff --git a/src/test/resources/FullTextIndexNode-search-values.csv b/src/test/resources/FullTextIndexNode-search-values.csv new file mode 100644 index 0000000..275d443 --- /dev/null +++ b/src/test/resources/FullTextIndexNode-search-values.csv @@ -0,0 +1,2 @@ +Index,FullTextIndexNode,search +Index,FullTextIndexNode,/search \ No newline at end of file