diff --git a/src/main/java/org/gcube/accounting/aggregator/RegexRulesAggregator.java b/src/main/java/org/gcube/accounting/aggregator/RegexRulesAggregator.java index 78e4af3..3491e19 100644 --- a/src/main/java/org/gcube/accounting/aggregator/RegexRulesAggregator.java +++ b/src/main/java/org/gcube/accounting/aggregator/RegexRulesAggregator.java @@ -152,6 +152,11 @@ public class RegexRulesAggregator implements Runnable { } } + @Deprecated + public void start() { + + } + public static void shutdown() { RegexRulesAggregator.getInstance().stop(); ExecutorUtils.shutDownPool(RegexRulesAggregator.REGEX_REDISCOVERY_POOL); diff --git a/src/test/resources/rules/GeoServer/GeoServer_OTHER.json b/src/test/resources/rules/GeoServer/GeoServer_OTHER.json index 9ec877d..e25baa1 100644 --- a/src/test/resources/rules/GeoServer/GeoServer_OTHER.json +++ b/src/test/resources/rules/GeoServer/GeoServer_OTHER.json @@ -1,6 +1,6 @@ { "match": { - "serviceClassRegex": "(GeoServer)|(geoserver)", + "serviceClassRegex": "(GeoServer)|(geoserver)|(SpatialData)", "serviceNameRegex": "(GeoServer)|(geoserver)", "calledMethodRegex": "^(?!.*\/(wfs|wms|wcs|wmts)).*$" }, diff --git a/src/test/resources/rules/GeoServer/GeoServer_PROTOCOL.json b/src/test/resources/rules/GeoServer/GeoServer_PROTOCOL.json index 44adff2..7711f51 100644 --- a/src/test/resources/rules/GeoServer/GeoServer_PROTOCOL.json +++ b/src/test/resources/rules/GeoServer/GeoServer_PROTOCOL.json @@ -1,6 +1,6 @@ { "match": { - "serviceClassRegex": "(GeoServer)|(geoserver)", + "serviceClassRegex": "(GeoServer)|(geoserver)|(SpatialData)", "serviceNameRegex": "(GeoServer)|(geoserver)", "calledMethodRegex": "^.*\/(?(wfs|wms|wcs|wmts)).*$" }, diff --git a/src/test/resources/rules/resource-registry/resource-registry-OTHER.json b/src/test/resources/rules/resource-registry/resource-registry-OTHER.json new file mode 100644 index 0000000..d11c1ff --- /dev/null +++ b/src/test/resources/rules/resource-registry/resource-registry-OTHER.json @@ -0,0 +1,12 @@ +{ + "match": { + "serviceClassRegex": "InformationSystem", + "serviceNameRegex": "resource-registry", + "calledMethodRegex": "^(?!(GET|HEAD|POST|PUT|DELETE|PURGE|OPTIONS|TRACE|CONNECT))\/.*" + }, + "replace": { + "serviceClass": "InformationSystem", + "serviceName": "resource-registry", + "calledMethod": "OTHER" + } +} \ No newline at end of file diff --git a/src/test/resources/rules/resource-registry/resource-regsitry-OTHER.csv b/src/test/resources/rules/resource-registry/resource-regsitry-OTHER.csv new file mode 100644 index 0000000..e4599d7 --- /dev/null +++ b/src/test/resources/rules/resource-registry/resource-regsitry-OTHER.csv @@ -0,0 +1,10 @@ +InformationSystem,resource-registry,/er/facet/c8abc72e-1707-4ac5-874e-53f1c71d92f8 +InformationSystem,resource-registry,/access/instance/Configuration/ceac4400-f2c8-11dd-99f0-cbe8b682b1c1 +InformationSystem,resource-registry,/er/resource/6d1fd757-d13b-4004-aa9a-e325a07a8ce1 +InformationSystem,resource-registry,/er/resource/fa3836ea-f703-4642-bfd4-e946c1698695 +InformationSystem,resource-registry,/er/resource/7f04cf07-eaa6-4ad5-a92f-98a46dc8cff5 +InformationSystem,resource-registry,/er/resource/e18815a0-8306-11e1-b54b-fa68d406a964 +InformationSystem,resource-registry,/er/resource/1c1ab6b7-ee65-4a34-876c-7795ce4032fd +InformationSystem,resource-registry,/access/instance/Configuration/63f74c10-f2d5-11dd-99f2-cbe8b682b1c1 +InformationSystem,resource-registry,/er/resource/49e05ea0-856f-11e0-bb3d-87643e470dd4 +InformationSystem,resource-registry,/access/instance/EService/d4bd53f1-6bbf-4ee3-8a36-fc410cc64912 diff --git a/src/test/resources/rules/resource-registry/resource-regsitry.csv b/src/test/resources/rules/resource-registry/resource-regsitry.csv new file mode 100644 index 0000000..3ad908a --- /dev/null +++ b/src/test/resources/rules/resource-registry/resource-regsitry.csv @@ -0,0 +1,10 @@ +InformationSystem,resource-registry,PUT /er/facet/c8abc72e-1707-4ac5-874e-53f1c71d92f8 +InformationSystem,resource-registry,GET /access/instance/Configuration/ceac4400-f2c8-11dd-99f0-cbe8b682b1c1 +InformationSystem,resource-registry,GET /er/resource/6d1fd757-d13b-4004-aa9a-e325a07a8ce1 +InformationSystem,resource-registry,DELETE /er/resource/fa3836ea-f703-4642-bfd4-e946c1698695 +InformationSystem,resource-registry,HEAD /er/resource/7f04cf07-eaa6-4ad5-a92f-98a46dc8cff5 +InformationSystem,resource-registry,POST /er/resource/e18815a0-8306-11e1-b54b-fa68d406a964 +InformationSystem,resource-registry,PURGE /er/resource/1c1ab6b7-ee65-4a34-876c-7795ce4032fd +InformationSystem,resource-registry,HEAD /access/instance/Configuration/63f74c10-f2d5-11dd-99f2-cbe8b682b1c1 +InformationSystem,resource-registry,CONNECT /er/resource/49e05ea0-856f-11e0-bb3d-87643e470dd4 +InformationSystem,resource-registry,TRACE /access/instance/EService/d4bd53f1-6bbf-4ee3-8a36-fc410cc64912