Fixed StorageHub rules

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

@@ -228,7 +228,7 @@ public class TestRules extends ContextTest {
 	public void testAllRuleInAdirectory() throws Exception {
 		allRules();
 		File rulesDirectory = getRulesDirectory();
-		File rulesDirFile = new File(rulesDirectory, "SmartExecutor");
+		File rulesDirFile = new File(rulesDirectory, "StorageHub");
 	
 		FilenameFilter filenameFilter = new FilenameFilter() {
 			@Override

src/test/resources/rules/StorageHub/StorageHub-createItem(FILE).csv

@@ -1,3 +1,4 @@
 DataAccess,StorageHub,/item/create/byPath
 DataAccess,StorageHub,/workspace/items/bc1c9525-43f7-4565-b5ea-0a0f9d7853a0/create/FILE
 DataAccess,StorageHub,createItem(FILE)
+DataAccess,StorageHub,/workspace/items/bc1c9525-43f7-4565-b5ea-0a0f9d7853a0/create/test-upload

src/test/resources/rules/StorageHub/StorageHub-createItem(FILE).json

@@ -2,7 +2,7 @@
 	"match": {
 		"serviceClassRegex": "DataAccess",
 		"serviceNameRegex": "StorageHub",
-		"calledMethodRegex": "(^\/workspace\/item(s){0,1}\/[0-9a-zA-Z\\-_]*\/create\/FILE$)|createItem\\(FILE\\)|(\/item\/create\/byPath)"
+		"calledMethodRegex": "(^\/workspace\/item(s){0,1}\/[0-9a-zA-Z\\-_]*\/create\/(FILE|(?!FOLDER).*)$)|createItem\\(FILE\\)|(\/item\/create\/byPath)"
 	},
 	"replace": {
 		"serviceClass": "DataAccess",

src/test/resources/rules/StorageHub/StorageHub-createItem(FOLDER).csv

@@ -0,0 +1 @@
+DataAccess,StorageHub,/workspace/items/2240a3dd6c-2c47-4848-bb7b-462e532954a9/create/FOLDER

src/test/resources/rules/StorageHub/StorageHub-createItem(FOLDER).json

@@ -0,0 +1,12 @@
+{
+	"match": {
+		"serviceClassRegex": "DataAccess",
+		"serviceNameRegex": "StorageHub",
+		"calledMethodRegex": "(^\/workspace\/item(s){0,1}\/[0-9a-zA-Z\\-_]*\/create\/FOLDER$)|createItem\\(FOLDER\\)"
+	},
+	"replace": {
+		"serviceClass": "DataAccess",
+		"serviceName": "StorageHub",
+		"calledMethod": "createItem(FOLDER)"
+	}
+}

src/test/resources/rules/StorageHub/StorageHub-getAcls.csv

@@ -0,0 +1 @@
+DataAccess,StorageHub,/workspace/itams/c141d53d-4cae-4bfc-a6f7-9b8bbd8c0e2b/acls

src/test/resources/rules/StorageHub/StorageHub-getAcls.json

@@ -0,0 +1,12 @@
+{
+	"match": {
+		"serviceClassRegex": "DataAccess",
+		"serviceNameRegex": "StorageHub",
+		"calledMethodRegex": "^\/(workspace\/){1,2}(item|itam)(s){0,1}\/[0-9a-zA-Z\\-_]*\/acl(s){0,1}(\/){0,1}$|getAcls"
+	},
+	"replace": {
+		"serviceClass": "DataAccess",
+		"serviceName": "StorageHub",
+		"calledMethod": "getAcls"
+	}
+}

src/test/resources/rules/StorageHub/StorageHub-getById.csv

@@ -7,3 +7,4 @@ DataAccess,StorageHub,/workspace/item/da558346-7d1a-4159-8780-a22e63f3c7dc/
 DataAccess,StorageHub,/workspace/items/87bea023-3eed-445b-8c27-4d9d4e5921cc
 DataAccess,StorageHub,/workspace/items/790e4c52-fbca-48e9-b267-67ea2ce708c0
 DataAccess,StorageHub,getById
+DataAccess,StorageHub,/workspace/workspace/items/6fbe6284-dd21-4555-bcae-f20662159e46

src/test/resources/rules/StorageHub/StorageHub-getById.json

@@ -2,7 +2,7 @@
 	"match": {
 		"serviceClassRegex": "DataAccess",
 		"serviceNameRegex": "StorageHub",
-		"calledMethodRegex": "^\/workspace(\/item(s){0,1}){0,1}\/(?!(i$)|count|i{0,1}t(h){0,1}rash|group(s){0,1}|user(s){0,1}|paged|v(re|ere|er)fo(ld|dl)ers{0,1}|((C|c)hi(dl|ld|d)ren))[0-9a-zA-Z\\-_]{1,}(\/){0,1}$|getById"
+		"calledMethodRegex": "^\/workspace(\/workspace){0,1}(\/item(s){0,1}){0,1}\/(?!(i$)|count|i{0,1}t(h){0,1}rash|group(s){0,1}|user(s){0,1}|paged|v(re|ere|er)fo(ld|dl)ers{0,1}|((C|c)hi(dl|ld|d)ren))[0-9a-zA-Z\\-_]{1,}(\/){0,1}$|getById"
 	},
 	"replace": {
 		"serviceClass": "DataAccess",

src/test/resources/rules/StorageHub/StorageHub-getVersions.csv

@@ -0,0 +1,2 @@
+DataAccess,StorageHub,/workspace/workspace/items/6fbe6284-dd21-4555-bcae-f20662159e46/version
+DataAccess,StorageHub,/workspace/workspace/items/6fbe6284-dd21-4555-bcae-f20662159e46/versions

src/test/resources/rules/StorageHub/StorageHub-getVersions.json

@@ -0,0 +1,12 @@
+{
+	"match": {
+		"serviceClassRegex": "DataAccess",
+		"serviceNameRegex": "StorageHub",
+		"calledMethodRegex": "^\/(workspace\/){1,2}item(s){0,1}\/[0-9a-zA-Z\\-_]*\/version(s){0,1}(\/){0,1}$|getVersions"
+	},
+	"replace": {
+		"serviceClass": "DataAccess",
+		"serviceName": "StorageHub",
+		"calledMethod": "getVersions"
+	}
+}

src/test/resources/rules/StorageHub/StorageHub-resolvePubliclink.csv

@@ -1,2 +1,3 @@
 DataAccess,StorageHub,/workspace/items/publiclink/E_cb6a04d1-f94b-4c2f-90ed-18c1cee591bc
 DataAccess,StorageHub,/workspace/items/publiclink/E_yl9pyk1l/+qF3LnaT17GYrcqp1eg7ZghY9VJUfIk/PIMEGZvJQQZxpQ0jBEOh2eZ
+DataAccess,StorageHub,/workspace/publiclink/E_Vm9EWkJIY1hyeGNZTiswWVk5STFmczJ5MnBaakdqWEhVL2hNbUhrVFhZdGlwbG5oM0ZNam0rbllGS1N3bTVubQ==

src/test/resources/rules/StorageHub/StorageHub-resolvePubliclink.json

@@ -2,7 +2,7 @@
 	"match": {
 		"serviceClassRegex": "DataAccess",
 		"serviceNameRegex": "StorageHub",
-		"calledMethodRegex": "\/workspace\/items\/publiclink\/.*"
+		"calledMethodRegex": "\/workspace(\/items){0,1}\/publiclink\/.*"
 	},
 	"replace": {
 		"serviceClass": "DataAccess",

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

@@ -851,13 +851,24 @@
 	"match": {
 		"serviceClassRegex": "DataAccess",
 		"serviceNameRegex": "StorageHub",
-		"calledMethodRegex": "(^\/workspace\/item(s){0,1}\/[0-9a-zA-Z\\-_]*\/create\/FILE$)|createItem\\(FILE\\)|(\/item\/create\/byPath)"
+		"calledMethodRegex": "(^\/workspace\/item(s){0,1}\/[0-9a-zA-Z\\-_]*\/create\/(FILE|(?!FOLDER).*)$)|createItem\\(FILE\\)|(\/item\/create\/byPath)"
 	},
 	"replace": {
 		"serviceClass": "DataAccess",
 		"serviceName": "StorageHub",
 		"calledMethod": "createItem(FILE)"
 	}
+},{
+	"match": {
+		"serviceClassRegex": "DataAccess",
+		"serviceNameRegex": "StorageHub",
+		"calledMethodRegex": "(^\/workspace\/item(s){0,1}\/[0-9a-zA-Z\\-_]*\/create\/FOLDER$)|createItem\\(FOLDER\\)"
+	},
+	"replace": {
+		"serviceClass": "DataAccess",
+		"serviceName": "StorageHub",
+		"calledMethod": "createItem(FOLDER)"
+	}
 },{
 	"match": {
 		"serviceClassRegex": "DataAccess",
@@ -884,7 +895,18 @@
 	"match": {
 		"serviceClassRegex": "DataAccess",
 		"serviceNameRegex": "StorageHub",
-		"calledMethodRegex": "^\/workspace(\/item(s){0,1}){0,1}\/(?!(i$)|count|i{0,1}t(h){0,1}rash|group(s){0,1}|user(s){0,1}|paged|v(re|ere|er)fo(ld|dl)ers{0,1}|((C|c)hi(dl|ld|d)ren))[0-9a-zA-Z\\-_]{1,}(\/){0,1}$|getById"
+		"calledMethodRegex": "^\/(workspace\/){1,2}(item|itam)(s){0,1}\/[0-9a-zA-Z\\-_]*\/acl(s){0,1}(\/){0,1}$|getAcls"
+	},
+	"replace": {
+		"serviceClass": "DataAccess",
+		"serviceName": "StorageHub",
+		"calledMethod": "getAcls"
+	}
+},{
+	"match": {
+		"serviceClassRegex": "DataAccess",
+		"serviceNameRegex": "StorageHub",
+		"calledMethodRegex": "^\/workspace(\/workspace){0,1}(\/item(s){0,1}){0,1}\/(?!(i$)|count|i{0,1}t(h){0,1}rash|group(s){0,1}|user(s){0,1}|paged|v(re|ere|er)fo(ld|dl)ers{0,1}|((C|c)hi(dl|ld|d)ren))[0-9a-zA-Z\\-_]{1,}(\/){0,1}$|getById"
 	},
 	"replace": {
 		"serviceClass": "DataAccess",
@@ -935,6 +957,17 @@
 		"serviceName": "StorageHub",
 		"calledMethod": "getUsers"
 	}
+},{
+	"match": {
+		"serviceClassRegex": "DataAccess",
+		"serviceNameRegex": "StorageHub",
+		"calledMethodRegex": "^\/(workspace\/){1,2}item(s){0,1}\/[0-9a-zA-Z\\-_]*\/version(s){0,1}(\/){0,1}$|getVersions"
+	},
+	"replace": {
+		"serviceClass": "DataAccess",
+		"serviceName": "StorageHub",
+		"calledMethod": "getVersions"
+	}
 },{
 	"match": {
 		"serviceClassRegex": "DataAccess",
@@ -1016,7 +1049,7 @@
 	"match": {
 		"serviceClassRegex": "DataAccess",
 		"serviceNameRegex": "StorageHub",
-		"calledMethodRegex": "\/workspace\/items\/publiclink\/.*"
+		"calledMethodRegex": "\/workspace(\/items){0,1}\/publiclink\/.*"
 	},
 	"replace": {
 		"serviceClass": "DataAccess",