diff options
author | vasraz <vasyl.razinkov@est.tech> | 2020-10-19 16:33:00 +0100 |
---|---|---|
committer | S�bastien Determe <sebastien.determe@intl.att.com> | 2020-10-23 14:26:12 +0000 |
commit | 9714961d2950d00ae66be01e20c1ebb8552a82e9 (patch) | |
tree | f9c46bd321f7ef72614d5e5cfbcb42e0bbb49ac5 /openecomp-be/lib/openecomp-tosca-lib | |
parent | 290420e92809093050a493f34be3cc214459162f (diff) |
Remove sdc-tosca-parser dependency
Change-Id: I762b7a1098505312486d690902f2f10108a601ff
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-3317
Diffstat (limited to 'openecomp-be/lib/openecomp-tosca-lib')
4 files changed, 0 insertions, 244 deletions
diff --git a/openecomp-be/lib/openecomp-tosca-lib/pom.xml b/openecomp-be/lib/openecomp-tosca-lib/pom.xml index 1d23ac4e4d..48d513dba5 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/pom.xml +++ b/openecomp-be/lib/openecomp-tosca-lib/pom.xml @@ -90,11 +90,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.onap.sdc.sdc-tosca</groupId> - <artifactId>sdc-tosca</artifactId> - <version>${sdc-tosca-parser.version}</version> - </dependency> - <dependency> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId> <scope>provided</scope> diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/ToscaValidationService.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/ToscaValidationService.java deleted file mode 100644 index 59d7acccd4..0000000000 --- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/ToscaValidationService.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright © 2016-2018 European Support Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.openecomp.sdc.tosca.services; - -import org.openecomp.core.utilities.file.FileContentHandler; -import org.openecomp.sdc.datatypes.error.ErrorMessage; - -import java.io.IOException; -import java.util.List; -import java.util.Map; - -public interface ToscaValidationService { - - public Map<String, List<ErrorMessage>> validate(FileContentHandler fileContentHandler) - throws IOException; - -} diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaValidationServiceImpl.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaValidationServiceImpl.java deleted file mode 100644 index 9f3dd0790f..0000000000 --- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaValidationServiceImpl.java +++ /dev/null @@ -1,162 +0,0 @@ -/* - * Copyright © 2016-2018 European Support Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.openecomp.sdc.tosca.services.impl; - -import org.apache.commons.io.FilenameUtils; -import org.onap.sdc.tosca.parser.config.ConfigurationManager; -import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException; -import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory; -import org.onap.sdc.toscaparser.api.common.JToscaValidationIssue; -import org.openecomp.core.utilities.file.FileContentHandler; -import org.openecomp.core.utilities.file.FileUtils; -import org.openecomp.core.utilities.orchestration.OnboardingTypesEnum; -import org.openecomp.core.validation.ErrorMessageCode; -import org.openecomp.core.validation.errors.ErrorMessagesFormatBuilder; -import org.openecomp.sdc.be.utils.TypeUtils.ToscaTagNamesEnum; -import org.openecomp.sdc.datatypes.error.ErrorLevel; -import org.openecomp.sdc.datatypes.error.ErrorMessage; -import org.openecomp.sdc.logging.api.Logger; -import org.openecomp.sdc.logging.api.LoggerFactory; -import org.openecomp.sdc.tosca.services.ToscaValidationService; -import org.yaml.snakeyaml.Yaml; - -import java.nio.file.Files; -import java.nio.file.Path; -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; - - -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - - -public class ToscaValidationServiceImpl implements ToscaValidationService { - - private static final Logger LOGGER = LoggerFactory.getLogger(ToscaValidationServiceImpl.class); - private static final String SDCPARSER_JTOSCA_VALIDATIONISSUE_CONFIG = - "SDCParser_jtosca-validation-issue-configuration.yaml"; - private static final String SDCPARSER_ERROR_CONFIG = "SDCParser_error-configuration.yaml"; - - static { - // Override default SDC Parser configuration - ConfigurationManager configurationManager = ConfigurationManager.getInstance(); - configurationManager.setJtoscaValidationIssueConfiguration(SDCPARSER_JTOSCA_VALIDATIONISSUE_CONFIG); - configurationManager.setErrorConfiguration(SDCPARSER_ERROR_CONFIG); - SdcToscaParserFactory.setConfigurationManager(configurationManager); - } - - @Override - public Map<String, List<ErrorMessage>> validate(FileContentHandler fileContentHandler) - throws IOException { - - Path dir = - Files.createTempDirectory(OnboardingTypesEnum.CSAR + "_" + System.currentTimeMillis()); - try { - // Write temporary files and folders to File System - Map<String, String> filePaths = FileUtils.writeFilesFromFileContentHandler - (fileContentHandler, dir); - // Process Tosca Yaml validation - return processToscaYamls(filePaths); - } finally { - // Cleanup temporary files and folders from file system - org.apache.commons.io.FileUtils.deleteDirectory(dir.toFile()); - } - } - - private Map<String, List<ErrorMessage>> processToscaYamls(Map<String, String> filePaths) { - Map<String, String> validFilePaths = getValidFilePaths(filePaths); - Map<String, List<ErrorMessage>> validationIssues = new HashMap<>(); - - // Process Yaml Files - for (Map.Entry<String, String> fileEntry : validFilePaths.entrySet()) { - try { - SdcToscaParserFactory factory = SdcToscaParserFactory.getInstance(); - factory.getSdcCsarHelper(fileEntry.getValue()); - processValidationIssues(fileEntry.getKey(), factory, validationIssues); - } catch (SdcToscaParserException stpe) { - LOGGER.error("SDC Parser Exception from SDC Parser Library : " + stpe); - ErrorMessage.ErrorMessageUtil.addMessage(fileEntry.getKey(), validationIssues).add( - new ErrorMessage(ErrorLevel.ERROR, ErrorMessagesFormatBuilder - .getErrorWithParameters(new ErrorMessageCode("JE000"), "Unexpected Error " - + "occurred"))); - } - catch (RuntimeException rte) { - LOGGER.error("Runtime Exception from SDC Parser Library : " + rte); - ErrorMessage.ErrorMessageUtil.addMessage(fileEntry.getKey(), validationIssues).add( - new ErrorMessage(ErrorLevel.ERROR, ErrorMessagesFormatBuilder - .getErrorWithParameters(new ErrorMessageCode("JE000"), "Unexpected Error " - + "occurred"))); - } - } - return validationIssues; - } - - private Map<String, String> getValidFilePaths(Map<String, String> filePaths) { - return filePaths.entrySet() - .stream() - .filter(map -> FileUtils.isValidYamlExtension(FilenameUtils.getExtension(map.getKey())) - && isToscaYaml(map.getValue())) - .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); - } - - private boolean isToscaYaml(final String filePath) { - boolean retValue = false; - - try (final InputStream input = new BufferedInputStream(new FileInputStream(new File(filePath)));) { - final Yaml yaml = new Yaml(); - final LinkedHashMap<String,Object> data = (LinkedHashMap) yaml.load(input); - if(data.get(ToscaTagNamesEnum.TOSCA_VERSION.getElementName()) != null) { - retValue = true; - } - } - catch(final Exception e){ - LOGGER.info("Ignore the exception as the input file may not be a Tosca Yaml; let the " + - "default value return", e); - } - return retValue; - } - - private void processValidationIssues(String fileName, SdcToscaParserFactory factory, Map<String, - List<ErrorMessage>> validationIssues) { - - List<JToscaValidationIssue> criticalsReport = factory.getCriticalExceptions(); - criticalsReport.stream().forEach(err -> - ErrorMessage.ErrorMessageUtil.addMessage(fileName, validationIssues).add( - new ErrorMessage(ErrorLevel.ERROR, ErrorMessagesFormatBuilder - .getErrorWithParameters(new ErrorMessageCode(err.getCode()), err.getMessage())))); - - List<JToscaValidationIssue> warningsReport = factory.getWarningExceptions(); - warningsReport.stream().forEach(err -> - ErrorMessage.ErrorMessageUtil.addMessage(fileName, validationIssues).add( - new ErrorMessage(ErrorLevel.WARNING, ErrorMessagesFormatBuilder - .getErrorWithParameters(new ErrorMessageCode(err.getCode()), err.getMessage())))); - - List<JToscaValidationIssue> notAnalyzedReport = factory.getNotAnalyzadExceptions(); - notAnalyzedReport.stream().forEach(err -> - ErrorMessage.ErrorMessageUtil.addMessage(fileName, validationIssues).add( - new ErrorMessage(ErrorLevel.WARNING, ErrorMessagesFormatBuilder - .getErrorWithParameters(new ErrorMessageCode(err.getCode()), err.getMessage())))); - - } - -} diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaValidationServiceImplTest.java b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaValidationServiceImplTest.java deleted file mode 100644 index c9ceb363a4..0000000000 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaValidationServiceImplTest.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright © 2016-2018 European Support Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.openecomp.sdc.tosca.services.impl; - -import org.apache.commons.io.IOUtils; -import org.junit.Test; -import org.openecomp.core.utilities.file.FileContentHandler; -import org.openecomp.core.utilities.orchestration.OnboardingTypesEnum; -import org.openecomp.sdc.common.utils.CommonUtil; -import org.openecomp.sdc.datatypes.error.ErrorMessage; -import org.openecomp.sdc.tosca.services.ToscaValidationService; - -import java.io.IOException; -import java.util.List; -import java.util.Map; - -import static org.junit.Assert.assertFalse; - -public class ToscaValidationServiceImplTest { - - @Test - public void validateCSARContentErrorHandling() throws IOException { - String resName = "/mock/validationService/csar/resource-Spgw-csar-ZTE.csar"; - byte[] uploadedFileData = IOUtils.toByteArray(this.getClass().getResource(resName)); - FileContentHandler contentMap = - CommonUtil.validateAndUploadFileContent(OnboardingTypesEnum.CSAR, uploadedFileData); - ToscaValidationService handler = new ToscaValidationServiceImpl(); - Map<String, List<ErrorMessage>> errors = handler.validate(contentMap); - assertFalse(errors.isEmpty()); - } - -} |