OZG-5636 use TempFileUtils

bayernid-proxy-impl/src/main/java/de/ozgcloud/nachrichten/postfach/bayernid/proxy/UploadStreamObserver.java

@@ -34,6 +34,7 @@ import java.util.concurrent.atomic.AtomicReference;
 
 import com.google.protobuf.ByteString;
 
+import de.ozgcloud.common.binaryfile.TempFileUtils;
 import de.ozgcloud.common.errorhandling.TechnicalException;
 import de.ozgcloud.nachrichten.postfach.bayernid.proxy.message.Attachment;
 import de.ozgcloud.nachrichten.postfach.bayernid.proxy.message.BayernIdMessage.BayernIdMessageBuilder;
@@ -81,29 +82,22 @@ public class UploadStreamObserver implements StreamObserver<GrpcSendBayernIdMess
 	}
 
 	Attachment buildAttachment(GrpcAttachmentMetadata attachmentMetadata) {
-		var attachmentFile = createTemporallyFile(attachmentMetadata.getFileName());
+		try {
 			return Attachment.builder()
 					.name(attachmentMetadata.getFileName())
 					.type(attachmentMetadata.getFileType())
-				.content(attachmentFile)
+					.content(createTemporallyFile())
 					.build();
+		} catch (IOException e) {
+			throw new TechnicalException("Can not create temporary file for attachment " + attachmentMetadata.getFileName(), e);
+		}
 	}
 
-	InputStream createTemporallyFile(String fileName) {
-		try {
+	InputStream createTemporallyFile() throws IOException {
 		closeTemporallyWriter();
-			var tempFilePath = createFile(fileName);
+		var tempFilePath = TempFileUtils.createTmpFile();
 		attachmentWriter = newOutputStream(tempFilePath);
 		return newInputStream(tempFilePath);
-		} catch (IOException e) {
-			throw new TechnicalException("Can not create temporary file for attachment " + fileName, e);
-		}
-	}
-
-	Path createFile(String fileName) throws IOException {
-		var tmpFile = Files.createTempFile(fileName, ATTACHMENT_FILE_SUFFIX);
-		tmpFile.toFile().deleteOnExit();
-		return tmpFile;
 	}
 
 	OutputStream newOutputStream(Path filePath) throws IOException {

bayernid-proxy-impl/src/test/java/de/ozgcloud/nachrichten/postfach/bayernid/proxy/UploadStreamObserverTest.java

@@ -33,18 +33,19 @@ import java.io.OutputStream;
 import java.nio.file.Path;
 import java.util.concurrent.atomic.AtomicReference;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
+import org.mockito.MockedStatic;
 import org.mockito.Spy;
-import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import com.google.protobuf.ByteString;
 
+import de.ozgcloud.common.binaryfile.TempFileUtils;
 import de.ozgcloud.common.errorhandling.TechnicalException;
 import de.ozgcloud.nachrichten.postfach.bayernid.proxy.message.Attachment;
 import de.ozgcloud.nachrichten.postfach.bayernid.proxy.message.BayernIdMessage.BayernIdMessageBuilder;
@@ -193,16 +194,20 @@ class UploadStreamObserverTest {
 			@Mock
 			private InputStream tmpFileInputStream;
 
+			@Nested
+			class TestBuildSuccessfully {
+				@SneakyThrows
 				@BeforeEach
 				void setup() {
-				doReturn(tmpFileInputStream).when(uploadStreamObserver).createTemporallyFile(any());
+					doReturn(tmpFileInputStream).when(uploadStreamObserver).createTemporallyFile();
 				}
 
+				@SneakyThrows
 				@Test
 				void shouldCallCreateTemporallyFile() {
 					uploadStreamObserver.buildAttachment(grpcAttachmentMetadata);
 
-				verify(uploadStreamObserver).createTemporallyFile(GrpcAttachmentMetadataTestFactory.FILE_NAME);
+					verify(uploadStreamObserver).createTemporallyFile();
 				}
 
 				@Test
@@ -227,20 +232,42 @@ class UploadStreamObserverTest {
 				}
 			}
 
+			@SneakyThrows
+			@Test
+			void shouldThrowTechnicalException() {
+				doThrow(IOException.class).when(uploadStreamObserver).createTemporallyFile();
+
+				assertThrows(TechnicalException.class, () -> uploadStreamObserver.buildAttachment(grpcAttachmentMetadata));
+			}
+		}
+
 		@Nested
 		class TestCreateTemporallyFile {
 
+			private static final Path TEMP_FILE_PATH = Path.of("tempFile");
+
 			@Mock
 			private OutputStream attachmentWriter;
 			@Mock
 			private InputStream tmpFileInputStream;
 
-			private Path tempFilePath = Path.of("tempFile");
+			private MockedStatic<TempFileUtils> mockTempFileUtils;
+
+			@BeforeEach
+			void init() {
+				mockTempFileUtils = mockStatic(TempFileUtils.class);
+				mockTempFileUtils.when(TempFileUtils::createTmpFile).thenReturn(TEMP_FILE_PATH);
+			}
+
+			@AfterEach
+			void close() {
+				mockTempFileUtils.close();
+			}
 
+			@SneakyThrows
 			@Test
 			void shouldCallCloseTemporallyFile() {
-
-				uploadStreamObserver.createTemporallyFile("test.txt");
+				uploadStreamObserver.createTemporallyFile();
 
 				verify(uploadStreamObserver).closeTemporallyWriter();
 			}
@@ -248,19 +275,19 @@ class UploadStreamObserverTest {
 			@SneakyThrows
 			@Test
 			void shouldCallCreateFile() {
-				uploadStreamObserver.createTemporallyFile(GrpcAttachmentMetadataTestFactory.FILE_NAME);
+				mockTempFileUtils.when(TempFileUtils::createTmpFile).thenReturn(TEMP_FILE_PATH);
+
+				uploadStreamObserver.createTemporallyFile();
 
-				verify(uploadStreamObserver).createFile(GrpcAttachmentMetadataTestFactory.FILE_NAME);
+				mockTempFileUtils.verify(() -> TempFileUtils.createTmpFile());
 			}
 
 			@SneakyThrows
 			@Test
 			void shouldCallNewOutputStream() {
-				doReturn(tempFilePath).when(uploadStreamObserver).createFile(any());
-
-				uploadStreamObserver.createTemporallyFile(GrpcAttachmentMetadataTestFactory.FILE_NAME);
+				uploadStreamObserver.createTemporallyFile();
 
-				verify(uploadStreamObserver).newOutputStream(tempFilePath);
+				verify(uploadStreamObserver).newOutputStream(TEMP_FILE_PATH);
 			}
 
 			@SneakyThrows
@@ -268,7 +295,7 @@ class UploadStreamObserverTest {
 			void shouldInitializeOutputWriter() {
 				doReturn(attachmentWriter).when(uploadStreamObserver).newOutputStream(any());
 
-				uploadStreamObserver.createTemporallyFile(GrpcAttachmentMetadataTestFactory.FILE_NAME);
+				uploadStreamObserver.createTemporallyFile();
 
 				assertThat(getAttachmentWriter()).isEqualTo(attachmentWriter);
 			}
@@ -276,11 +303,9 @@ class UploadStreamObserverTest {
 			@SneakyThrows
 			@Test
 			void shouldCallNewInputStream() {
-				doReturn(tempFilePath).when(uploadStreamObserver).createFile(any());
+				uploadStreamObserver.createTemporallyFile();
 
-				uploadStreamObserver.createTemporallyFile(GrpcAttachmentMetadataTestFactory.FILE_NAME);
-
-				verify(uploadStreamObserver).newInputStream(tempFilePath);
+				verify(uploadStreamObserver).newInputStream(TEMP_FILE_PATH);
 			}
 
 			@SneakyThrows
@@ -288,19 +313,11 @@ class UploadStreamObserverTest {
 			void shouldReturnInputStream() {
 				doReturn(tmpFileInputStream).when(uploadStreamObserver).newInputStream(any());
 
-				var result = uploadStreamObserver.createTemporallyFile(GrpcAttachmentMetadataTestFactory.FILE_NAME);
+				var result = uploadStreamObserver.createTemporallyFile();
 
 				assertThat(result).isEqualTo(tmpFileInputStream);
 			}
 
-			@SneakyThrows
-			@Test
-			void shouldThrowException() {
-				doThrow(new IOException()).when(uploadStreamObserver).createFile(any());
-
-				assertThrows(TechnicalException.class, () -> uploadStreamObserver.createTemporallyFile(GrpcAttachmentMetadataTestFactory.FILE_NAME));
-			}
-
 			private OutputStream getAttachmentWriter() {
 				return (OutputStream) ReflectionTestUtils.getField(uploadStreamObserver, "attachmentWriter");
 			}