diff options
Diffstat (limited to 'openecomp-be/backend/openecomp-sdc-vendor-software-product-manager')
2 files changed, 10 insertions, 3 deletions
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/csar/validation/PMDictionaryValidator.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/csar/validation/PMDictionaryValidator.java index a91dd9f445..90270c2f7e 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/csar/validation/PMDictionaryValidator.java +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/csar/validation/PMDictionaryValidator.java @@ -41,11 +41,18 @@ public class PMDictionaryValidator { try { List<YamlDocumentValidationError> validationErrors = new YamlContentValidator().validate(fileContent); validationErrors.stream() - .map(YamlDocumentValidationError::getMessage) + .map(this::formatErrorMessage) .forEach(errors::add); } catch (Exception e) { errors.add(e.getMessage()); } return errors; } + + private String formatErrorMessage(YamlDocumentValidationError error) { + return String.format("Document number: %d, Path: %s, Message: %s", + error.getYamlDocumentNumber(), + error.getPath(), + error.getMessage()); + } } diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/csar/validation/PMDictionaryValidatorTest.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/csar/validation/PMDictionaryValidatorTest.java index 22ef7720dc..1aec5570a2 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/csar/validation/PMDictionaryValidatorTest.java +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/csar/validation/PMDictionaryValidatorTest.java @@ -58,7 +58,7 @@ class PMDictionaryValidatorTest { // then assertThat(errors.size(), is(1)); - assertThat(errors.get(0), is("Key not found: pmDictionaryHeader")); + assertThat(errors.get(0), is("Document number: 1, Path: /pmDictionary/, Message: Key not found: pmDictionaryHeader")); } @Test @@ -74,4 +74,4 @@ class PMDictionaryValidatorTest { assertThat(errors.size(), is(1)); assertThat(errors.get(0), is("PM_Dictionary YAML file is empty")); } -}
\ No newline at end of file +} |