Strengthen file processing (#396)

Co-authored-by: Enrico Martelli <[email protected]>

Author: rob93c

qodana.baseline.json

@@ -20,6 +20,7 @@
 import com.github.stickerifier.stickerify.telegram.model.TelegramRequest;
 import com.pengrad.telegrambot.ExceptionHandler;
 import com.pengrad.telegrambot.TelegramBot;
+import com.pengrad.telegrambot.TelegramException;
 import com.pengrad.telegrambot.UpdatesListener;
 import com.pengrad.telegrambot.model.LinkPreviewOptions;
 import com.pengrad.telegrambot.model.Update;
@@ -47,15 +48,12 @@
  *
  * @author Roberto Cella
  */
-public class Stickerify {
+public record Stickerify(TelegramBot bot, Executor executor) implements ExceptionHandler {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(Stickerify.class);
 	private static final String BOT_TOKEN = System.getenv("STICKERIFY_TOKEN");
 	private static final ThreadFactory VIRTUAL_THREAD_FACTORY = Thread.ofVirtual().name("Virtual-", 0).factory();
 
-	private final TelegramBot bot;
-	private final Executor executor;
-
 	/**
 	 * Instantiate the bot processing requests with virtual threads.
 	 *
@@ -70,13 +68,13 @@ public Stickerify() {
 	 *
 	 * @see Stickerify
 	 */
-	Stickerify(TelegramBot bot, Executor executor) {
-		this.bot = bot;
-		this.executor = executor;
-
-		ExceptionHandler exceptionHandler = e -> LOGGER.atError().log("There was an unexpected failure: {}", e.getMessage());
+	public Stickerify {
+		bot.setUpdatesListener(this::handleUpdates, this, new GetUpdates().timeout(50));
+	}
 
-		bot.setUpdatesListener(this::handleUpdates, exceptionHandler, new GetUpdates().timeout(50));
+	@Override
+	public void onException(TelegramException e) {
+		LOGGER.atError().log("There was an unexpected failure: {}", e.getMessage());
 	}
 
 	private int handleUpdates(List<Update> updates) {
@@ -220,7 +218,9 @@ private <T extends BaseRequest<T, R>, R extends BaseResponse> R execute(BaseRequ
 	private static void deleteTempFiles(Set<Path> pathsToDelete) {
 		for (var path : pathsToDelete) {
 			try {
-				Files.deleteIfExists(path);
+				if (!Files.deleteIfExists(path)) {
+					LOGGER.atInfo().log("Unable to delete temp file {}", path);
+				}
 			} catch (IOException e) {
 				LOGGER.atError().setCause(e).log("An error occurred trying to delete temp file {}", path);
 			}

src/main/java/com/github/stickerifier/stickerify/bot/Stickerify.java

@@ -50,6 +50,7 @@ public final class MediaHelper {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(MediaHelper.class);
 
+	private static final Tika TIKA = new Tika();
 	private static final Gson GSON = new Gson();
 	static final ProcessLocator FFMPEG_LOCATOR = new PathLocator();
 	private static final int PRESERVE_ASPECT_RATIO = -2;
@@ -102,7 +103,7 @@ private static String detectMimeType(File file) {
 		String mimeType = null;
 
 		try {
-			mimeType = new Tika().detect(file);
+			mimeType = TIKA.detect(file);
 
 			LOGGER.atDebug().log("The file has {} MIME type", mimeType);
 		} catch (IOException _) {
@@ -204,8 +205,8 @@ private static boolean isFileSizeLowerThan(File file, long threshold) throws Fil
 	 * @return the image, if supported by {@link ImageIO}
 	 */
 	private static ImmutableImage toImage(File file) {
-		try {
-			return ImmutableImage.loader().fromFile(file);
+		try (var inputStream = new FileInputStream(file)) {
+			return ImmutableImage.loader().fromStream(inputStream);
 		} catch (IOException _) {
 			return null;
 		}
@@ -318,7 +319,9 @@ private static File createTempFile(String fileExtension) throws FileOperationExc
 	 */
 	private static void deleteFile(File file) throws FileOperationException {
 		try {
-			Files.deleteIfExists(file.toPath());
+			if (!Files.deleteIfExists(file.toPath())) {
+				LOGGER.atInfo().log("Unable to delete file {}", file.toPath());
+			}
 		} catch (IOException e) {
 			throw new FileOperationException("An error occurred deleting the file", e);
 		}

src/main/java/com/github/stickerifier/stickerify/media/MediaHelper.java

@@ -8,15 +8,18 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import com.github.stickerifier.stickerify.junit.ClearTempFiles;
+import com.github.stickerifier.stickerify.junit.Tags;
 import com.github.stickerifier.stickerify.telegram.Answer;
 import com.pengrad.telegrambot.TelegramBot;
 import mockwebserver3.MockWebServer;
 import mockwebserver3.RecordedRequest;
 import mockwebserver3.junit5.StartStop;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
 import java.net.URLEncoder;
 
+@Tag(Tags.TELEGRAM_API)
 @ClearTempFiles
 class StickerifyTest {
 

src/test/java/com/github/stickerifier/stickerify/bot/StickerifyTest.java

@@ -0,0 +1,16 @@
+package com.github.stickerifier.stickerify.junit;
+
+public final class Tags {
+	public static final String ANIMATED_STICKER = "AnimatedSticker";
+	public static final String CONCURRENT = "Concurrent";
+	public static final String IMAGE = "Image";
+	public static final String LOG = "Log";
+	public static final String MEDIA = "Media";
+	public static final String TELEGRAM_API = "TelegramApi";
+	public static final String UNSUPPORTED_FILE = "UnsupportedFile";
+	public static final String VIDEO = "Video";
+
+	private Tags() {
+		throw new UnsupportedOperationException();
+	}
+}

src/test/java/com/github/stickerifier/stickerify/junit/Tags.java

@@ -9,10 +9,13 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 
+import com.github.stickerifier.stickerify.junit.Tags;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
+@Tag(Tags.LOG)
 class ExceptionHighlighterTest {
 
 	private static final String LOG_MESSAGE = "Received request";

src/test/java/com/github/stickerifier/stickerify/logger/ExceptionHighlighterTest.java

@@ -8,10 +8,13 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 
+import com.github.stickerifier.stickerify.junit.Tags;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
+@Tag(Tags.LOG)
 class MessageHighlighterTest {
 
 	private static final String LOG_MESSAGE = "Received request";