Refactor workspace migration to accept storage path

Updated ModelService and related calls to require an explicit metaModelStoragePath parameter for workspace migration, removing reliance on ApplicationSettings within the service. Adjusted tests, controller, and properties to support this change and improved configuration clarity.

Author: michelu89

aspect-model-editor-runtime/src/main/resources/application-dev.properties

@@ -17,8 +17,6 @@ micronaut.server.host=127.0.0.1
 micronaut.security.enabled=false
 # Logging Configuration
 logger.levels.root=INFO
-logger.levels.io.micronaut=INFO
-logger.levels.io.micronaut.security=INFO
 # Multipart Configuration
 micronaut.server.multipart.enabled=true
 micronaut.server.multipart.file-size-threshold=100MB

aspect-model-editor-runtime/src/main/resources/application-mac.properties

@@ -17,8 +17,6 @@ micronaut.server.host=127.0.0.1
 micronaut.security.enabled=false
 # Logging Configuration
 logger.levels.root=INFO
-logger.levels.io.micronaut=INFO
-logger.levels.io.micronaut.security=INFO
 # Multipart Configuration
 micronaut.server.multipart.enabled=true
 micronaut.server.multipart.file-size-threshold=100MB

aspect-model-editor-runtime/src/main/resources/application.properties

@@ -21,8 +21,6 @@ micronaut.server.configurations.all.allowed-methods=["*"]
 micronaut.server.configurations.all.allowed-headers=["*"]
 # Logging Configuration
 logger.levels.root=INFO
-logger.levels.io.micronaut=INFO
-logger.levels.io.micronaut.security=INFO
 # Multipart Configuration
 micronaut.server.multipart.enabled=true
 micronaut.server.multipart.file-size-threshold=100MB

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

@@ -22,7 +22,6 @@
 import java.util.Map;
 import java.util.function.Supplier;
 
-import org.eclipse.esmf.ame.config.ApplicationSettings;
 import org.eclipse.esmf.ame.exceptions.CreateFileException;
 import org.eclipse.esmf.ame.exceptions.FileHandlingException;
 import org.eclipse.esmf.ame.exceptions.FileNotFoundException;
@@ -168,20 +167,22 @@ public Map<String, List<Version>> getAllNamespaces( final boolean onlyAspectMode
       }
    }
 
-   public MigrationResult migrateWorkspace( final boolean setNewVersion ) {
+   public MigrationResult migrateWorkspace( final boolean setNewVersion, final Path metaModelStoragePath ) {
       final List<String> errors = new ArrayList<>();
 
       try {
          getAllNamespaces( false ).forEach(
-               ( namespace, versions ) -> versions.forEach( version -> processVersion( namespace, version, setNewVersion, errors ) ) );
+               ( namespace, versions ) -> versions.forEach(
+                     version -> processVersion( namespace, version, setNewVersion, errors, metaModelStoragePath ) ) );
          return new MigrationResult( true, errors );
       } catch ( final Exception e ) {
          errors.add( e.getMessage() );
          return new MigrationResult( false, errors );
       }
    }
 
-   private void processVersion( final String namespace, final Version version, final boolean setNewVersion, final List<String> errors ) {
+   private void processVersion( final String namespace, final Version version, final boolean setNewVersion, final List<String> errors,
+         final Path metaModelStoragePath ) {
       version.getModels().forEach( model -> {
          try {
             final boolean isNotLatestKnownVersion = KnownVersion.fromVersionString( model.getVersion() )
@@ -195,7 +196,7 @@ private void processVersion( final String namespace, final Version version, fina
             final AspectModel aspectModel = aspectModelLoader.load( aspectModelPath.toFile() );
 
             if ( setNewVersion ) {
-               applyNamespaceVersionChange( aspectModel, errors );
+               applyNamespaceVersionChange( aspectModel, errors, metaModelStoragePath );
                return;
             }
 
@@ -206,7 +207,7 @@ private void processVersion( final String namespace, final Version version, fina
       } );
    }
 
-   private void applyNamespaceVersionChange( final AspectModel aspectModel, final List<String> errors ) {
+   private void applyNamespaceVersionChange( final AspectModel aspectModel, final List<String> errors, final Path metaModelStoragePath ) {
       try {
          final AspectModelFile originalFile = aspectModel.files().getFirst();
          final AspectChangeManager changeManager = new AspectChangeManager( aspectModel );
@@ -231,7 +232,7 @@ private void applyNamespaceVersionChange( final AspectModel aspectModel, final L
 
          ModelUtils.createFile( updatedFile.namespaceUrn(),
                updatedFile.filename().orElseThrow( () -> new FileHandlingException( "Filename missing" ) ),
-               ApplicationSettings.getMetaModelStoragePath() );
+               metaModelStoragePath );
 
          AspectSerializer.INSTANCE.write( updatedFile );
       } catch ( final IOException e ) {

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

@@ -179,7 +179,7 @@ public Path modelPath() {
 
    @Test
    void testMigrateWorkspaceWithoutVersionUpgrade() throws IOException {
-      final MigrationResult migrationResult = modelService.migrateWorkspace( false );
+      final MigrationResult migrationResult = modelService.migrateWorkspace( false, MIGRATION_WORKSPACE_PATH );
 
       assertTrue( migrationResult.isSuccess() );
 
@@ -201,7 +201,7 @@ void testMigrateWorkspaceWithoutVersionUpgrade() throws IOException {
 
    @Test
    void testMigrateWorkspaceWithVersionUpgrade() throws IOException {
-      final MigrationResult migrationResult = modelService.migrateWorkspace( true );
+      final MigrationResult migrationResult = modelService.migrateWorkspace( true, MIGRATION_WORKSPACE_PATH );
 
       assertTrue( migrationResult.isSuccess() );
 

aspect-model-editor-service/src/test/resources/application-test.properties

@@ -11,4 +11,5 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # Logging Configuration
-logger.levels.root=ERROR
+setting.meta-model-path=/tmp/test-meta-model-path
+logger.levels.root=info

aspect-model-editor-web/src/main/java/org/eclipse/esmf/ame/api/ModelController.java

@@ -166,6 +166,6 @@ public HttpResponse<Map<String, List<Version>>> getAllNamespaces(
     */
    @Get( uri = "migrate-workspace" )
    public HttpResponse<MigrationResult> migrateWorkspace( @QueryValue( defaultValue = "false" ) final boolean setNewVersion ) {
-      return HttpResponse.ok( modelService.migrateWorkspace( setNewVersion ) );
+      return HttpResponse.ok( modelService.migrateWorkspace( setNewVersion, ApplicationSettings.getMetaModelStoragePath() ) );
    }
 }