Add validate package before importing it

Author: michelu89

aspect-model-editor-service/src/main/java/org/eclipse/esmf/ame/services/PackageService.java

@@ -13,6 +13,7 @@
 
 package org.eclipse.esmf.ame.services;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -33,6 +34,7 @@
 import org.eclipse.esmf.ame.exceptions.FileNotFoundException;
 import org.eclipse.esmf.ame.services.models.Version;
 import org.eclipse.esmf.ame.services.utils.ModelGroupingUtils;
+import org.eclipse.esmf.ame.services.utils.ModelUtils;
 import org.eclipse.esmf.aspectmodel.AspectModelFile;
 import org.eclipse.esmf.aspectmodel.edit.AspectChangeManager;
 import org.eclipse.esmf.aspectmodel.edit.AspectChangeManagerConfig;
@@ -46,6 +48,7 @@
 import org.eclipse.esmf.aspectmodel.resolver.exceptions.ModelResolutionException;
 import org.eclipse.esmf.aspectmodel.resolver.fs.ModelsRoot;
 import org.eclipse.esmf.aspectmodel.resolver.fs.StructuredModelsRoot;
+import org.eclipse.esmf.aspectmodel.resolver.modelfile.RawAspectModelFile;
 import org.eclipse.esmf.aspectmodel.resolver.modelfile.RawAspectModelFileBuilder;
 import org.eclipse.esmf.aspectmodel.serializer.AspectSerializer;
 import org.eclipse.esmf.aspectmodel.urn.AspectModelUrn;
@@ -80,7 +83,38 @@ public byte[] exportPackage( final String aspectModelUrn ) {
             .orElseThrow( () -> new FileNotFoundException( String.format( "No file found for %s", aspectModelUrn ) ) ).getContent();
    }
 
-   public Map<String, List<Version>> importPackage( final CompletedFileUpload zipFile, final List<String> filesToImport ) {
+   public List<Map<String, String>> validatePackage( final CompletedFileUpload zipFile ) {
+      try {
+         final byte[] zipContent = IOUtils.toByteArray( zipFile.getInputStream() );
+         final NamespacePackage namespacePackage = new NamespacePackage( zipContent, null );
+
+         return namespacePackage.loadContents().flatMap( file -> {
+                  final ByteArrayInputStream inputStream =
+                        ModelUtils.createInputStream( ( (RawAspectModelFile) file ).sourceRepresentation() );
+                  final AspectModel aspectModel = aspectModelLoader.load( inputStream );
+                  if ( aspectModel != null ) {
+                     return aspectModel.files().stream()
+                           .flatMap( aspectModelFile -> {
+                              try {
+                                 return aspectModelLoader.load( aspectModelFile.elements().getFirst().urn() )
+                                       .files().stream().map( AspectModelFile::filename )
+                                       .filter( Optional::isPresent ).map( Optional::get );
+                              } catch ( final ModelResolutionException e ) {
+                                 LOG.info( "Ignoring Exception" );
+                                 return Stream.empty();
+                              }
+                           } );
+                  }
+                  return Stream.empty();
+               } )
+               .map( filename -> Map.of( "model", filename ) )
+               .toList();
+      } catch ( final IOException e ) {
+         throw new ModelResolutionException( "Could not read from input", e );
+      }
+   }
+
+   public Map<String, List<Version>> importPackage( final CompletedFileUpload zipFile ) {
       try {
          final ModelsRoot modelsRoot = new StructuredModelsRoot( this.modelPath );
          final byte[] zipContent = IOUtils.toByteArray( zipFile.getInputStream() );
@@ -92,9 +126,7 @@ public Map<String, List<Version>> importPackage( final CompletedFileUpload zipFi
          final AspectChangeManager changeManager = initChangeManager();
          changeManager.applyChange( new ChangeGroup( fileChanges ) );
 
-         final Stream<AspectModelFile> selectedFiles = filterImportedFiles( changeManager, filesToImport );
-
-         final Stream<URI> savedUris = saveAspectModelFiles( selectedFiles );
+         final Stream<URI> savedUris = saveAspectModelFiles( changeManager.aspectModelFiles() );
 
          return new ModelGroupingUtils( this.aspectModelLoader, this.modelPath ).groupModelsByNamespaceAndVersion( savedUris );
       } catch ( final IOException e ) {
@@ -116,11 +148,6 @@ private AspectChangeManager initChangeManager() {
       return new AspectChangeManager( config, new AspectModelLoader().emptyModel() );
    }
 
-   private Stream<AspectModelFile> filterImportedFiles( final AspectChangeManager changeManager, final List<String> filesToImport ) {
-      return changeManager.aspectModelFiles().filter(
-            file -> filesToImport.stream().anyMatch( path -> file.sourceLocation().map( URI::toString ).orElse( "" ).contains( path ) ) );
-   }
-
    private Stream<URI> saveAspectModelFiles( final Stream<AspectModelFile> files ) {
       return files.peek( this::ensureParentDirectoryExists ).peek( AspectSerializer.INSTANCE::write ).map( AspectModelFile::sourceLocation )
             .filter( Optional::isPresent ).map( Optional::get );

aspect-model-editor-service/src/test/java/org/eclipse/esmf/ame/services/PackageServiceTest.java

@@ -26,7 +26,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
-import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.zip.ZipEntry;
@@ -81,8 +80,7 @@ void testImportAspectModelPackage() throws IOException {
 
       final CompletedFileUpload mockedZipFile = new MockFileUpload( "TestArchive.zip", testPackage, MediaType.APPLICATION_PDF_TYPE );
 
-      packageService.importPackage( mockedZipFile,
-            List.of( "org.eclipse.esmf.example/1.0.0/Esmf.ttl", "org.eclipse.esmf.test/1.0.0/Movement.ttl" ) );
+      packageService.importPackage( mockedZipFile );
 
       try ( final ZipInputStream zis = new ZipInputStream( new ByteArrayInputStream( testPackage ) ) ) {
          ZipEntry entry;