Merge release/1.4.0 into main

.github/workflows/deploy-artifactory-release.yml → .github/workflows/deploy-mvn-central-release.yml

@@ -28,16 +28,16 @@ jobs:
         run: |
           echo "BRANCH=${{ github.event.inputs.RELEASE_BRANCH || github.ref }}" >> $GITHUB_ENV
       - name: Checkout repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ env.BRANCH }}
           fetch-depth: 0
       - name: Setup Java JDK and Maven
-        uses: ontimize/setup-java-maven-gitAction@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'
-          server-id: ossrh
+          server-id: central
           server-username: MAVEN_USERNAME
           server-password: MAVEN_CENTRAL_TOKEN
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
@@ -68,4 +68,13 @@ jobs:
       - name: Create pull request
         run: |
           version=${{ steps.tag.outputs.version }}
-          gh pr create -B develop -H sync/$version --title "Backmerge from main into develop" --body "Created by a GitHub Action → Resync develop branch with main branch and increase project version"
+          gh pr create -B develop -H sync/$version --title "Backmerge from main into develop" --body "Created by a GitHub Action → Resync develop branch with main branch and increase project version"
+      - name: Create release on Github
+        uses: ncipollo/release-action@2792aea87063cfd0d27953ac38e3ab45afacc154
+        with:
+          commit: ${{ env.BRANCH }}
+          tag: ${{ steps.tag.outputs.version }}
+          name: ${{ steps.tag.outputs.version }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          body: |
+            Check out the [changelog](CHANGELOG.md) for version ${{ steps.tag.outputs.version }}

.github/workflows/deploy-mvn-central-snapshot.yml

@@ -13,16 +13,16 @@ jobs:
       MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
     steps:
       - name: Checkout repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Java JDK and Maven
-        uses: ontimize/setup-java-maven-gitAction@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'
-          server-id: ossrh
+          server-id: central
           server-username: MAVEN_USERNAME
           server-password: MAVEN_CENTRAL_TOKEN
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
           gpg-passphrase: MAVEN_GPG_PASSPHRASE
       - name: Publish to Apache Maven Central
-        run: mvn -B -U clean deploy -Pgenerate-version
+        run: mvn -B -U clean deploy -Pgenerate-version

CHANGELOG.md

@@ -9,6 +9,19 @@
 
 ## [Unreleased]
 
+## [1.4.0] - 2025-05-13
+
+### Added ✔️
+* The `TemporalFileManager` has been created to manage temporary files per request.  
+
+* **OSdmsService:** Added `getTemporalFiles` method has been added to `OSdmsService`.
+
+### Fixed 🐛
+* Closed `S3ObjectInputStream` instances properly to avoid `CLOSE_WAIT` socket issues and potential memory/resource leaks during file download operations.
+
+### Changed 🛠️
+* **S3 Connection:** The connection to S3 has been optimized.
+
 ## [1.3.1] - 2023-06-28
 
 ### Fixed 🐛
@@ -65,9 +78,10 @@
 * **OSdmsWorkspace Annotation:** Added an annotation to establish multiple query workspaces on the DMS system for an
   entity.
 
-[unreleased]: https://github.com/ontimize/ontimize-jee-sdms/compare/1.3.1...HEAD
+[unreleased]: https://github.com/ontimize/ontimize-jee-sdms/compare/1.4.0...HEAD
+[1.4.0]: https://github.com/ontimize/ontimize-jee-sdms/compare/1.3.1...1.4.0
 [1.3.1]: https://github.com/ontimize/ontimize-jee-sdms/compare/1.3.0...1.3.1
 [1.3.0]: https://github.com/ontimize/ontimize-jee-sdms/compare/1.2.0...1.3.0
 [1.2.0]: https://github.com/ontimize/ontimize-jee-sdms/compare/1.1.0...1.2.0
 [1.1.0]: https://github.com/ontimize/ontimize-jee-sdms/compare/1.0.0...1.1.0
-[1.0.0]: https://github.com/ontimize/ontimize-jee-sdms/releases/tag/1.0.0
+[1.0.0]: https://github.com/ontimize/ontimize-jee-sdms/releases/tag/1.0.0

README.md

@@ -1,11 +1,16 @@
-# Ontimize JEE Storage DMS
+# Ontimize JEE Storage SDMS
+
 ## 📜 Introduction
-Ontimize JEE Storage DMS is a module of the Ontimize framework that provides a document management solution for Java Enterprise Edition (JEE) based enterprise applications. This module enables organizations to store and manage documents within their enterprise applications.
-## ✍ Use
-To use the module, you only need to import it into your project to be able to use it. On the entity that is required to have the DMS endpoints, you will have to extend the drivers and add the corresponding DMS methods to the entity services. For more information, see the [documentation]().
+Ontimize JEE Storage SDMS is a module of the Ontimize framework that provides a document management solution for Java Enterprise Edition (JEE) based enterprise applications. This module enables organizations to store and manage documents within their enterprise applications.
+
+## ✍ Usage
+To use this module, you only need to import it into your project. For entities requiring SDMS endpoints, you must extend the drivers and add the corresponding SDMS methods to the entity's services. For more information, please refer to the [documentation](https://ontimize.github.io/docs/v3/systems/sdms/).
+
 ## 💼 Documentation
-All documentation related to how to use it in a project, tutorials and details of its systems and usage can be found online by accessing the link about [Ontimize Boot documentation](https://ontimize.github.io/ontimize-boot/).
-## 👁️‍🗨️ Versions and dependencies
-All the versions and dependencies of the artifacts contained in this project can be downloaded from [Maven Central](https://central.sonatype.dev/namespace/com.ontimize.boot), as well as knowing each of its dependencies.
+All documentation related to project integration, tutorials, and details about its systems and usage can be found online via the following link to the [Ontimize Boot documentation](https://ontimize.github.io/docs/).
+
+## 👁️‍🗨️ Versions and Dependencies
+All versions and dependencies of the artifacts included in this project can be downloaded from [Maven Central](https://central.sonatype.com/namespace/com.ontimize.jee.sdms), as well as viewing each of their dependencies.
+
 ## :gear: Changelog
-You can consult our changelog at the following [link](CHANGELOG.md)
+You can consult our changelog at the following [link](CHANGELOG.md)

ontimize-jee-sdms-common/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.ontimize.jee.sdms</groupId>
     <artifactId>ontimize-jee-sdms-common</artifactId>
-    <version>1.3.1</version>
+    <version>1.4.0</version>
     <packaging>jar</packaging>
     <name>Ontimize EE SDMS (Common module)</name>
     <description>Ontimize EE Storage DMS (SDMS) - Common module</description>
@@ -14,7 +14,7 @@
     <parent>
         <groupId>com.ontimize.jee.sdms</groupId>
         <artifactId>ontimize-jee-sdms</artifactId>
-        <version>1.3.1</version>
+        <version>1.4.0</version>
     </parent>
 
     <organization>
@@ -51,6 +51,11 @@
             <artifactId>ontimize-jee-common</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+
         <!-- REFLECTIONS -->
         <dependency>
             <groupId>org.reflections</groupId>

ontimize-jee-sdms-common/src/main/java/com/ontimize/jee/sdms/common/action/IOSdmsAction.java

@@ -66,6 +66,8 @@ public interface IOSdmsAction {
      */
     EntityResult download( OSdmsRestDataDto data );
 
+    EntityResult getTemporalFiles( OSdmsRestDataDto data );
+
 // ------------------------------------------------------------------------------------------------------------------ \\
 // -------| DMS - UPLOAD |------------------------------------------------------------------------------------------- \\
 // ------------------------------------------------------------------------------------------------------------------ \\

ontimize-jee-sdms-common/src/main/java/com/ontimize/jee/sdms/common/file/DefaultTemporalFileManager.java

@@ -0,0 +1,62 @@
+package com.ontimize.jee.sdms.common.file;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+@Component
+public class DefaultTemporalFileManager implements TemporalFileManager{
+
+    @Value( "${ontimize.sdms.file.temporal.directory}" )
+    private String temporalDirectory;
+
+    private static final ThreadLocal<List<File>> FILES = new ThreadLocal<>();
+
+    @Override
+    public File create( final String name, final InputStream inputStream ) throws IOException {
+        final File directory = new File( this.temporalDirectory );
+        final File file;
+        if( directory.exists() && directory.isDirectory() ) file = File.createTempFile( name, ".tmp", directory );
+        else file = File.createTempFile( name, ".tmp" );
+        try( FileOutputStream fos = new FileOutputStream( file )) {
+            inputStream.transferTo( fos );
+        }
+        if( FILES.get() == null ) FILES.set( new ArrayList<>() );
+        FILES.get().add( file );
+        return file;
+    }
+
+    @Override
+    public File create( final InputStream inputStream ) throws IOException {
+        return this.create( UUID.randomUUID().toString(), inputStream );
+    }
+
+    @Override
+    public void delete( final File file ) throws IOException {
+        if( FILES.get() == null ) return;
+        final Optional<File> result = FILES.get().stream()
+                .filter( target -> target.getAbsolutePath().equals( file.getAbsolutePath() ))
+                .findFirst();
+        if( result.isPresent() ){
+            final File target = result.get();
+            FILES.get().remove( target );
+            if( target.exists() ) Files.delete( target.toPath() );
+        }
+    }
+
+    @Override
+    public void cleanUp() throws IOException {
+        if( FILES.get() == null ) return;
+        for( final File file : FILES.get() ) if( file.exists() ) Files.delete( file.toPath() );
+        FILES.remove();
+    }
+}

ontimize-jee-sdms-common/src/main/java/com/ontimize/jee/sdms/common/file/TemporalFileManager.java

@@ -0,0 +1,13 @@
+package com.ontimize.jee.sdms.common.file;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
+public interface TemporalFileManager {
+
+    File create( InputStream inputStream ) throws IOException;
+    File create( String name, InputStream inputStream ) throws IOException;
+    void delete( File file ) throws IOException;
+    void cleanUp() throws IOException;
+}

ontimize-jee-sdms-common/src/main/java/com/ontimize/jee/sdms/common/zip/OSdmsZipCompressor.java

@@ -4,9 +4,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
+import java.io.*;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
@@ -35,48 +33,44 @@ public class OSdmsZipCompressor implements IOSdmsZipCompressor {
     @Override
     public <T extends IOSdmsZippeable> OSdmsZipDto compress( final String zipName, final List<T> dataToZip ) {
         final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        final ZipOutputStream zos = new ZipOutputStream( baos );
-        final Set<OSdmsZipData> data = dataToZip.stream()
-                .map( IOSdmsZippeable::getDataToZip )
-                .filter( Objects::nonNull )
-                .collect( Collectors.toSet() );
-
-        for( final OSdmsZipData zipData : data ) {
-            final ZipEntry entry = new ZipEntry( zipData.getFileName() );
-            try {
-                zos.putNextEntry( entry );
-                final byte[] bytes = new byte[ 1024 ];
-                int length;
-                while( ( length = zipData.getInputStream().read( bytes ) ) >= 0 ) {
-                    zos.write( bytes, 0, length );
+
+        try (ZipOutputStream zos = new ZipOutputStream(baos)) {
+            final Set<OSdmsZipData> data = dataToZip.stream()
+                    .map(IOSdmsZippeable::getDataToZip)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toSet());
+
+            for (final OSdmsZipData zipData : data) {
+                final ZipEntry entry = new ZipEntry(zipData.getFileName());
+                final File file = zipData.getFile();
+
+                if (file == null || !file.exists()) {
+                    LOGGER.warn("File {} does not exist or is null, skipping", zipData.getFileName());
+                    continue;
                 }
-            }
-            catch( final IOException e ) {
-                LOGGER.error( "Error compressing data to ZIP file: {}", e.getMessage() );
-            }
-            finally {
-                try {
+
+                try (InputStream inputStream = new FileInputStream(file)) {
+                    zos.putNextEntry(entry);
+                    byte[] buffer = new byte[4096];
+                    int length;
+                    while ((length = inputStream.read(buffer)) >= 0) {
+                        zos.write(buffer, 0, length);
+                    }
                     zos.closeEntry();
-                    zipData.getInputStream().close();
-                }
-                catch( final IOException e ) {
-                    LOGGER.error( "Error closing Resoources: {}", e.getMessage() );
+                } catch (IOException e) {
+                    LOGGER.error("Error compressing file {}: {}", zipData.getFileName(), e.getMessage());
                 }
             }
+        } catch (IOException e) {
+            LOGGER.error("Error creating ZIP output stream: {}", e.getMessage());
         }
 
-        try {
-            zos.close();
-        }
-        catch( final IOException e ) {
-            LOGGER.error( "Error closing ZIP file: {}", e.getMessage() );
-        }
-
-        final ByteArrayInputStream bais = new ByteArrayInputStream( baos.toByteArray() );
+        // Construir el DTO con el contenido del zip en memoria
+        final ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
         final OSdmsZipDto zipDto = new OSdmsZipDto();
-        zipDto.setFile( bais );
-        zipDto.setName( zipName );
-        zipDto.setSize( baos.size() );
+        zipDto.setFile(bais);
+        zipDto.setName(zipName);
+        zipDto.setSize(baos.size());
 
         return zipDto;
     }

ontimize-jee-sdms-common/src/main/java/com/ontimize/jee/sdms/common/zip/OSdmsZipData.java

@@ -1,6 +1,6 @@
 package com.ontimize.jee.sdms.common.zip;
 
-import java.io.InputStream;
+import java.io.File;
 import java.util.Objects;
 
 
@@ -15,18 +15,18 @@ public class OSdmsZipData {
     private String fileName;
 
     /**
-     * The inputStream field represents the input stream to be zipped.
+     * The File field represents the file to be zipped.
      */
-    private InputStream inputStream;
+    private File file;
 
 // ------------------------------------------------------------------------------------------------------------------ \\
 
     public OSdmsZipData() {
     }
 
-    public OSdmsZipData( final String fileName, final InputStream inputStream ) {
+    public OSdmsZipData( final String fileName, final File file ) {
         this.setFileName( fileName );
-        this.setInputStream( inputStream );
+        this.setFile( file );
     }
 
 // ------------------------------------------------------------------------------------------------------------------ \\
@@ -41,12 +41,12 @@ public void setFileName( final String fileName ) {
         this.fileName = fileName;
     }
 
-    public InputStream getInputStream() {
-        return this.inputStream;
+    public File getFile() {
+        return this.file;
     }
 
-    public void setInputStream( final InputStream inputStream ) {
-        this.inputStream = inputStream;
+    public void setFile( final File file ) {
+        this.file = file;
     }
 
 // ------------------------------------------------------------------------------------------------------------------ \\

ontimize-jee-sdms-engine/ontimize-jee-sdms-engine-s3/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.ontimize.jee.sdms</groupId>
     <artifactId>ontimize-jee-sdms-engine-s3</artifactId>
-    <version>1.3.1</version>
+    <version>1.4.0</version>
     <packaging>jar</packaging>
     <name>Ontimize EE SDMS (Engine S3 module)</name>
     <description>Ontimize EE Storage DMS (SDMS) - Engine S3 module</description>
@@ -14,7 +14,7 @@
     <parent>
         <groupId>com.ontimize.jee.sdms</groupId>
         <artifactId>ontimize-jee-sdms-engine</artifactId>
-        <version>1.3.1</version>
+        <version>1.4.0</version>
     </parent>
 
     <organization>