From bc3eb00205e566e80f13bb93a7a3b1ace8867406 Mon Sep 17 00:00:00 2001 From: Eliza Kalata Date: Mon, 9 May 2022 10:41:23 +0200 Subject: [PATCH] Test changes for delete draft item media. --- .../validators/vocabularies/ConceptFactory.java | 11 +++-------- .../vocabularies/ConceptPropertyFactory.java | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/main/java/eu/sshopencloud/marketplace/validators/vocabularies/ConceptFactory.java b/src/main/java/eu/sshopencloud/marketplace/validators/vocabularies/ConceptFactory.java index d0dbe006..be551988 100644 --- a/src/main/java/eu/sshopencloud/marketplace/validators/vocabularies/ConceptFactory.java +++ b/src/main/java/eu/sshopencloud/marketplace/validators/vocabularies/ConceptFactory.java @@ -93,7 +93,7 @@ public class ConceptFactory { Concept object; // either uri or code and vocabulary must be provided if (relatedConcept.getUri() == null) { - object = createByCodeAndVocabularyId(relatedConcept.getCode().toLowerCase(Locale.ROOT), relatedConcept.getVocabulary(), errors); + object = createByCodeAndVocabularyId(relatedConcept.getCode(), relatedConcept.getVocabulary(), errors); } else { object = createByUri(relatedConcept.getUri(), errors); } @@ -131,14 +131,9 @@ public class ConceptFactory { .code(code).vocabulary(vocabulary.getCode()).build()); if (conceptHolder.isEmpty()) { - Optional optionalConceptHolder = conceptRepository.findByCodeAndVocabularyCode(code, vocabulary.getCode()); // assign error to code field because vocabulary was validated earlier - if (optionalConceptHolder.isEmpty()) { - errors.rejectValue("code", "field.notExist", "Concept does not exist."); - return null; - }else { - return optionalConceptHolder.get(); - } + errors.rejectValue("code", "field.notExist", "Concept does not exist."); + return null; } return conceptHolder.get(); diff --git a/src/main/java/eu/sshopencloud/marketplace/validators/vocabularies/ConceptPropertyFactory.java b/src/main/java/eu/sshopencloud/marketplace/validators/vocabularies/ConceptPropertyFactory.java index 312b81f9..900b6154 100644 --- a/src/main/java/eu/sshopencloud/marketplace/validators/vocabularies/ConceptPropertyFactory.java +++ b/src/main/java/eu/sshopencloud/marketplace/validators/vocabularies/ConceptPropertyFactory.java @@ -24,7 +24,7 @@ public class ConceptPropertyFactory { Concept concept; // either uri or code and vocabulary must be provided if (conceptId.getUri() == null) { - concept = conceptFactory.createByCodeAndVocabularyId(conceptId.getCode().toLowerCase(Locale.ROOT), conceptId.getVocabulary(), errors); + concept = conceptFactory.createByCodeAndVocabularyId(conceptId.getCode(), conceptId.getVocabulary(), errors); } else { concept = conceptFactory.createByUri(conceptId.getUri(), errors); } -- GitLab