Merge pull request #233 from bci-oss/bugfix/232-getallurns-returns-non-valid-urns

Adds a resolve method to validate if the given URN is bamm conform …

Author: atextor

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

@@ -40,6 +40,7 @@
 import io.openmanufacturing.sds.aspectmodel.versionupdate.MigratorFactory;
 import io.openmanufacturing.sds.aspectmodel.versionupdate.MigratorService;
 import io.openmanufacturing.sds.aspectmodel.versionupdate.MigratorServiceLoader;
+import io.vavr.Value;
 import io.vavr.control.Option;
 import io.vavr.control.Try;
 
@@ -66,10 +67,27 @@ public static Set<String> getAllUrnsInModel( final Model model ) {
                Stream.of( statement.getObject().asResource().getURI() ) : Stream.empty();
 
          return Stream.of( subjectUri, propertyUri, objectUri )
-               .flatMap( Function.identity() );
+               .flatMap( Function.identity() )
+               .map( AspectModelResolver::resolveBammUrn )
+               .flatMap( Value::toJavaStream );
       } ) ).flatMap( Function.identity() ).collect( Collectors.toSet() );
    }
 
+   /**
+    * Tries to resolve the given Bamm URN {@link AspectModelUrn}
+    *
+    * @param urn The Aspect (meta) model URN
+    * @return The {@link String} if it is resolvable, an {@link UrnSyntaxException} otherwise
+    */
+   private static Try<String> resolveBammUrn( final String urn ) {
+      try {
+         AspectModelUrn.fromUrn( urn );
+         return Try.success( urn );
+      } catch ( final UrnSyntaxException exception ) {
+         return Try.failure( exception );
+      }
+   }
+
    /**
     * Method to resolve a given {@link AspectModelUrn} using a suitable {@link ResolutionStrategy}.
     * This creates the closure (merged model) of all referenced models and the corresponding meta model.