Fixed rules

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

@@ -219,8 +219,8 @@ public class TestRules extends ContextTest {
 	public void testSingleRule() throws Exception {
 		allRules();
 		File rulesDirectory = getRulesDirectory();
-		File rulesDirFile = new File(rulesDirectory, "SocialNetworking");
-		File rulesFile = new File(rulesDirFile, "SocialNetworking-all.json");
+		File rulesDirFile = new File(rulesDirectory, "DataMiner");
+		File rulesFile = new File(rulesDirFile, "DataMiner-all.json");
 		testRule(rulesFile);
 	}
 	

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

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

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

@@ -3,4 +3,13 @@ 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/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

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

@@ -1,5 +1,3 @@
-WPS,DataMiner,/WebProcessingService
-WPS,DataMiner,WebProcessingService
 WPS,DataMiner,UNKNOWN
 WPS,DataMiner,OTHER
 WPS,DataMiner,gcube/resource/scopes

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

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

@@ -1,3 +1,13 @@
+WPS,DataMiner,GetCapabilities
+WPS,DataMiner,/GetCapabilities
+WPS,DataMiner,RetrieveResultServlet
+WPS,DataMiner,/RetrieveResultServlet
+WPS,DataMiner,DescribeProcess
+WPS,DataMiner,/DescribeProcess
+WPS,DataMiner,WebProcessingService
+WPS,DataMiner,/WebProcessingService
+WPS,DataMiner,CancelComputationServlet
+WPS,DataMiner,/CancelComputationServlet
 WPS,DataMiner,Execute
 WPS,DataMiner,Execute - org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.clusterers.DBSCAN
 WPS,DataMiner,Execute - org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.clusterers.KMEANS

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

@@ -2,11 +2,11 @@
 	"match": {
 		"serviceClassRegex": "(WPS)|(DataAnalysis)",
 		"serviceNameRegex": "DataMiner",
-		"calledMethodRegex": "^/{0,1}GetCapabilities.*"
+		"calledMethodRegex": "^\/{0,1}(?<Method>(?!(UNKNOWN|OTHER|(gcube\/resource\/scopes))).*)"
 	},
 	"replace": {
 		"serviceClass": "DataAnalysis",
 		"serviceName": "DataMiner",
-		"calledMethod": "getCapabilities"
+		"calledMethod": "${Method}"
 	}
 }

src/test/resources/rules/DataMiner/DataMiner-describeProcess.csv

@@ -1 +0,0 @@
-WPS,DataMiner,DescribeProcess

src/test/resources/rules/DataMiner/DataMiner-describeProcess.json

@@ -1,12 +0,0 @@
-{
-	"match": {
-		"serviceClassRegex": "(WPS)|(DataAnalysis)",
-		"serviceNameRegex": "DataMiner",
-		"calledMethodRegex": "^/{0,1}DescribeProcess.*"
-	},
-	"replace": {
-		"serviceClass": "DataAnalysis",
-		"serviceName": "DataMiner",
-		"calledMethod": "describeProcess"
-	}
-}

src/test/resources/rules/DataMiner/DataMiner-getCapabilities.csv

@@ -1 +0,0 @@
-WPS,DataMiner,GetCapabilities

src/test/resources/rules/DataMiner/DataMiner-getResult.csv

@@ -1,2 +0,0 @@
-WPS,DataMiner,/RetrieveResultServlet
-WPS,DataMiner,RetrieveResultServlet

src/test/resources/rules/DataMiner/DataMiner-getResult.json

@@ -1,12 +0,0 @@
-{
-	"match": {
-		"serviceClassRegex": "(WPS)|(DataAnalysis)",
-		"serviceNameRegex": "DataMiner",
-		"calledMethodRegex": "^/{0,1}RetrieveResult.*"
-	},
-	"replace": {
-		"serviceClass": "DataAnalysis",
-		"serviceName": "DataMiner",
-		"calledMethod": "getResult"
-	}
-}

src/test/resources/rules/DataMiner/DataMiner-stop.csv

@@ -1,2 +0,0 @@
-WPS,DataMiner,/CancelComputationServlet
-WPS,DataMiner,CancelComputationServlet

src/test/resources/rules/DataMiner/DataMiner-stop.json

@@ -1,12 +0,0 @@
-{
-	"match": {
-		"serviceClassRegex": "(WPS)|(DataAnalysis)",
-		"serviceNameRegex": "DataMiner",
-		"calledMethodRegex": "^/{0,1}CancelComputation.*"
-	},
-	"replace": {
-		"serviceClass": "DataAnalysis",
-		"serviceName": "DataMiner",
-		"calledMethod": "stop"
-	}
-}

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

@@ -97,3 +97,52 @@ DataAccess,HomeLibraryWebapp,post/MoveToTrashIds
 DataAccess,HomeLibraryWebapp,post/RemoveItem
 DataAccess,HomeLibraryWebapp,post/SaveAccountingItem
 DataAccess,HomeLibraryWebapp,post/SaveItem
+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,/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/GetChildrenCount
+DataAccess,HomeLibraryWebapp,/get/GetItemById
+DataAccess,HomeLibraryWebapp,/get/GetItemByPath
+DataAccess,HomeLibraryWebapp,/get/GetParentsById
+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/CreateFolder
+DataAccess,HomeLibraryWebapp,/post/MoveToTrashIds
+DataAccess,HomeLibraryWebapp,/post/RemoveItem
+DataAccess,HomeLibraryWebapp,/post/SaveAccountingItem
+DataAccess,HomeLibraryWebapp,/post/SaveItem
+DataAccess,HomeLibraryWebapp,/rest/GetPublicLink
+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