Reintroduce backwards compatible method signatures

Author: atextor

core/esmf-aspect-model-document-generators/src/main/java/org/eclipse/esmf/aspectmodel/generator/JsonGenerator.java

@@ -71,7 +71,7 @@ public String generateYaml() {
     * @deprecated Use {@link #generateJson()} instead
     */
    @Deprecated( forRemoval = true )
-   public String generateJsonPretty() {
+   public String generateJsonPretty() throws IOException {
       return generateJson();
    }
 
@@ -82,7 +82,7 @@ public String generateJsonPretty() {
     * @deprecated Use {@link #generate(Function)} instead
     */
    @Deprecated( forRemoval = true )
-   public void generateJsonPretty( final Function<String, OutputStream> nameMapper ) {
+   public void generateJsonPretty( final Function<String, OutputStream> nameMapper ) throws IOException {
       generate( nameMapper );
    }
 
@@ -93,13 +93,13 @@ public void generateJsonPretty( final Function<String, OutputStream> nameMapper
     * @deprecated Use {@link #generate(Function)} instead
     */
    @Deprecated( forRemoval = true )
-   public void generateJson( final Function<String, OutputStream> nameMapper ) {
+   public void generateJson( final Function<String, OutputStream> nameMapper ) throws IOException {
       generate( nameMapper );
    }
 
    @Override
    protected void write( final Artifact<String, R> artifact, final Function<String, OutputStream> nameMapper ) {
-      try ( final OutputStream output = nameMapper.apply( aspect.getName() ) ) {
+      try ( final OutputStream output = nameMapper.apply( aspect().getName() ) ) {
          output.write( artifact.serialize() );
          output.flush();
       } catch ( final IOException exception ) {

core/esmf-aspect-model-document-generators/src/main/java/org/eclipse/esmf/aspectmodel/generator/jsonschema/AspectModelJsonSchemaGenerator.java

@@ -26,6 +26,12 @@
 public class AspectModelJsonSchemaGenerator extends JsonGenerator<JsonSchemaGenerationConfig, JsonNode, JsonSchemaArtifact> {
    public static final JsonSchemaGenerationConfig DEFAULT_CONFIG = JsonSchemaGenerationConfigBuilder.builder().build();
 
+   /**
+    * Kept for backwards compatibility
+    */
+   @Deprecated( forRemoval = true )
+   public static final AspectModelJsonSchemaGenerator INSTANCE = new AspectModelJsonSchemaGenerator( null );
+
    public AspectModelJsonSchemaGenerator( final Aspect aspect ) {
       this( aspect, DEFAULT_CONFIG );
    }
@@ -34,6 +40,14 @@ public AspectModelJsonSchemaGenerator( final Aspect aspect, final JsonSchemaGene
       super( aspect, config );
    }
 
+   /**
+    * @deprecated Use {@link #AspectModelJsonSchemaGenerator(Aspect, JsonSchemaGenerationConfig)} and {@link #singleResult()} instead
+    */
+   @Deprecated( forRemoval = true )
+   public JsonSchemaArtifact apply( final Aspect aspect, final JsonSchemaGenerationConfig config ) {
+      return new AspectModelJsonSchemaGenerator( aspect, config ).singleResult();
+   }
+
    @Override
    public Stream<JsonSchemaArtifact> generate() {
       final AspectModelJsonSchemaVisitor visitor = new AspectModelJsonSchemaVisitor( config );

core/esmf-aspect-model-generator/src/main/java/org/eclipse/esmf/aspectmodel/generator/Generator.java renamed to core/esmf-aspect-model-generator/src/main/java/org/eclipse/esmf/aspectmodel/generator/AspectGenerator.java

@@ -69,16 +69,6 @@ protected <E extends ModelElement> Stream<A> applyTemplate(
       return elements( clazz ).map( element -> artifactGenerator.apply( element, config ) );
    }
 
-   protected void writeCharSequenceToOutputStream( final CharSequence charSequence, final OutputStream outputStream )
-         throws IOException {
-      try ( final Writer writer = new OutputStreamWriter( outputStream, StandardCharsets.UTF_8 ) ) {
-         for ( int i = 0; i < charSequence.length(); i++ ) {
-            writer.write( charSequence.charAt( i ) );
-         }
-         writer.flush();
-      }
-   }
-
    /**
     * Generates artifacts from the given Aspect model. As this generation may produce multiple artifacts, the generator
     * provides the caller with the identifer of the respective artifact via the callback function. The caller needs to