import java.util.Objects;
import java.util.Optional;
+import static org.openecomp.core.validation.errors.ErrorMessagesFormatBuilder.getErrorWithParameters;
+
public class MonitoringUploadsManagerImpl implements MonitoringUploadsManager {
private static final MdcDataDebugMessage MDC_DATA_DEBUG_MESSAGE = new MdcDataDebugMessage();
private final ComponentArtifactDao componentArtifactDao;
LoggerErrorCode.DATA_ERROR.getErrorCode(), INVALID + type
.toString() + " zip file");
throw new CoreException(new MonitoringUploadErrorBuilder(
- Messages.NO_ZIP_FILE_WAS_UPLOADED_OR_ZIP_NOT_EXIST.getErrorMessage()).build());
+ getErrorWithParameters(Messages.NO_FILE_WAS_UPLOADED_OR_FILE_NOT_EXIST.getErrorMessage(),
+ "zip")).build());
} else {
Map<String, List<ErrorMessage>> errors = new HashMap<>();
try {
MdcDataErrorMessage.createErrorMessageAndUpdateMdc(LoggerConstants.TARGET_ENTITY_DB,
LoggerTragetServiceName.UPLOAD_MONITORING_FILE, ErrorLevel.ERROR.name(),
LoggerErrorCode.DATA_ERROR.getErrorCode(), INVALID + type
- .toString() + "zip file" );
+ .toString() + "zip file");
throw new CoreException(new MonitoringUploadErrorBuilder(exception.getMessage()).build());
}
}
import java.util.Map;
import java.util.Optional;
+import static org.openecomp.core.validation.errors.ErrorMessagesFormatBuilder.getErrorWithParameters;
+
public class OrchestrationTemplateCandidateManagerImpl
implements OrchestrationTemplateCandidateManager {
private static final Logger LOGGER =
if (!candidateDataEntity.isPresent()) {
ErrorMessage errorMessage = new ErrorMessage(ErrorLevel.ERROR,
- Messages.NO_ZIP_FILE_WAS_UPLOADED_OR_ZIP_NOT_EXIST.getErrorMessage());
+ getErrorWithParameters(Messages.NO_FILE_WAS_UPLOADED_OR_FILE_NOT_EXIST.getErrorMessage
+ (), ""));
LOGGER.error(errorMessage.getMessage());
MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID, vspId);
CandidateService candidateService) {
UploadFileResponse uploadFileResponse = new UploadFileResponse();
uploadFileResponse.setOnboardingType(getHandlerType());
- if (isNotEmptyFileToUpload(fileToUpload, uploadFileResponse, candidateService)) {
+ if (isNotEmptyFileToUpload(fileSuffix, fileToUpload, uploadFileResponse, candidateService)) {
return uploadFileResponse;
}
byte[] uploadedFileData = FileUtils.toByteArray(fileToUpload);
- if (isInvalidRawZipData(uploadFileResponse, uploadedFileData, candidateService)) {
+ if (isInvalidRawZipData(fileSuffix, uploadFileResponse, uploadedFileData, candidateService)) {
return uploadFileResponse;
}
CandidateService candidateService,
UploadFileResponse uploadFileResponse);
- private boolean isNotEmptyFileToUpload(InputStream fileToUpload,
+ private boolean isNotEmptyFileToUpload(String fileSuffix, InputStream fileToUpload,
UploadFileResponse uploadFileResponse,
CandidateService candidateService) {
Optional<ErrorMessage> errorMessage =
- candidateService.validateNonEmptyFileToUpload(fileToUpload);
+ candidateService.validateNonEmptyFileToUpload(fileToUpload, fileSuffix);
if (errorMessage.isPresent()) {
uploadFileResponse.addStructureError(SdcCommon.UPLOAD_FILE, errorMessage.get());
return true;
return false;
}
- protected boolean isInvalidRawZipData(UploadFileResponse uploadFileResponse,
+ protected boolean isInvalidRawZipData(String fileSuffix,
+ UploadFileResponse uploadFileResponse,
byte[] uploadedFileData,
CandidateService candidateService) {
Optional<ErrorMessage> errorMessage;
- errorMessage = candidateService.validateRawZipData(uploadedFileData);
+ errorMessage = candidateService.validateRawZipData(fileSuffix, uploadedFileData);
if (errorMessage.isPresent()) {
uploadFileResponse.addStructureError(SdcCommon.UPLOAD_FILE, errorMessage.get());
return true;
}
@Override
- protected boolean isInvalidRawZipData(UploadFileResponse uploadFileResponse,
+ protected boolean isInvalidRawZipData(String fileSuffix,
+ UploadFileResponse uploadFileResponse,
byte[] uploadedFileData,
CandidateService candidateService) {
- return super.isInvalidRawZipData(uploadFileResponse, uploadedFileData, candidateService);
+ return super.isInvalidRawZipData(fileSuffix, uploadFileResponse, uploadedFileData, candidateService);
}
}
valid = false;
}
- VendorSoftwareProductUtils.setErrorsIntoLogger(vspErrors, serviceName, targetServiceName);
+ VendorSoftwareProductUtils.setErrorsIntoLogger(vspErrors, targetServiceName);
}
}
VendorSoftwareProductUtils
- .setErrorsIntoLogger(uploadDataErrors, serviceName, targetServiceName);
+ .setErrorsIntoLogger(uploadDataErrors, targetServiceName);
}
public Map<String, List<ErrorMessage>> getCompilationErrors() {
}
VendorSoftwareProductUtils
- .setErrorsIntoLogger(uploadDataErrors, serviceName, targetServiceName);
+ .setErrorsIntoLogger(uploadDataErrors, targetServiceName);
}
public QuestionnaireValidationResult getQuestionnaireValidationResult() {
import org.openecomp.sdc.logging.context.impl.MdcDataErrorMessage;
import org.openecomp.sdc.logging.types.LoggerConstants;
import org.openecomp.sdc.logging.types.LoggerErrorDescription;
-import org.openecomp.sdc.logging.types.LoggerServiceName;
import org.openecomp.sdc.vendorsoftwareproduct.dao.type.ComponentMonitoringUploadEntity;
import org.openecomp.sdc.vendorsoftwareproduct.types.OrchestrationTemplateActionResponse;
import org.slf4j.MDC;
public class VendorSoftwareProductUtils {
- private static final String MANUAL = "Manual";
protected static Logger logger =
- (Logger) LoggerFactory.getLogger(VendorSoftwareProductUtils.class);
+ LoggerFactory.getLogger(VendorSoftwareProductUtils.class);
/**
* Add file names to upload file response.
uploadFileResponse.removeFileFromList(SdcCommon.MANIFEST_NAME);
}
- /**
- * Validate raw zip data.
- *
- * @param uploadedFileData the uploaded file data
- * @param errors the errors
- */
- public static void validateRawZipData(byte[] uploadedFileData,
- Map<String, List<ErrorMessage>> errors) {
- if (uploadedFileData.length == 0) {
- MDC.put(LoggerConstants.ERROR_DESCRIPTION, LoggerErrorDescription.INVALID_ZIP);
- ErrorMessage.ErrorMessageUtil.addMessage(SdcCommon.UPLOAD_FILE, errors).add(
- new ErrorMessage(ErrorLevel.ERROR,
- Messages.NO_ZIP_FILE_WAS_UPLOADED_OR_ZIP_NOT_EXIST.getErrorMessage()));
- }
- }
/**
* Validate content zip data.
public static void validateContentZipData(FileContentHandler contentMap,
Map<String, List<ErrorMessage>> errors) {
MDC.put(LoggerConstants.ERROR_DESCRIPTION, LoggerErrorDescription.INVALID_ZIP);
- if (contentMap.getFileList().size() == 0) {
+ if (contentMap.getFileList().isEmpty()) {
ErrorMessage.ErrorMessageUtil.addMessage(SdcCommon.UPLOAD_FILE, errors)
.add(new ErrorMessage(ErrorLevel.ERROR, Messages.INVALID_ZIP_FILE.getErrorMessage()));
}
}
- private static boolean isTrapOrPoll(MonitoringUploadType type) {
- return type.equals(MonitoringUploadType.SNMP_POLL) ||
- type.equals(MonitoringUploadType.SNMP_TRAP);
- }
-
-
/**
* Sets errors into logger.
- *
- * @param errors the errors
- * @param serviceName the service name
+ * @param errors the errors
* @param targetServiceName the target service name
*/
public static void setErrorsIntoLogger(Map<String, List<ErrorMessage>> errors,
- LoggerServiceName serviceName, String targetServiceName) {
+ String targetServiceName) {
MdcDataErrorMessage mdcDataErrorMessage =
new MdcDataErrorMessage(targetServiceName, LoggerConstants.TARGET_ENTITY_DB,
ErrorLevel.ERROR.name(), null, null);
/**
* Sets errors into logger.
- *
- * @param errors the errors
- * @param serviceName the service name
+ * @param errors the errors
* @param targetServiceName the target service name
*/
public static void setErrorsIntoLogger(Collection<ErrorCode> errors,
- LoggerServiceName serviceName, String targetServiceName) {
+ String targetServiceName) {
MdcDataErrorMessage mdcDataErrorMessage =
new MdcDataErrorMessage(targetServiceName, LoggerConstants.TARGET_ENTITY_DB,
ErrorLevel.ERROR.name(), null, null);
logger.error(error.message());
}
}
-
- /*public static boolean isManual(String vspId, Version version, VendorSoftwareProductInfoDao
- vspInfoDao) {
- String onboardingMethod = vspInfoDao.get(new VspDetails(vspId, version)).getOnboardingMethod();
- if (MANUAL.equals(onboardingMethod)) {
- return true;
- }
- return false;
- }*/
-
}
+++ /dev/null
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.common.utils;
-
-import org.openecomp.core.utilities.file.FileContentHandler;
-import org.openecomp.core.utilities.orchestration.OnboardingTypesEnum;
-
-import java.io.IOException;
-
-public class CommonUtil {
-
- public static FileContentHandler validateAndUploadFileContent(OnboardingTypesEnum type,
- byte[] uploadedFileData)
- throws IOException {
- throw new IOException();
- }
-
-}
@Test
public void shouldReturnOptionalPresentIfInputStreamIsNull() {
- assertTrue(candidateService.validateNonEmptyFileToUpload(null).isPresent());
+ assertTrue(candidateService.validateNonEmptyFileToUpload(null, "zip").isPresent());
}
// end validateNonEmptyFileToUpload tests
// start validateNonEmptyFileToUpload tests
@Test
public void shouldReturnOptionalEmptyIfUploadedFileDataIsNotNull() {
- assertEquals(candidateService.validateRawZipData(new byte[]{}), Optional.empty());
+ assertEquals(candidateService.validateRawZipData("zip", new byte[]{}), Optional.empty());
}
@Test
public void shouldReturnOptionalPresentIfUploadedFileDataIsNull() {
- assertTrue(candidateService.validateRawZipData(null).isPresent());
+ assertTrue(candidateService.validateRawZipData("zip", null).isPresent());
}
// end validateNonEmptyFileToUpload tests
// start heatStructureTreeToFileDataStructure tests
package org.openecomp.sdc.vendorsoftwareproduct.upload.csar;
+import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.Spy;
import org.testng.annotations.Test;
import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
import java.io.InputStream;
import java.util.List;
import java.util.function.Predicate;
@Mock
private ManifestCreatorNamingConventionImpl manifestCreator;
+ @InjectMocks
private OrchestrationTemplateCandidateManagerImpl candidateManager;
- public static String id001 = null;
-
- public static Version activeVersion002 = null;
+ private static String id001 = "dummyId";
+ private static Version activeVersion002 = new Version("dummyVersion");
+ private static final String BASE_DIR = "/vspmanager.csar";
+ private static final String CSAR = "csar";
@BeforeMethod
@Test
public void testSuccessfulUploadFile() throws Exception {
- VspDetails vspDetails = new VspDetails("dummyId", new Version(1, 0));
+ VspDetails vspDetails = new VspDetails(id001, activeVersion002);
doReturn(vspDetails).when(vspInfoDaoMock).get(any(VspDetails.class));
- try (InputStream is = getClass().getResourceAsStream("/vspmanager.csar/SDCmock.csar")) {
- UploadFileResponse uploadFileResponse =
- candidateManager.upload(id001, activeVersion002, is, "csar", "SDCmock");
- assertEquals(uploadFileResponse.getOnboardingType(), OnboardingTypesEnum.CSAR);
- assertEquals(0, uploadFileResponse.getErrors().size());
- assertTrue(uploadFileResponse.getErrors().isEmpty());
- }
+ testCsarUpload("successfulUpload.csar", 0);
}
@Test
- public void testFail1UploadFile() throws Exception {
- VspDetails vspDetails = new VspDetails("dummyId", new Version(1, 0));
+ public void testIllegalUploadInvalidFileInRoot() throws Exception {
+ VspDetails vspDetails = new VspDetails(id001, activeVersion002);
doReturn(vspDetails).when(vspInfoDaoMock).get(any(VspDetails.class));
- try (InputStream is = getClass().getResourceAsStream("/vspmanager.csar/SDCmockFail1.csar")) {
- UploadFileResponse uploadFileResponse =
- candidateManager.upload(id001, activeVersion002, is,
- "csar", "SDCmockFail1");
- assertEquals(uploadFileResponse.getOnboardingType(), OnboardingTypesEnum.CSAR);
- assertEquals(1, uploadFileResponse.getErrors().size());
- assertTrue(uploadFileResponse.getErrors().values().stream().anyMatch(
- getListPredicate(Messages.CSAR_FILES_NOT_ALLOWED.getErrorMessage().substring(0, 7))));
- }
- }
-
- private Predicate<List<ErrorMessage>> getListPredicate(String substring) {
- return error -> isEquals(substring, error);
- }
-
- private boolean isEquals(String substring, List<ErrorMessage> error) {
- return error.iterator().next().getMessage().contains(substring);
+ UploadFileResponse response = testCsarUpload("invalidFileInRoot.csar", 1);
+ assertTrue(response.getErrors().values().stream().anyMatch(
+ getListPredicate(Messages.CSAR_FILES_NOT_ALLOWED.getErrorMessage().substring(0, 7))));
}
@Test
- public void testFail2UploadFile() throws Exception {
- VspDetails vspDetails = new VspDetails("dummyId", new Version(1, 0));
+ public void testIllegalUploadMissingMainServiceTemplate() throws Exception {
+ VspDetails vspDetails = new VspDetails(id001, activeVersion002);
doReturn(vspDetails).when(vspInfoDaoMock).get(any(VspDetails.class));
- try (InputStream is = getClass().getResourceAsStream("/vspmanager.csar/SDCmockFail2.csar")) {
- UploadFileResponse uploadFileResponse =
- candidateManager.upload(id001, activeVersion002, is,
- "csar", "SDCmockFail2");
- assertEquals(uploadFileResponse.getOnboardingType(), OnboardingTypesEnum.CSAR);
- assertEquals(1, uploadFileResponse.getErrors().size());
- assertTrue(uploadFileResponse.getErrors().values().stream().anyMatch(
- getListPredicate(Messages.CSAR_FILE_NOT_FOUND.getErrorMessage().substring(0, 7))));
- }
- }
-
- @Test
- public void testFail3UploadFile() throws Exception {
- VspDetails vspDetails = new VspDetails("dummyId", new Version(1, 0));
- doReturn(vspDetails).when(vspInfoDaoMock).get(any(VspDetails.class));
-
- try (InputStream is = getClass().getResourceAsStream("/vspmanager.csar/SDCmockFail3.csar")) {
- UploadFileResponse uploadFileResponse =
- candidateManager.upload(id001, activeVersion002, is,
- "csar", "SDCmockFail3");
- assertEquals(uploadFileResponse.getOnboardingType(), OnboardingTypesEnum.CSAR);
- assertEquals(1, uploadFileResponse.getErrors().size());
- }
+ UploadFileResponse response = testCsarUpload("missingMainServiceTemplate.csar", 1);
+ assertTrue(response.getErrors().values().stream().anyMatch(
+ getListPredicate(Messages.CSAR_FILE_NOT_FOUND.getErrorMessage().substring(0, 7))));
}
@Test
public void testUploadFileIsNotZip() throws Exception {
- VspDetails vspDetails = new VspDetails("dummyId", new Version(1, 0));
+ VspDetails vspDetails = new VspDetails(id001, activeVersion002);
doReturn(vspDetails).when(vspInfoDaoMock).get(any(VspDetails.class));
- try (InputStream is = new ByteArrayInputStream("Thia is not a zip file".getBytes());) {
- UploadFileResponse uploadFileResponse =
- candidateManager.upload(id001, activeVersion002, is,
- "csar", "file");
- assertEquals(uploadFileResponse.getOnboardingType(), OnboardingTypesEnum.CSAR);
- assertFalse(uploadFileResponse.getErrors().isEmpty());
- assertTrue(uploadFileResponse.getErrors().values().stream().anyMatch(
- getListPredicate(Messages.CSAR_FILE_NOT_FOUND.getErrorMessage().substring(0, 7))));
- }
+ UploadFileResponse response = testCsarUpload("notCsar.txt", 1);
+ assertEquals("no csar file was uploaded or file doesn't exist",
+ response.getErrors().values().iterator().next().get(0).getMessage());
}
@Test
public void testUploadFileIsEmpty() throws Exception {
- VspDetails vspDetails = new VspDetails("dummyId", new Version(1, 0));
+ VspDetails vspDetails = new VspDetails(id001, activeVersion002);
doReturn(vspDetails).when(vspInfoDaoMock).get(any(VspDetails.class));
try (InputStream is = new ByteArrayInputStream(new byte[]{})) {
UploadFileResponse uploadFileResponse = candidateManager.upload(id001,
activeVersion002, is, "csar", "file");
- assertEquals(uploadFileResponse.getOnboardingType(), OnboardingTypesEnum.CSAR);
assertEquals(1, uploadFileResponse.getErrors().size());
}
}
@Test
- public void testMFError() throws Exception {
- VspDetails vspDetails = new VspDetails("dummyId", new Version(1, 0));
+ public void testInvalidManifestContent() throws Exception {
+ VspDetails vspDetails = new VspDetails(id001, activeVersion002);
doReturn(vspDetails).when(vspInfoDaoMock).get(any(VspDetails.class));
- try (InputStream is = getClass().getResourceAsStream("/vspmanager.csar/SDCmockBrokenMF.csar")) {
- UploadFileResponse uploadFileResponse =
- candidateManager.upload(id001, activeVersion002, is, "csar", "SDCmockBrokenMF");
- assertEquals(uploadFileResponse.getOnboardingType(), OnboardingTypesEnum.CSAR);
- assertEquals(1, uploadFileResponse.getErrors().size());
- assertTrue(uploadFileResponse.getErrors().values().stream()
- .anyMatch(getListPredicate(Messages.MANIFEST_NO_METADATA.getErrorMessage())));
+ try (InputStream is = getClass()
+ .getResourceAsStream(BASE_DIR + "/invalidManifestContent.csar")) {
+ UploadFileResponse response =
+ candidateManager.upload(id001, activeVersion002, is, "csar", "invalidManifestContent");
+ assertEquals(1, response.getErrors().size());
+ assertEquals(response.getErrors().values().iterator().next().get(0).getMessage(),
+ "Manifest " +
+ "contains invalid line : aaa: vCSCF");
+
+ }
+ }
+
+ private Predicate<List<ErrorMessage>> getListPredicate(String substring) {
+ return error -> isEquals(substring, error);
+ }
+
+ private boolean isEquals(String substring, List<ErrorMessage> error) {
+ return error.iterator().next().getMessage().contains(substring);
+ }
+
+ private UploadFileResponse testCsarUpload(String csarFileName, int expectedErrorsNumber)
+ throws IOException {
+ UploadFileResponse uploadFileResponse;
+ try (InputStream is = getClass()
+ .getResourceAsStream(BASE_DIR + File.separator + csarFileName)) {
+ uploadFileResponse =
+ candidateManager.upload(id001, activeVersion002, is, CSAR, csarFileName);
+ assertEquals(expectedErrorsNumber, uploadFileResponse.getErrors().size());
}
+ return uploadFileResponse;
}
USER1);
Assert.assertEquals(uploadFileResponse.getErrors().get(SdcCommon.UPLOAD_FILE).get(0)
.getMessage(),
- Messages.NO_ZIP_FILE_WAS_UPLOADED_OR_ZIP_NOT_EXIST.getErrorMessage());
+ Messages.NO_FILE_WAS_UPLOADED_OR_FILE_NOT_EXIST.getErrorMessage());
}
@Test(dependsOnMethods = "testUploadEmptyFile")
MODULE_IN_MANIFEST_VOL_ENV_NO_VOL("Module '%s', has volume Env. reference with no Volume " +
"reference"),
ILLEGAL_MANIFEST("Illegal Manifest"),
- NO_ZIP_FILE_WAS_UPLOADED_OR_ZIP_NOT_EXIST("no zip file was uploaded or zip file doesn't exist"),
+ NO_FILE_WAS_UPLOADED_OR_FILE_NOT_EXIST("no %s file was uploaded or file doesn't exist"),
MAPPING_OBJECTS_FAILURE("Failed to map object %s to %s. Exception message: %s"),
MORE_THEN_ONE_VOL_FOR_HEAT("heat contains more then one vol. selecting only first vol"),
FILE_CONTENT_MAP("failed to load %s content"),
import java.util.Optional;
public interface CandidateService {
- Optional<ErrorMessage> validateNonEmptyFileToUpload(InputStream heatFileToUpload);
+ Optional<ErrorMessage> validateNonEmptyFileToUpload(InputStream heatFileToUpload,
+ String fileSuffix);
- Optional<ErrorMessage> validateRawZipData(byte[] uploadedFileData);
+ Optional<ErrorMessage> validateRawZipData(String fileSuffix, byte[] uploadedFileData);
OrchestrationTemplateCandidateData createCandidateDataEntity(
CandidateDataEntityTo candidateDataEntityTo, InputStream zipFileManifest,
import java.util.zip.ZipInputStream;
import java.util.zip.ZipOutputStream;
+import static org.openecomp.core.validation.errors.ErrorMessagesFormatBuilder.getErrorWithParameters;
+
public class CandidateServiceImpl implements CandidateService {
protected static final Logger logger = LoggerFactory.getLogger(CandidateServiceImpl.class);
private static MdcDataDebugMessage mdcDataDebugMessage = new MdcDataDebugMessage();
}
@Override
- public Optional<ErrorMessage> validateNonEmptyFileToUpload(InputStream fileToUpload) {
+ public Optional<ErrorMessage> validateNonEmptyFileToUpload(InputStream fileToUpload,
+ String fileSuffix) {
mdcDataDebugMessage.debugEntryMessage(null);
+ String errorMessage =
+ getErrorWithParameters(Messages.NO_FILE_WAS_UPLOADED_OR_FILE_NOT_EXIST.getErrorMessage(),
+ fileSuffix);
+
if (Objects.isNull(fileToUpload)) {
return Optional.of(new ErrorMessage(ErrorLevel.ERROR,
- Messages.NO_ZIP_FILE_WAS_UPLOADED_OR_ZIP_NOT_EXIST.getErrorMessage()));
+ errorMessage));
} else {
try {
int available = fileToUpload.available();
if (available == 0) {
mdcDataDebugMessage.debugExitMessage(null);
return Optional.of(new ErrorMessage(ErrorLevel.ERROR,
- Messages.NO_ZIP_FILE_WAS_UPLOADED_OR_ZIP_NOT_EXIST.getErrorMessage()));
+ errorMessage));
}
} catch (IOException e) {
logger.debug(e.getMessage(), e);
mdcDataDebugMessage.debugExitMessage(null);
return Optional.of(new ErrorMessage(ErrorLevel.ERROR,
- Messages.NO_ZIP_FILE_WAS_UPLOADED_OR_ZIP_NOT_EXIST.getErrorMessage()));
+ errorMessage));
}
}
}
@Override
- public Optional<ErrorMessage> validateRawZipData(byte[] uploadedFileData) {
+ public Optional<ErrorMessage> validateRawZipData(String fileSuffix,
+ byte[] uploadedFileData) {
if (Objects.isNull(uploadedFileData)) {
return Optional.of(new ErrorMessage(ErrorLevel.ERROR,
- Messages.NO_ZIP_FILE_WAS_UPLOADED_OR_ZIP_NOT_EXIST.getErrorMessage()));
+ getErrorWithParameters(Messages.NO_FILE_WAS_UPLOADED_OR_FILE_NOT_EXIST.getErrorMessage(),
+ fileSuffix)));
}
return Optional.empty();
}
Code Review / sdc.git / commitdiff