Merge pull request #342 from bci-oss/341-loading-bamm-models-fails

Fix loading of BAMM models

Author: atextor

core/esmf-aspect-model-resolver/src/main/java/org/eclipse/esmf/aspectmodel/resolver/AspectModelResolver.java

@@ -357,9 +357,13 @@ private void mergeModels( final Model target, final Model other ) {
     */
    public static Try<VersionedModel> loadAndResolveModel( final File input ) {
       final File inputFile = input.getAbsoluteFile();
-      final AspectModelUrn urn = fileToUrn( inputFile );
-      return getModelRoot( inputFile ).flatMap( modelsRoot ->
-            new AspectModelResolver().resolveAspectModel( new FileSystemStrategy( modelsRoot ), urn ) );
+      return getModelRoot( inputFile ).flatMap( modelsRoot -> {
+         try ( final InputStream inputStream = new FileInputStream( input ) ) {
+            return new AspectModelResolver().resolveAspectModel( new FileSystemStrategy( modelsRoot ), inputStream );
+         } catch ( final IOException exception ) {
+            throw new ModelResolutionException( "Could not open file " + input, exception );
+         }
+      } );
    }
 
    /**