Adding and fixing rules

src/main/java/org/gcube/accounting/aggregator/RegexRulesAggregator.java

@@ -84,7 +84,11 @@ public class RegexRulesAggregator implements Runnable {
 		return matcherReplace;
 	}
 	
-	
+	public void vacumRules() {
+		synchronized(matcherReplaceList) {
+			matcherReplaceList = new ArrayList<>();
+		}
+	}
 	
 	
 	public void readConfiguration() {

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

@@ -56,6 +56,7 @@ public class TestRules extends ContextTest {
 			}
 			rulesFiles.addAll(Arrays.asList(dir.listFiles(filenameFilter)));
 			RegexRulesAggregator regexRulesAggregator = RegexRulesAggregator.getInstance();
+			regexRulesAggregator.vacumRules();
 			for(File rulesFile : rulesFiles) {
 				ObjectMapper mapper = DSMapper.getObjectMapper();
 				MatcherReplace matcherReplace = mapper.readValue(rulesFile, MatcherReplace.class);
@@ -123,6 +124,7 @@ public class TestRules extends ContextTest {
 				sur.setServiceName(serviceName);
 				sur.setCalledMethod(calledMethod);
 				sur.validate();
+				sur.validate();
 				// logger.trace("To Be aggregated ServiceUsageRecord {}", sur);
 				
 				long oldMinInvocationTime = aggregated.getMinInvocationTime();
@@ -212,12 +214,13 @@ public class TestRules extends ContextTest {
 				"-----------------------------------------------------------------------------------------------------\n\n\n");
 	}
 	
+	
 	@Test
 	public void testSingleRule() throws Exception {
 		allRules();
 		File rulesDirectory = getRulesDirectory();
-		File rulesDirFile = new File(rulesDirectory, "data-transfer-service");
-		File rulesFile = new File(rulesDirFile, "data-transfer-service-transfer.json");
+		File rulesDirFile = new File(rulesDirectory, "dataminer-pool-manager");
+		File rulesFile = new File(rulesDirFile, "dataminer-pool-manager-OTHER.json");
 		testRule(rulesFile);
 	}
 	

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

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

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

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

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

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

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

@@ -0,0 +1,12 @@
+{
+	"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

@@ -0,0 +1,4 @@
+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-item.json

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

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

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

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

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

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

@@ -1,2 +1,6 @@
 Data-Catalogue,Catalogue-WS,/rest/licenses/list
-Data-Catalogue,Catalogue-WS,/rest/api/licenses/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/licences/list
+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}licenses\/list)|(listLicenses)"
+		"calledMethodRegex": "^\/rest\/(api\/){0,1}licen(c|s)es\/(?<Action>list)(\/{0,1})"
 	},
 	"replace": {
 		"serviceClass": "DataPublishing",
 		"serviceName": "Catalogue-WS",
-		"calledMethod": "listLicenses"
+		"calledMethod": "${Action}Licenses"
 	}
 }

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

@@ -0,0 +1 @@
+Data-Catalogue,Catalogue-WS,/rest/api/organizations/create

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

@@ -0,0 +1,12 @@
+{
+	"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})"
+	},
+	"replace": {
+		"serviceClass": "DataPublishing",
+		"serviceName": "Catalogue-WS",
+		"calledMethod": "${Action}Organization"
+	}
+}

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

@@ -10,4 +10,8 @@ Data-Catalogue,Catalogue-WS,/rest/api/organizations/list%3finclude_dataset_count
 Data-Catalogue,Catalogue-WS,/rest/api/organizations/list%3flimit=2
 Data-Catalogue,Catalogue-WS,/rest/api/organizations/list%3foffset=2
 Data-Catalogue,Catalogue-WS,/rest/api/organizations/list%3forder_by=name
-Data-Catalogue,Catalogue-WS,/rest/api/organizations/list/%3finclude_dataset_count=true
+Data-Catalogue,Catalogue-WS,/rest/api/organizations/list/%3finclude_dataset_count=true
+Data-Catalogue,Catalogue-WS,listOrganizations
+Data-Catalogue,Catalogue-WS,listOrganization
+Data-Catalogue,Catalogue-WS,listOrganisations
+Data-Catalogue,Catalogue-WS,listOrganisation

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

@@ -2,7 +2,7 @@
 	"match": {
 		"serviceClassRegex": "(Data-Catalogue)|(DataPublishing)",
 		"serviceNameRegex": "Catalogue-WS",
-		"calledMethodRegex": "^\/rest\/api\/organi(s|z)ation(s){0,1}\/list.*"
+		"calledMethodRegex": "(\/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",

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

@@ -0,0 +1 @@
+Data-Catalogue,Catalogue-WS,/rest/api/profiles/profile

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

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

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

@@ -0,0 +1,4 @@
+Data-Catalogue,Catalogue-WS,/rest/api/profiles/profile_names
+Data-Catalogue,Catalogue-WS,/rest/api/profiles/profile_names/
+Data-Catalogue,Catalogue-WS,/rest/api/profile/list
+Data-Catalogue,Catalogue-WS,/rest/api/profiles/list

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

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

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

@@ -0,0 +1,3 @@
+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

@@ -0,0 +1,12 @@
+{
+	"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

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

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

@@ -0,0 +1,12 @@
+{
+	"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/Catalogue-WS/Catalogue-WS-showOrganizations.csv

@@ -1,6 +0,0 @@
-Data-Catalogue,Catalogue-WS,/rest/api/organisations/show%3fid=biodiversitylab
-Data-Catalogue,Catalogue-WS,/rest/api/organizations/show
-Data-Catalogue,Catalogue-WS,/rest/api/organizations/show%3fid=aquamaps
-Data-Catalogue,Catalogue-WS,/rest/api/organizations/show%3fid=biodiversitylab
-Data-Catalogue,Catalogue-WS,/rest/api/organizations/show%3fid=egip
-Data-Catalogue,Catalogue-WS,/rest/api/organizations/show%3fid=organization_name

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}(WebProcessingService|UNKNOWN|OTHER|(gcube\/resource\/scopes)).*"
 	},
 	"replace": {
 		"serviceClass": "DataAnalysis",

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

@@ -1,4 +1,4 @@
 Data-Catalogue,GRSFPublisher,UNKNOWN
 Data-Catalogue,GRSFPublisher,OTHER
 Data-Catalogue,GRSFPublisher,/rest/firms/hello
-Data-Catalogue,GRSFPublisher,/rest/ram/hello
+Data-Catalogue,GRSFPublisher,/rest/ram/hello

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

@@ -2,7 +2,7 @@
 	"match": {
 		"serviceClassRegex": "(Data-Catalogue)|(DataPublishing)",
 		"serviceNameRegex": "GRSFPublisher",
-		"calledMethodRegex": ".*(hello)|(UNKNOWN)|(OTHER)|(get-licenses).*"
+		"calledMethodRegex": ".*((hello)|(UNKNOWN)|(OTHER)).*"
 	},
 	"replace": {
 		"serviceClass": "DataPublishing",

src/test/resources/rules/GRSFPublisher/GRSFPublisher-getLicenses.csv

@@ -0,0 +1,7 @@
+Data-Catalogue,GRSFPublisher,/rest/ram/fishery/get-licenses
+Data-Catalogue,GRSFPublisher,/rest/ram/stock/get-license
+Data-Catalogue,GRSFPublisher,/rest/ram/stock/get-licenses
+Data-Catalogue,GRSFPublisher,/rest/stock/fishery/get-licenses
+Data-Catalogue,GRSFPublisher,/rest/stock/get-licenses
+Data-Catalogue,GRSFPublisher,/rest/stock/ram/get-licenses
+Data-Catalogue,GRSFPublisher,/rest/stock/rams/get-licenses

src/test/resources/rules/GRSFPublisher/GRSFPublisher-getLicenses.json

@@ -0,0 +1,12 @@
+{
+	"match": {
+		"serviceClassRegex": "(Data-Catalogue)|(DataPublishing)",
+		"serviceNameRegex": "GRSFPublisher",
+		"calledMethodRegex": ".*get-license(s{0,1}).*"
+	},
+	"replace": {
+		"serviceClass": "DataPublishing",
+		"serviceName": "GRSFPublisher",
+		"calledMethod": "getLicenses"
+	}
+}

src/test/resources/rules/GRSFPublisher/GRSFPublisher-update.csv

@@ -1 +1,2 @@
 Data-Catalogue,GRSFPublisher,/rest/grsf/stock/update-product
+Data-Catalogue,GRSFPublisher,update

src/test/resources/rules/GRSFPublisher/GRSFPublisher-update.json

@@ -2,7 +2,7 @@
 	"match": {
 		"serviceClassRegex": "(Data-Catalogue)|(DataPublishing)",
 		"serviceNameRegex": "GRSFPublisher",
-		"calledMethodRegex": ".*update-product.*"
+		"calledMethodRegex": "(.*update-product.*)|(update)"
 	},
 	"replace": {
 		"serviceClass": "DataPublishing",

src/test/resources/rules/GeoNetwork/GeoNetwork-read.json

@@ -2,7 +2,7 @@
 	"match": {
 		"serviceClassRegex": "(SDI)|(SpatialData)",
 		"serviceNameRegex": "GeoNetwork",
-		"calledMethodRegex": ".*(\\.get(\\..*|\/.*|$)|\\.show(\\..*|$)|((\\.|/)info(?!edit).*))"
+		"calledMethodRegex": "(.*(\\.get(\\..*|\/.*|$)|\\.show(\\..*|$)|((\\.|/)info(?!edit).*)))|(read@json)"
 	},
 	"replace": {
 		"serviceClass": "SDI",

src/test/resources/rules/HomeLibraryWebapp/HomeLibraryWebapp-all.csv

@@ -0,0 +1,99 @@
+DataAccess,HomeLibraryWebapp,/CanAddChildren
+DataAccess,HomeLibraryWebapp,/CanDelete
+DataAccess,HomeLibraryWebapp,/CanModifyProperties
+DataAccess,HomeLibraryWebapp,/CanReadNode
+DataAccess,HomeLibraryWebapp,/ChangePass
+DataAccess,HomeLibraryWebapp,/CreateCostumePrivilegeServlet
+DataAccess,HomeLibraryWebapp,/CreateGroupServlet
+DataAccess,HomeLibraryWebapp,/CreateSession
+DataAccess,HomeLibraryWebapp,/CreateUserServlet
+DataAccess,HomeLibraryWebapp,/DeleteAcesServlet
+DataAccess,HomeLibraryWebapp,/DeleteAuthorizableServlet
+DataAccess,HomeLibraryWebapp,/GetAccountingById
+DataAccess,HomeLibraryWebapp,/GetDisplayNameServlet
+DataAccess,HomeLibraryWebapp,/GetRegisteredPrivileges
+DataAccess,HomeLibraryWebapp,/GetVersionServlet
+DataAccess,HomeLibraryWebapp,/GroupMembershipServlet
+DataAccess,HomeLibraryWebapp,/IsGroupServlet
+DataAccess,HomeLibraryWebapp,/ListGroupsServlet
+DataAccess,HomeLibraryWebapp,/ListUsersServlet
+DataAccess,HomeLibraryWebapp,/ModifyAceServlet
+DataAccess,HomeLibraryWebapp,/ReleaseSession
+DataAccess,HomeLibraryWebapp,/SetVersionServlet
+DataAccess,HomeLibraryWebapp,/UpdateGroupServlet
+DataAccess,HomeLibraryWebapp,/acl/CanAddChildren
+DataAccess,HomeLibraryWebapp,/acl/CanModifyProperties
+DataAccess,HomeLibraryWebapp,/acl/CanReadNode
+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/GetReferences
+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/MoveToTrashIds
+DataAccess,HomeLibraryWebapp,/post/RemoveItem
+DataAccess,HomeLibraryWebapp,/post/SaveAccountingItem
+DataAccess,HomeLibraryWebapp,/post/SaveItem
+DataAccess,HomeLibraryWebapp,/rest/CreateFolder
+DataAccess,HomeLibraryWebapp,/rest/Delete
+DataAccess,HomeLibraryWebapp,/rest/Download
+DataAccess,HomeLibraryWebapp,/rest/List
+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
+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,OTHER
+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/GetItemById
+DataAccess,HomeLibraryWebapp,get/GetItemByPath
+DataAccess,HomeLibraryWebapp,get/GetParentsById
+DataAccess,HomeLibraryWebapp,get/GetReferences
+DataAccess,HomeLibraryWebapp,get/IsLocked
+DataAccess,HomeLibraryWebapp,get/LockSession
+DataAccess,HomeLibraryWebapp,get/Move
+DataAccess,HomeLibraryWebapp,get/UnlockSession
+DataAccess,HomeLibraryWebapp,post/ChangePrimaryType
+DataAccess,HomeLibraryWebapp,post/MoveToTrashIds
+DataAccess,HomeLibraryWebapp,post/RemoveItem
+DataAccess,HomeLibraryWebapp,post/SaveAccountingItem
+DataAccess,HomeLibraryWebapp,post/SaveItem

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

@@ -0,0 +1,12 @@
+{
+	"match": {
+		"serviceClassRegex": "DataAccess",
+		"serviceNameRegex": "HomeLibraryWebapp",
+		"calledMethodRegex": "\/{0,1}((acl|get|rest|post|trash|versioning)\/){0,1}(?<Method>[a-zA-Z]*)"
+	},
+	"replace": {
+		"serviceClass": "DataAccess",
+		"serviceName": "HomeLibraryWebapp",
+		"calledMethod": "${Method}"
+	}
+}

src/test/resources/rules/allRules.json.full

@@ -58,18 +58,73 @@
 	"match": {
 		"serviceClassRegex": "(Data-Catalogue)|(DataPublishing)",
 		"serviceNameRegex": "Catalogue-WS",
-		"calledMethodRegex": "(^\/rest\/(api\/){0,1}licenses\/list)|(listLicenses)"
+		"calledMethodRegex": "(\/rest\/(api\/){0,1})group(s){0,1}\/(?<Action>(create|show|purge|delete))(\/{0,1})"
 	},
 	"replace": {
 		"serviceClass": "DataPublishing",
 		"serviceName": "Catalogue-WS",
-		"calledMethod": "listLicenses"
+		"calledMethod": "${Action}Group"
 	}
 },{
 	"match": {
 		"serviceClassRegex": "(Data-Catalogue)|(DataPublishing)",
 		"serviceNameRegex": "Catalogue-WS",
-		"calledMethodRegex": "^\/rest\/api\/organi(s|z)ation(s){0,1}\/list.*"
+		"calledMethodRegex": "(\/rest\/(api\/){0,1})group(s){0,1}\/(?<Action>list)(\/{0,1})"
+	},
+	"replace": {
+		"serviceClass": "DataPublishing",
+		"serviceName": "Catalogue-WS",
+		"calledMethod": "${Action}Groups"
+	}
+},{
+	"match": {
+		"serviceClassRegex": "(Data-Catalogue)|(DataPublishing)",
+		"serviceNameRegex": "Catalogue-WS",
+		"calledMethodRegex": "(\/rest\/(api\/){0,1})item(s){0,1}\/(?<Action>(create|show|purge|delete))(\/{0,1})"
+	},
+	"replace": {
+		"serviceClass": "DataPublishing",
+		"serviceName": "Catalogue-WS",
+		"calledMethod": "${Action}Item"
+	}
+},{
+	"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"
+	}
+},{
+	"match": {
+		"serviceClassRegex": "(Data-Catalogue)|(DataPublishing)",
+		"serviceNameRegex": "Catalogue-WS",
+		"calledMethodRegex": "^\/rest\/(api\/){0,1}licen(c|s)es\/(?<Action>list)(\/{0,1})"
+	},
+	"replace": {
+		"serviceClass": "DataPublishing",
+		"serviceName": "Catalogue-WS",
+		"calledMethod": "${Action}Licenses"
+	}
+},{
+	"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})"
+	},
+	"replace": {
+		"serviceClass": "DataPublishing",
+		"serviceName": "Catalogue-WS",
+		"calledMethod": "${Action}Organization"
+	}
+},{
+	"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}))"
 	},
 	"replace": {
 		"serviceClass": "DataPublishing",
@@ -91,12 +146,45 @@
 	"match": {
 		"serviceClassRegex": "(Data-Catalogue)|(DataPublishing)",
 		"serviceNameRegex": "Catalogue-WS",
-		"calledMethodRegex": "^\/rest\/api\/organi(s|z)ation(s){0,1}\/show.*"
+		"calledMethodRegex": "(\/rest\/(api\/){0,1})profile(s){0,1}\/(?<Action>(show|profile))(\/{0,1})"
+	},
+	"replace": {
+		"serviceClass": "DataPublishing",
+		"serviceName": "Catalogue-WS",
+		"calledMethod": "showProfile"
+	}
+},{
+	"match": {
+		"serviceClassRegex": "(Data-Catalogue)|(DataPublishing)",
+		"serviceNameRegex": "Catalogue-WS",
+		"calledMethodRegex": "(\/rest\/(api\/){0,1})profile(s){0,1}\/(?<Action>(list|profile_names))(\/{0,1})"
+	},
+	"replace": {
+		"serviceClass": "DataPublishing",
+		"serviceName": "Catalogue-WS",
+		"calledMethod": "listProfile"
+	}
+},{
+	"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"
+	}
+},{
+	"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": "showOrganizations"
+		"calledMethod": "${Action}Resource"
 	}
 },{
 	"match": {
@@ -157,7 +245,7 @@
 	"match": {
 		"serviceClassRegex": "(WPS)|(DataAnalysis)",
 		"serviceNameRegex": "DataMiner",
-		"calledMethodRegex": "^/{0,1}(WebProcessingService|UNKNOWN|OTHER|gcube\/resource\/scopes).*"
+		"calledMethodRegex": "^\/{0,1}(WebProcessingService|UNKNOWN|OTHER|(gcube\/resource\/scopes)).*"
 	},
 	"replace": {
 		"serviceClass": "DataAnalysis",
@@ -300,7 +388,7 @@
 	"match": {
 		"serviceClassRegex": "(SDI)|(SpatialData)",
 		"serviceNameRegex": "GeoNetwork",
-		"calledMethodRegex": ".*(\\.get(\\..*|\/.*|$)|\\.show(\\..*|$)|((\\.|/)info(?!edit).*))"
+		"calledMethodRegex": "(.*(\\.get(\\..*|\/.*|$)|\\.show(\\..*|$)|((\\.|/)info(?!edit).*)))|(read@json)"
 	},
 	"replace": {
 		"serviceClass": "SDI",
@@ -374,6 +462,17 @@
 		"serviceName": "GRSFPublisher",
 		"calledMethod": "delete"
 	}
+},{
+	"match": {
+		"serviceClassRegex": "(Data-Catalogue)|(DataPublishing)",
+		"serviceNameRegex": "GRSFPublisher",
+		"calledMethodRegex": ".*get-license(s{0,1}).*"
+	},
+	"replace": {
+		"serviceClass": "DataPublishing",
+		"serviceName": "GRSFPublisher",
+		"calledMethod": "getLicenses"
+	}
 },{
 	"match": {
 		"serviceClassRegex": "(Data-Catalogue)|(DataPublishing)",
@@ -389,7 +488,7 @@
 	"match": {
 		"serviceClassRegex": "(Data-Catalogue)|(DataPublishing)",
 		"serviceNameRegex": "GRSFPublisher",
-		"calledMethodRegex": ".*(hello)|(UNKNOWN)|(OTHER)|(get-licenses).*"
+		"calledMethodRegex": ".*((hello)|(UNKNOWN)|(OTHER)).*"
 	},
 	"replace": {
 		"serviceClass": "DataPublishing",
@@ -400,7 +499,7 @@
 	"match": {
 		"serviceClassRegex": "(Data-Catalogue)|(DataPublishing)",
 		"serviceNameRegex": "GRSFPublisher",
-		"calledMethodRegex": ".*update-product.*"
+		"calledMethodRegex": "(.*update-product.*)|(update)"
 	},
 	"replace": {
 		"serviceClass": "DataPublishing",

src/test/resources/rules/dataminer-pool-manager/dataminer-pool-manager-OTHER.csv

@@ -0,0 +1,3 @@
+DataAnalysis,dataminer-pool-manager,api
+DataAnalysis,dataminer-pool-manager,gcube/resource
+dataanalysis,dataminer-pool-manager,OTHER

src/test/resources/rules/dataminer-pool-manager/dataminer-pool-manager-OTHER.json

@@ -0,0 +1,12 @@
+{
+	"match": {
+		"serviceClassRegex": "(DataAnalysis)|(data-analysis)|dataanalysis",
+		"serviceNameRegex": "dataminer-pool-manager",
+		"calledMethodRegex": "\/{0,1}(api|OTHER|(gcube\/resource))"
+	},
+	"replace": {
+		"serviceClass": "DataAnalysis",
+		"serviceName": "dataminer-pool-manager",
+		"calledMethod": "OTHER"
+	}
+}

src/test/resources/rules/dataminer-pool-manager/dataminer-pool-manager-all.csv

@@ -0,0 +1,10 @@
+DataAnalysis,dataminer-pool-manager,/api/algorithm/add
+DataAnalysis,dataminer-pool-manager,/api/algorithm/stage
+DataAnalysis,dataminer-pool-manager,/api/log
+DataAnalysis,dataminer-pool-manager,/api/monitor
+DataAnalysis,dataminer-pool-manager,api/algorithm/add
+DataAnalysis,dataminer-pool-manager,api/algorithm/stage
+DataAnalysis,dataminer-pool-manager,api/log
+DataAnalysis,dataminer-pool-manager,api/monitor
+dataanalysis,dataminer-pool-manager,api/algorithm/stage
+dataanalysis,dataminer-pool-manager,api/log

src/test/resources/rules/dataminer-pool-manager/dataminer-pool-manager-all.json

@@ -0,0 +1,12 @@
+{
+	"match": {
+		"serviceClassRegex": "(DataAnalysis)|(data-analysis)|dataanalysis",
+		"serviceNameRegex": "dataminer-pool-manager",
+		"calledMethodRegex": "\/{0,1}api\/(algorithm\/){0,1}(?<Method>[a-zA-Z]*)"
+	},
+	"replace": {
+		"serviceClass": "DataAnalysis",
+		"serviceName": "dataminer-pool-manager",
+		"calledMethod": "${Method}"
+	}
+}