Adding and fixing rules

src/test/java/org/gcube/accounting/datamodel/validations/validators/TestRules.java

@@ -219,11 +219,33 @@ public class TestRules extends ContextTest {
 	public void testSingleRule() throws Exception {
 		allRules();
 		File rulesDirectory = getRulesDirectory();
-		File rulesDirFile = new File(rulesDirectory, "DataMiner");
-		File rulesFile = new File(rulesDirFile, "DataMiner-all.json");
-		testRule(rulesFile);
+		File rulesDirFile = new File(rulesDirectory, "Catalogue-WS");
+		File ruleFile = new File(rulesDirFile, "Catalogue-WS-collection.json");
+		testRule(ruleFile);
 	}
 	
+	@Test
+	public void testAllRuleInAdirectory() throws Exception {
+		allRules();
+		File rulesDirectory = getRulesDirectory();
+		File rulesDirFile = new File(rulesDirectory, "gcat");
+	
+		FilenameFilter filenameFilter = new FilenameFilter() {
+			@Override
+			public boolean accept(File dir, String name) {
+				return name.endsWith(".json");
+			}
+		};
+		
+		List<File> rulesFiles = new ArrayList<>();
+		rulesFiles.addAll(Arrays.asList(rulesDirFile.listFiles(filenameFilter)));
+		
+		for(File ruleFile : rulesFiles) {
+			testRule(ruleFile);
+		}
+	}
+	
+	
 	@Test
 	public void testAllRules() throws Exception {
 		List<File> rulesFiles = allRules();

src/test/resources/rules/Catalogue-WS/Catalogue-WS-collection-instance.csv

@@ -0,0 +1,10 @@
+Data-Catalogue,Catalogue-WS,/rest/api/groups/create
+Data-Catalogue,Catalogue-WS,/rest/api/groups/show
+Data-Catalogue,Catalogue-WS,/rest/api/items/create
+Data-Catalogue,Catalogue-WS,/rest/api/items/delete
+Data-Catalogue,Catalogue-WS,/rest/api/items/purge
+Data-Catalogue,Catalogue-WS,/rest/api/items/show
+Data-Catalogue,Catalogue-WS,/rest/api/resources/create
+Data-Catalogue,Catalogue-WS,/rest/api/resources/delete
+Data-Catalogue,Catalogue-WS,/rest/api/resources/show
+Data-Catalogue,Catalogue-WS,/rest/api/namespaces/show

src/test/resources/rules/Catalogue-WS/Catalogue-WS-collection-instance.json

@@ -2,11 +2,11 @@
 	"match": {
 		"serviceClassRegex": "(Data-Catalogue)|(DataPublishing)",
 		"serviceNameRegex": "Catalogue-WS",
-		"calledMethodRegex": "(\/rest\/(api\/){0,1})group(s){0,1}\/(?<Action>(create|show|purge|delete))(\/{0,1})"
+		"calledMethodRegex": "(\/){0,1}(rest\/(api\/){0,1})(?<Collection>(group|item|resource|namespace))(s){0,1}\/(?<Action>(create|show|purge|delete))(\/{0,1})"
 	},
 	"replace": {
 		"serviceClass": "DataPublishing",
 		"serviceName": "Catalogue-WS",
-		"calledMethod": "${Action}Group"
+		"calledMethod": "${Action} ${Collection}"
 	}
 }

src/test/resources/rules/Catalogue-WS/Catalogue-WS-collection.csv

@@ -0,0 +1,3 @@
+Data-Catalogue,Catalogue-WS,/rest/api/groups/list
+Data-Catalogue,Catalogue-WS,/rest/api/items/list
+Data-Catalogue,Catalogue-WS,/rest/api/resources/list

src/test/resources/rules/Catalogue-WS/Catalogue-WS-collection.json

@@ -2,11 +2,11 @@
 	"match": {
 		"serviceClassRegex": "(Data-Catalogue)|(DataPublishing)",
 		"serviceNameRegex": "Catalogue-WS",
-		"calledMethodRegex": "(\/rest\/(api\/){0,1})item(s){0,1}\/(?<Action>(create|show|purge|delete))(\/{0,1})"
+		"calledMethodRegex": "(\/){0,1}(rest\/(api\/){0,1})(?<Collection>(groups|items|resources))\/(?<Action>list)(\/{0,1})"
 	},
 	"replace": {
 		"serviceClass": "DataPublishing",
 		"serviceName": "Catalogue-WS",
-		"calledMethod": "${Action}Item"
+		"calledMethod": "${Action} ${Collection}"
 	}
 }

src/test/resources/rules/Catalogue-WS/Catalogue-WS-group.csv

@@ -1,2 +0,0 @@
-Data-Catalogue,Catalogue-WS,/rest/api/groups/create
-Data-Catalogue,Catalogue-WS,/rest/api/groups/show

src/test/resources/rules/Catalogue-WS/Catalogue-WS-groups.csv

@@ -1 +0,0 @@
-Data-Catalogue,Catalogue-WS,/rest/api/groups/list

src/test/resources/rules/Catalogue-WS/Catalogue-WS-groups.json

@@ -1,12 +0,0 @@
-{
-	"match": {
-		"serviceClassRegex": "(Data-Catalogue)|(DataPublishing)",
-		"serviceNameRegex": "Catalogue-WS",
-		"calledMethodRegex": "(\/rest\/(api\/){0,1})group(s){0,1}\/(?<Action>list)(\/{0,1})"
-	},
-	"replace": {
-		"serviceClass": "DataPublishing",
-		"serviceName": "Catalogue-WS",
-		"calledMethod": "${Action}Groups"
-	}
-}

src/test/resources/rules/Catalogue-WS/Catalogue-WS-item.csv

@@ -1,4 +0,0 @@
-Data-Catalogue,Catalogue-WS,/rest/api/items/create
-Data-Catalogue,Catalogue-WS,/rest/api/items/delete
-Data-Catalogue,Catalogue-WS,/rest/api/items/purge
-Data-Catalogue,Catalogue-WS,/rest/api/items/show

src/test/resources/rules/Catalogue-WS/Catalogue-WS-items.csv

@@ -1 +0,0 @@
-Data-Catalogue,Catalogue-WS,/rest/api/items/list

src/test/resources/rules/Catalogue-WS/Catalogue-WS-items.json

@@ -1,12 +0,0 @@
-{
-	"match": {
-		"serviceClassRegex": "(Data-Catalogue)|(DataPublishing)",
-		"serviceNameRegex": "Catalogue-WS",
-		"calledMethodRegex": "(\/rest\/(api\/){0,1})item(s){0,1}\/(?<Action>list)(\/{0,1})"
-	},
-	"replace": {
-		"serviceClass": "DataPublishing",
-		"serviceName": "Catalogue-WS",
-		"calledMethod": "${Action}Items"
-	}
-}

src/test/resources/rules/Catalogue-WS/Catalogue-WS-license.json

@@ -2,11 +2,11 @@
 	"match": {
 		"serviceClassRegex": "(Data-Catalogue)|(DataPublishing)",
 		"serviceNameRegex": "Catalogue-WS",
-		"calledMethodRegex": "^\/rest\/(api\/){0,1}licen(c|s)es\/(?<Action>(create|show|purge|delete))(\/{0,1})"
+		"calledMethodRegex": "(\/){0,1}(rest\/(api\/){0,1})licen(c|s)es\/(?<Action>(create|show|purge|delete))(\/{0,1})"
 	},
 	"replace": {
 		"serviceClass": "DataPublishing",
 		"serviceName": "Catalogue-WS",
-		"calledMethod": "${Action}License"
+		"calledMethod": "${Action} license"
 	}
 }

src/test/resources/rules/Catalogue-WS/Catalogue-WS-licenses.csv

@@ -3,13 +3,4 @@ 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/
-
-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
+Data-Catalogue,Catalogue-WS,/rest/api/licenses/list/

src/test/resources/rules/Catalogue-WS/Catalogue-WS-licenses.json

@@ -2,11 +2,11 @@
 	"match": {
 		"serviceClassRegex": "(Data-Catalogue)|(DataPublishing)",
 		"serviceNameRegex": "Catalogue-WS",
-		"calledMethodRegex": "^\/rest\/(api\/){0,1}licen(c|s)es\/(?<Action>list)(\/{0,1})"
+		"calledMethodRegex": "(\/){0,1}(rest\/(api\/){0,1})licen(c|s)es\/(?<Action>list)(\/{0,1})"
 	},
 	"replace": {
 		"serviceClass": "DataPublishing",
 		"serviceName": "Catalogue-WS",
-		"calledMethod": "${Action}Licenses"
+		"calledMethod": "${Action} licenses"
 	}
 }

src/test/resources/rules/Catalogue-WS/Catalogue-WS-namespaces.csv

@@ -1,2 +1 @@
-Data-Catalogue,Catalogue-WS,/rest/api/namespaces/show
 Data-Catalogue,Catalogue-WS,/rest/api/profiles/namespaces

src/test/resources/rules/Catalogue-WS/Catalogue-WS-namespaces.json

@@ -2,11 +2,11 @@
 	"match": {
 		"serviceClassRegex": "(Data-Catalogue)|(DataPublishing)",
 		"serviceNameRegex": "Catalogue-WS",
-		"calledMethodRegex": "(\/rest\/(api\/){0,1})(profiles){0,1}namespaces(s){0,1}.*"
+		"calledMethodRegex": "(\/){0,1}(rest\/(api\/){0,1})profiles\/namespaces(s){0,1}.*"
 	},
 	"replace": {
 		"serviceClass": "DataPublishing",
 		"serviceName": "Catalogue-WS",
-		"calledMethod": "${Action}Resource"
+		"calledMethod": "list namespaces"
 	}
 }

src/test/resources/rules/Catalogue-WS/Catalogue-WS-organization.json

@@ -2,11 +2,11 @@
 	"match": {
 		"serviceClassRegex": "(Data-Catalogue)|(DataPublishing)",
 		"serviceNameRegex": "Catalogue-WS",
-		"calledMethodRegex": "\/rest\/(api\/){0,1}organi(s|z)ation(s){0,1}\/(?<Action>(create|show|purge|delete))(\/{0,1})"
+		"calledMethodRegex": "(\/){0,1}(rest\/(api\/){0,1})organi(s|z)ation(s){0,1}\/(?<Action>(create|show|purge|delete))(\/{0,1})"
 	},
 	"replace": {
 		"serviceClass": "DataPublishing",
 		"serviceName": "Catalogue-WS",
-		"calledMethod": "${Action}Organization"
+		"calledMethod": "${Action} organization"
 	}
 }

src/test/resources/rules/Catalogue-WS/Catalogue-WS-organizations.json

@@ -2,11 +2,11 @@
 	"match": {
 		"serviceClassRegex": "(Data-Catalogue)|(DataPublishing)",
 		"serviceNameRegex": "Catalogue-WS",
-		"calledMethodRegex": "(\/rest\/(api\/){0,1}organi(s|z)ation(s){0,1}\/(?<Action>list)\/{0,1}.*)|(listOrgani(s|z)ation(s{0,1}))"
+		"calledMethodRegex": "(\/){0,1}(rest\/(api\/){0,1})organi(s|z)ation(s){0,1}\/(?<Action>list)(\/){0,1}.*|(listOrgani(s|z)ation(s{0,1}))"
 	},
 	"replace": {
 		"serviceClass": "DataPublishing",
 		"serviceName": "Catalogue-WS",
-		"calledMethod": "listOrganizations"
+		"calledMethod": "list organizations"
 	}
 }

src/test/resources/rules/Catalogue-WS/Catalogue-WS-profile.json

@@ -2,11 +2,11 @@
 	"match": {
 		"serviceClassRegex": "(Data-Catalogue)|(DataPublishing)",
 		"serviceNameRegex": "Catalogue-WS",
-		"calledMethodRegex": "(\/rest\/(api\/){0,1})profile(s){0,1}\/(?<Action>(show|profile))(\/{0,1})"
+		"calledMethodRegex": "(\/){0,1}(rest\/(api\/){0,1})profile(s){0,1}\/(?<Action>(show|profile))(\/){0,1}"
 	},
 	"replace": {
 		"serviceClass": "DataPublishing",
 		"serviceName": "Catalogue-WS",
-		"calledMethod": "showProfile"
+		"calledMethod": "show profile"
 	}
 }

src/test/resources/rules/Catalogue-WS/Catalogue-WS-profiles.json

@@ -2,11 +2,11 @@
 	"match": {
 		"serviceClassRegex": "(Data-Catalogue)|(DataPublishing)",
 		"serviceNameRegex": "Catalogue-WS",
-		"calledMethodRegex": "(\/rest\/(api\/){0,1})profile(s){0,1}\/(?<Action>(list|profile_names))(\/{0,1})"
+		"calledMethodRegex": "(\/){0,1}(rest\/(api\/){0,1})profile(s){0,1}\/(?<Action>(list|profile_names))(\/{0,1})"
 	},
 	"replace": {
 		"serviceClass": "DataPublishing",
 		"serviceName": "Catalogue-WS",
-		"calledMethod": "listProfile"
+		"calledMethod": "list profile"
 	}
 }

src/test/resources/rules/Catalogue-WS/Catalogue-WS-resource.csv

@@ -1,3 +0,0 @@
-Data-Catalogue,Catalogue-WS,/rest/api/resources/create
-Data-Catalogue,Catalogue-WS,/rest/api/resources/delete
-Data-Catalogue,Catalogue-WS,/rest/api/resources/show

src/test/resources/rules/Catalogue-WS/Catalogue-WS-resource.json

@@ -1,12 +0,0 @@
-{
-	"match": {
-		"serviceClassRegex": "(Data-Catalogue)|(DataPublishing)",
-		"serviceNameRegex": "Catalogue-WS",
-		"calledMethodRegex": "(\/rest\/(api\/){0,1})resource(s){0,1}\/(?<Action>create|show|purge|delete)(\/{0,1})"
-	},
-	"replace": {
-		"serviceClass": "DataPublishing",
-		"serviceName": "Catalogue-WS",
-		"calledMethod": "${Action}Resource"
-	}
-}

src/test/resources/rules/Catalogue-WS/Catalogue-WS-resources.csv

@@ -1 +0,0 @@
-Data-Catalogue,Catalogue-WS,/rest/api/resources/list

src/test/resources/rules/Catalogue-WS/Catalogue-WS-resources.json

@@ -1,12 +0,0 @@
-{
-	"match": {
-		"serviceClassRegex": "(Data-Catalogue)|(DataPublishing)",
-		"serviceNameRegex": "Catalogue-WS",
-		"calledMethodRegex": "(\/rest\/(api\/){0,1})resource(s){0,1}\/(?<Action>list)(\/{0,1})"
-	},
-	"replace": {
-		"serviceClass": "DataPublishing",
-		"serviceName": "Catalogue-WS",
-		"calledMethod": "${Action}Resource"
-	}
-}

src/test/resources/rules/SocialNetworking/SocialNetworking-OTHER.json

@@ -2,7 +2,7 @@
 	"match": {
 		"serviceClassRegex": "Portal",
 		"serviceNameRegex": "SocialNetworking",
-		"calledMethodRegex": "(\/{0,1}(rest))|OTHER"
+		"calledMethodRegex": "(\/{0,1}(rest))|OTHER|UNKNOWN"
 	},
 	"replace": {
 		"serviceClass": "Portal",

src/test/resources/rules/SocialNetworking/SocialNetworking-all.json

@@ -2,7 +2,7 @@
 	"match": {
 		"serviceClassRegex": "Portal",
 		"serviceNameRegex": "SocialNetworking",
-		"calledMethodRegex": "\/{0,1}rest\/((1|2)\/){0,1}(((users(\/2){0,1})|comments|full-text-search|hashtags|messages|notifications|people|posts|tokens|vres|vers)\/){0,1}(?<Method>[a-zA-Z\\-]*)"
+		"calledMethodRegex": "\/{0,1}rest\/((1|2)\/){0,1}(((users(\/2){0,1})|comments|full-text-search|hashtags|messages|notifications|people|posts|tokens|vres|vers)\/){0,1}(?<Method>[a-zA-Z\\-]*(\/){0,1})"
 	},
 	"replace": {
 		"serviceClass": "Portal",

src/test/resources/rules/data-transfer-service/data-transfer-service-OTHER.csv

@@ -0,0 +1 @@
+DataTransfer,data-transfer-service,OTHER

src/test/resources/rules/gcat/gcat-OTHER.csv

@@ -0,0 +1,3 @@
+DataCatalogue,science-catalogue,/index
+DataCatalogue,science-catalogue,OTHER
+DataCatalogue,science-catalogue,UNKNOWN

src/test/resources/rules/gcat/gcat-OTHER.json

@@ -0,0 +1,12 @@
+{
+	"match": {
+		"serviceClassRegex": "(DataCatalogue)|(DataPublishing)",
+		"serviceNameRegex": "(science-catalogue)|(gcat)|(gCat)",
+		"calledMethodRegex": "(\/index)|OTHER|UNKNOWN"
+	},
+	"replace": {
+		"serviceClass": "DataPublishing",
+		"serviceName": "gcat",
+		"calledMethod": "OTHER"
+	}
+}

src/test/resources/rules/gcat/gcat-collection-instance.csv

@@ -0,0 +1,13 @@
+DataCatalogue,science-catalogue,/groups/ABCD
+DataCatalogue,science-catalogue,/groups/aaaaaa
+DataCatalogue,science-catalogue,/groups/fd72502e-ddfa-4121-a12a-bb42e572d649
+DataCatalogue,science-catalogue,/items/14f76289_43fa_4a76_8f36_a48793b9dd82
+DataCatalogue,science-catalogue,/items/ABCD
+DataCatalogue,science-catalogue,/items/f13813ae-7205-434d-8baf-3661ab665127
+DataCatalogue,science-catalogue,/items/restful_transaction_model
+DataCatalogue,science-catalogue,/organizations/algorithms
+DataCatalogue,science-catalogue,/organizations/aquamaps1
+DataCatalogue,science-catalogue,/profiles/Empty%20Profile
+DataCatalogue,science-catalogue,/rest/api/items/create
+DataCatalogue,science-catalogue,/users/andrearossi
+DataCatalogue,science-catalogue,/users/luca_frosini

src/test/resources/rules/gcat/gcat-collection-instance.json

@@ -0,0 +1,12 @@
+{
+	"match": {
+		"serviceClassRegex": "(DataCatalogue)|(DataPublishing)",
+		"serviceNameRegex": "(science-catalogue)|(gcat)|(gCat)",
+		"calledMethodRegex": "(\/){0,1}(rest\/(api\/){0,1}){0,1}(?<Collection>group|item|license|namespace|organization|profile|user)s\/(?!list)[%0-9a-zA-Z\\-_]*$"
+	},
+	"replace": {
+		"serviceClass": "DataPublishing",
+		"serviceName": "gcat",
+		"calledMethod": "read ${Collection}"
+	}
+}

src/test/resources/rules/gcat/gcat-collection.csv

@@ -0,0 +1,8 @@
+DataCatalogue,science-catalogue,/groups
+DataCatalogue,science-catalogue,/items
+DataCatalogue,science-catalogue,/licenses
+DataCatalogue,science-catalogue,/namespaces
+DataCatalogue,science-catalogue,/organizations
+DataCatalogue,science-catalogue,/profiles
+DataCatalogue,science-catalogue,/users
+DataCatalogue,science-catalogue,/rest/api/groups/list

src/test/resources/rules/gcat/gcat-collection.json

@@ -0,0 +1,12 @@
+{
+	"match": {
+		"serviceClassRegex": "(DataCatalogue)|(DataPublishing)",
+		"serviceNameRegex": "(science-catalogue)|(gcat)|(gCat)",
+		"calledMethodRegex": "(\/){0,1}(rest\/(api\/){0,1}){0,1}(?<Collection>((groups(\/list){0,1}))|items|licenses|namespaces|organizations|profiles|users)$"
+	},
+	"replace": {
+		"serviceClass": "DataPublishing",
+		"serviceName": "gcat",
+		"calledMethod": "list ${Collection}"
+	}
+}

src/test/resources/rules/gcat/gcat-resource-instance.csv

@@ -0,0 +1 @@
+DataCatalogue,science-catalogue,/items/ABCD/resources/EFGH

src/test/resources/rules/gcat/gcat-resource-instance.json

@@ -0,0 +1,12 @@
+{
+	"match": {
+		"serviceClassRegex": "(DataCatalogue)|(DataPublishing)",
+		"serviceNameRegex": "(science-catalogue)|(gcat)|(gCat)",
+		"calledMethodRegex": "(\/){0,1}(rest\/(api\/){0,1}){0,1}items\/[%0-9a-zA-Z\\-_]*\/resources\/[%0-9a-zA-Z\\-_]*$"
+	},
+	"replace": {
+		"serviceClass": "DataPublishing",
+		"serviceName": "gcat",
+		"calledMethod": "read resource"
+	}
+}

src/test/resources/rules/gcat/gcat-resources.csv

@@ -0,0 +1,2 @@
+DataCatalogue,science-catalogue,/items/ABCD/resources
+DataCatalogue,science-catalogue,/items/restful_transaction_model/resources

src/test/resources/rules/gcat/gcat-resources.json

@@ -0,0 +1,12 @@
+{
+	"match": {
+		"serviceClassRegex": "(DataCatalogue)|(DataPublishing)",
+		"serviceNameRegex": "(science-catalogue)|(gcat)|(gCat)",
+		"calledMethodRegex": "(\/){0,1}(rest\/(api\/){0,1}){0,1}items\/[%0-9a-zA-Z\\-_]*\/resources$"
+	},
+	"replace": {
+		"serviceClass": "DataPublishing",
+		"serviceName": "gcat",
+		"calledMethod": "list resources"
+	}
+}