From b4cc36d9039c0fe491ad3c1e2e6e0222ea64a773 Mon Sep 17 00:00:00 2001
From: "angel.herce" <angel.herce@imatia.com>
Date: Mon, 28 Apr 2025 07:10:45 +0200
Subject: [PATCH] feat: Add component to auto remove temp files

---
 .../jee/sdms/common/file/DefaultTemporalFileManager.java      | 4 +++-
 .../sdms/engine/s3/repository/dto/OSdmsS3RepositoryDto.java   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ontimize-jee-sdms-common/src/main/java/com/ontimize/jee/sdms/common/file/DefaultTemporalFileManager.java b/ontimize-jee-sdms-common/src/main/java/com/ontimize/jee/sdms/common/file/DefaultTemporalFileManager.java
index 8369457..d82f8fb 100644
--- a/ontimize-jee-sdms-common/src/main/java/com/ontimize/jee/sdms/common/file/DefaultTemporalFileManager.java
+++ b/ontimize-jee-sdms-common/src/main/java/com/ontimize/jee/sdms/common/file/DefaultTemporalFileManager.java
@@ -2,6 +2,7 @@
 
 import jakarta.annotation.PreDestroy;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.ScopedProxyMode;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
 
@@ -16,7 +17,7 @@
 import java.util.UUID;
 
 @Component
-@RequestScope
+@RequestScope( proxyMode = ScopedProxyMode.TARGET_CLASS )
 public class DefaultTemporalFileManager implements TemporalFileManager{
 
     @Value( "${ontimize.sdms.file.temporal.directory}" )
@@ -60,5 +61,6 @@ public void cleanUp() throws IOException {
         for( final File file : this.files ){
             if( file.exists() ) Files.delete( file.toPath() );
         }
+        this.files.clear();
     }
 }
diff --git a/ontimize-jee-sdms-engine/ontimize-jee-sdms-engine-s3/src/main/java/com/ontimize/jee/sdms/engine/s3/repository/dto/OSdmsS3RepositoryDto.java b/ontimize-jee-sdms-engine/ontimize-jee-sdms-engine-s3/src/main/java/com/ontimize/jee/sdms/engine/s3/repository/dto/OSdmsS3RepositoryDto.java
index bbd4326..0786fb6 100644
--- a/ontimize-jee-sdms-engine/ontimize-jee-sdms-engine-s3/src/main/java/com/ontimize/jee/sdms/engine/s3/repository/dto/OSdmsS3RepositoryDto.java
+++ b/ontimize-jee-sdms-engine/ontimize-jee-sdms-engine-s3/src/main/java/com/ontimize/jee/sdms/engine/s3/repository/dto/OSdmsS3RepositoryDto.java
@@ -215,7 +215,7 @@ public void set( final S3Object s3Object ) {
         this.processKey( s3Object.getKey() );
         this.bucket = s3Object.getBucketName();
         try (final InputStream is = s3Object.getObjectContent()) {
-            this.file = this.temporalFileManager.create( this.key, is );
+            this.file = this.temporalFileManager.create( is );
             if( this.file != null ) this.size = this.file.length();
         } catch ( IOException e) {
             this.file = null;