diff options
author | Bogumil Zebek <bogumil.zebek@nokia.com> | 2019-07-26 10:25:09 +0200 |
---|---|---|
committer | Zebek Bogumil <bogumil.zebek@nokia.com> | 2019-07-31 11:06:50 +0200 |
commit | e66d2541cf7ee1836784681331b6909421a86d63 (patch) | |
tree | a67705ff015b7c78511e9cecc47c25c3fdddbb61 /csarvalidation/src/main/java/org/onap/cvc/csar/parser | |
parent | dc6775fbc0779eb2db77ab8215fcb7847b94a4cf (diff) |
Option 1 - vnf only
Change-Id: I281dddab930328f24b9267aa6afc6ae08fd9ed01
Issue-ID: VNFSDK-396
Signed-off-by: Zebek Bogumil <bogumil.zebek@nokia.com>
Diffstat (limited to 'csarvalidation/src/main/java/org/onap/cvc/csar/parser')
3 files changed, 24 insertions, 10 deletions
diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/parser/CmsParser.java b/csarvalidation/src/main/java/org/onap/cvc/csar/parser/CmsParser.java index b1bf4b4..aa0fb48 100644 --- a/csarvalidation/src/main/java/org/onap/cvc/csar/parser/CmsParser.java +++ b/csarvalidation/src/main/java/org/onap/cvc/csar/parser/CmsParser.java @@ -48,9 +48,7 @@ public class CmsParser { for (String line : lines) { ManifestLine manifestLine = ManifestLine.of(line); - if (cmsSectionParsing && (manifestLine.startsWith(METADATA_SECTION_TAG_SECTION) - || manifestLine.startsWith(NON_MANO_ARTIFACT_SETS_TAG_SECTION) - || manifestLine.startsWith(SOURCE_TAG_SECTION))) { + if (cmsSectionParsing && isContainSepecialTag(manifestLine)) { isSpecialTagReached = true; } else if (!isSpecialTagReached && line.contains(BEGIN_CMS_SECTION)) { cmsSectionParsing = true; @@ -75,6 +73,12 @@ public class CmsParser { return constructResponse(buf, errors, cmsSectionParsing, endCmsMarkerReached); } + private boolean isContainSepecialTag(ManifestLine manifestLine) { + return manifestLine.startsWith(METADATA_SECTION_TAG_SECTION) + || manifestLine.startsWith(NON_MANO_ARTIFACT_SETS_TAG_SECTION) + || manifestLine.startsWith(SOURCE_TAG_SECTION); + } + private Pair<String, List<CSARArchive.CSARError>> constructResponse(StringBuilder buf, List<CSARArchive.CSARError> errors, boolean cmsSectionParsing, boolean endCmsMarkerReached) { if(endCmsMarkerReached) { return Pair.of(buf.toString(), errors); diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/parser/ManifestConsts.java b/csarvalidation/src/main/java/org/onap/cvc/csar/parser/ManifestConsts.java index da17317..afa0e2d 100644 --- a/csarvalidation/src/main/java/org/onap/cvc/csar/parser/ManifestConsts.java +++ b/csarvalidation/src/main/java/org/onap/cvc/csar/parser/ManifestConsts.java @@ -20,8 +20,6 @@ package org.onap.cvc.csar.parser; final class ManifestConsts { - private ManifestConsts(){} - static final String METADATA_SECTION_TAG_SECTION = "metadata"; static final String SOURCE_TAG_SECTION = "source"; static final String ALGORITHM = "algorithm"; @@ -35,4 +33,6 @@ final class ManifestConsts { static final String BEGIN_CMS_SECTION = "BEGIN CMS"; static final String END_CMS_SECTION = "END CMS"; + private ManifestConsts(){} + } diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/parser/SourcesParser.java b/csarvalidation/src/main/java/org/onap/cvc/csar/parser/SourcesParser.java index 5f3f0d7..9cbef8a 100644 --- a/csarvalidation/src/main/java/org/onap/cvc/csar/parser/SourcesParser.java +++ b/csarvalidation/src/main/java/org/onap/cvc/csar/parser/SourcesParser.java @@ -45,9 +45,7 @@ public class SourcesParser { for (int lineNumber = 0; lineNumber < lines.size(); lineNumber++) { String line = lines.get(lineNumber); ManifestLine manifestLine = ManifestLine.of(line); - if (sourceSectionParsing && (manifestLine.startsWith(METADATA_SECTION_TAG_SECTION) - || manifestLine.startsWith(NON_MANO_ARTIFACT_SETS_TAG_SECTION) - || line.contains(CMS))) { + if (sourceSectionParsing && isContainSpecialTag(line, manifestLine)) { isSpecialTagReached = true; } else if (!isSpecialTagReached && manifestLine.startsWith(SOURCE_TAG_SECTION)) { sourceSectionParsing = true; @@ -62,6 +60,12 @@ public class SourcesParser { return Pair.of(sources, errors); } + private boolean isContainSpecialTag(String line, ManifestLine manifestLine) { + return manifestLine.startsWith(METADATA_SECTION_TAG_SECTION) + || manifestLine.startsWith(NON_MANO_ARTIFACT_SETS_TAG_SECTION) + || line.contains(CMS); + } + private Source handleSourceLine(List<Source> sources, List<CSARArchive.CSARError> errors, int lineNumber, ManifestLine manifestLine) { Source source; String value = parseSourceSectionLine(manifestLine, lineNumber, errors); @@ -140,8 +144,14 @@ public class SourcesParser { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + + if (o == null || getClass() != o.getClass()) { + return false; + } + Source source1 = (Source) o; return Objects.equals(value, source1.value) && Objects.equals(algorithm, source1.algorithm) && |