Remove unneeded legacy class 'AbstractGenerator'

org.eclipse.esmf.aspectmodel.generator.Generator already fulfills this task

Author: atextor

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

@@ -21,18 +21,15 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import org.eclipse.esmf.aspectmodel.generator.jsonschema.AspectModelJsonSchemaGenerator;
 import org.eclipse.esmf.aspectmodel.urn.AspectModelUrn;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.TextNode;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
-import com.fasterxml.jackson.dataformat.yaml.YAMLMapper;
 import com.fasterxml.jackson.dataformat.yaml.util.StringQuotingChecker;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Streams;
@@ -133,14 +130,14 @@ private JsonNode updateRefValues( final JsonNode node, final Map<String, String>
    protected Map<Path, JsonNode> getContentWithSeparateSchemasAsJson( final Optional<String> mainSpec ) {
       final JsonNode jsonContent = getContent();
       final String aspectName = AspectModelUrn.fromUrn(
-            jsonContent.get( "info" ).get( AbstractGenerator.SAMM_EXTENSION ).asText() ).getName();
+            jsonContent.get( "info" ).get( AspectModelJsonSchemaGenerator.SAMM_EXTENSION ).asText() ).getName();
       return getSeparateSchemas( aspectName, "json", mainSpec );
    }
 
    protected Map<Path, String> getContentWithSeparateSchemasAsYaml( final Optional<String> mainSpec ) {
       final JsonNode jsonContent = getContent();
       final String aspectName = AspectModelUrn.fromUrn(
-            jsonContent.get( "info" ).get( AbstractGenerator.SAMM_EXTENSION ).asText() ).getName();
+            jsonContent.get( "info" ).get( AspectModelJsonSchemaGenerator.SAMM_EXTENSION ).asText() ).getName();
       return getSeparateSchemas( aspectName, "yaml", mainSpec ).entrySet().stream().collect( Collectors.toMap(
             Map.Entry::getKey, entry -> jsonToYaml( entry.getValue() ) ) );
    }

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

@@ -7,9 +7,9 @@
 import java.util.stream.Stream;
 
 import org.eclipse.esmf.aspectmodel.VersionNumber;
-import org.eclipse.esmf.aspectmodel.generator.AbstractGenerator;
 import org.eclipse.esmf.aspectmodel.generator.JsonGenerator;
 import org.eclipse.esmf.aspectmodel.generator.XsdToJsonTypeMapping;
+import org.eclipse.esmf.aspectmodel.generator.jsonschema.AspectModelJsonSchemaGenerator;
 import org.eclipse.esmf.aspectmodel.urn.AspectModelUrn;
 import org.eclipse.esmf.metamodel.Aspect;
 import org.eclipse.esmf.metamodel.Event;
@@ -67,7 +67,7 @@ public Stream<AsyncApiSchemaArtifact> generate() {
          info.put( TITLE_FIELD, aspect().getPreferredName( config.locale() ) + " MQTT API" );
          info.put( "version", apiVersion );
          info.put( DESCRIPTION_FIELD, getDescription( aspect().getDescription( config.locale() ) ) );
-         info.put( AbstractGenerator.SAMM_EXTENSION, aspect().urn().toString() );
+         info.put( AspectModelJsonSchemaGenerator.SAMM_EXTENSION, aspect().urn().toString() );
 
          rootNode.set( "channels", getChannelNode( aspect(), config ) );
          if ( !aspect().getEvents().isEmpty() || !aspect().getOperations().isEmpty() ) {

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

@@ -24,6 +24,8 @@
  * Generator that generates a JSON Schema for payloads corresponding to a given Aspect model.
  */
 public class AspectModelJsonSchemaGenerator extends JsonGenerator<JsonSchemaGenerationConfig, JsonNode, JsonSchemaArtifact> {
+   public static final String SAMM_EXTENSION = "x-samm-aspect-model-urn";
+
    public static final JsonSchemaGenerationConfig DEFAULT_CONFIG = JsonSchemaGenerationConfigBuilder.builder().build();
 
    /**

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

@@ -25,7 +25,6 @@
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import org.eclipse.esmf.aspectmodel.generator.AbstractGenerator;
 import org.eclipse.esmf.aspectmodel.generator.DocumentGenerationException;
 import org.eclipse.esmf.aspectmodel.generator.XsdToJsonTypeMapping;
 import org.eclipse.esmf.aspectmodel.visitor.AspectVisitor;
@@ -650,7 +649,7 @@ private ObjectNode addDescription( final ObjectNode node, final ModelElement des
 
    private void addSammExtensionAttribute( final ObjectNode node, final ModelElement describedElement ) {
       if ( !describedElement.isAnonymous() ) {
-         node.put( AbstractGenerator.SAMM_EXTENSION, describedElement.urn().toString() );
+         node.put( AspectModelJsonSchemaGenerator.SAMM_EXTENSION, describedElement.urn().toString() );
       }
    }
 }

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

@@ -36,7 +36,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.eclipse.esmf.aspectmodel.generator.AbstractGenerator;
 import org.eclipse.esmf.aspectmodel.generator.JsonGenerator;
 import org.eclipse.esmf.aspectmodel.generator.jsonschema.AspectModelJsonSchemaGenerator;
 import org.eclipse.esmf.aspectmodel.generator.jsonschema.AspectModelJsonSchemaVisitor;
@@ -137,7 +136,7 @@ public Stream<OpenApiSchemaArtifact> generate() {
          ( (ObjectNode) rootNode.get( "info" ) )
                .put( "title", aspect().getPreferredName( config.locale() ) )
                .put( "version", apiVersion )
-               .put( AbstractGenerator.SAMM_EXTENSION, aspect().urn().toString() );
+               .put( AspectModelJsonSchemaGenerator.SAMM_EXTENSION, aspect().urn().toString() );
          setServers( rootNode, config.baseUrl(), apiVersion, READ_SERVER_PATH );
          final boolean includePaging = includePaging( aspect(), config.pagingOption() );
          setOptionalSchemas( aspect(), config, includePaging, rootNode );

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

@@ -21,7 +21,7 @@
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 
-import org.eclipse.esmf.aspectmodel.generator.AbstractGenerator;
+import org.eclipse.esmf.aspectmodel.generator.jsonschema.AspectModelJsonSchemaGenerator;
 import org.eclipse.esmf.aspectmodel.visitor.AspectVisitor;
 import org.eclipse.esmf.metamodel.Aspect;
 import org.eclipse.esmf.metamodel.Characteristic;
@@ -181,7 +181,7 @@ public String visitAspect( final Aspect aspect, final Context context ) {
             columnDeclarations,
             columnDeclarations.isEmpty() ? "" : "\n",
             comment,
-            AbstractGenerator.SAMM_EXTENSION,
+            AspectModelJsonSchemaGenerator.SAMM_EXTENSION,
             aspect.urn()
       );
    }