Fixing rules

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

@@ -1,2 +1,3 @@
 Data-Catalogue,Catalogue-WS,/rest
 Data-Catalogue,Catalogue-WS,UNKNOWN
+Data-Catalogue,Catalogue-WS,OTHER

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

@@ -2,11 +2,11 @@
 	"match": {
 		"serviceClassRegex": "Data-Catalogue",
 		"serviceNameRegex": "Catalogue-WS",
-		"calledMethodRegex": "^\/rest$|^UNKNOWN$"
+		"calledMethodRegex": "^\/rest$|^UNKNOWN|^OTHER$"
 	},
 	"replace": {
 		"serviceClass": "Data-Catalogue",
 		"serviceName": "Catalogue-WS",
-		"calledMethod": "UNKNOWN"
+		"calledMethod": "OTHER"
 	}
 }

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

@@ -1,4 +1,5 @@
 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,11 +2,11 @@
 	"match": {
 		"serviceClassRegex": "WPS",
 		"serviceNameRegex": "DataMiner",
-		"calledMethodRegex": "^/{0,1}(WebProcessingService|UNKNOWN|gcube\/resource\/scopes).*"
+		"calledMethodRegex": "^/{0,1}(WebProcessingService|UNKNOWN|OTHER|gcube\/resource\/scopes).*"
 	},
 	"replace": {
 		"serviceClass": "WPS",
 		"serviceName": "DataMiner",
-		"calledMethod": "UNKNOWN"
+		"calledMethod": "OTHER"
 	}
 }

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

@@ -1,3 +1,4 @@
 Data-Catalogue,GRSFPublisher,UNKNOWN
+Data-Catalogue,GRSFPublisher,OTHER
 Data-Catalogue,GRSFPublisher,/rest/firms/hello
 Data-Catalogue,GRSFPublisher,/rest/ram/hello

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

@@ -2,11 +2,11 @@
 	"match": {
 		"serviceClassRegex": "Data-Catalogue",
 		"serviceNameRegex": "GRSFPublisher",
-		"calledMethodRegex": ".*(hello)|(UNKNOWN).*"
+		"calledMethodRegex": ".*(hello)|(UNKNOWN)|(OTHER).*"
 	},
 	"replace": {
 		"serviceClass": "Data-Catalogue",
 		"serviceName": "GRSFPublisher",
-		"calledMethod": "UNKNOWN"
+		"calledMethod": "OTHER"
 	}
 }

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

@@ -0,0 +1,3 @@
+DataAnalysis,RConnector,UNKNOWN
+DataAnalysis,RConnector,OTHER
+DataAnalysis,RConnector,gcube/resource/scopes

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

@@ -2,11 +2,11 @@
 	"match": {
 		"serviceClassRegex": "DataAnalysis",
 		"serviceNameRegex": "RConnector",
-		"calledMethodRegex": "UNKNOWN|^\/{0,1}gcube\/resource\/scopes"
+		"calledMethodRegex": "UNKNOWN|OTHER|^\/{0,1}gcube\/resource\/scopes"
 	},
 	"replace": {
 		"serviceClass": "DataAnalysis",
 		"serviceName": "RConnector",
-		"calledMethod": "UNKNOWN"
+		"calledMethod": "OTHER"
 	}
 }

src/test/resources/rules/RConnector/RConnector-UNKNOWN.csv

@@ -1,2 +0,0 @@
-DataAnalysis,RConnector,UNKNOWN
-DataAnalysis,RConnector,gcube/resource/scopes

src/test/resources/rules/SimulFishGrowthData-UNKNOWN.json

@@ -1,12 +0,0 @@
-{
-	"match": {
-		"serviceClassRegex": "Search",
-		"serviceNameRegex": "SimulFishGrowthData",
-		"calledMethodRegex": ".*"
-	},
-	"replace": {
-		"serviceClass": "Search",
-		"serviceName": "SimulFishGrowthData",
-		"calledMethod": "UNKNOWN"
-	}
-}

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

@@ -7,6 +7,6 @@
 	"replace": {
 		"serviceClass": "Search",
 		"serviceName": "SimulFishGrowthData",
-		"calledMethod": "UNKNOWN"
+		"calledMethod": "OTHER"
 	}
 }

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

@@ -0,0 +1,4 @@
+VREManagement,SmartExecutor,UNKNOWN
+VREManagement,smart-executor,UNKNOWN
+VREManagement,SmartExecutor,OTHER
+VREManagement,smart-executor,OTHER

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

@@ -2,11 +2,11 @@
 	"match": {
 		"serviceClassRegex": "VREManagement",
 		"serviceNameRegex": "(SmartExecutor)|(smart-executor)",
-		"calledMethodRegex": ".*UNKNOWN.*"
+		"calledMethodRegex": ".*(UNKNOWN)|(OTHER).*"
 	},
 	"replace": {
 		"serviceClass": "VREManagement",
 		"serviceName": "smart-executor",
-		"calledMethod": "UNKNOWN"
+		"calledMethod": "OTHER"
 	}
 }

src/test/resources/rules/SmartExecutor/SmartExecutor-UNKNOWN.csv

@@ -1,2 +0,0 @@
-VREManagement,SmartExecutor,UNKNOWN
-VREManagement,smart-executor,UNKNOWN

src/test/resources/rules/geoanalytics-main-service/geoanalytics-main-service-OTHER.json

@@ -7,6 +7,6 @@
 	"replace": {
 		"serviceClass": "geoanalytics",
 		"serviceName": "geoanalytics-main-service",
-		"calledMethod": "UNKNOWN"
+		"calledMethod": "OTHER"
 	}
 }

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

@@ -5,4 +5,5 @@ content-management,storage,/rest/resources/58c6717a7c1b605b68964500
 content-management,storage,/rest/resources/58c6717a7c1b605b68964501
 content-management,storage,/rest/resources/add
 content-management,storage,/rest/resources58c045237c1b604d593ba3c2
-content-management,storage,UNKNOWN
+content-management,storage,UNKNOWN
+content-management,storage,OTHER

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

@@ -7,6 +7,6 @@
 	"replace": {
 		"serviceClass": "content-management",
 		"serviceName": "storage",
-		"calledMethod": "UNKNOWN"
+		"calledMethod": "OTHER"
 	}
 }