Fix comments

Author: Yavor16

multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/Messages.java

@@ -87,7 +87,7 @@ public final class Messages {
     public static final String ERROR_OCCURRED_DURING_OBJECT_STORE_HEALTH_CHECKING_FOR_INSTANCE = "Error occurred during object store health checking for instance: \"{0}\"";
     public static final String ERROR_OCCURRED_WHILE_CHECKING_DATABASE_INSTANCE_0 = "Error occurred while checking database instance: \"{0}\"";
     public static final String INVALID_MULTIPART_FILE = "The provided multipart file cannot be empty";
-    public static final String INVALID_YAML_FILE = "The provided {0} file is invalid! The file format must be either yaml or mtaext";
+    public static final String THE_PROVIDED_0_FILE_IS_INVALID = "The provided {0} file is invalid! The file format must be either yaml or mtaext";
     public static final String UNSUPPORTED_FILE_FORMAT = "Unsupported file format! \"{0}\" detected";
 
     // Warning messages

multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/validators/parameters/FileMimeTypeValidator.java

@@ -57,15 +57,15 @@ private void validateYamlFile(InputStream uploadedFileInputStream, String filena
         try {
             yaml.load(uploadedFileInputStream);
         } catch (YAMLException e) {
-            throw new IllegalArgumentException(MessageFormat.format(Messages.INVALID_YAML_FILE, filename), e);
+            throw new IllegalArgumentException(MessageFormat.format(Messages.THE_PROVIDED_0_FILE_IS_INVALID, filename), e);
         }
     }
 
     private void validateTextFileExtension(String filename) {
         String fileExtension = FilenameUtils.getExtension(filename);
 
         if (!(YAML_FILE_EXTENSION.equals(fileExtension) || EXTENSION_DESCRIPTOR_FILE_EXTENSION.equals(fileExtension))) {
-            throw new IllegalArgumentException(MessageFormat.format(Messages.INVALID_YAML_FILE, filename));
+            throw new IllegalArgumentException(MessageFormat.format(Messages.THE_PROVIDED_0_FILE_IS_INVALID, filename));
         }
     }
 }

multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/steps/ValidateDeployParametersStep.java

@@ -1,6 +1,7 @@
 package org.cloudfoundry.multiapps.controller.process.steps;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.math.BigInteger;
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -21,7 +22,6 @@
 import org.cloudfoundry.multiapps.controller.persistence.services.FileStorageException;
 import org.cloudfoundry.multiapps.controller.process.Messages;
 import org.cloudfoundry.multiapps.controller.process.stream.ArchiveStreamWithName;
-import org.cloudfoundry.multiapps.controller.process.stream.LazyArchiveInputStream;
 import org.cloudfoundry.multiapps.controller.process.util.FileSweeper;
 import org.cloudfoundry.multiapps.controller.process.util.MergedArchiveStreamCreator;
 import org.cloudfoundry.multiapps.controller.process.util.PriorityCallable;
@@ -185,22 +185,22 @@ private void mergeArchive(ProcessContext context, List<FileEntry> archivePartEnt
                                                        archivePartEntries.size(), archiveSize);
             FileEntry uploadedArchive = persistArchive(archiveStreamWithName, context, archiveSize);
             context.setVariable(Variables.APP_ARCHIVE_ID, uploadedArchive.getId());
-            validateMergedArchive(archiveStreamWithName);
+            validateMergedArchive(uploadedArchive);
             getStepLogger().infoWithoutProgressMessage(MessageFormat.format(Messages.ARCHIVE_WITH_ID_0_AND_NAME_1_WAS_STORED,
                                                                             uploadedArchive.getId(),
                                                                             archiveStreamWithName.getArchiveName()));
-        } catch (IOException e) {
-            throw new SLException(e);
         } finally {
             IOUtils.closeQuietly(archiveStreamWithName.getArchiveStream());
         }
     }
 
-    private void validateMergedArchive(ArchiveStreamWithName archiveStreamWithName) throws IOException {
-        LazyArchiveInputStream lazyArchiveInputStream = (LazyArchiveInputStream) archiveStreamWithName.getArchiveStream();
-        fileMimeTypeValidator.validateInputStreamMimeType(lazyArchiveInputStream.getCurrentInputStream(),
-                                                          archiveStreamWithName.getArchiveName());
-        lazyArchiveInputStream.close();
+    private void validateMergedArchive(FileEntry fileEntry) {
+        try (InputStream fileInputStream = fileService.openInputStream(fileEntry.getSpace(), fileEntry.getId())) {
+            fileMimeTypeValidator.validateInputStreamMimeType(fileInputStream,
+                                                              fileEntry.getName());
+        } catch (FileStorageException | IOException e) {
+            throw new SLException(e);
+        }
     }
 
     private String[] getArchivePartIds(ProcessContext context) {

multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/stream/LazyArchiveInputStream.java

@@ -82,10 +82,6 @@ public synchronized int read(byte[] b, int off, int len) throws IOException {
         return bytesRead;
     }
 
-    public InputStream getCurrentInputStream() {
-        return currentInputStream;
-    }
-
     @Override
     public synchronized int available() throws IOException {
         // The return value of this method must be anything except 0