From 875f34c86b3459d46e201b8792e95a263e134bf9 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Fri, 3 Apr 2020 16:56:58 +0200
Subject: [PATCH] Fixing StorageHug rules

---
 ...torageHub-getVreFolder.csv => StorageHub-getVreFolders.csv} | 2 +-
 ...rageHub-getVreFolder.json => StorageHub-getVreFolders.json} | 0
 .../resources/rules/StorageHub/StorageHub-getVreRootFolder.csv | 3 ++-
 .../rules/StorageHub/StorageHub-getVreRootFolder.json          | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)
 rename src/test/resources/rules/StorageHub/{StorageHub-getVreFolder.csv => StorageHub-getVreFolders.csv} (79%)
 rename src/test/resources/rules/StorageHub/{StorageHub-getVreFolder.json => StorageHub-getVreFolders.json} (100%)

diff --git a/src/test/resources/rules/StorageHub/StorageHub-getVreFolder.csv b/src/test/resources/rules/StorageHub/StorageHub-getVreFolders.csv
similarity index 79%
rename from src/test/resources/rules/StorageHub/StorageHub-getVreFolder.csv
rename to src/test/resources/rules/StorageHub/StorageHub-getVreFolders.csv
index f37f017..b5b4408 100644
--- a/src/test/resources/rules/StorageHub/StorageHub-getVreFolder.csv
+++ b/src/test/resources/rules/StorageHub/StorageHub-getVreFolders.csv
@@ -2,4 +2,4 @@ DataAccess,StorageHub,/workspace/verefolders
 DataAccess,StorageHub,/workspace/vrefodlers
 DataAccess,StorageHub,getVreFolders
 DataAccess,StorageHub,/workspace/verefolders/
-DataAccess,StorageHub,/workspace/vrefodlers/
\ No newline at end of file
+DataAccess,StorageHub,/workspace/vrefodlers/
diff --git a/src/test/resources/rules/StorageHub/StorageHub-getVreFolder.json b/src/test/resources/rules/StorageHub/StorageHub-getVreFolders.json
similarity index 100%
rename from src/test/resources/rules/StorageHub/StorageHub-getVreFolder.json
rename to src/test/resources/rules/StorageHub/StorageHub-getVreFolders.json
diff --git a/src/test/resources/rules/StorageHub/StorageHub-getVreRootFolder.csv b/src/test/resources/rules/StorageHub/StorageHub-getVreRootFolder.csv
index 403c0de..d8e4a2c 100644
--- a/src/test/resources/rules/StorageHub/StorageHub-getVreRootFolder.csv
+++ b/src/test/resources/rules/StorageHub/StorageHub-getVreRootFolder.csv
@@ -1,3 +1,4 @@
 DataAccess,StorageHub,/workspace/vrefolder
 DataAccess,StorageHub,/workspace/vrefolder/
-DataAccess,StorageHub,getVreRootFolder
\ No newline at end of file
+DataAccess,StorageHub,getVreRootFolder
+DataAccess,StorageHub,/workspace/item/vrefolder
\ No newline at end of file
diff --git a/src/test/resources/rules/StorageHub/StorageHub-getVreRootFolder.json b/src/test/resources/rules/StorageHub/StorageHub-getVreRootFolder.json
index 23cbc13..07c7d88 100644
--- a/src/test/resources/rules/StorageHub/StorageHub-getVreRootFolder.json
+++ b/src/test/resources/rules/StorageHub/StorageHub-getVreRootFolder.json
@@ -2,7 +2,7 @@
 	"match": {
 		"serviceClassRegex": "DataAccess",
 		"serviceNameRegex": "StorageHub",
-		"calledMethodRegex": "\/workspace\/vrefolder(\/){0,1}|getVreRootFolder"
+		"calledMethodRegex": "\/workspace\/(item(s){0,1}\/){0,1}vrefolder(\/){0,1}|getVreRootFolder"
 	},
 	"replace": {
 		"serviceClass": "DataAccess",