Specify model namespace definition

Author: Yauhenikapl

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/loader/AspectModelLoader.java

@@ -16,12 +16,15 @@
 import static java.util.stream.Collectors.toSet;
 
 import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Path;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Deque;
+import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -30,6 +33,8 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
 
 import org.eclipse.esmf.aspectmodel.AspectModelFile;
 import org.eclipse.esmf.aspectmodel.resolver.AspectModelFileLoader;
@@ -173,6 +178,38 @@ public AspectModel load( final InputStream inputStream ) {
       return buildAspectModel( loaderContext.loadedFiles() );
    }
 
+   public AspectModel loadFromArchive( final String pathToArchive ) {
+      File zipFile = new File( pathToArchive );
+
+      if (!zipFile.exists() || !zipFile.isFile()) {
+         throw new RuntimeException(new FileNotFoundException("The specified file does not exist or is not a file."));
+      }
+
+      List<AspectModelFile> aspectModelFiles = new ArrayList<>();
+
+      try ( ZipFile zip = new ZipFile( zipFile ) ) {
+         Enumeration<? extends ZipEntry> entries = zip.entries();
+
+         while ( entries.hasMoreElements() ) {
+            ZipEntry entry = entries.nextElement();
+            System.out.println( entry.getName() ); // Consider removing or modifying this debug statement in production.
+
+            if ( entry.getName().endsWith( ".ttl" ) ) {
+               try ( InputStream inputStream = zip.getInputStream( entry ) ) {
+                  AspectModelFile aspectModelFile = AspectModelFileLoader.load( inputStream );
+                  aspectModelFiles.add( aspectModelFile );
+               } catch ( IOException e ) {
+                  System.err.println( "Error reading entry: " + entry.getName() + " - " + e.getMessage() );
+               }
+            }
+         }
+      } catch ( IOException e ) {
+         System.err.println( "Error reading the ZIP file: " + e.getMessage() );
+      }
+
+      return buildAspectModel( aspectModelFiles );
+   }
+
    private AspectModelFile migrate( final AspectModelFile file ) {
       return MetaModelVersionMigrator.INSTANCE.apply( file );
    }

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/metamodel/impl/DefaultNamespace.java

@@ -44,7 +44,7 @@ public DefaultNamespace( final String packagePart, final VersionNumber versionNu
     * @param elements the list of elements in the namspace
     */
    public DefaultNamespace( final String uri, final List<ModelElement> elements, final Optional<AspectModelFile> source ) {
-      this( uri.split( ":" )[2], VersionNumber.parse( uri.split( ":" )[3] ), elements, source );
+      this( uri.split( ":" )[2], VersionNumber.parse( uri.split( ":" )[3].replace( "#", "" ) ), elements, source );
    }
 
    //   /**

core/esmf-aspect-meta-model-java/src/test/java/org/eclipse/esmf/aspectmodel/loader/AspectModelLoaderTest.java

@@ -15,12 +15,17 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import org.eclipse.esmf.metamodel.AbstractEntity;
+import org.eclipse.esmf.metamodel.AspectModel;
 import org.eclipse.esmf.metamodel.ComplexType;
 import org.eclipse.esmf.test.TestAspect;
 import org.eclipse.esmf.test.TestResources;
@@ -30,17 +35,34 @@
 class AspectModelLoaderTest {
    @Test
    public void testOfAbstractEntityCyclomaticCreation() {
-      final Map<String, ComplexType> entities =
-            TestResources.load( TestAspect.ASPECT_WITH_MULTIPLE_ENTITIES_SAME_EXTEND ).elements().stream()
-                  .filter( ComplexType.class::isInstance )
-                  .map( ComplexType.class::cast )
-                  .collect( Collectors.toMap( ComplexType::getName, Function.identity() ) );
+      final Map<String, ComplexType> entities = TestResources.load( TestAspect.ASPECT_WITH_MULTIPLE_ENTITIES_SAME_EXTEND ).elements()
+            .stream().filter( ComplexType.class::isInstance ).map( ComplexType.class::cast )
+            .collect( Collectors.toMap( ComplexType::getName, Function.identity() ) );
 
       assertThat( entities ).extracting( "AbstractTestEntity" ).isInstanceOf( AbstractEntity.class );
       final AbstractEntity abstractEntity = (AbstractEntity) entities.get( "AbstractTestEntity" );
-      assertThat( entities ).extracting( "testEntityOne" ).isInstanceOfSatisfying( ComplexType.class, type ->
-            assertThat( type ).extracting( ComplexType::getExtends ).extracting( Optional::get ).isSameAs( abstractEntity ) );
-      assertThat( entities ).extracting( "testEntityTwo" ).isInstanceOfSatisfying( ComplexType.class, type ->
-            assertThat( type ).extracting( ComplexType::getExtends ).extracting( Optional::get ).isSameAs( abstractEntity ) );
+      assertThat( entities ).extracting( "testEntityOne" ).isInstanceOfSatisfying( ComplexType.class,
+            type -> assertThat( type ).extracting( ComplexType::getExtends ).extracting( Optional::get ).isSameAs( abstractEntity ) );
+      assertThat( entities ).extracting( "testEntityTwo" ).isInstanceOfSatisfying( ComplexType.class,
+            type -> assertThat( type ).extracting( ComplexType::getExtends ).extracting( Optional::get ).isSameAs( abstractEntity ) );
+   }
+
+   @Test
+   public void testLoadAspectModelFromZipArchive() throws URISyntaxException {
+      final ClassLoader classLoader = getClass().getClassLoader();
+      final Path archivePath = Paths.get( classLoader.getResource( "namespaces.zip" ).toURI() );
+      final AspectModel aspectModel = new AspectModelLoader().loadFromArchive( archivePath.toString() );
+
+      assertThat( aspectModel.namespaces() ).hasSize( 2 );
+      assertThat( aspectModel.namespaces().get( 0 ).getName() ).contains( "urn:samm:org.eclipse.examples:1.1.0" );
+      assertThat( aspectModel.namespaces().get( 1 ).getName() ).contains( "urn:samm:org.eclipse.examples:1.0.0" );
+
+      final List<String> aspectsNames = List.of( "Movement2", "Movement3", "Movement", "SimpleAspect" );
+
+      assertThat( aspectModel.files() ).hasSize( 4 );
+      assertThat( aspectModel.files() )
+            .anySatisfy( aspectModelFile -> {
+               assertThat( aspectsNames ).contains( aspectModelFile.aspect().getName() );
+            } );
    }
 }