Fix/import export delete problem on windows (#29)

* Update PackageServiceTest.java

* Fixing delete problems for import and export

* Fix file lock on windows to remove not closed stream from jena loadturtle method

* Remove unecessary delete method

Author: michelu89

src/main/java/org/eclipse/esmf/ame/repository/strategy/utils/LocalFolderResolverUtils.java

@@ -13,14 +13,6 @@
 
 package org.eclipse.esmf.ame.repository.strategy.utils;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.channels.FileChannel;
-import java.nio.file.StandardOpenOption;
-import java.util.Objects;
-
-import javax.annotation.Nonnull;
-
 import org.apache.commons.io.FileUtils;
 import org.eclipse.esmf.ame.exceptions.FileNotFoundException;
 import org.eclipse.esmf.ame.exceptions.InvalidAspectModelException;
@@ -29,6 +21,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.annotation.Nonnull;
+import java.io.File;
+import java.io.IOException;
+import java.util.Objects;
+
 public class LocalFolderResolverUtils {
 
    private static final Logger LOG = LoggerFactory.getLogger( LocalFolderResolverUtils.class );
@@ -112,14 +109,9 @@ private static void handleFiles( final File storagePath ) throws IOException {
       for ( final File file : Objects.requireNonNull( storagePath.listFiles() ) ) {
          if ( file.isDirectory() ) {
             handleFiles( file );
-            FileUtils.forceDelete( file );
-         } else {
-            file.createNewFile();
-            final FileChannel channel = FileChannel.open( file.toPath(), StandardOpenOption.WRITE );
-            channel.lock().release();
-            channel.close();
-            FileUtils.forceDelete( file );
          }
+
+         FileUtils.forceDelete( file );
       }
    }
 }

src/main/java/org/eclipse/esmf/ame/resolver/inmemory/InMemoryStrategy.java

@@ -13,23 +13,10 @@
 
 package org.eclipse.esmf.ame.resolver.inmemory;
 
-import static org.apache.jena.http.auth.AuthEnv.LOG;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.RDFNode;
-import org.apache.jena.rdf.model.Resource;
-import org.apache.jena.rdf.model.ResourceFactory;
-import org.apache.jena.rdf.model.StmtIterator;
+import io.vavr.NotImplementedError;
+import io.vavr.control.Try;
+import org.apache.commons.io.IOUtils;
+import org.apache.jena.rdf.model.*;
 import org.apache.jena.riot.RiotException;
 import org.apache.jena.vocabulary.RDF;
 import org.eclipse.esmf.ame.exceptions.UrnNotFoundException;
@@ -43,8 +30,15 @@
 import org.eclipse.esmf.aspectmodel.vocabulary.SAMME;
 import org.eclipse.esmf.samm.KnownVersion;
 
-import io.vavr.NotImplementedError;
-import io.vavr.control.Try;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+import static org.apache.jena.http.auth.AuthEnv.LOG;
 
 public class InMemoryStrategy extends AbstractResolutionStrategy {
    public final Path processingRootPath;
@@ -62,8 +56,11 @@ private Model loadTurtle( final String aspectModel ) {
       final ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(
             aspectModel.getBytes( StandardCharsets.UTF_8 ) );
 
-      return TurtleLoader.loadTurtle( byteArrayInputStream ).getOrElseThrow(
-            error -> new RiotException( error.getCause().getMessage(), error.getCause() ) );
+       Model model = TurtleLoader.loadTurtle( byteArrayInputStream ).getOrElseThrow(
+               error -> new RiotException( error.getCause().getMessage(), error.getCause() ) );
+
+       IOUtils.closeQuietly( byteArrayInputStream );
+       return model;
    }
 
    @Override
@@ -109,7 +106,7 @@ protected Try<Model> getModelFromFileSystem( final AspectModelUrn aspectModelUrn
 
       final File namedResourceFile = directory.resolve( aspectModelUrn.getName() + ".ttl" ).toFile();
       if ( namedResourceFile.exists() ) {
-         return loadFromUri( namedResourceFile.toURI() );
+         return loadTurtle( new File( namedResourceFile.toURI() ) );
       }
 
       LOG.warn( "Looking for {}, but no {}.ttl was found. Inspecting files in {}", aspectModelUrn.getName(),
@@ -123,6 +120,16 @@ protected Try<Model> getModelFromFileSystem( final AspectModelUrn aspectModelUrn
                   "No model file containing " + aspectModelUrn + " could be found in directory: " + directory ) ) );
    }
 
+   private Try<Model> loadTurtle( final File aspectModel ) {
+      try ( final InputStream inputStream = new FileInputStream( aspectModel ) ) {
+         final Try<Model> model = TurtleLoader.loadTurtle( inputStream );
+         IOUtils.closeQuietly( inputStream );
+         return model;
+      } catch ( final IOException exception ) {
+         return Try.failure( exception );
+      }
+   }
+
    public AspectModelUrn getAspectModelUrn() {
       return AspectModelUrn.fromUrn(
             getEsmfStatements().orElseThrow( () -> new NotImplementedError( "AspectModelUrn cannot be found." ) ).next()

src/main/java/org/eclipse/esmf/ame/services/utils/UnzipUtils.java

@@ -47,8 +47,10 @@ private UnzipUtils() {
     */
    @SuppressWarnings( { "squid:S135", "squid:S5042" } )
    public static void unzipPackageFile( final InputStream zipFile, final Path packagePath ) {
-      try ( final ZipInputStream zipInputStream = new ZipInputStream( zipFile ) ) {
+      ZipInputStream zipInputStream = null;
 
+      try {
+         zipInputStream = new ZipInputStream( zipFile );
          ZipEntry zipEntry = zipInputStream.getNextEntry();
 
          while ( zipEntry != null ) {
@@ -76,12 +78,15 @@ public static void unzipPackageFile( final InputStream zipFile, final Path packa
 
             zipEntry = zipInputStream.getNextEntry();
          }
+
          zipInputStream.closeEntry();
 
-         IOUtils.closeQuietly( zipInputStream );
       } catch ( final IOException e ) {
          LOG.error( "Cannot read file." );
          throw new FileReadException( "Error reading the zip file.", e );
+      } finally {
+         IOUtils.closeQuietly( zipFile );
+         IOUtils.closeQuietly( zipInputStream );
       }
    }
 

src/main/java/org/eclipse/esmf/ame/services/utils/ZipUtils.java

@@ -45,8 +45,12 @@ private ZipUtils() {
    public static byte[] createZipFile( final String zipFileName, final String sourceStoragePath ) throws IOException {
       final String zipFile = sourceStoragePath + File.separator + zipFileName;
 
-      try ( final FileOutputStream fos = new FileOutputStream( zipFile );
-            final ZipOutputStream zos = new ZipOutputStream( fos ) ) {
+      FileOutputStream fos = null;
+      ZipOutputStream zos = null;
+
+      try {
+         fos = new FileOutputStream(zipFile);
+         zos = new ZipOutputStream(fos);
 
          final List<File> fileList = getFileList( new File( sourceStoragePath ), new ArrayList<>(), sourceStoragePath );
 
@@ -73,6 +77,9 @@ public static byte[] createZipFile( final String zipFileName, final String sourc
       } catch ( final IOException e ) {
          LOG.error( "Cannot create zip file." );
          throw new CreateFileException( "Error creating the zip file.", e );
+      }finally {
+         IOUtils.closeQuietly( fos );
+         IOUtils.closeQuietly( zos );
       }
 
       return Files.readAllBytes( Paths.get( zipFile ) );

src/test/java/org/eclipse/esmf/ame/services/PackageServiceTest.java

@@ -60,7 +60,7 @@ class PackageServiceTest {
 
    @Test
    void testValidateImportAspectModelPackage() throws IOException {
-      final Path storagePath = Paths.get( resourcesPath.toString(), "test-packages" );
+      final Path storagePath = Paths.get( resourcesPath.toString(), "test-packages-import" );
       final Path zipFilePath = Paths.get( resourcesPath.toString(), "TestArchive.zip" );
 
       final MockMultipartFile mockedZipFile = new MockMultipartFile( "TestArchive.zip",
@@ -78,7 +78,7 @@ void testValidateImportAspectModelPackage() throws IOException {
 
    @Test
    void testValidateAspectModels() {
-      final Path exportedStoragePath = Paths.get( resourcesPath.toString(), "test-packages" );
+      final Path exportedStoragePath = Paths.get( resourcesPath.toString(), "test-packages-export" );
       final List<String> aspectModelFiles = List.of( nameSpaceOne, nameSpaceTwo );
 
       final ValidationProcess validationProcess = Mockito.mock( ValidationProcess.class );