diff --git a/pom.xml b/pom.xml index 3c460e3..96d5237 100644 --- a/pom.xml +++ b/pom.xml @@ -146,6 +146,15 @@ + + org.apache.maven.plugins + maven-surefire-plugin + 2.19.1 + + true + false + + diff --git a/src/main/java/de/gwdg/europeanaqa/api/calculator/EdmFieldExtractor.java b/src/main/java/de/gwdg/europeanaqa/api/calculator/EdmFieldExtractor.java index d4e3927..e870cb7 100644 --- a/src/main/java/de/gwdg/europeanaqa/api/calculator/EdmFieldExtractor.java +++ b/src/main/java/de/gwdg/europeanaqa/api/calculator/EdmFieldExtractor.java @@ -10,7 +10,6 @@ import de.gwdg.metadataqa.api.model.JsonPathCache; import de.gwdg.metadataqa.api.schema.Schema; import de.gwdg.metadataqa.api.util.CompressionLevel; -import org.jetbrains.annotations.NotNull; import java.util.*; import java.util.logging.Logger; @@ -128,7 +127,7 @@ private String extractValueByPath(JsonPathCache cache, String jsonPath) { private String extractValueByPath(JsonPathCache cache, String jsonPath, String defaultValue) { List instances = cache.get(jsonPath); String value = (instances != null && !instances.isEmpty()) - ? instances.get(0).getValue() + ? instances.get(0).getValue().trim() : defaultValue; return value; } diff --git a/src/main/resources/abbreviations/providers-v1.csv b/src/main/resources/abbreviations/providers-v1.csv index b371817..fb9f9d4 100644 --- a/src/main/resources/abbreviations/providers-v1.csv +++ b/src/main/resources/abbreviations/providers-v1.csv @@ -1 +1,237 @@ 0;na +1;3D-COFORM consortium +2;3D ICONS +3;Across Limits +4;APEnet +5;Archives départementales de la Gironde +6;Archives Portal Europe +7;Arts Council Norway +8;Arxiu Comarcal del Baix Empordà +9;Arxiu Comarcal del Montsià +10;Arxiu Comarcal del Pallars Jussa +11;Arxiu Comarcal del Pallars Jussà +12;Arxiu Comarcal del Pallars Jussà. +13;Arxiu Comarcal del Pla de l'Estany / Biblioteca Comarcal del Pla de l'Estany +14;Arxiu Comarcal del Ripollès +15;Arxiu Històric de Girona +16;Arxiu Municipal de Santa Perpètua de Mogoda +17;Arxiu Municipal de Santa Perpètua de Mogoda (AMSPM) +18;ASSETS +19;Associació de Mestres Rosa Sensat +20;Ateneu Barcelonès +21;Athena +22;AthenaPlus +23;Békés Megyei Tudásház es Könyvtár, HU +24;BHL Europe +25;Biblioteca Academiei Române +26;Biblioteca de Catalunya +27;Biblioteca de Comerç i Turisme de la Generalitat de Catalunya +28;Biblioteca de l'Esport de la Generalitat de Catalunya +29;Biblioteca de l'Orfeó Català +30;Biblioteca Fages de Climent, Figueres +31;Biblioteca Horta-Can Mariner +32;Biblioteca Lambert Mata +33;Biblioteca Marcel·lí Domingo (Tortosa) +34;Biblioteca Marquès d'Olivart de les Borges Blanques +35;Biblioteca Municipal del Pont de Suert +36;Biblioteca Museu Víctor Balaguer +37;Biblioteca Nazionale Centrale di Firenze +38;Biblioteca Nou Barris +39;Biblioteca Patrimonial Digital +40;Biblioteca Pública Episcopal del Seminari de Barcelona +41;Biblioteca Sant Pau i Santa creu +42;Biblioteca Virtual Miguel de Cervantes +43;Bibliothèque nationale de France +44;Bibliothèques Virtuelles Humanistes +45;Biodiversity Heritage Library +46;Bulgariana +47;Byzantine Cyprus +48;CARARE +49;Casa Àsia, Museu de la Música +50;Centre de Documentació de l'Orfeó Català +51;Centre de Documentació i Museu Tèxtil +52;Centre de Lectura de Reus +53;Centre de Promoció de la Cultura Popular i Tradicional Catalana +54;Centre Excursionista de Catalunya +55;Centre Excursionista de Catalunya (CEC) +56;Cité de la musique +57;Citeu la font de la següent forma: Fem memòria dels oficis +58;Collections Trust +59;Consorci de Serveis Universitaris de Catalunya. Àrea de Biblioteques, Documentació i Informació +60;CultureGrid +61;Cyprus Library +62;Cyprus Ministry of Education and Culture +63;Daguerreobase +64;DASI - Digital Archive for the Study of pre-Islamic Arabian Inscriptions +65;Department of Information Management, Hacettepe University +66;Deutsche Digitale Bibliothek +67;Digiphil +68;Digital Archive DIGAR / Digitaalarhiiv DIGAR +69;Digitale Collectie +70;Digitising Contemporary Art +71;Diplomatic Documents of Switzerland, dodis.ch +72;Diputació de Barcelona +73;DISMARC +74;DIZI +75;DK-National Aggregation Service +76;DM2E +77;EAGLE +78;ECLAP, e-library for Performing Arts +79;EFG - The European Film Gateway +80;Erfgoedplus.be +81;eSbírky +82;EUInsideDA +83;Europeana +84;Europeana 1914-1918 +85;Europeana 1989 +86;Europeana 280 +87;EuropeanaConnect - EOD +88;Europeana development +89;Europeana Fashion +90;Europeana Food and Drink +91;Europeana Foundation +92;Europeana Inside Sweden +93;Europeana Local +94;EuropeanaLocal Austria +95;EuropeanaLocal Deutschland +96;EuropeanaLocal Portugal +97;EuropeanaLocal Romania +98;EuropeanaLocal Sweden +99;Europeana Sounds +100;Europeana Space +101;EuropeanaTravel +102;European Commission +103;EuroPhoto +104;EUscreen +105;Federacja Bibliotek Cyfrowych +106;Federico Zeri Foundation +107;Filmoteca de Catalunya +108;Fondazione Biblioteca Europea di Informazione e Cultura (BEIC) +109;Forum Hungaricum Non-profit Ltd. +110;Fundação Calouste Gulbenkian - Portugal +111;Fundació Bosch i Cardellach ; Gremi de Fabricants de Sabadell +112;Generalitat de Catalunya. Servei de Biblioteques +113;Greek Aggregator SearchCulture.gr | National Documentation Centre (EKT) +114;Hellenic Aggregator at Veria Public Library +115;Hispana +116;HOPE - Heritage of the People's Europe +117;http://digiphil.hu/ +118;IALHI +119;ICAB +120;ICM Ard-Media +121;Il·lustre Col·legi d'Advocats de Barcelona - ICAB +122;INP - National Heritage Institute, Bucharest +123;Institut Cartogràfic de Catalunya +124;Institut Cartogràfic i Geològic de Catalunya +125;Institut Cartogràfic i Geològic de Catalunya +126;Institut de Cultura de Barcelona (ICUB) +127;Institut de Seguretat Pública de Catalunya +128;Institut d'Estudis Ilerdencs. Servei d'Arxiu i Llegats +129;Institut National de l'Audiovisuel +130;Instituto de Historia Contemporânea da Faculdade de Ciências Sociais e Humanas da Universidade Nova Lisboa – Portugal +131;Instituto dos Museus e da Conservação +132;IRCAM-Institut de Recherche et Coordination Acoustique/Musique +133;Irish Manuscripts Commission +134;Judaica Europeana +135;Judaica Europeana/Jewish Heritage Network +136;KAMRA +137;Kultura.hr - Ministry of Culture of the Republic of Croatia +138;Kulturpool +139;Landesarchiv Baden-Württemberg +140;Latvijas Nacionâlâ Bibliotçka +141;Liberalisme +142;Library of the "Lucian Blaga" University of Sibiu +143;Linked Heritage +144;LoCloud +145;LT-Aggregator Service National Library of Lithuania +146;Lucian Blaga Central University Library, Cluj-Napoca, Romania +147;Manuscriptorium - National Library of the Czech Republic +148;Martynas Mazvydas National Library of Lithuania +149;Mediateca de la Universidad de Oviedo - Encycloasturias +150;Médiathèque Valais - Martigny +151;MIMO - Musical Instrument Museums Online +152;moteur Collections ; France +153;Muis -Museums Public Portal +154;Musées lausannois +155;Museo Galileo - Istituto e Museo di Storia della Scienza +156;Museo Nacional del Prado +157;Museu +158;Museumap.hu +159;Museu Marítim de Barcelona +160;Museums.EU +161;MUSIT +162;Národní muzeum, National Museum, Czech Republic +163;National and University Library in Zagreb +164;National and University Library of Iceland +165;National and University Library of Slovenia +166;National and University Library St Kliment Ohridski +167;National and University Library, Zagreb +168;National Digital Library (NDL) +169;National Library of Albania +170;National Library of Bulgaria +171;National Library of Denmark +172;National Library of Estonia +173;National Library of Finland +174;National Library of Greece +175;National Library of Ireland +176;National Library of Latvia +177;National Library of Luxembourg +178;National Library of Poland +179;National Library of Romania +180;National Library of Scotland +181;National Library of Serbia +182;National Library of the Czech Republic +183;National Library of the Netherlands +184;National Library of the Netherlands - Koninklijke Bibliotheek +185;National Library of the Republic of Moldova +186;National Library of Turkey +187;National Library or Romania +188;National Széchényi Library +189;Niedersächsische Staats- und Universitätsbibliothek Göttingen +190;OAPEN Foundation +191;OpenUp! +192;ORF +193;Österreichische Mediathek +194;Österreichische Nationalbibliothek - Austrian National Library +195;Pamiatkový úrad SR +196;Partage Plus +197;Photoconsortium +198;Rijksmuseum +199;RNOD - Portugal +200;RODIN. Repositorio de Objetos de Docencia e Investigación de la Universidad de Cádiz +201;Slovak National Gallery +202;Slovenian National E-content Aggregator +203;Slovenski nacionalni agregator e-vsebin +204;Societat Coral Erato +205;Spletna galerija, Semantika d.o.o. +206;Swedish Open Cultural Heritage | K-samsök +207;Swiss National Library +208;The British Library +209;The European Library +210;The Great War Archive, University of Oxford +211;The National Bibliographic Office of Malta +212;The National Library of Poland +213;The National Parliamentary Library of Georgia +214;The Natural Europe Project +215;The Wroblewski Library of the Lithuanian Academy of Sciences +216;thinkMOTION +217;Thyssen-Bornemisza Museum +218;Universitat Autònoma de Barcelona +219;Universitat de Barcelona +220;Universitat de Barcelona +221;Universitat de Girona. Biblioteca +222;Universitat de Girona. Biblioteca. Fons Bertrana +223;Universitat de Lleida +224;Universitat Politècnica de Catalunya +225;Universitat Pompeu Fabra +226;Universitätsbibliothek Heidelberg +227;University College Dublin +228;University College Dublin, UCD Library +229;University of Fribourg - Universitas Friburgensis +230;University of Ioannina +231;University of Patras/Library and Information Center +232;Vilnius University Library +233;Vlaamse Kunstcollectie +234;Wellcome Collection +235;Wikimedia Commons Community +236;Регионална библиотека ПЕНЧО СЛАВЕЙКОВ - Варна / Public Library - Varna diff --git a/src/test/java/de/gwdg/europeanaqa/api/abbreviation/EdmCountryManagerTest.java b/src/test/java/de/gwdg/europeanaqa/api/abbreviation/EdmCountryManagerTest.java index e1cb8d3..a223bfc 100644 --- a/src/test/java/de/gwdg/europeanaqa/api/abbreviation/EdmCountryManagerTest.java +++ b/src/test/java/de/gwdg/europeanaqa/api/abbreviation/EdmCountryManagerTest.java @@ -1,6 +1,10 @@ package de.gwdg.europeanaqa.api.abbreviation; -import org.junit.*; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/src/test/java/de/gwdg/europeanaqa/api/abbreviation/EdmLanguageManagerTest.java b/src/test/java/de/gwdg/europeanaqa/api/abbreviation/EdmLanguageManagerTest.java index 98b0a03..967df59 100644 --- a/src/test/java/de/gwdg/europeanaqa/api/abbreviation/EdmLanguageManagerTest.java +++ b/src/test/java/de/gwdg/europeanaqa/api/abbreviation/EdmLanguageManagerTest.java @@ -1,6 +1,10 @@ package de.gwdg.europeanaqa.api.abbreviation; -import org.junit.*; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/src/test/java/de/gwdg/europeanaqa/api/calculator/EdmFieldExtractorTest.java b/src/test/java/de/gwdg/europeanaqa/api/calculator/EdmFieldExtractorTest.java index c1b9609..b08ed00 100644 --- a/src/test/java/de/gwdg/europeanaqa/api/calculator/EdmFieldExtractorTest.java +++ b/src/test/java/de/gwdg/europeanaqa/api/calculator/EdmFieldExtractorTest.java @@ -4,7 +4,6 @@ import de.gwdg.europeanaqa.api.abbreviation.EdmDataProviderManager; import de.gwdg.europeanaqa.api.abbreviation.EdmDatasetManager; import de.gwdg.europeanaqa.api.abbreviation.EdmLanguageManager; -import de.gwdg.metadataqa.api.counter.Counters; import de.gwdg.metadataqa.api.model.EdmFieldInstance; import de.gwdg.metadataqa.api.model.JsonPathCache; import de.gwdg.metadataqa.api.schema.EdmFullBeanSchema;