Rename AspectChangeContext to AspectChangeManager

Author: atextor

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/edit/AspectChangeContext.java renamed to core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/edit/AspectChangeManager.java

@@ -16,7 +16,6 @@
 import java.util.ArrayDeque;
 import java.util.Deque;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Stream;
@@ -30,21 +29,21 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class AspectChangeContext implements ChangeContext {
-   private static final Logger LOG = LoggerFactory.getLogger( AspectChangeContext.class );
+public class AspectChangeManager implements ChangeContext {
+   private static final Logger LOG = LoggerFactory.getLogger( AspectChangeManager.class );
 
    private final Deque<Change> undoStack = new ArrayDeque<>();
    private final Deque<Change> redoStack = new ArrayDeque<>();
    private final DefaultAspectModel aspectModel;
-   private final AspectChangeContextConfig config;
+   private final AspectChangeManagerConfig config;
    private final Map<AspectModelFile, FileState> fileState = new HashMap<>();
    private boolean isUndoOperation = false;
 
    private enum FileState {
       CREATED, CHANGED, REMOVED
    }
 
-   public AspectChangeContext( final AspectChangeContextConfig config, final AspectModel aspectModel ) {
+   public AspectChangeManager( final AspectChangeManagerConfig config, final AspectModel aspectModel ) {
       this.config = config;
       resetFileStates();
       if ( aspectModel instanceof final DefaultAspectModel defaultAspectModel ) {
@@ -54,8 +53,8 @@ public AspectChangeContext( final AspectChangeContextConfig config, final Aspect
       }
    }
 
-   public AspectChangeContext( final AspectModel aspectModel ) {
-      this( AspectChangeContextConfigBuilder.builder().build(), aspectModel );
+   public AspectChangeManager( final AspectModel aspectModel ) {
+      this( AspectChangeManagerConfigBuilder.builder().build(), aspectModel );
    }
 
    public synchronized ChangeReport applyChange( final Change change ) {
@@ -125,32 +124,29 @@ public Stream<AspectModelFile> aspectModelFiles() {
    }
 
    @Override
-   public AspectChangeContextConfig config() {
+   public AspectChangeManagerConfig config() {
       return config;
    }
 
    @Override
-   public List<AspectModelFile> createdFiles() {
+   public Stream<AspectModelFile> createdFiles() {
       return fileState.entrySet().stream()
             .filter( entry -> entry.getValue() == FileState.CREATED )
-            .map( Map.Entry::getKey )
-            .toList();
+            .map( Map.Entry::getKey );
    }
 
    @Override
-   public List<AspectModelFile> modifiedFiles() {
+   public Stream<AspectModelFile> modifiedFiles() {
       return fileState.entrySet().stream()
             .filter( entry -> entry.getValue() == FileState.CHANGED )
-            .map( Map.Entry::getKey )
-            .toList();
+            .map( Map.Entry::getKey );
    }
 
    @Override
-   public List<AspectModelFile> removedFiles() {
+   public Stream<AspectModelFile> removedFiles() {
       return fileState.entrySet().stream()
             .filter( entry -> entry.getValue() == FileState.REMOVED )
-            .map( Map.Entry::getKey )
-            .toList();
+            .map( Map.Entry::getKey );
    }
 
    @Override

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/edit/AspectChangeContextConfig.java renamed to core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/edit/AspectChangeManagerConfig.java

@@ -18,13 +18,13 @@
 import io.soabase.recordbuilder.core.RecordBuilder;
 
 @RecordBuilder
-public record AspectChangeContextConfig(
+public record AspectChangeManagerConfig(
       List<String> defaultFileHeader,
       boolean detailedChangeReport
 ) {
-   public static AspectChangeContextConfig DEFAULT = AspectChangeContextConfigBuilder.builder().build();
+   public static AspectChangeManagerConfig DEFAULT = AspectChangeManagerConfigBuilder.builder().build();
 
-   public AspectChangeContextConfig {
+   public AspectChangeManagerConfig {
       if ( defaultFileHeader == null ) {
          defaultFileHeader = List.of();
       }

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/edit/ChangeContext.java

@@ -13,21 +13,20 @@
 
 package org.eclipse.esmf.aspectmodel.edit;
 
-import java.util.List;
 import java.util.stream.Stream;
 
 import org.eclipse.esmf.aspectmodel.AspectModelFile;
 
 public interface ChangeContext {
    Stream<AspectModelFile> aspectModelFiles();
 
-   AspectChangeContextConfig config();
+   AspectChangeManagerConfig config();
 
-   List<AspectModelFile> createdFiles();
+   Stream<AspectModelFile> createdFiles();
 
-   List<AspectModelFile> modifiedFiles();
+   Stream<AspectModelFile> modifiedFiles();
 
-   List<AspectModelFile> removedFiles();
+   Stream<AspectModelFile> removedFiles();
 
    void indicateFileIsAdded( AspectModelFile file );
 

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/edit/ChangeReportFormatter.java

@@ -23,7 +23,7 @@
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
 
-public class ChangeReportFormatter implements BiFunction<ChangeReport, AspectChangeContextConfig, String> {
+public class ChangeReportFormatter implements BiFunction<ChangeReport, AspectChangeManagerConfig, String> {
    public static final ChangeReportFormatter INSTANCE = new ChangeReportFormatter();
 
    private ChangeReportFormatter() {
@@ -37,7 +37,7 @@ private void handleSimpleEntry( final StringBuilder builder, final ChangeReport.
    }
 
    private void handleMultipleEntries( final StringBuilder builder, final ChangeReport.MultipleEntries multipleEntries, final String indent,
-         final int indentationLevel, final AspectChangeContextConfig config ) {
+         final int indentationLevel, final AspectChangeManagerConfig config ) {
       if ( multipleEntries.summary() != null ) {
          builder.append( indent );
          builder.append( "- " );
@@ -58,7 +58,7 @@ private void handleMultipleEntries( final StringBuilder builder, final ChangeRep
    }
 
    private void handleEntryWithDetails( final StringBuilder builder, final ChangeReport.EntryWithDetails entryWithDetails,
-         final String indent, final AspectChangeContextConfig config ) {
+         final String indent, final AspectChangeManagerConfig config ) {
       builder.append( indent );
       builder.append( "- " );
       builder.append( entryWithDetails.summary() );
@@ -99,7 +99,7 @@ private void handleEntryWithDetails( final StringBuilder builder, final ChangeRe
       }
    }
 
-   private void append( final StringBuilder builder, final ChangeReport report, final AspectChangeContextConfig config,
+   private void append( final StringBuilder builder, final ChangeReport report, final AspectChangeManagerConfig config,
          final int indentationLevel ) {
       final String indent = "  ".repeat( indentationLevel );
       if ( report instanceof final ChangeReport.SimpleEntry simpleEntry ) {
@@ -123,7 +123,7 @@ private String show( final Model model ) {
    }
 
    @Override
-   public String apply( final ChangeReport changeReport, final AspectChangeContextConfig config ) {
+   public String apply( final ChangeReport changeReport, final AspectChangeManagerConfig config ) {
       final StringBuilder builder = new StringBuilder();
       append( builder, changeReport, config, 0 );
       return builder.toString();