/*
* Copyright © 2016-2017 European Support Limited
+ * Modifications copyright (c) 2021 Nokia
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.openecomp.sdc.vendorsoftwareproduct.services.impl.filedatastructuremodule;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.regex.Pattern;
import org.apache.commons.collections4.CollectionUtils;
import org.openecomp.core.utilities.file.FileContentHandler;
import org.openecomp.sdc.heat.datatypes.manifest.FileData;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.*;
-import java.util.regex.Pattern;
-
public class ManifestCreatorNamingConventionImpl implements ManifestCreator {
- protected static final Logger logger =
- LoggerFactory.getLogger(ManifestCreatorNamingConventionImpl.class);
- private static final String CLOUD_SPECIFIC_FIXED_KEY_WORD = "cloudtech";
- private static final String[][] CLOUD_SPECIFIC_KEY_WORDS = {{"k8s", "azure", "aws"}, /* cloud specific technology */
- {"charts", "day0", "configtemplate"} /*cloud specific sub type*/};
- private static final String CONTROLLER_BLUEPRINT_ARCHIVE_FIXED_KEY_WORD = "CBA";
- private static final String HELM_KEY_WORD = "HELM";
+ protected static final Logger logger = LoggerFactory.getLogger(ManifestCreatorNamingConventionImpl.class);
+ private static final String CLOUD_SPECIFIC_FIXED_KEY_WORD = "cloudtech";
+ private static final String[][] CLOUD_SPECIFIC_KEY_WORDS = {{"k8s", "azure", "aws"}, /* cloud specific technology */
+ {"charts", "day0", "configtemplate"} /*cloud specific sub type*/};
+ private static final String CONTROLLER_BLUEPRINT_ARCHIVE_FIXED_KEY_WORD = "CBA";
+ private static final String HELM_KEY_WORD = "HELM";
+
+ @Override
+ public Optional<ManifestContent> createManifest(VspDetails vspDetails, FilesDataStructure filesDataStructure) {
+ if (Objects.isNull(filesDataStructure)) {
+ return Optional.empty();
+ }
+ List<FileData> fileDataList = new ArrayList<>();
+ addModulesToManifestFileDataList(filesDataStructure, fileDataList);
+ addNestedToManifest(filesDataStructure, fileDataList);
+ addArtifactsToManifestFileDataList(filesDataStructure, fileDataList);
+ ManifestContent manifestContent = createManifest(vspDetails, fileDataList);
+ return Optional.of(manifestContent);
+ }
- @Override
- public Optional<ManifestContent> createManifest(
- VspDetails vspDetails, FilesDataStructure filesDataStructure) {
- if (Objects.isNull(filesDataStructure)) {
- return Optional.empty();
+ @Override
+ public Optional<ManifestContent> createManifestFromExisting(VspDetails vspDetails, FilesDataStructure filesDataStructure,
+ ManifestContent existingManifest) {
+ if (Objects.isNull(filesDataStructure)) {
+ return Optional.empty();
+ }
+ List<FileData> fileDataList = new ArrayList<>();
+ addModulesToManifestFileDataList(filesDataStructure, fileDataList);
+ addNestedToManifest(filesDataStructure, fileDataList);
+ addArtifactsToManifestFileDataList(filesDataStructure, fileDataList, existingManifest);
+ ManifestContent manifestContent = createManifest(vspDetails, fileDataList);
+ return Optional.of(manifestContent);
}
- List<FileData> fileDataList = new ArrayList<>();
- addModulesToManifestFileDataList(filesDataStructure, fileDataList);
- addNestedToManifest(filesDataStructure, fileDataList);
- addArtifactsToManifestFileDataList(filesDataStructure, fileDataList);
- ManifestContent manifestContent = createManifest(vspDetails, fileDataList);
- return Optional.of(manifestContent);
- }
+ private void addArtifactsToManifestFileDataList(FilesDataStructure filesDataStructure, List<FileData> fileDataList,
+ ManifestContent existingManifest) {
+ Collection<String> forArtifacts = CollectionUtils.union(filesDataStructure.getArtifacts(), filesDataStructure.getUnassigned());
+ if (CollectionUtils.isNotEmpty(forArtifacts)) {
+ for (String artifact : forArtifacts) {
+ if (isCloudSpecificArtifact(artifact)) {
+ fileDataList.add(createBaseFileData(FileData.Type.CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT, artifact));
+ } else if (isControllerBlueprintArchive(artifact)) {
+ fileDataList.add(createBaseFileData(FileData.Type.CONTROLLER_BLUEPRINT_ARCHIVE, artifact));
+ } else if (isHelm(artifact)) {
+ fileDataList.add(createBaseFileData(FileData.Type.HELM, artifact));
+ } else if (isPmDictionary(artifact, existingManifest)) {
+ fileDataList.add(createBaseFileData(FileData.Type.PM_DICTIONARY, artifact));
+ } else {
+ fileDataList.add(createBaseFileData(FileData.Type.OTHER, artifact));
+ }
+ }
+ }
+ }
- private void addNestedToManifest(
- FilesDataStructure filesDataStructure, List<FileData> fileDataList) {
- if (CollectionUtils.isNotEmpty(filesDataStructure.getNested())) {
- for (String nested : filesDataStructure.getNested()) {
- fileDataList.add(createBaseFileData(FileData.Type.HEAT, nested));
- }
+ private boolean isPmDictionary(String artifact, ManifestContent existingManifest) {
+ return existingManifest.getData().stream().filter(fileData -> FileData.Type.PM_DICTIONARY.equals(fileData.getType())).map(FileData::getFile)
+ .anyMatch(pmDictionaryFile -> pmDictionaryFile.equals(artifact));
}
- }
- @Override
- public Optional<ManifestContent> createManifest(VspDetails vspDetails,
- FileContentHandler fileContentHandler,
- AnalyzedZipHeatFiles analyzedZipHeatFiles) {
- logger.info("Trying to generate manifest");
- if (Objects.isNull(fileContentHandler)
- || CollectionUtils.isEmpty(fileContentHandler.getFileList())) {
- logger.info("fileContentHandler or filesList is empty. ManifestContent will not be created");
- return Optional.empty();
+ private void addNestedToManifest(FilesDataStructure filesDataStructure, List<FileData> fileDataList) {
+ if (CollectionUtils.isNotEmpty(filesDataStructure.getNested())) {
+ for (String nested : filesDataStructure.getNested()) {
+ fileDataList.add(createBaseFileData(FileData.Type.HEAT, nested));
+ }
+ }
}
- Map<String, byte[]> files = fileContentHandler.getFiles();
+ @Override
+ public Optional<ManifestContent> createManifest(VspDetails vspDetails, FileContentHandler fileContentHandler,
+ AnalyzedZipHeatFiles analyzedZipHeatFiles) {
+ logger.info("Trying to generate manifest");
+ if (Objects.isNull(fileContentHandler) || CollectionUtils.isEmpty(fileContentHandler.getFileList())) {
+ logger.info("fileContentHandler or filesList is empty. ManifestContent will not be created");
+ return Optional.empty();
+ }
+ Map<String, byte[]> files = fileContentHandler.getFiles();
+ List<FileData> fileDataList = createFileDataListFromZipFiles(fileContentHandler, files, analyzedZipHeatFiles.getFilesNotEligbleForModules());
+ ManifestContent manifestContent = createManifest(vspDetails, fileDataList);
+ return Optional.of(manifestContent);
+ }
- List<FileData> fileDataList =
- createFileDataListFromZipFiles(fileContentHandler, files,
- analyzedZipHeatFiles.getFilesNotEligbleForModules());
- ManifestContent manifestContent = createManifest(vspDetails, fileDataList);
+ private ManifestContent createManifest(VspDetails vspDetails, List<FileData> fileDataList) {
+ ManifestContent manifestContent = new ManifestContent();
+ manifestContent.setName(vspDetails.getName());
+ manifestContent.setDescription(vspDetails.getDescription());
+ manifestContent.setVersion(vspDetails.getVersion() == null ? null : vspDetails.getVersion().toString());
+ // vsp version, need to check in confluence
+ manifestContent.setData(fileDataList);
+ return manifestContent;
+ }
- return Optional.of(manifestContent);
- }
+ private List<FileData> createFileDataListFromZipFiles(FileContentHandler fileContentHandler, Map<String, byte[]> files,
+ Collection<String> filesNotEligibleForModules) {
+ Set<String> processedFiles = new HashSet<>();
+ List<FileData> fileDataList = new ArrayList<>();
+ for (String fileName : files.keySet()) {
+ if (processedFiles.contains(fileName)) {
+ continue;
+ }
+ if (isFileBaseFile(fileName)) {
+ fileDataList.add(createModuleFileData(fileName, true, processedFiles, fileContentHandler.getFileList(), fileDataList));
+ } else if (isFileModuleFile(fileName, filesNotEligibleForModules)) {
+ fileDataList.add(createModuleFileData(fileName, false, processedFiles, fileContentHandler.getFileList(), fileDataList));
+ } else {
+ if (HeatFileAnalyzer.isYamlFile(fileName)) {
+ fileDataList.add(createBasicFileData(fileName, FileData.Type.HEAT, null));
+ } else if (HeatFileAnalyzer.isEnvFile(fileName)) {
+ fileDataList.add(createBasicFileData(fileName, FileData.Type.HEAT_ENV, null));
+ } else {
+ fileDataList.add(createBasicFileData(fileName, FileData.Type.OTHER, null));
+ }
+ }
+ }
+ return fileDataList;
+ }
- private ManifestContent createManifest(VspDetails vspDetails, List<FileData> fileDataList) {
- ManifestContent manifestContent = new ManifestContent();
- manifestContent.setName(vspDetails.getName());
- manifestContent.setDescription(vspDetails.getDescription());
- manifestContent
- .setVersion(vspDetails.getVersion() == null ? null : vspDetails.getVersion().toString());
- // vsp version, need to check in confluence
- manifestContent.setData(fileDataList);
- return manifestContent;
- }
+ private boolean isFileModuleFile(String fileName, Collection<String> filesCannotBeModule) {
+ return !filesCannotBeModule.contains(fileName);
+ }
- private List<FileData> createFileDataListFromZipFiles(FileContentHandler fileContentHandler,
- Map<String, byte[]> files,
- Collection<String> filesNotEligibleForModules) {
+ @Override
+ public boolean isFileBaseFile(String fileName) {
+ return Pattern.matches(Constants.BASE_HEAT_REGEX, fileName) && !isVolFile(fileName);
+ }
- Set<String> processedFiles = new HashSet<>();
- List<FileData> fileDataList = new ArrayList<>();
- for (String fileName : files.keySet()) {
- if (processedFiles.contains(fileName)) {
- continue;
- }
- if (isFileBaseFile(fileName)) {
- fileDataList
- .add(createModuleFileData(
- fileName, true, processedFiles, fileContentHandler.getFileList(), fileDataList));
- } else if (isFileModuleFile(fileName, filesNotEligibleForModules)) {
- fileDataList
- .add(createModuleFileData(
- fileName, false, processedFiles, fileContentHandler.getFileList(), fileDataList));
- } else {
- if (HeatFileAnalyzer.isYamlFile(fileName)) {
- fileDataList.add(createBasicFileData(fileName, FileData.Type.HEAT, null));
- } else if (HeatFileAnalyzer.isEnvFile(fileName)) {
- fileDataList.add(createBasicFileData(fileName, FileData.Type.HEAT_ENV, null));
+ protected boolean isCloudSpecificArtifact(String artifact) {
+ if (artifact.contains(CLOUD_SPECIFIC_FIXED_KEY_WORD)) {
+ for (int i = 0; i < CLOUD_SPECIFIC_KEY_WORDS.length; i++) {
+ if (Arrays.stream(CLOUD_SPECIFIC_KEY_WORDS[i]).noneMatch(str -> artifact.contains(str))) {
+ return false;
+ }
+ }
+ return true;
} else {
- fileDataList.add(createBasicFileData(fileName, FileData.Type.OTHER, null));
+ return false;
}
- }
}
- return fileDataList;
- }
-
- private boolean isFileModuleFile(String fileName, Collection<String> filesCannotBeModule) {
- return !filesCannotBeModule.contains(fileName);
- }
-
- @Override
- public boolean isFileBaseFile(String fileName) {
- return Pattern.matches(Constants.BASE_HEAT_REGEX, fileName) && !isVolFile(fileName);
- }
-
- protected boolean isCloudSpecificArtifact(String artifact) {
- if (artifact.contains(CLOUD_SPECIFIC_FIXED_KEY_WORD)) {
- for (int i = 0; i < CLOUD_SPECIFIC_KEY_WORDS.length; i++) {
- if (Arrays.stream(CLOUD_SPECIFIC_KEY_WORDS[i]).noneMatch(str -> artifact.contains(str))) {
- return false;
- }
- }
- return true;
- } else {
- return false;
- }
- }
- private boolean isControllerBlueprintArchive(String artifact) {
- return artifact.toUpperCase().contains(CONTROLLER_BLUEPRINT_ARCHIVE_FIXED_KEY_WORD);
- }
+ private boolean isControllerBlueprintArchive(String artifact) {
+ return artifact.toUpperCase().contains(CONTROLLER_BLUEPRINT_ARCHIVE_FIXED_KEY_WORD);
+ }
- private boolean isHelm(String artifact) {
- return artifact.toUpperCase().contains(HELM_KEY_WORD);
- }
+ private boolean isHelm(String artifact) {
+ return artifact.toUpperCase().contains(HELM_KEY_WORD);
+ }
- private void addArtifactsToManifestFileDataList(
- FilesDataStructure filesDataStructure, List<FileData> fileDataList) {
- Collection<String> forArtifacts = CollectionUtils
- .union(filesDataStructure.getArtifacts(), filesDataStructure.getUnassigned());
- if (CollectionUtils.isNotEmpty(forArtifacts)) {
- for (String artifact : forArtifacts) {
- if (isCloudSpecificArtifact(artifact)) {
- fileDataList.add(createBaseFileData(FileData.Type.CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT, artifact));
- } else if (isControllerBlueprintArchive(artifact)) {
- fileDataList.add(createBaseFileData(FileData.Type.CONTROLLER_BLUEPRINT_ARCHIVE, artifact));
- } else if (isHelm(artifact)) {
- fileDataList.add(createBaseFileData(FileData.Type.HELM, artifact));
- }
- else {
- fileDataList.add(createBaseFileData(FileData.Type.OTHER, artifact));
+ private void addArtifactsToManifestFileDataList(FilesDataStructure filesDataStructure, List<FileData> fileDataList) {
+ Collection<String> forArtifacts = CollectionUtils.union(filesDataStructure.getArtifacts(), filesDataStructure.getUnassigned());
+ if (CollectionUtils.isNotEmpty(forArtifacts)) {
+ for (String artifact : forArtifacts) {
+ if (isCloudSpecificArtifact(artifact)) {
+ fileDataList.add(createBaseFileData(FileData.Type.CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT, artifact));
+ } else if (isControllerBlueprintArchive(artifact)) {
+ fileDataList.add(createBaseFileData(FileData.Type.CONTROLLER_BLUEPRINT_ARCHIVE, artifact));
+ } else if (isHelm(artifact)) {
+ fileDataList.add(createBaseFileData(FileData.Type.HELM, artifact));
+ } else {
+ fileDataList.add(createBaseFileData(FileData.Type.OTHER, artifact));
+ }
+ }
}
- }
}
- }
- private void addModulesToManifestFileDataList(
- FilesDataStructure filesDataStructure, List<FileData> fileDataList) {
- if (CollectionUtils.isNotEmpty(filesDataStructure.getModules())) {
- for (Module module : filesDataStructure.getModules()) {
- FileData.Type type = module.getType();
- if (type == null) {
- type = FileData.Type.HEAT;
+ private void addModulesToManifestFileDataList(FilesDataStructure filesDataStructure, List<FileData> fileDataList) {
+ if (CollectionUtils.isNotEmpty(filesDataStructure.getModules())) {
+ for (Module module : filesDataStructure.getModules()) {
+ FileData.Type type = module.getType();
+ if (type == null) {
+ type = FileData.Type.HEAT;
+ }
+ FileData fileData = createBaseFileData(type, module.getYaml());
+ fileData.setBase(module.getIsBase());
+ addEnv(module, fileData);
+ addVolume(module, fileData);
+ fileDataList.add(fileData);
+ }
}
- FileData fileData = createBaseFileData(type, module.getYaml());
- fileData.setBase(module.getIsBase());
- addEnv(module, fileData);
- addVolume(module, fileData);
- fileDataList.add(fileData);
- }
}
- }
- private void addEnv(Module module, FileData fileData) {
- if (Objects.nonNull(module.getEnv())) {
- FileData env = createBaseFileData(FileData.Type.HEAT_ENV, module.getEnv());
- fileData.addFileData(env);
+ private void addEnv(Module module, FileData fileData) {
+ if (Objects.nonNull(module.getEnv())) {
+ FileData env = createBaseFileData(FileData.Type.HEAT_ENV, module.getEnv());
+ fileData.addFileData(env);
+ }
}
- }
- private void addVolume(Module module, FileData fileData) {
- String volModule = module.getVol();
- if (Objects.nonNull(volModule)) {
- FileData vol = createBaseFileData(FileData.Type.HEAT_VOL, volModule);
- if (Objects.nonNull(module.getVolEnv())) {
- vol.addFileData(createBaseFileData(FileData.Type.HEAT_ENV, module.getVolEnv()));
- }
- fileData.addFileData(vol);
+ private void addVolume(Module module, FileData fileData) {
+ String volModule = module.getVol();
+ if (Objects.nonNull(volModule)) {
+ FileData vol = createBaseFileData(FileData.Type.HEAT_VOL, volModule);
+ if (Objects.nonNull(module.getVolEnv())) {
+ vol.addFileData(createBaseFileData(FileData.Type.HEAT_ENV, module.getVolEnv()));
+ }
+ fileData.addFileData(vol);
+ }
}
- }
- private FileData createBaseFileData(FileData.Type heat, String yaml) {
- FileData fileData = new FileData();
- fileData.setType(heat);
- fileData.setFile(yaml);
- return fileData;
- }
-
- private FileData createModuleFileData(
- String moduleFileName, boolean isBase, Set<String> processedFiles,
- Set<String> fileNames, List<FileData> fileDataList) {
- FileData moduleFileData = createBasicFileData(moduleFileName, FileData.Type.HEAT, isBase);
- Optional<String> volFile = fetchRelatedVolume(moduleFileName, fileNames);
- volFile.ifPresent(vol -> {
- markFileAsProcessed(vol, processedFiles);
- removeFromFileDataListIfAlreadyProcessed(fileDataList, vol);
- FileData volFileData = createBasicFileData(vol, FileData.Type.HEAT_VOL, null);
- Optional<String> envFile = fetchRelatedEnv(vol, fileNames);
- envFile.ifPresent(env -> {
- markFileAsProcessed(env, processedFiles);
- removeFromFileDataListIfAlreadyProcessed(fileDataList, env);
- FileData envFileData = createBasicFileData(env, FileData.Type.HEAT_ENV, null);
- volFileData.addFileData(envFileData);
- });
- moduleFileData.addFileData(volFileData);
- });
- Optional<String> envFile = fetchRelatedEnv(moduleFileName, fileNames);
- envFile.ifPresent(env -> {
- markFileAsProcessed(env, processedFiles);
- FileData envFileData = createBasicFileData(env, FileData.Type.HEAT_ENV, null);
- moduleFileData.addFileData(envFileData);
- });
- return moduleFileData;
- }
-
- private void removeFromFileDataListIfAlreadyProcessed(List<FileData> fileDataList, String vol) {
- fileDataList.removeIf(fileData -> fileData.getFile().equals(vol));
- }
-
- private FileData createBasicFileData(String fileName, FileData.Type type, Boolean isBase) {
- FileData fileData = new FileData();
- if (isBase != null) {
- fileData.setBase(isBase);
+ private FileData createBaseFileData(FileData.Type heat, String yaml) {
+ FileData fileData = new FileData();
+ fileData.setType(heat);
+ fileData.setFile(yaml);
+ return fileData;
}
- fileData.setType(type);
- fileData.setFile(fileName);
- return fileData;
- }
-
- private Optional<String> fetchRelatedEnv(String fileName, Set<String> fileNames) {
- String envFileName
- = fileName.substring(0, fileName.lastIndexOf(".")) + Constants.ENV_FILE_EXTENSION;
- return fileNames.contains(envFileName) ? Optional.of(envFileName) : Optional.empty();
- }
-
- private Optional<String> fetchRelatedVolume(String fileName, Set<String> fileNames) {
- String volFile1stExt =
- extractVolFileName(fileName, ".yaml");
- String volFile2ndExt =
- extractVolFileName(fileName, ".yml");
+ private FileData createModuleFileData(String moduleFileName, boolean isBase, Set<String> processedFiles, Set<String> fileNames,
+ List<FileData> fileDataList) {
+ FileData moduleFileData = createBasicFileData(moduleFileName, FileData.Type.HEAT, isBase);
+ Optional<String> volFile = fetchRelatedVolume(moduleFileName, fileNames);
+ volFile.ifPresent(vol -> {
+ markFileAsProcessed(vol, processedFiles);
+ removeFromFileDataListIfAlreadyProcessed(fileDataList, vol);
+ FileData volFileData = createBasicFileData(vol, FileData.Type.HEAT_VOL, null);
+ Optional<String> envFile = fetchRelatedEnv(vol, fileNames);
+ envFile.ifPresent(env -> {
+ markFileAsProcessed(env, processedFiles);
+ removeFromFileDataListIfAlreadyProcessed(fileDataList, env);
+ FileData envFileData = createBasicFileData(env, FileData.Type.HEAT_ENV, null);
+ volFileData.addFileData(envFileData);
+ });
+ moduleFileData.addFileData(volFileData);
+ });
+ Optional<String> envFile = fetchRelatedEnv(moduleFileName, fileNames);
+ envFile.ifPresent(env -> {
+ markFileAsProcessed(env, processedFiles);
+ FileData envFileData = createBasicFileData(env, FileData.Type.HEAT_ENV, null);
+ moduleFileData.addFileData(envFileData);
+ });
+ return moduleFileData;
+ }
- if (fileNames.contains(volFile1stExt)) {
- return Optional.of(volFile1stExt);
+ private void removeFromFileDataListIfAlreadyProcessed(List<FileData> fileDataList, String vol) {
+ fileDataList.removeIf(fileData -> fileData.getFile().equals(vol));
}
- if (fileNames.contains(volFile2ndExt)) {
- return Optional.of(volFile2ndExt);
+
+ private FileData createBasicFileData(String fileName, FileData.Type type, Boolean isBase) {
+ FileData fileData = new FileData();
+ if (isBase != null) {
+ fileData.setBase(isBase);
+ }
+ fileData.setType(type);
+ fileData.setFile(fileName);
+ return fileData;
}
- return Optional.empty();
- }
- private String extractVolFileName(String fileName, String fileExt) {
- return fileName.substring(
- 0, fileName.lastIndexOf("."))
- + Constants.VOL_FILE_NAME_SUFFIX + fileExt;
- }
+ private Optional<String> fetchRelatedEnv(String fileName, Set<String> fileNames) {
+ String envFileName = fileName.substring(0, fileName.lastIndexOf(".")) + Constants.ENV_FILE_EXTENSION;
+ return fileNames.contains(envFileName) ? Optional.of(envFileName) : Optional.empty();
+ }
+ private Optional<String> fetchRelatedVolume(String fileName, Set<String> fileNames) {
+ String volFile1stExt = extractVolFileName(fileName, ".yaml");
+ String volFile2ndExt = extractVolFileName(fileName, ".yml");
+ if (fileNames.contains(volFile1stExt)) {
+ return Optional.of(volFile1stExt);
+ }
+ if (fileNames.contains(volFile2ndExt)) {
+ return Optional.of(volFile2ndExt);
+ }
+ return Optional.empty();
+ }
- private boolean isVolFile(String fileName) {
- return fileName
- .endsWith(
- Constants.VOL_FILE_NAME_SUFFIX + ".yaml")
- || fileName.endsWith(Constants.VOL_FILE_NAME_SUFFIX + ".yml");
- }
+ private String extractVolFileName(String fileName, String fileExt) {
+ return fileName.substring(0, fileName.lastIndexOf(".")) + Constants.VOL_FILE_NAME_SUFFIX + fileExt;
+ }
+ private boolean isVolFile(String fileName) {
+ return fileName.endsWith(Constants.VOL_FILE_NAME_SUFFIX + ".yaml") || fileName.endsWith(Constants.VOL_FILE_NAME_SUFFIX + ".yml");
+ }
- private void markFileAsProcessed(String fileName, Set<String> processedFiles) {
- processedFiles.add(fileName);
- }
+ private void markFileAsProcessed(String fileName, Set<String> processedFiles) {
+ processedFiles.add(fileName);
+ }
}
Code Review / sdc.git / blobdiff