Remove usage of deprecated internal APIs

Author: atextor

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

@@ -22,7 +22,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
@@ -36,6 +35,8 @@
 import org.eclipse.esmf.aspectmodel.edit.ChangeReportFormatter;
 import org.eclipse.esmf.aspectmodel.generator.LanguageCollector;
 import org.eclipse.esmf.aspectmodel.generator.diagram.AspectModelDiagramGenerator;
+import org.eclipse.esmf.aspectmodel.generator.diagram.DiagramGenerationConfig;
+import org.eclipse.esmf.aspectmodel.generator.diagram.DiagramGenerationConfigBuilder;
 import org.eclipse.esmf.aspectmodel.serializer.AspectSerializer;
 import org.eclipse.esmf.exception.CommandException;
 import org.eclipse.esmf.metamodel.Aspect;
@@ -79,19 +80,21 @@ protected InputHandler getInputHandler( final String input ) {
       throw new CommandException( "Can not find file: " + input );
    }
 
-   protected void generateDiagram( final String input, final AspectModelDiagramGenerator.Format targetFormat,
+   protected void generateDiagram( final String input, final DiagramGenerationConfig.Format targetFormat,
          final String outputFileName, final String languageTag ) throws IOException {
       final Aspect aspect = getInputHandler( input ).loadAspect();
-      final AspectModelDiagramGenerator generator = new AspectModelDiagramGenerator( aspect );
-      final Set<AspectModelDiagramGenerator.Format> targetFormats = new HashSet<>();
-      targetFormats.add( targetFormat );
       final Set<Locale> languagesUsedInModel = LanguageCollector.collectUsedLanguages( aspect );
       if ( !languagesUsedInModel.contains( Locale.forLanguageTag( languageTag ) ) ) {
          throw new CommandException( String.format( "The model does not contain the desired language: %s.", languageTag ) );
       }
       // we intentionally override the name of the generated artifact here to the name explicitly desired by the user (outputFileName),
       // as opposed to what the model thinks it should be called (name)
-      generator.generateDiagrams( targetFormats, Locale.forLanguageTag( languageTag ), name -> getStreamForFile( outputFileName ) );
+      final DiagramGenerationConfig config = DiagramGenerationConfigBuilder.builder()
+            .format( targetFormat )
+            .language( Locale.forLanguageTag( languageTag ) )
+            .build();
+      final AspectModelDiagramGenerator generator = new AspectModelDiagramGenerator( aspect, config );
+      generator.generate( name -> getStreamForFile( outputFileName ) );
    }
 
    protected FileOutputStream getStreamForFile( final String artifactPath, final String artifactName, final String baseOutputPath ) {

tools/samm-cli/src/main/java/org/eclipse/esmf/aspect/to/AspectToPngCommand.java

@@ -20,6 +20,7 @@
 import org.eclipse.esmf.ResolverConfigurationMixin;
 import org.eclipse.esmf.aspect.AspectToCommand;
 import org.eclipse.esmf.aspectmodel.generator.diagram.AspectModelDiagramGenerator;
+import org.eclipse.esmf.aspectmodel.generator.diagram.DiagramGenerationConfig;
 import org.eclipse.esmf.exception.CommandException;
 
 import picocli.CommandLine;
@@ -67,7 +68,7 @@ public void run() {
       setResolverConfig( resolverConfiguration );
 
       try {
-         generateDiagram( parentCommand.parentCommand.getInput(), AspectModelDiagramGenerator.Format.PNG, outputFilePath, language );
+         generateDiagram( parentCommand.parentCommand.getInput(), DiagramGenerationConfig.Format.PNG, outputFilePath, language );
       } catch ( final IOException e ) {
          throw new CommandException( e );
       }

tools/samm-cli/src/main/java/org/eclipse/esmf/aspect/to/AspectToSqlCommand.java

@@ -51,12 +51,12 @@ public class AspectToSqlCommand extends AbstractCommand {
 
    @CommandLine.Option(
          names = { "--dialect", "-d" },
-         description = "The SQL dialect to generate for (default: ${DEFAULT-VALUE}" )
+         description = "The SQL dialect to generate for (default: ${DEFAULT-VALUE})" )
    private SqlGenerationConfig.Dialect dialect = SqlGenerationConfig.Dialect.DATABRICKS;
 
    @CommandLine.Option(
          names = { "--mapping-strategy", "-s" },
-         description = "The mapping strategy to use (default: ${DEFAULT-VALUE}" )
+         description = "The mapping strategy to use (default: ${DEFAULT-VALUE})" )
    private SqlGenerationConfig.MappingStrategy strategy = SqlGenerationConfig.MappingStrategy.DENORMALIZED;
 
    @CommandLine.Option(

tools/samm-cli/src/main/java/org/eclipse/esmf/aspect/to/AspectToSvgCommand.java

@@ -20,6 +20,7 @@
 import org.eclipse.esmf.ResolverConfigurationMixin;
 import org.eclipse.esmf.aspect.AspectToCommand;
 import org.eclipse.esmf.aspectmodel.generator.diagram.AspectModelDiagramGenerator;
+import org.eclipse.esmf.aspectmodel.generator.diagram.DiagramGenerationConfig;
 import org.eclipse.esmf.exception.CommandException;
 
 import picocli.CommandLine;
@@ -66,7 +67,7 @@ public void run() {
       setResolverConfig( resolverConfiguration );
 
       try {
-         generateDiagram( parentCommand.parentCommand.getInput(), AspectModelDiagramGenerator.Format.SVG, outputFilePath, language );
+         generateDiagram( parentCommand.parentCommand.getInput(), DiagramGenerationConfig.Format.SVG, outputFilePath, language );
       } catch ( final IOException e ) {
          throw new CommandException( e );
       }