Switch for different variants in AspectEditMoveCommand

Author: atextor

core/esmf-aspect-model-serializer/src/main/java/org/eclipse/esmf/aspectmodel/serializer/AspectSerializer.java

@@ -72,7 +72,8 @@ public String apply( final Aspect aspect ) {
    }
 
    /**
-    * Serializes all files of an Aspect Model to their respective source locations
+    * Serializes all files of an Aspect Model to their respective source locations.
+    * <b>Attention:</b> This method does not check validity of paths or existance of files and will overwrite without further checks.
     *
     * @param aspectModel the Aspect Model
     */
@@ -81,11 +82,13 @@ public void write( final AspectModel aspectModel ) {
    }
 
    /**
-    * Writes the content of an Aspect Model file to its defined source location
+    * Returns a URL for the Aspect Model file if it can be determined.
     *
-    * @param aspectModelFile the Aspect Model file
+    * @param aspectModelFile the input Aspect Model file
+    * @return the Aspect Model file's location as URL
+    * @throws SerializationException if the file has no source location or the source location URI is no URL
     */
-   public void write( final AspectModelFile aspectModelFile ) {
+   public URL aspectModelFileUrl( final AspectModelFile aspectModelFile ) {
       if ( aspectModelFile.sourceLocation().isEmpty() ) {
          throw new SerializationException( "Aspect Model file has no source location" );
       }
@@ -98,13 +101,23 @@ public void write( final AspectModelFile aspectModelFile ) {
          throw new SerializationException( "Aspect Model file can only be written to locations given by URLs" );
       }
 
+      return url;
+   }
+
+   /**
+    * Writes the content of an Aspect Model file to its defined source location
+    *
+    * @param aspectModelFile the Aspect Model file
+    */
+   public void write( final AspectModelFile aspectModelFile ) {
+      final URL url = aspectModelFileUrl( aspectModelFile );
       final Function<URI, OutputStream> protocolHandler = protocolHandlers.get( url.getProtocol() );
       if ( protocolHandler == null ) {
          throw new SerializationException( "Don't know how to write " + url.getProtocol() + " URLs: " + url );
       }
 
       final String content = aspectModelFileToString( aspectModelFile );
-      try ( final OutputStream out = protocolHandler.apply( uri ) ) {
+      try ( final OutputStream out = protocolHandler.apply( aspectModelFile.sourceLocation().get() ) ) {
          out.write( content.getBytes( StandardCharsets.UTF_8 ) );
       } catch ( final IOException exception ) {
          throw new SerializationException( exception );

tools/samm-cli/src/main/java/org/eclipse/esmf/AbstractCommand.java

@@ -46,7 +46,7 @@
 import org.apache.commons.io.FilenameUtils;
 
 public abstract class AbstractCommand implements Runnable {
-   private Path modelsRootForFile( final File file ) {
+   protected Path modelsRootForFile( final File file ) {
       return file.toPath().getParent().getParent().getParent();
    }
 

tools/samm-cli/src/main/java/org/eclipse/esmf/aspect/edit/AspectEditMoveCommand.java

@@ -19,6 +19,7 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.eclipse.esmf.AbstractCommand;
@@ -34,7 +35,9 @@
 import org.eclipse.esmf.aspectmodel.edit.ChangeReport;
 import org.eclipse.esmf.aspectmodel.edit.ChangeReportFormatter;
 import org.eclipse.esmf.aspectmodel.edit.change.MoveElementToExistingFile;
+import org.eclipse.esmf.aspectmodel.edit.change.MoveElementToNewFile;
 import org.eclipse.esmf.aspectmodel.serializer.AspectSerializer;
+import org.eclipse.esmf.aspectmodel.urn.AspectModelUrn;
 import org.eclipse.esmf.exception.CommandException;
 import org.eclipse.esmf.metamodel.AspectModel;
 import org.eclipse.esmf.metamodel.ModelElement;
@@ -111,16 +114,26 @@ public class AspectEditMoveCommand extends AbstractCommand {
 
    @Override
    public void run() {
-      final File file = new File( targetFile );
-      if ( file.exists() ) {
-         if ( targetNamespace == null ) {
+      final String input = parentCommand.parentCommand.getInput();
+
+      if ( targetNamespace == null ) {
+         final File targetFileRelativeToInput = getInputFile( input ).toPath().getParent().resolve( targetFile ).toFile();
+         if ( targetFileRelativeToInput.exists() ) {
             moveElementToExistingFile();
          } else {
-            moveElementToOtherNamespaceExistingFile();
+            moveElementToNewFile();
          }
       } else {
-         if ( targetNamespace == null ) {
-            moveElementToNewFile();
+         final File inputFile = getInputFile( input );
+         final AspectModelUrn targetNamespaceUrn = AspectModelUrn.from( targetNamespace )
+               .getOrElseThrow( () -> new CommandException( "Target namespace is invalid: " + targetNamespace ) );
+         final File targetFileInNewNamespace = modelsRootForFile( inputFile )
+               .resolve( targetNamespaceUrn.getNamespaceMainPart() )
+               .resolve( targetNamespaceUrn.getVersion() )
+               .resolve( targetFile )
+               .toFile();
+         if ( targetFileInNewNamespace.exists() ) {
+            moveElementToOtherNamespaceExistingFile();
          } else {
             moveElementToOtherNamespaceNewFile();
          }
@@ -131,7 +144,21 @@ public void run() {
     * Supports the case {@code samm aspect Aspect.ttl edit move :MyAspect newFile.ttl}
     */
    private void moveElementToNewFile() {
-      // TODO
+      final String input = parentCommand.parentCommand.getInput();
+      final AspectModel aspectModel = loadAspectModelOrFail( input, customResolver );
+
+      // Do refactoring
+      final ModelElement modelElement = determineModelElementToMove( aspectModel );
+      final URI targetFileUri = getInputFile( input ).toPath().getParent().resolve( targetFile ).toUri();
+      final List<String> headerCommentForNewFile = copyHeader
+            ? modelElement.getSourceFile().headerComment()
+            : List.of();
+      final Change move = new MoveElementToNewFile( modelElement, headerCommentForNewFile, Optional.of( targetFileUri ) );
+      final AspectChangeContext changeContext = performRefactoring( aspectModel, move );
+
+      // Check & write changes to file system
+      checkFilesystemConsistency( changeContext );
+      performFileSystemWrite( changeContext );
    }
 
    /**
@@ -160,13 +187,27 @@ private void moveElementToExistingFile() {
       final AspectModel aspectModel = AspectModelBuilder.merge( sourceAspectModel, targetAspectModel );
 
       // Find the loaded AspectModelFile that corresponds to the input targetFile
+      final AspectModelFile targetAspectModelFile = determineTargetAspectModelFile( aspectModel );
+
+      // Do refactoring
+      final ModelElement modelElement = determineModelElementToMove( aspectModel );
+      final Change move = new MoveElementToExistingFile( modelElement, targetAspectModelFile );
+      final AspectChangeContext changeContext = performRefactoring( aspectModel, move );
+
+      // Check & write changes to file system
+      checkFilesystemConsistency( changeContext );
+      performFileSystemWrite( changeContext );
+   }
+
+   private AspectModelFile determineTargetAspectModelFile( final AspectModel aspectModel ) {
       final URI targetFileUri = getInputFile( targetFile ).toURI();
-      final AspectModelFile targetAspectModelFile = aspectModel.files().stream()
+      return aspectModel.files().stream()
             .filter( file -> file.sourceLocation().map( uri -> uri.equals( targetFileUri ) ).orElse( false ) )
             .findFirst()
             .orElseThrow( () -> new CommandException( "Could not determine target file" ) );
+   }
 
-      // Determine the URN for the element to move
+   private ModelElement determineModelElementToMove( final AspectModel aspectModel ) {
       final List<ModelElement> potentialElements = aspectModel.elements().stream()
             .filter( element -> !element.isAnonymous() )
             .filter( element -> element.urn().toString().endsWith( elementName ) )
@@ -183,24 +224,22 @@ private void moveElementToExistingFile() {
                + "\nPlease use the element's full URN." );
          System.exit( 1 );
       }
+      return potentialElements.get( 0 );
+   }
 
-      // Perform the refactoring
+   private AspectChangeContext performRefactoring( final AspectModel aspectModel, final Change change ) {
       final AspectChangeContextConfig config = AspectChangeContextConfigBuilder.builder()
             .detailedChangeReport( details )
             .build();
       final AspectChangeContext changeContext = new AspectChangeContext( config, aspectModel );
-      final ModelElement modelElement = potentialElements.get( 0 );
-      final Change move = new MoveElementToExistingFile( modelElement, targetAspectModelFile );
-      final ChangeReport changeReport = changeContext.applyChange( move );
+      final ChangeReport changeReport = changeContext.applyChange( change );
       if ( dryRun ) {
          System.out.println( "Changes to be performed" );
          System.out.println( "=======================" );
          System.out.println( ChangeReportFormatter.INSTANCE.apply( changeReport, config ) );
          System.exit( 0 );
       }
-
-      checkFilesystemConsistency( changeContext );
-      performFileSystemWrite( changeContext );
+      return changeContext;
    }
 
    private void performFileSystemWrite( final AspectChangeContext changeContext ) {