Added Smaph and 3MConnector 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, "WhnManager");
-		File ruleFile = new File(rulesDirFile, "WhnManager-OTHER.json");
+		File rulesDirFile = new File(rulesDirectory, "3MConnector");
+		File ruleFile = new File(rulesDirFile, "3MConnector-connect.json");
 		testRule(ruleFile);
 	}
 	
@@ -228,7 +228,7 @@ public class TestRules extends ContextTest {
 	public void testAllRuleInAdirectory() throws Exception {
 		allRules();
 		File rulesDirectory = getRulesDirectory();
-		File rulesDirFile = new File(rulesDirectory, "StorageHub");
+		File rulesDirFile = new File(rulesDirectory, "3MConnector");
 	
 		FilenameFilter filenameFilter = new FilenameFilter() {
 			@Override

src/test/resources/rules/3MConnector/3MConnector-connect.csv

@@ -0,0 +1,2 @@
+DataAccess,3MConnector,gcube/service/connect
+DataAccess,3MConnector,/gcube/service/connect

src/test/resources/rules/3MConnector/3MConnector-connect.json

@@ -0,0 +1,12 @@
+{
+	"match": {
+		"serviceClassRegex": "DataAccess",
+		"serviceNameRegex": "3MConnector",
+		"calledMethodRegex": "^\/{0,1}gcube\/service\/connect.*"
+	},
+	"replace": {
+		"serviceClass": "DataAccess",
+		"serviceName": "3MConnector",
+		"calledMethod": "connect"
+	}
+}

src/test/resources/rules/3MConnector/3MConnector-disconnect.csv

@@ -0,0 +1,2 @@
+DataAccess,3MConnector,gcube/service/disconnect
+DataAccess,3MConnector,/gcube/service/disconnect

src/test/resources/rules/3MConnector/3MConnector-disconnect.json

@@ -0,0 +1,12 @@
+{
+	"match": {
+		"serviceClassRegex": "DataAccess",
+		"serviceNameRegex": "3MConnector",
+		"calledMethodRegex": "^\/{0,1}gcube\/service\/disconnect.*"
+	},
+	"replace": {
+		"serviceClass": "DataAccess",
+		"serviceName": "3MConnector",
+		"calledMethod": "disconnect"
+	}
+}

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

@@ -0,0 +1,2 @@
+Application,Smaph,custom.js
+Application,Smaph,sitting-cat.png

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

@@ -0,0 +1,12 @@
+{
+	"match": {
+		"serviceClassRegex": "Application",
+		"serviceNameRegex": "Smaph",
+		"calledMethodRegex": "(?!annotate).*"
+	},
+	"replace": {
+		"serviceClass": "Application",
+		"serviceName": "Smaph",
+		"calledMethod": "OTHER"
+	}
+}

src/test/resources/rules/Smaph/Smaph-annotate.csv

@@ -0,0 +1 @@
+Application,Smaph,annotate

src/test/resources/rules/Smaph/Smaph-annotate.json

@@ -0,0 +1,12 @@
+{
+	"match": {
+		"serviceClassRegex": "Application",
+		"serviceNameRegex": "Smaph",
+		"calledMethodRegex": "annotate"
+	},
+	"replace": {
+		"serviceClass": "Application",
+		"serviceName": "Smaph",
+		"calledMethod": "annotate"
+	}
+}

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

@@ -21,6 +21,28 @@
 		"serviceName": "DataMiner",
 		"calledMethod": "${CalledMethod}"
 	}
+},{
+	"match": {
+		"serviceClassRegex": "DataAccess",
+		"serviceNameRegex": "3MConnector",
+		"calledMethodRegex": "^\/{0,1}gcube\/service\/connect.*"
+	},
+	"replace": {
+		"serviceClass": "DataAccess",
+		"serviceName": "3MConnector",
+		"calledMethod": "connect"
+	}
+},{
+	"match": {
+		"serviceClassRegex": "DataAccess",
+		"serviceNameRegex": "3MConnector",
+		"calledMethodRegex": "^\/{0,1}gcube\/service\/disconnect.*"
+	},
+	"replace": {
+		"serviceClass": "DataAccess",
+		"serviceName": "3MConnector",
+		"calledMethod": "disconnect"
+	}
 },{
 	"match": {
 		"serviceClassRegex": "Common",
@@ -748,6 +770,28 @@
 		"serviceName": "SimulFishGrowthData",
 		"calledMethod": "OTHER"
 	}
+},{
+	"match": {
+		"serviceClassRegex": "Application",
+		"serviceNameRegex": "Smaph",
+		"calledMethodRegex": "annotate"
+	},
+	"replace": {
+		"serviceClass": "Application",
+		"serviceName": "Smaph",
+		"calledMethod": "annotate"
+	}
+},{
+	"match": {
+		"serviceClassRegex": "Application",
+		"serviceNameRegex": "Smaph",
+		"calledMethodRegex": "(?!annotate).*"
+	},
+	"replace": {
+		"serviceClass": "Application",
+		"serviceName": "Smaph",
+		"calledMethod": "OTHER"
+	}
 },{
 	"match": {
 		"serviceClassRegex": "VREManagement",