Fix bamm-cli validation problem.

Author: RaMisess

tools/bamm-cli/src/main/java/io/openmanufacturing/sds/AbstractCommand.java

@@ -47,24 +47,26 @@
 public abstract class AbstractCommand implements Runnable {
    protected static final Logger LOG = LoggerFactory.getLogger( AbstractCommand.class );
 
-   protected Try<AspectContext> loadAndResolveModel( final File input, final ExternalResolverMixin resolverConfig ) {
+   protected Try<VersionedModel> loadAndResolveModel( final File input, final ExternalResolverMixin resolverConfig ) {
       final Try<VersionedModel> versionedModel;
       if ( resolverConfig.commandLine.isBlank() ) {
          versionedModel = AspectModelResolver.loadAndResolveModel( input );
       } else {
          final AspectModelUrn urn = fileToUrn( input.getAbsoluteFile() );
          versionedModel = new AspectModelResolver().resolveAspectModel( new ExternalResolverStrategy( resolverConfig.commandLine ), urn );
       }
-      return versionedModel.flatMap( model -> {
-         final AspectModelUrn urn = fileToUrn( input.getAbsoluteFile() );
-         return AspectModelLoader.getSingleAspect( model, aspect -> aspect.getName().equals( urn.getName() ) )
-               .map( aspect -> new AspectContext( model, aspect ) );
-      } );
+      return versionedModel;
    }
 
    protected AspectContext loadModelOrFail( final String modelFileName, final ExternalResolverMixin resolverConfig ) {
       final File inputFile = new File( modelFileName );
-      final Try<AspectContext> context = loadAndResolveModel( inputFile, resolverConfig );
+      final Try<VersionedModel> versionedModel = loadAndResolveModel( inputFile, resolverConfig );
+      final Try<AspectContext> context = versionedModel.flatMap( model -> {
+         final AspectModelUrn urn = fileToUrn( inputFile.getAbsoluteFile() );
+         return AspectModelLoader.getSingleAspect( model, aspect -> aspect.getName().equals( urn.getName() ) )
+               .map( aspect -> new AspectContext( model, aspect ) );
+      } );
+
       return context.recover( throwable -> {
          // Model can not be loaded, root cause e.g. File not found
          if ( throwable instanceof IllegalArgumentException ) {

tools/bamm-cli/src/main/java/io/openmanufacturing/sds/aspect/AspectValidateCommand.java

@@ -23,7 +23,6 @@
 import io.openmanufacturing.sds.aspectmodel.validation.services.AspectModelValidator;
 import io.openmanufacturing.sds.aspectmodel.validation.services.DetailedViolationFormatter;
 import io.openmanufacturing.sds.aspectmodel.validation.services.ViolationFormatter;
-import io.openmanufacturing.sds.metamodel.AspectContext;
 import io.vavr.control.Try;
 import picocli.CommandLine;
 
@@ -50,7 +49,7 @@ public class AspectValidateCommand extends AbstractCommand {
 
    @Override
    public void run() {
-      final Try<VersionedModel> versionedModel = loadAndResolveModel( new File( parentCommand.getInput() ), customResolver ).map( AspectContext::rdfModel );
+      final Try<VersionedModel> versionedModel = loadAndResolveModel( new File( parentCommand.getInput() ), customResolver );
       final AspectModelValidator validator = new AspectModelValidator();
 
       final List<Violation> violations = validator.validateModel( versionedModel );