Added rules for Catalogue-WS refs #18056

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");
 	}
 	
 }

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"
+	}
+}

src/test/resources/Catalogue-WS-UNKNOWN-values.csv

@@ -0,0 +1,2 @@
+Data-Catalogue,Catalogue-WS,/rest
+Data-Catalogue,Catalogue-WS,UNKNOWN

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"
+	}
+}

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

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"
+	}
+}

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

src/test/resources/FullTextIndexNode-remaining-values.csv

@@ -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