merging dev into uat (#184)

Co-authored-by: adrrossi <[email protected]> Co-authored-by: GitHub Action <[email protected]> Co-authored-by: adrrss <[email protected]> Co-authored-by: SMANUM <[email protected]> Co-authored-by: GiacomoB <[email protected]> Co-authored-by: Simone Munao <[email protected]> Co-authored-by: ElisKina-dev <[email protected]> Co-authored-by: EmVal <[email protected]> Co-authored-by: ElisKina-dev <[email protected]> Co-authored-by: Gabriele Maiocchi <[email protected]> Co-authored-by: Giacomo Brancazi <[email protected]>
pagopa · Sep 23, 2024 · 3ae136d · 3ae136d
1 parent a610183
commit 3ae136d
Show file tree

Hide file tree

Showing 7 changed files with 16,215 additions and 16,400 deletions.
diff --git a/_TMP/coverage-results.md b/_TMP/coverage-results.md
@@ -6,10 +6,10 @@
 
 | Outcome                 | Value                                                               |
 |-------------------------|---------------------------------------------------------------------|
-| Code Coverage %         | 92.08%               |
-| :heavy_check_mark: Number of Lines Covered | 2268    |
+| Code Coverage %         | 92.09%               |
+| :heavy_check_mark: Number of Lines Covered | 2269    |
 | :x: Number of Lines Missed  | 195     |
-| Total Number of Lines   | 2463     |
+| Total Number of Lines   | 2464     |
 
 
 ## Details:
@@ -902,7 +902,7 @@
         
 #### Lines Missed:
         
-- Line #109
+- Line #110
 ```
         } catch (IOException e) {
 ```

diff --git a/helm-chart/Chart.yaml b/helm-chart/Chart.yaml
@@ -14,7 +14,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: v1.25.0
+version: v1.25.0-dev.4
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>it.gov.pagopa</groupId>
     <artifactId>atm-layer-model</artifactId>
-    <version>1.25.0</version>
+    <version>1.25.0-dev.4</version>
     <name>atm-layer-model</name>
     <properties>
         <compiler-plugin.version>3.11.0</compiler-plugin.version>

diff --git a/...a/it/gov/pagopa/atmlayer/service/model/service/impl/ResourceEntityStorageServiceImpl.java b/...a/it/gov/pagopa/atmlayer/service/model/service/impl/ResourceEntityStorageServiceImpl.java
@@ -34,19 +34,20 @@
 @ApplicationScoped
 @Slf4j
 public class ResourceEntityStorageServiceImpl implements ResourceEntityStorageService {
-    @Inject
-    ObjectStoreStrategy objectStoreStrategy;
+    private final ObjectStoreStrategy objectStoreStrategy;
     private final ObjectStoreService objectStoreService;
-    @Inject
-    ObjectStoreProperties objectStoreProperties;
-    @Inject
-    ResourceFileService resourceFileService;
+    private final ObjectStoreProperties objectStoreProperties;
+    private final ResourceFileService resourceFileService;
 
+    @Inject
     public ResourceEntityStorageServiceImpl(ObjectStoreStrategy objectStoreStrategy,
-                                            ObjectStoreProperties objectStoreProperties) {
+                                            ObjectStoreProperties objectStoreProperties,
+                                            ResourceFileService resourceFileService) {
         this.objectStoreStrategy = objectStoreStrategy;
         this.objectStoreService = objectStoreStrategy.getType(
                 ObjectStoreStrategyEnum.fromValue(objectStoreProperties.type()));
+        this.objectStoreProperties = objectStoreProperties;
+        this.resourceFileService = resourceFileService;
     }
 
     @Override

diff --git a/src/main/java/it/gov/pagopa/atmlayer/service/model/utils/FileUtilities.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/utils/FileUtilities.java
@@ -98,7 +98,8 @@ public static String toHexString(byte[] hash) {
     public static File fromStringToFile(String fileBase64) {
         try {
             byte[] decodedBytes = Base64.getDecoder().decode(fileBase64);
-            File tempFile = File.createTempFile("tempfile", ".tmp");
+            Path tempDir = Files.createTempDirectory("multipleUpload");
+            File tempFile = File.createTempFile("tempfile", ".tmp", tempDir.toFile());
             try (FileOutputStream fos = new FileOutputStream(tempFile)) {
                 fos.write(decodedBytes);
             }

diff --git a/src/test/resources/integration-test/output/result.html b/src/test/resources/integration-test/output/result.html