Merge pull request #362 from nramc/361-bug-logo-image-file-failed-load

fix: failed to load qr logo image fixed with replacing spring Resource with classpath resource

Author: nramc

src/main/java/com/github/nramc/dev/journey/api/config/TotpConfig.java

@@ -6,11 +6,9 @@
 import com.github.nramc.dev.journey.api.core.usecase.codes.totp.TotpProperties;
 import com.github.nramc.dev.journey.api.core.usecase.codes.totp.TotpSecretGenerator;
 import com.github.nramc.dev.journey.api.core.usecase.codes.totp.TotpTimeStepWindowProvider;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.Resource;
 
 /**
  * TOTP Implementation based on <a href="https://datatracker.ietf.org/doc/html/rfc6238">RFC-6238</a> guidelines
@@ -43,8 +41,8 @@ public TotpCodeVerifier totpCodeVerifier(
     }
 
     @Bean
-    public QRCodeGenerator qrCodeGenerator(@Value("classpath:assets/qr-code-logo-60x60.png") Resource logoFile) {
-        return new QRCodeGenerator(logoFile);
+    public QRCodeGenerator qrCodeGenerator() {
+        return new QRCodeGenerator();
     }
 
 

src/main/java/com/github/nramc/dev/journey/api/core/usecase/codes/totp/QRCodeGenerator.java

@@ -8,17 +8,17 @@
 import com.google.zxing.common.BitMatrix;
 import com.google.zxing.qrcode.QRCodeWriter;
 import lombok.RequiredArgsConstructor;
-import org.springframework.core.io.Resource;
+import org.springframework.core.io.ClassPathResource;
 
 import javax.imageio.ImageIO;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 
 @RequiredArgsConstructor
 public class QRCodeGenerator {
-    private final Resource logoFile;
 
     public byte[] generate(QRCodeData qrCodeData) {
         try {
@@ -34,15 +34,15 @@ public byte[] generate(QRCodeData qrCodeData) {
     }
 
     public byte[] generateWithLogo(QRCodeData qrCodeData) {
-        try {
+        try (InputStream inputStreamLogo = new ClassPathResource("assets/qr-code-logo-60x60.png").getInputStream()) {
             // Generate QR image
             QRCodeWriter writer = new QRCodeWriter();
             BitMatrix bitMatrix = writer.encode(qrCodeData.getUri(), BarcodeFormat.QR_CODE, qrCodeData.width(), qrCodeData.height());
             MatrixToImageConfig imageConfig = new MatrixToImageConfig(MatrixToImageConfig.BLACK, MatrixToImageConfig.WHITE);
             BufferedImage qrImage = MatrixToImageWriter.toBufferedImage(bitMatrix, imageConfig);
 
             // Getting logo image
-            BufferedImage logoImage = ImageIO.read(logoFile.getFile());
+            BufferedImage logoImage = ImageIO.read(inputStreamLogo);
             int finalImageHeight = qrImage.getHeight() - logoImage.getHeight();
             int finalImageWidth = qrImage.getWidth() - logoImage.getWidth();
 

src/test/java/com/github/nramc/dev/journey/api/core/usecase/codes/totp/QRCodeGeneratorTest.java

@@ -1,8 +1,6 @@
 package com.github.nramc.dev.journey.api.core.usecase.codes.totp;
 
 import org.junit.jupiter.api.Test;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -33,18 +31,17 @@ class QRCodeGeneratorTest {
             .height(TOTP_PROPERTIES.qrHeight())
             .secret("EX47GINFPBK5GNLYLILGD2H6ZLGJNNWB")
             .build();
-    private final Resource logoFile = new ClassPathResource("assets/qr-code-logo-60x60.png");
 
     @Test
     void something() throws IOException {
-        QRCodeGenerator generator = new QRCodeGenerator(logoFile);
+        QRCodeGenerator generator = new QRCodeGenerator();
         Path tempFile = Files.write(Files.createTempFile("qr_test", ".png"), generator.generate(QR_DATA));
         assertThat(tempFile).isNotNull();
     }
 
     @Test
     void qRCodeGenerator() throws IOException {
-        QRCodeGenerator generator = new QRCodeGenerator(logoFile);
+        QRCodeGenerator generator = new QRCodeGenerator();
         Path tempFile = Files.write(Files.createTempFile("qr_test", ".png"), generator.generateWithLogo(QR_DATA));
         assertThat(tempFile).isNotNull();
     }