diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/impl/heattotosca/HeatToToscaTranslatorImpl.java')
| -rw-r--r-- | openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/impl/heattotosca/HeatToToscaTranslatorImpl.java | 162 |
1 files changed, 75 insertions, 87 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/impl/heattotosca/HeatToToscaTranslatorImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/impl/heattotosca/HeatToToscaTranslatorImpl.java index 54a0285026..d713e9ce7c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/impl/heattotosca/HeatToToscaTranslatorImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/impl/heattotosca/HeatToToscaTranslatorImpl.java @@ -7,9 +7,9 @@ * 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. @@ -17,9 +17,12 @@ * limitations under the License. * ============LICENSE_END========================================================= */ - package org.openecomp.sdc.translator.impl.heattotosca; +import java.io.InputStream; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.apache.commons.collections4.MapUtils; import org.openecomp.core.translator.api.HeatToToscaTranslator; import org.openecomp.core.translator.datatypes.TranslatorOutput; @@ -42,102 +45,87 @@ import org.openecomp.sdc.translator.services.heattotosca.TranslationService; import org.openecomp.sdc.translator.services.heattotosca.UnifiedCompositionManager; import org.openecomp.sdc.translator.services.heattotosca.UnifiedCompositionService; -import java.io.InputStream; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - public class HeatToToscaTranslatorImpl implements HeatToToscaTranslator { - private TranslationContext translationContext = new TranslationContext(); - private ValidationManager validationManager = - ValidationManagerFactory.getInstance().createInterface(); - private boolean isValid = false; - - - @Override - public void addManifest(String name, byte[] content) { - ManifestContent manifestData = JsonUtil.json2Object(new String(content), ManifestContent.class); - ManifestFile manifest = new ManifestFile(); - manifest.setName(name); - manifest.setContent(manifestData); - translationContext.setManifest(manifest); - translationContext.addFile(name, content); - validationManager.addFile(SdcCommon.MANIFEST_NAME, content); - addFilesFromManifestToTranslationContextManifestFilesMap(manifestData.getData()); - isValid = false; - } - - @Override - public void addFile(String name, byte[] content) { - translationContext.addFile(name, content); - validationManager.addFile(name, content); - isValid = false; - } - - @Override - public void addFile(String name, InputStream content) { - addFile(name, FileUtils.toByteArray(content)); - } - - - @Override - public Map<String, List<ErrorMessage>> validate() { - - Map<String, List<ErrorMessage>> errors = new HashMap<>(); - if (translationContext.getManifest() == null) { - ErrorMessage.ErrorMessageUtil.addMessage(SdcCommon.MANIFEST_NAME, errors) - .add(new ErrorMessage(ErrorLevel.ERROR, Messages.MANIFEST_NOT_EXIST.getErrorMessage())); - return errors; + private TranslationContext translationContext = new TranslationContext(); + private ValidationManager validationManager = ValidationManagerFactory.getInstance().createInterface(); + private boolean isValid = false; + + @Override + public void addManifest(String name, byte[] content) { + ManifestContent manifestData = JsonUtil.json2Object(new String(content), ManifestContent.class); + ManifestFile manifest = new ManifestFile(); + manifest.setName(name); + manifest.setContent(manifestData); + translationContext.setManifest(manifest); + translationContext.addFile(name, content); + validationManager.addFile(SdcCommon.MANIFEST_NAME, content); + addFilesFromManifestToTranslationContextManifestFilesMap(manifestData.getData()); + isValid = false; } - if (MapUtils.isEmpty(errors)) { - errors = validationManager.validate(); + @Override + public void addFile(String name, byte[] content) { + translationContext.addFile(name, content); + validationManager.addFile(name, content); + isValid = false; } - if (MapUtils.isEmpty(MessageContainerUtil.getMessageByLevel(ErrorLevel.ERROR, errors))) { - isValid = true; + + @Override + public void addFile(String name, InputStream content) { + addFile(name, FileUtils.toByteArray(content)); } - return errors; - } - @Override - public TranslatorOutput translate() { - TranslationService translationService = new TranslationService(); - TranslatorOutput translatorOutput = new TranslatorOutput(); - UnifiedCompositionManager unifiedCompositionManager = new UnifiedCompositionManager(new - ConsolidationService(new UnifiedCompositionService())); - if (!isValid) { - Map<String, List<ErrorMessage>> errors = validate(); + @Override + public Map<String, List<ErrorMessage>> validate() { + Map<String, List<ErrorMessage>> errors = new HashMap<>(); + if (translationContext.getManifest() == null) { + ErrorMessage.ErrorMessageUtil.addMessage(SdcCommon.MANIFEST_NAME, errors) + .add(new ErrorMessage(ErrorLevel.ERROR, Messages.MANIFEST_NOT_EXIST.getErrorMessage())); + return errors; + } + if (MapUtils.isEmpty(errors)) { + errors = validationManager.validate(); + } + if (MapUtils.isEmpty(MessageContainerUtil.getMessageByLevel(ErrorLevel.ERROR, errors))) { + isValid = true; + } + return errors; + } - if (MapUtils.isNotEmpty(MessageContainerUtil.getMessageByLevel(ErrorLevel.ERROR, errors))) { - translatorOutput.setErrorMessages(errors); + @Override + public TranslatorOutput translate() { + TranslationService translationService = new TranslationService(); + TranslatorOutput translatorOutput = new TranslatorOutput(); + UnifiedCompositionManager unifiedCompositionManager = new UnifiedCompositionManager( + new ConsolidationService(new UnifiedCompositionService())); + if (!isValid) { + Map<String, List<ErrorMessage>> errors = validate(); + if (MapUtils.isNotEmpty(MessageContainerUtil.getMessageByLevel(ErrorLevel.ERROR, errors))) { + translatorOutput.setErrorMessages(errors); + return translatorOutput; + } + } + translatorOutput = translationService.translateHeatFiles(translationContext); + ToscaServiceModel unifiedToscaServiceModel = unifiedCompositionManager + .createUnifiedComposition(translatorOutput.getToscaServiceModel(), translationContext); + translatorOutput.setToscaServiceModel(unifiedToscaServiceModel); return translatorOutput; - } } - translatorOutput = translationService.translateHeatFiles(translationContext); - ToscaServiceModel unifiedToscaServiceModel = unifiedCompositionManager - .createUnifiedComposition(translatorOutput.getToscaServiceModel(), translationContext); - translatorOutput.setToscaServiceModel(unifiedToscaServiceModel); - return translatorOutput; - } - - @Override - public void addExternalArtifacts(String name, byte[] content) { - translationContext.addExternalArtifacts(name, content); - } - - @Override - public void addExternalArtifacts(String name, InputStream content) { - addExternalArtifacts(name, FileUtils.toByteArray(content)); - } - - private void addFilesFromManifestToTranslationContextManifestFilesMap( - List<FileData> fileDataListFromManifest) { - for (FileData fileFromManfiest : fileDataListFromManifest) { - translationContext.addManifestFile(fileFromManfiest.getFile(), fileFromManfiest.getType()); + @Override + public void addExternalArtifacts(String name, byte[] content) { + translationContext.addExternalArtifacts(name, content); } - } + @Override + public void addExternalArtifacts(String name, InputStream content) { + addExternalArtifacts(name, FileUtils.toByteArray(content)); + } + private void addFilesFromManifestToTranslationContextManifestFilesMap(List<FileData> fileDataListFromManifest) { + for (FileData fileFromManfiest : fileDataListFromManifest) { + translationContext.addManifestFile(fileFromManfiest.getFile(), fileFromManfiest.getType()); + } + } } |