Add charset utf 8 with readstring for windows problems (#47)

Author: michelu89

src/main/java/org/eclipse/esmf/ame/repository/strategy/LocalFolderResolverStrategy.java

@@ -15,7 +15,10 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.channels.FileChannel;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.FileSystem;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -275,7 +278,7 @@ private List<AspectModelInformation> getListOfAspectModels( final List<String> f
             final String[] arg = transformToValidModelDirectory( path ).split( ":" );
             final String namespace = arg[0] + ":" + arg[1];
             final String fileName = arg[2];
-            String aspectModel = Files.readString( importFileSystem.getPath( path ) );
+            String aspectModel = LocalFolderResolverUtils.readString( importFileSystem.getPath( path ), StandardCharsets.UTF_8 );
             return new AspectModelInformation( namespace, fileName, aspectModel );
          } catch ( IOException e ) {
             throw new FileNotFoundException( "Cannot find in-memory file to create package information", e );

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

@@ -15,6 +15,10 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Objects;
 
 import javax.annotation.Nonnull;
@@ -73,48 +77,17 @@ public static String buildFilePath( final String namespace, final String fileNam
    }
 
    /**
-    * This method will convert the given urn to AspectModelUrn.
+    * Reads the content of a file located at the specified path using the provided character encoding.
     *
-    * @param urn - urn of the aspect model.
-    * @return AspectModelUrn.
+    * @param path The path to the file to be read.
+    * @param charset The character encoding to be used for decoding the file content.
+    * @return The content of the file as a string decoded with the specified character encoding.
+    * @throws IOException If an I/O error occurs while reading the file.
     */
-   public static AspectModelUrn convertToAspectModelUrn( final String urn ) {
-      return AspectModelUrn.from( urn ).getOrElse( () -> {
-         throw new InvalidAspectModelException(
-               String.format( "The URN constructed from the input file path is invalid: %s", urn ) );
-      } );
-   }
-
-   /**
-    * This method will delete the given directory and all of its contents.
-    *
-    * @param storagePath - path of the directory to be deleted.
-    */
-   public static void deleteDirectory( final File storagePath ) {
-      try {
-         if ( storagePath.exists() && storagePath.isDirectory() ) {
-            handleFiles( storagePath );
-            FileUtils.forceDelete( storagePath );
-         }
-      } catch ( final IOException error ) {
-         LOG.error( "Cannot delete exported package folder." );
-         throw new FileNotFoundException( String.format( "Unable to delete folder on: %s", storagePath ), error );
-      }
-   }
-
-   /**
-    * This method will unlock all files in the given directory.
-    *
-    * @param storagePath path of the directory to be deleted.
-    * @throws IOException if an I/O error occurs.
-    */
-   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 );
+   public static String readString( Path path, Charset charset) throws IOException {
+      try ( InputStream inputStream = Files.newInputStream(path)) {
+         byte[] bytes = inputStream.readAllBytes();
+         return new String(bytes, charset);
       }
    }
 }

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

@@ -18,6 +18,7 @@
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.FileSystem;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -26,6 +27,7 @@
 
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.riot.RiotException;
+import org.eclipse.esmf.ame.repository.strategy.utils.LocalFolderResolverUtils;
 import org.eclipse.esmf.aspectmodel.resolver.AspectModelResolver;
 import org.eclipse.esmf.aspectmodel.urn.AspectModelUrn;
 
@@ -35,39 +37,39 @@ public class InMemoryStrategy extends ResolutionStrategy {
    public final FileSystem fileSystem;
 
    public InMemoryStrategy( final String aspectModel, final Path processingRootPath, final FileSystem fileSystem )
-         throws RiotException {
+           throws RiotException {
       super( aspectModel, processingRootPath );
       this.fileSystem = fileSystem;
    }
 
    protected Try<Model> getModelFromFileSystem( final AspectModelUrn aspectModelUrn, final Path rootPath ) {
       try ( Stream<Path> pathStream = Files.walk( rootPath ) ) {
          final String filePath =
-               aspectModelUrn.getNamespace() + File.separator + aspectModelUrn.getVersion() + File.separator
-                     + aspectModelUrn.getName() + ".ttl";
+                 aspectModelUrn.getNamespace() + File.separator + aspectModelUrn.getVersion() + File.separator
+                         + aspectModelUrn.getName() + ".ttl";
 
          final Path file = fileSystem.getPath( filePath );
 
          if ( Files.exists( file ) ) {
-            return Try.of( () -> loadTurtleFromString( Files.readString( file ) ) );
+            return Try.of( () -> loadTurtleFromString( LocalFolderResolverUtils.readString( file, StandardCharsets.UTF_8 ) ) );
          }
 
          LOG.warn( "Looking for {}, but no {}.ttl was found. Inspecting files in {}", aspectModelUrn.getName(),
-               aspectModelUrn.getName(), filePath );
+                 aspectModelUrn.getName(), filePath );
 
          Optional<Try<Model>> modelWithDefinition = pathStream
-               .filter( Files::isRegularFile )
-               .map( Path::toAbsolutePath )
-               .map( Path::toString )
-               .map( fileSystem::getPath )
-               .map( aspectModelPath -> Try.of( () -> loadTurtleFromString( Files.readString( aspectModelPath ) ) ) )
-               .filter( tryModel -> tryModel.map(
-                                                  model -> AspectModelResolver.containsDefinition( model, aspectModelUrn ) )
-                                            .getOrElse( false ) )
-               .findFirst();
+                 .filter( Files::isRegularFile )
+                 .map( Path::toAbsolutePath )
+                 .map( Path::toString )
+                 .map( fileSystem::getPath )
+                 .map( aspectModelPath -> Try.of( () -> loadTurtleFromString( LocalFolderResolverUtils.readString( aspectModelPath, StandardCharsets.UTF_8 ) ) ) )
+                 .filter( tryModel -> tryModel.map(
+                                 model -> AspectModelResolver.containsDefinition( model, aspectModelUrn ) )
+                         .getOrElse( false ) )
+                 .findFirst();
 
          return modelWithDefinition.orElse( Try.failure( new FileNotFoundException(
-               "No model file containing " + aspectModelUrn + " could be found in directory" ) ) );
+                 "No model file containing " + aspectModelUrn + " could be found in directory" ) ) );
       } catch ( IOException exception ) {
          return Try.failure( exception );
       }

src/main/java/org/eclipse/esmf/ame/services/PackageService.java

@@ -16,6 +16,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.FileSystem;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -172,7 +173,7 @@ public List<String> importAspectModelPackage( final List<AspectModelFiles> aspec
          try {
             final FolderStructure folderStructure = LocalFolderResolverUtils.extractFilePath( data.getNamespace() );
             folderStructure.setFileName( fileName );
-            String aspectModel = Files.readString( importFileSystem.getPath( folderStructure.toString() ) );
+            String aspectModel = LocalFolderResolverUtils.readString( importFileSystem.getPath( folderStructure.toString() ), StandardCharsets.UTF_8 );
             Optional<String> namespaceVersion = Optional.of(
                   folderStructure.getFileRootPath() + File.separator + folderStructure.getVersion() );