Update OECD source

nbbrd · Sep 6, 2024 · 9dd673e · 9dd673e
1 parent 15dd205
commit 9dd673e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 - ![PROVIDER] Replace curl-backend property `sdmxdl.networking.curlBackend` with url-backend property `sdmxdl.networking.urlBackend`
 - ![CLI] Replace `list drivers` command with `list plugins` command
 
+### Fixed
+
+- ![SOURCE] Update OECD source [#543](https://github.com/nbbrd/sdmx-dl/issues/543)
+
 ## [3.0.0-beta.12] - 2023-10-16
 
 This is the twelfth beta release of **sdmx-dl**.  

diff --git a/docs/tmp/sources.csv b/docs/tmp/sources.csv
@@ -18,7 +18,7 @@ INSEE,National Institute of Statistics and Economic Studies,,DIALECTS_INSEE,http
 ISTAT,Italian National Institute of Statistics,,RI_SDMX21,https://esploradati.istat.it/SDMXWS/rest,sdmxdl.driver.detailSupported=true,https://esploradati.istat.it/databrowser/,upptime:/nbbrd/sdmx-upptime/ISTAT,https://nbbrd.github.io/sdmx-upptime/history/istat,"en,it"
 NB,Norges Bank,,RI_SDMX21,https://data.norges-bank.no/api,sdmxdl.driver.detailSupported=true,https://www.norges-bank.no/en/topics/Statistics/,upptime:/nbbrd/sdmx-upptime/NB,https://nbbrd.github.io/sdmx-upptime/history/nb,"en,no"
 NBB,National Bank of Belgium,,DIALECTS_NBB,https://stat.nbb.be/restsdmx/sdmx.ashx,,https://stat.nbb.be,upptime:/nbbrd/sdmx-upptime/NBB,https://nbbrd.github.io/sdmx-upptime/history/nbb,"en,de,fr,nl"
-OECD,The Organisation for Economic Co-operation and Development,,DIALECTS_DOTSTAT,https://stats.oecd.org/restsdmx/sdmx.ashx,,https://stats.oecd.org,upptime:/nbbrd/sdmx-upptime/OECD,https://nbbrd.github.io/sdmx-upptime/history/oecd,"en,es,fr,it"
+OECD,The Organisation for Economic Co-operation and Development,,RI_SDMX21,https://sdmx.oecd.org/public/rest,sdmxdl.driver.detailSupported=true,https://data-explorer.oecd.org/,upptime:/nbbrd/sdmx-upptime/OECD,https://nbbrd.github.io/sdmx-upptime/history/oecd,"en,es,fr,it"
 SE,Statistics Estonia,,DIALECTS_DOTSTAT,http://andmebaas.stat.ee/restsdmx/sdmx.ashx,,http://andmebaas.stat.ee,upptime:/nbbrd/sdmx-upptime/SE,https://nbbrd.github.io/sdmx-upptime/history/se,"en,et"
 SGR,SDMX Global Registry,,RI_SDMX21,https://registry.sdmx.org/ws/rest,sdmxdl.driver.detailSupported=true,https://registry.sdmx.org/overview.html,upptime:/nbbrd/sdmx-upptime/SGR,https://nbbrd.github.io/sdmx-upptime/history/sgr,en
 SIMEL,El Salvador Labor Market Information System,,RI_SDMX21,https://disseminatesimel.mtps.gob.sv/rest,sdmxdl.driver.detailSupported=true,https://datasimel.mtps.gob.sv/,upptime:/nbbrd/sdmx-upptime/SIMEL,https://nbbrd.github.io/sdmx-upptime/history/simel,"en,es"

diff --git a/...rovider-dialects/src/main/java/sdmxdl/provider/dialects/drivers/DotStatDialectDriver.java b/...rovider-dialects/src/main/java/sdmxdl/provider/dialects/drivers/DotStatDialectDriver.java
@@ -53,19 +53,6 @@ public final class DotStatDialectDriver implements Driver {
             .rank(NATIVE_DRIVER_RANK)
             .connector(RestConnector.of(DotStatDialectDriver::newClient))
             .properties(RI_CONNECTION_PROPERTIES)
-            .source(WebSource
-                    .builder()
-                    .id("OECD")
-                    .name("en", "The Organisation for Economic Co-operation and Development")
-                    .name("es", "Organización para la Cooperación y el Desarrollo Económicos")
-                    .name("fr", "Organisation de coopération et de développement économiques")
-                    .name("it", "Organizzazione per la Cooperazione e lo Sviluppo Economico")
-                    .driver(DIALECTS_DOTSTAT)
-                    .endpointOf("https://stats.oecd.org/restsdmx/sdmx.ashx")
-                    .websiteOf("https://stats.oecd.org")
-                    .monitorOf("upptime:/nbbrd/sdmx-upptime/OECD")
-                    .monitorWebsiteOf("https://nbbrd.github.io/sdmx-upptime/history/oecd")
-                    .build())
             .source(WebSource
                     .builder()
                     .id("SE")

diff --git a/sdmx-dl-provider-ri/src/main/java/sdmxdl/provider/ri/drivers/Sdmx21RiDriver.java b/sdmx-dl-provider-ri/src/main/java/sdmxdl/provider/ri/drivers/Sdmx21RiDriver.java
@@ -170,6 +170,20 @@ public final class Sdmx21RiDriver implements Driver {
                     .monitorOf("upptime:/nbbrd/sdmx-upptime/NB")
                     .monitorWebsiteOf("https://nbbrd.github.io/sdmx-upptime/history/nb")
                     .build())
+            .source(WebSource
+                    .builder()
+                    .id("OECD")
+                    .name("en", "The Organisation for Economic Co-operation and Development")
+                    .name("es", "Organización para la Cooperación y el Desarrollo Económicos")
+                    .name("fr", "Organisation de coopération et de développement économiques")
+                    .name("it", "Organizzazione per la Cooperazione e lo Sviluppo Economico")
+                    .driver(RI_SDMX_21)
+                    .endpointOf("https://sdmx.oecd.org/public/rest")
+                    .propertyOf(DETAIL_SUPPORTED_PROPERTY, true)
+                    .websiteOf("https://data-explorer.oecd.org/")
+                    .monitorOf("upptime:/nbbrd/sdmx-upptime/OECD")
+                    .monitorWebsiteOf("https://nbbrd.github.io/sdmx-upptime/history/oecd")
+                    .build())
             .source(WebSource
                     .builder()
                     .id("SGR")