Merge pull request #151 from bci-oss/bugfix/OMP-SDK-112-different-metamodel-versions-validation-exception

Fix validation exception.

Author: atextor

core/sds-aspect-model-resolver/src/main/java/io/openmanufacturing/sds/aspectmodel/resolver/AspectModelResolver.java

@@ -132,15 +132,12 @@ public Try<VersionedModel> resolveAspectModel( final ResolutionStrategy resolver
                   migratorService.getSdsMigratorFactory()
                                  .createAspectMetaModelResourceResolver()
                                  .mergeMetaModelIntoRawModel( model, oldest )
-                                 .orElse( migratorService.getMigratorFactory()
-                                                         .map( MigratorFactory::createAspectMetaModelResourceResolver )
-                                                         .map( Try::success )
-                                                         .orElseThrow()
-                                                         .flatMap( metaResolver -> metaResolver
-                                                               .mergeMetaModelIntoRawModel( model,
-                                                                     oldest ) ) )
-                                 .flatMap(
-                                       migratorService::updateMetaModelVersion ) ) );
+                                 .orElse( () -> migratorService.getMigratorFactory()
+                                                               .map( MigratorFactory::createAspectMetaModelResourceResolver )
+                                                               .map( Try::success )
+                                                               .orElseThrow()
+                                                               .flatMap( metaResolver -> metaResolver.mergeMetaModelIntoRawModel( model, oldest ) ) )
+                                 .flatMap( migratorService::updateMetaModelVersion ) ) );
    }
 
    /**