Fix comments

Author: Yavor16

multiapps-controller-core/src/main/java/module-info.java

@@ -45,7 +45,6 @@
     requires transitive org.cloudfoundry.multiapps.controller.persistence;
     requires transitive org.cloudfoundry.multiapps.mta;
 
-    requires org.apache.tika.core;
     requires org.cloudfoundry.client;
     requires com.fasterxml.jackson.annotation;
     requires com.fasterxml.jackson.core;
@@ -62,6 +61,7 @@
     requires org.apache.commons.lang3;
     requires org.apache.httpcomponents.httpclient;
     requires org.apache.httpcomponents.httpcore;
+    requires org.apache.tika.core;
     requires org.cloudfoundry.multiapps.common;
     requires org.cloudfoundry.multiapps.controller.api;
     requires org.slf4j;

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

@@ -86,7 +86,7 @@ public final class Messages {
     public static final String OBJECT_STORE_FILE_STORAGE_HEALTH_DATABASE_HEALTH = "Object store file storage health: \"{0}\", Database health: \"{1}\"";
     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 THE_PROVIDED_MULTIPART_FILE_CANNOT_BE_EMPTY = "The provided multipart file cannot be empty";
     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";
 

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

@@ -27,7 +27,7 @@ public class FileMimeTypeValidator {
 
     public void validateMultipartFileMimeType(MultipartFile multipartFile) {
         if (multipartFile == null || multipartFile.isEmpty()) {
-            throw new IllegalArgumentException(Messages.INVALID_MULTIPART_FILE);
+            throw new IllegalArgumentException(Messages.THE_PROVIDED_MULTIPART_FILE_CANNOT_BE_EMPTY);
         }
 
         try {

multiapps-controller-core/src/test/java/org/cloudfoundry/multiapps/controller/core/validators/parameters/FileMimeTypeValidatorTest.java

@@ -3,7 +3,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 
-import org.apache.tika.Tika;
 import org.cloudfoundry.multiapps.controller.core.Messages;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -13,24 +12,22 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.when;
 
-class fileMimeTypeValidatorTest {
+class FileMimeTypeValidatorTest {
 
-    private Tika tika;
     private MultipartFile multipartFile;
     private InputStream inputStream;
-    private FileMimeTypeValidator fileMimeTypeValidator = new FileMimeTypeValidator();
+    private final FileMimeTypeValidator fileMimeTypeValidator = new FileMimeTypeValidator();
 
     @BeforeEach
     void setUp() {
-        tika = Mockito.mock(Tika.class);
         multipartFile = Mockito.mock(MultipartFile.class);
     }
 
     @Test
     void testValidateMultipartFileMimeTypeWithNullFile() {
         assertThrows(IllegalArgumentException.class, () -> {
             fileMimeTypeValidator.validateMultipartFileMimeType(null);
-        }, Messages.INVALID_MULTIPART_FILE);
+        }, Messages.THE_PROVIDED_MULTIPART_FILE_CANNOT_BE_EMPTY);
     }
 
     @Test
@@ -39,7 +36,7 @@ void testValidateMultipartFileMimeTypeWithEmptyFile() {
 
         assertThrows(IllegalArgumentException.class, () -> {
             fileMimeTypeValidator.validateMultipartFileMimeType(multipartFile);
-        }, Messages.INVALID_MULTIPART_FILE);
+        }, Messages.THE_PROVIDED_MULTIPART_FILE_CANNOT_BE_EMPTY);
     }
 
     @Test
@@ -48,7 +45,6 @@ void testValidateMultipartFileMimeType_ValidYamlFile() throws Exception {
 
         when(multipartFile.getInputStream()).thenReturn(inputStream);
         when(multipartFile.getOriginalFilename()).thenReturn("valid.yaml");
-        when(tika.detect(inputStream)).thenReturn("text/plain");
 
         fileMimeTypeValidator.validateMultipartFileMimeType(multipartFile);
     }
@@ -57,7 +53,6 @@ void testValidateMultipartFileMimeType_ValidYamlFile() throws Exception {
     void testValidateMultipartFileOctetStreamMimeType() throws Exception {
         when(multipartFile.getInputStream()).thenReturn(inputStream);
         when(multipartFile.getOriginalFilename()).thenReturn("valid.zip");
-        when(tika.detect(inputStream)).thenReturn("application/octet-stream");
 
         fileMimeTypeValidator.validateMultipartFileMimeType(multipartFile);
     }
@@ -66,7 +61,6 @@ void testValidateMultipartFileOctetStreamMimeType() throws Exception {
     void testValidateMultipartFileOApplicationZipMimeType() throws Exception {
         when(multipartFile.getInputStream()).thenReturn(inputStream);
         when(multipartFile.getOriginalFilename()).thenReturn("valid.zip");
-        when(tika.detect(inputStream)).thenReturn("application/zip");
 
         fileMimeTypeValidator.validateMultipartFileMimeType(multipartFile);
     }