Added perform-service rules #19025

changelog.xml

@@ -3,7 +3,7 @@
 <ReleaseNotes>
 	<Changeset component="org.gcube.accounting.accounting-lib.3-6-0" date="${buildDate}">
 		<Change>Properly terminated RegexRulesAggregator scheduled thread #18547</Change>
-		<Change>Added test for regex and replacement allowing calledMethod aggregation #10645</Change>
+		<Change>Added improved version of calledMethod rewrite for aggregation #10645</Change>
 	</Changeset>
 	<Changeset component="org.gcube.accounting.accounting-lib.3-5-0" date="2019-11-06">
 		<Change>Removed usage of deprecated APIs</Change>

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, "3MConnector");
+		File rulesDirFile = new File(rulesDirectory, "perform-service");
 	
 		FilenameFilter filenameFilter = new FilenameFilter() {
 			@Override

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

@@ -300,7 +300,7 @@
 	"match": {
 		"serviceClassRegex": "DataTransfer",
 		"serviceNameRegex": "data-transfer-service",
-		"calledMethodRegex": "(\/{0,1}gcube\/service\/(REST|application.wadl))|OTHER"
+		"calledMethodRegex": "(^\/{0,1}gcube\/service\/(REST|application.wadl))|OTHER"
 	},
 	"replace": {
 		"serviceClass": "DataTransfer",
@@ -311,7 +311,7 @@
 	"match": {
 		"serviceClassRegex": "DataTransfer",
 		"serviceNameRegex": "data-transfer-service",
-		"calledMethodRegex": "\/{0,1}gcube\/service\/REST\/.*"
+		"calledMethodRegex": "^(\/){0,1}gcube\/service\/REST\/.*"
 	},
 	"replace": {
 		"serviceClass": "DataTransfer",
@@ -627,6 +627,50 @@
 		"serviceName": "ICProxy",
 		"calledMethod": "query"
 	}
+},{
+	"match": {
+		"serviceClassRegex": "Application",
+		"serviceNameRegex": "perform-service",
+		"calledMethodRegex": "^\/{0,1}gcube\/(service|resource)\/import(\/){0,1}.*"
+	},
+	"replace": {
+		"serviceClass": "Application",
+		"serviceName": "perform-service",
+		"calledMethod": "import"
+	}
+},{
+	"match": {
+		"serviceClassRegex": "Application",
+		"serviceNameRegex": "perform-service",
+		"calledMethodRegex": "^\/{0,1}gcube\/(service|resource)\/mappings(\/){0,1}.*"
+	},
+	"replace": {
+		"serviceClass": "Application",
+		"serviceName": "perform-service",
+		"calledMethod": "mappings"
+	}
+},{
+	"match": {
+		"serviceClassRegex": "Application",
+		"serviceNameRegex": "perform-service",
+		"calledMethodRegex": "^\/{0,1}gcube\/(service|resource)(\/){0,1}$"
+	},
+	"replace": {
+		"serviceClass": "Application",
+		"serviceName": "perform-service",
+		"calledMethod": "OTHER"
+	}
+},{
+	"match": {
+		"serviceClassRegex": "Application",
+		"serviceNameRegex": "perform-service",
+		"calledMethodRegex": "^\/{0,1}gcube\/(service|resource)\/performance(\/){0,1}.*"
+	},
+	"replace": {
+		"serviceClass": "Application",
+		"serviceName": "perform-service",
+		"calledMethod": "performance"
+	}
 },{
 	"match": {
 		"serviceClassRegex": "(InformationSystem)|(Accounting)",

src/test/resources/rules/data-transfer-service/data-transfer-service-OTHER.json

@@ -2,7 +2,7 @@
 	"match": {
 		"serviceClassRegex": "DataTransfer",
 		"serviceNameRegex": "data-transfer-service",
-		"calledMethodRegex": "(\/{0,1}gcube\/service\/(REST|application.wadl))|OTHER"
+		"calledMethodRegex": "(^\/{0,1}gcube\/service\/(REST|application.wadl))|OTHER"
 	},
 	"replace": {
 		"serviceClass": "DataTransfer",

src/test/resources/rules/data-transfer-service/data-transfer-service-transfer.json

@@ -2,7 +2,7 @@
 	"match": {
 		"serviceClassRegex": "DataTransfer",
 		"serviceNameRegex": "data-transfer-service",
-		"calledMethodRegex": "\/{0,1}gcube\/service\/REST\/.*"
+		"calledMethodRegex": "^(\/){0,1}gcube\/service\/REST\/.*"
 	},
 	"replace": {
 		"serviceClass": "DataTransfer",

src/test/resources/rules/perform-service/perform-service-OTHER.csv

@@ -0,0 +1,4 @@
+Application,perform-service,/gcube/resource
+Application,perform-service,/gcube/service
+Application,perform-service,/gcube/resource/
+Application,perform-service,/gcube/service/

src/test/resources/rules/perform-service/perform-service-OTHER.json

@@ -0,0 +1,12 @@
+{
+	"match": {
+		"serviceClassRegex": "Application",
+		"serviceNameRegex": "perform-service",
+		"calledMethodRegex": "^\/{0,1}gcube\/(service|resource)(\/){0,1}$"
+	},
+	"replace": {
+		"serviceClass": "Application",
+		"serviceName": "perform-service",
+		"calledMethod": "OTHER"
+	}
+}

src/test/resources/rules/perform-service/perform-service-import.csv

@@ -0,0 +1,33 @@
+Application,perform-service,/gcube/service/import
+Application,perform-service,/gcube/service/import/
+Application,perform-service,/gcube/service/import/12682101
+Application,perform-service,/gcube/service/import/12682549
+Application,perform-service,/gcube/service/import/13625424
+Application,perform-service,/gcube/service/import/136254247
+Application,perform-service,/gcube/service/import/14128201
+Application,perform-service,/gcube/service/import/14801407
+Application,perform-service,/gcube/service/import/14801409
+Application,perform-service,/gcube/service/import/14869801
+Application,perform-service,/gcube/service/import/14962621
+Application,perform-service,/gcube/service/import/14962624
+Application,perform-service,/gcube/service/import/14962628
+Application,perform-service,/gcube/service/import/14962630
+Application,perform-service,/gcube/service/import/last/12682549
+Application,perform-service,/gcube/service/import/last/13625424
+Application,perform-service,/gcube/resource/import
+Application,perform-service,/gcube/resource/import/
+Application,perform-service,/gcube/resource/import/12682101
+Application,perform-service,/gcube/resource/import/12682549
+Application,perform-service,/gcube/resource/import/13625424
+Application,perform-service,/gcube/resource/import/136254247
+Application,perform-service,/gcube/resource/import/14128201
+Application,perform-service,/gcube/resource/import/14801407
+Application,perform-service,/gcube/resource/import/14801409
+Application,perform-service,/gcube/resource/import/14869801
+Application,perform-service,/gcube/resource/import/14962621
+Application,perform-service,/gcube/resource/import/14962624
+Application,perform-service,/gcube/resource/import/14962628
+Application,perform-service,/gcube/resource/import/14962630
+Application,perform-service,/gcube/resource/import/last/12682549
+Application,perform-service,/gcube/resource/import/last/13625424
+Application,perform-service,/gcube/resource/import/12682549

src/test/resources/rules/perform-service/perform-service-import.json

@@ -0,0 +1,12 @@
+{
+	"match": {
+		"serviceClassRegex": "Application",
+		"serviceNameRegex": "perform-service",
+		"calledMethodRegex": "^\/{0,1}gcube\/(service|resource)\/import(\/){0,1}.*"
+	},
+	"replace": {
+		"serviceClass": "Application",
+		"serviceName": "perform-service",
+		"calledMethod": "import"
+	}
+}

src/test/resources/rules/perform-service/perform-service-mapping.csv

@@ -0,0 +1,2 @@
+Application,perform-service,/gcube/service/mappings/batch
+Application,perform-service,/gcube/service/mappings/farm

src/test/resources/rules/perform-service/perform-service-mapping.json

@@ -0,0 +1,12 @@
+{
+	"match": {
+		"serviceClassRegex": "Application",
+		"serviceNameRegex": "perform-service",
+		"calledMethodRegex": "^\/{0,1}gcube\/(service|resource)\/mappings(\/){0,1}.*"
+	},
+	"replace": {
+		"serviceClass": "Application",
+		"serviceName": "perform-service",
+		"calledMethod": "mappings"
+	}
+}

src/test/resources/rules/perform-service/perform-service-performance.csv

@@ -0,0 +1,2 @@
+Application,perform-service,/gcube/service/performance
+Application,perform-service,/gcube/service/performance/

src/test/resources/rules/perform-service/perform-service-performance.json

@@ -0,0 +1,12 @@
+{
+	"match": {
+		"serviceClassRegex": "Application",
+		"serviceNameRegex": "perform-service",
+		"calledMethodRegex": "^\/{0,1}gcube\/(service|resource)\/performance(\/){0,1}.*"
+	},
+	"replace": {
+		"serviceClass": "Application",
+		"serviceName": "perform-service",
+		"calledMethod": "performance"
+	}
+}