Fixing rules

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

@@ -216,8 +216,8 @@ public class TestRules extends ContextTest {
 	public void testSingleRule() throws Exception {
 		allRules();
 		File rulesDirectory = getRulesDirectory();
-		File rulesDirFile = new File(rulesDirectory, "FullTextIndexNode");
-		File rulesFile = new File(rulesDirFile, "FullTextIndexNode-OTHER.json");
+		File rulesDirFile = new File(rulesDirectory, "Thredds");
+		File rulesFile = new File(rulesDirFile, "Thredds_OTHER.json");
 		testRule(rulesFile);
 	}
 	

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

@@ -1,7 +1,7 @@
 {
 	"match": {
 		"serviceClassRegex": "DataPublishing",
-		"serviceNameRegex": "SDMXDataSource",
+		"serviceNameRegex": "SDMXDataSource.*",
 		"calledMethodRegex": ".*"
 	},
 	"replace": {

src/test/resources/rules/Thredds/Thredds_AlreadyRewrote

@@ -0,0 +1,21 @@
+SDI,Thredds,METADATA::MyCatalog
+SDI,Thredds,METADATA::FabioPreTest
+SDI,Thredds,METADATA::Oscar
+SDI,Thredds,METADATA::myCatalog
+SDI,Thredds,METADATA::another_catalog
+SDI,Thredds,METADATA::TestFabioWS
+SDI,Thredds,METADATA::newCatalog
+SDI,Thredds,METADATA::OTHER
+SDI,Thredds,dodsC::newCatalog
+SDI,Thredds,dodsC::TestFabioWS
+SDI,Thredds,dodsC::FabioPreTest
+SDI,Thredds,dodsC::MyCatalog
+SDI,Thredds,dodsC::Oscar
+SDI,Thredds,wms::Oscar
+SDI,Thredds,wms::MyCatalog
+SDI,Thredds,wms::myCatalog
+SDI,Thredds,wms::newCatalog
+SDI,Thredds,wms::FabioPreTest
+SDI,Thredds,wms::another_catalog
+SDI,Thredds,wms::OTHER
+SDI,Thredds,dodsC::OTHER

src/test/resources/rules/Thredds/Thredds_OTHER.csv

@@ -14,3 +14,4 @@ SDI,Thredds,/godiva2/theme/default/style.css
 SDI,Thredds,/js/lib/OpenLayers-2.12/theme/default/style.css
 SDI,Thredds,/style/ncss/form.css
 SDI,Thredds,/threddsIcon.gif
+SDI,Thredds,OTHER

src/test/resources/rules/allRules.json

@@ -399,7 +399,7 @@
 },{
 	"match": {
 		"serviceClassRegex": "DataPublishing",
-		"serviceNameRegex": "SDMXDataSource",
+		"serviceNameRegex": "SDMXDataSource.*",
 		"calledMethodRegex": ".*"
 	},
 	"replace": {
@@ -532,7 +532,7 @@
 	"match": {
 		"serviceClassRegex": "SDI",
 		"serviceNameRegex": "Thredds",
-		"calledMethodRegex": "^(\/){1}(?<Protocol>[a-zA-Z0-9]*){1}(\/public\/netcdf\/){1}(?<Collection>[a-zA-Z0-9_-]*(?<!(..\\.nc)))(\/){1}.*(?<!(..\\.nc|.\\.asc|\\.tiff))$"
+		"calledMethodRegex": "^(\/){1}(?<Protocol>[a-zA-Z0-9]*){1}(\/public\/netcdf\/){1}(?<Collection>[a-zA-Z0-9_\\-%]*(?<!(..\\.nc)))(\/){1}.*(?<!(..\\.nc|.\\.asc|\\.tiff))$"
 	},
 	"replace": {
 		"serviceClass": "SDI",
@@ -565,7 +565,7 @@
 	"match": {
 		"serviceClassRegex": "SDI",
 		"serviceNameRegex": "Thredds",
-		"calledMethodRegex": "^(\/){1}(?<Protocol>[a-zA-Z0-9]*){1}(\/public\/netcdf\/){1}(?<Collection>[a-zA-Z0-9_-]*)(\/){1}(.*\\.(nc|asc|tiff))$"
+		"calledMethodRegex": "^(\/){1}(?<Protocol>[a-zA-Z0-9]*){1}(\/public\/netcdf\/){1}(?<Collection>[a-zA-Z0-9_\\-%]*)(\/){1}(.*\\.(nc|asc|tiff))$"
 	},
 	"replace": {
 		"serviceClass": "SDI",