Fixes a bug where the ClasspathStrategy couldn't search for other files as the given path wasn't correct.

Fixes a bug where the sorting of URLs leaded to an exception because java.net.URL does not extend Comparable. Adds a custom comparator.

Author: DvSmi

core/sds-aspect-model-java-generator/src/test/java/io/openmanufacturing/sds/aspectmodel/java/StaticMetaModelJavaGeneratorTest.java

@@ -67,8 +67,8 @@ public void testCodeGeneration( final TestAspect testAspect ) {
    }
 
    /**
-    * Tests that code generation succeeds for all test models for the latest meta model version
-    * @param testAspect the injected Aspect model
+    * Tests that code generation succeeds for all test models, that have properties shared over two files, for the latest meta model version
+    * @param testAspect the injected shared Aspect models
     */
    @ParameterizedTest
    @EnumSource( value = TestSharedAspect.class )

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

@@ -19,6 +19,7 @@
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.stream.Stream;
 
 import org.apache.commons.io.IOUtils;
@@ -86,7 +87,8 @@ protected URL resourceUrl( final String directory, final String filename ) {
       return getClass().getClassLoader().getResource( directory + "/" + filename );
    }
 
-   protected Stream<String> filesInDirectory( final String directory ) {
+   protected Stream<String> filesInDirectory( String dir ) {
+      final String directory = dir.startsWith( "/" ) ? dir : "/" + dir;
       try {
          final InputStream directoryUrl = getClass().getResourceAsStream( directory );
          if ( directoryUrl == null ) {
@@ -117,13 +119,13 @@ public Try<Model> apply( final AspectModelUrn aspectModelUrn ) {
       return filesInDirectory( directory )
             .filter( name -> name.endsWith( ".ttl" ) )
             .map( name -> resourceUrl( directory, name ) )
-            .sorted()
+            .sorted( Comparator.comparing( URL::getPath ) )
             .map( this::loadFromUrl )
             .filter( tryModel -> tryModel
                   .map( model -> AspectModelResolver.containsDefinition( model, aspectModelUrn ) )
                   .getOrElse( false ) )
             .findFirst()
             .orElse( Try.failure( new FileNotFoundException(
-                  "The AspectModel: " + aspectModelUrn.toString() + " could not be found in directory: " + directory ) ) );
+                  "The AspectModel: " + aspectModelUrn + " could not be found in directory: " + directory ) ) );
    }
 }

core/sds-test-resources/src/main/java/io/openmanufacturing/sds/test/TestResources.java

@@ -13,18 +13,12 @@
 
 package io.openmanufacturing.sds.test;
 
-import java.io.File;
 import java.io.InputStream;
-import java.nio.file.Path;
-
-import org.apache.commons.lang3.ClassLoaderUtils;
-import org.apache.jena.rdf.model.Resource;
 
 import io.openmanufacturing.sds.aspectmetamodel.KnownVersion;
 import io.openmanufacturing.sds.aspectmodel.VersionNumber;
 import io.openmanufacturing.sds.aspectmodel.resolver.AspectModelResolver;
 import io.openmanufacturing.sds.aspectmodel.resolver.ClasspathStrategy;
-import io.openmanufacturing.sds.aspectmodel.resolver.FileSystemStrategy;
 import io.openmanufacturing.sds.aspectmodel.resolver.services.SdsAspectMetaModelResourceResolver;
 import io.openmanufacturing.sds.aspectmodel.resolver.services.TurtleLoader;
 import io.openmanufacturing.sds.aspectmodel.resolver.services.VersionedModel;
@@ -53,8 +47,7 @@ public static Try<VersionedModel> getModel( final TestModel model, final KnownVe
    }
 
    public static Try<VersionedModel> getModel( final TestSharedModel model, final KnownVersion knownVersion ) {
-      final String modelsRoot = "/valid/" + knownVersion.toString().toLowerCase();
-      var s = TestSharedModel.class.getResource(modelsRoot +"/"+ TestSharedAspect.RESOURCE_PATH +"/"+ model.getName()+".ttl").getPath();
-      return new AspectModelResolver().resolveAspectModel( new FileSystemStrategy( new File(s.substring(0, s.indexOf( TestSharedModel.RESOURCE_PATH )  )).toPath()), model.getUrn() );
+      final String modelsRoot = "valid/" + knownVersion.toString().toLowerCase();
+      return new AspectModelResolver().resolveAspectModel( new ClasspathStrategy( modelsRoot ), model.getUrn() );
    }
 }