From 02e390ca6000004935f66d7d3a38fa4d97e48eb6 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Mon, 6 Apr 2020 15:42:13 +0200
Subject: [PATCH] Added ServiceClass for Thredds

---
 .../resources/rules/Thredds/Thredds_METADATA::COLLECTION.json   | 2 +-
 src/test/resources/rules/Thredds/Thredds_METADATA::OTHER.json   | 2 +-
 .../resources/rules/Thredds/Thredds_PROTOCOL::COLLECTION.json   | 2 +-
 src/test/resources/rules/Thredds/Thredds_PROTOCOL::OTHER.json   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test/resources/rules/Thredds/Thredds_METADATA::COLLECTION.json b/src/test/resources/rules/Thredds/Thredds_METADATA::COLLECTION.json
index dc9c942..d2ac44b 100644
--- a/src/test/resources/rules/Thredds/Thredds_METADATA::COLLECTION.json
+++ b/src/test/resources/rules/Thredds/Thredds_METADATA::COLLECTION.json
@@ -1,6 +1,6 @@
 {
 	"match": {
-		"serviceClassRegex": "SDI",
+		"serviceClassRegex": "SDI|DataAnalysis",
 		"serviceNameRegex": "Thredds",
 		"calledMethodRegex": "^(\/){1}(?<Protocol>[a-zA-Z0-9]*){1}(\/public\/netcdf\/){1}(?<Collection>[a-zA-Z0-9_\\-%]*(?<!(..\\.nc)))(\/){1}.*(?<!(..\\.nc|.\\.asc|\\.tiff))$"
 	},
diff --git a/src/test/resources/rules/Thredds/Thredds_METADATA::OTHER.json b/src/test/resources/rules/Thredds/Thredds_METADATA::OTHER.json
index ea1008d..e26b33a 100644
--- a/src/test/resources/rules/Thredds/Thredds_METADATA::OTHER.json
+++ b/src/test/resources/rules/Thredds/Thredds_METADATA::OTHER.json
@@ -1,6 +1,6 @@
 {
 	"match": {
-		"serviceClassRegex": "SDI",
+		"serviceClassRegex": "SDI|DataAnalysis",
 		"serviceNameRegex": "Thredds",
 		"calledMethodRegex": "^(\/){1}(?<Protocol>[a-zA-Z0-9]*){1}(\/public\/netcdf\/){1}[^\/]*((?<!(..\\.nc|.\\.asc|\\.tiff))|\/wfs)$"
 	},
diff --git a/src/test/resources/rules/Thredds/Thredds_PROTOCOL::COLLECTION.json b/src/test/resources/rules/Thredds/Thredds_PROTOCOL::COLLECTION.json
index 95185c2..cc1ea4f 100644
--- a/src/test/resources/rules/Thredds/Thredds_PROTOCOL::COLLECTION.json
+++ b/src/test/resources/rules/Thredds/Thredds_PROTOCOL::COLLECTION.json
@@ -1,6 +1,6 @@
 {
 	"match": {
-		"serviceClassRegex": "SDI",
+		"serviceClassRegex": "SDI|DataAnalysis",
 		"serviceNameRegex": "Thredds",
 		"calledMethodRegex": "^(\/){1}(?<Protocol>[a-zA-Z0-9]*){1}(\/public\/netcdf\/){1}(?<Collection>[a-zA-Z0-9_\\-%]*)(\/){1}(.*\\.(nc|asc|tiff))$"
 	},
diff --git a/src/test/resources/rules/Thredds/Thredds_PROTOCOL::OTHER.json b/src/test/resources/rules/Thredds/Thredds_PROTOCOL::OTHER.json
index 203d04e..3424e43 100644
--- a/src/test/resources/rules/Thredds/Thredds_PROTOCOL::OTHER.json
+++ b/src/test/resources/rules/Thredds/Thredds_PROTOCOL::OTHER.json
@@ -1,6 +1,6 @@
 {
 	"match": {
-		"serviceClassRegex": "SDI",
+		"serviceClassRegex": "SDI|DataAnalysis",
 		"serviceNameRegex": "Thredds",
 		"calledMethodRegex": "^(\/){1}(?<Protocol>[a-zA-Z0-9]*){1}(\/public\/netcdf\/){1}[^\/]*(\\.(nc|asc|tiff))$"
 	},