diff --git a/metis-dereference/metis-dereference-import/src/main/java/eu/europeana/metis/dereference/vocimport/VocabularyCollectionMavenRule.java b/metis-dereference/metis-dereference-import/src/main/java/eu/europeana/metis/dereference/vocimport/VocabularyCollectionMavenRule.java index 936ae4dee..5b411cd4b 100644 --- a/metis-dereference/metis-dereference-import/src/main/java/eu/europeana/metis/dereference/vocimport/VocabularyCollectionMavenRule.java +++ b/metis-dereference/metis-dereference-import/src/main/java/eu/europeana/metis/dereference/vocimport/VocabularyCollectionMavenRule.java @@ -116,19 +116,19 @@ public void execute(EnforcerRuleHelper enforcerRuleHelper) throws EnforcerRuleEx final Path vocabularyDirectory = baseDirectory.resolve(vocabularyDirectoryFile); try { - // Prepare validation - final VocabularyCollectionImporter importer = vocabularyCollectionImporterFactory - .createImporter(baseDirectory, vocabularyDirectory); - final VocabularyCollectionValidatorImpl validator = new VocabularyCollectionValidatorImpl( - importer, lenientOnLackOfExamples, lenientOnMappingTestFailures, - lenientOnExampleRetrievalFailures); - log.info(""); - log.info("Validating vocabulary collection: " + importer.getDirectoryLocation().toString()); + // Prepare validation + final VocabularyCollectionImporter importer = vocabularyCollectionImporterFactory + .createImporter(baseDirectory, vocabularyDirectory); + final VocabularyCollectionValidatorImpl validator = new VocabularyCollectionValidatorImpl( + importer, lenientOnLackOfExamples, lenientOnMappingTestFailures, + lenientOnExampleRetrievalFailures); + log.info(""); + log.info("Validating vocabulary collection: " + importer.getDirectoryLocation().toString()); - // Perform validation + // Perform validation validator.validate(vocabulary -> log.info(" Vocabulary found: " + vocabulary.getName()), - log::warn); + log::warn); } catch (VocabularyImportException e) { log.error(e.getMessage()); throw new EnforcerRuleException("Vocabulary collection validation failed.", e); diff --git a/metis-enrichment/metis-enrichment-common/src/main/java/eu/europeana/enrichment/api/external/model/Concept.java b/metis-enrichment/metis-enrichment-common/src/main/java/eu/europeana/enrichment/api/external/model/Concept.java index eecdf67a7..7b9f71439 100644 --- a/metis-enrichment/metis-enrichment-common/src/main/java/eu/europeana/enrichment/api/external/model/Concept.java +++ b/metis-enrichment/metis-enrichment-common/src/main/java/eu/europeana/enrichment/api/external/model/Concept.java @@ -27,6 +27,9 @@ public class Concept extends EnrichmentBase { private List broadMatch; @XmlElement(name = "closeMatch", namespace = "http://www.w3.org/2004/02/skos/core#") private List closeMatch; + /** Supported for serving in dereference API, not in the wider aggregation workflow. **/ + @XmlElement(name = "definition", namespace = "http://www.w3.org/2004/02/skos/core#") + private List