diff options
author | Gao Weitao <victor.gao@huawei.com> | 2019-06-06 12:22:35 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-06-06 12:22:35 +0000 |
commit | 900dd46df0976d545ec66a4822fc1fc846f262b4 (patch) | |
tree | 80e0329f8aea05421976defbbb2fe4fe68fce9a0 /csarvalidation/src/main/java/org/onap/cvc/csar/PnfManifestParser.java | |
parent | 379eb896b050fbb1f88ca7e736665c573f8c9f74 (diff) | |
parent | 84eb0c707c621e4855bf27e49be0cc69ded1f321 (diff) |
Merge "Specification change"dublin
Diffstat (limited to 'csarvalidation/src/main/java/org/onap/cvc/csar/PnfManifestParser.java')
-rw-r--r-- | csarvalidation/src/main/java/org/onap/cvc/csar/PnfManifestParser.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/PnfManifestParser.java b/csarvalidation/src/main/java/org/onap/cvc/csar/PnfManifestParser.java index 5ef74fd..8831082 100644 --- a/csarvalidation/src/main/java/org/onap/cvc/csar/PnfManifestParser.java +++ b/csarvalidation/src/main/java/org/onap/cvc/csar/PnfManifestParser.java @@ -29,6 +29,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -118,7 +119,7 @@ class PnfManifestParser { return Pair.of(sources, errors); } - Pair<Map<String, Map<String, List<String>>>, List<CSARArchive.CSARError>> fetchNonManoArtifacts() { + Optional<Pair<Map<String, Map<String, List<String>>>, List<CSARArchive.CSARError>>> fetchNonManoArtifacts() { Map<String, Map<String, List<String>>> nonManoArtifacts = new HashMap<>(); List<CSARArchive.CSARError> errors = new ArrayList<>(); @@ -143,10 +144,10 @@ class PnfManifestParser { } if (!isNonManoArtifactsSectionAvailable) { - errors.add(new PnfCSARErrorEntryMissing(NON_MANO_ARTIFACT_SETS_TAG_SECTION, this.fileName, -1)); + return Optional.empty(); } - return Pair.of(nonManoArtifacts, errors); + return Optional.of(Pair.of(nonManoArtifacts, errors)); } private boolean isLineExcluded(String line) { |