Skip to content

Commit 96f1f53

Browse files
committed
Update ModelService.java
1 parent 22f7236 commit 96f1f53

File tree

1 file changed

+8
-2
lines changed
  • aspect-model-editor-service/src/main/java/org/eclipse/esmf/ame/services

1 file changed

+8
-2
lines changed

aspect-model-editor-service/src/main/java/org/eclipse/esmf/ame/services/ModelService.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,10 @@ public String migrateModel( final URI uri, final CompletedFileUpload aspectModel
177177
final AspectModel aspectModel = aspectModelLoader.load( ModelUtils.openInputStreamFromUpload( aspectModelFile ), uri );
178178

179179
return aspectModel.files().stream()
180-
.filter( a -> a.sourceLocation().map( source -> source.getScheme().equals( "blob" ) ).orElse( false ) ).findFirst()
180+
.filter( a -> a.sourceLocation().map( source -> {
181+
final String scheme = source.getScheme();
182+
return "blob".equals( scheme ) || "file".equals( scheme );
183+
} ).orElse( false ) ).findFirst()
181184
.map( AspectSerializer.INSTANCE::aspectModelFileToString )
182185
.orElseThrow( () -> new InvalidAspectModelException( "No aspect model found to migrate" ) );
183186
}
@@ -186,7 +189,10 @@ public String getFormattedModel( final URI uri, final CompletedFileUpload aspect
186189
final AspectModel aspectModel = aspectModelLoader.load( ModelUtils.openInputStreamFromUpload( aspectModelFile ), uri );
187190

188191
return aspectModel.files().stream()
189-
.filter( a -> a.sourceLocation().map( source -> source.getScheme().equals( "blob" ) ).orElse( false ) ).findFirst()
192+
.filter( a -> a.sourceLocation().map( source -> {
193+
final String scheme = source.getScheme();
194+
return "blob".equals( scheme ) || "file".equals( scheme );
195+
} ).orElse( false ) ).findFirst()
190196
.map( AspectSerializer.INSTANCE::aspectModelFileToString )
191197
.orElseThrow( () -> new InvalidAspectModelException( "No aspect model found to formate" ) );
192198
}

0 commit comments

Comments
 (0)