Enable configuring @type attribute for JSON payload in samm-cli

Author: atextor

documentation/developer-guide/modules/tooling-guide/pages/samm-cli.adoc

@@ -166,9 +166,10 @@ of model resolution] for more information.
                                        be generated (default: en)                                                            | `samm aspect AspectModel.ttl to asyncapi -l de`
                                    | _--separate-files, -sf_ : Create separate files for each schema                         |
                                    | _--custom-resolver_ : use an external resolver for the resolution of the model elements |
-.3+| [[aspect-to-json]] aspect <model> to json | Generate example JSON payload data for an Aspect Model                      | `samm aspect AspectModel.ttl to json`
+.4+| [[aspect-to-json]] aspect <model> to json | Generate example JSON payload data for an Aspect Model                      | `samm aspect AspectModel.ttl to json`
                                    | _--output, -o_ : output file path (default: stdout)                                     |
                                    | _--custom-resolver_ : use an external resolver for the resolution of the model elements |
+                                   | _--add-type-attribute_, _-ta_ : Add `@type` attribute for inherited Entities            |
 .3+| [[aspect-to-jsonld]] aspect <model> to jsonld | Generate JSON-LD representation of an Aspect Model                      | `samm aspect AspectModel.ttl to jsonld`
                                    | _--output, -o_ : output file path (default: stdout)                                     |
                                    | _--custom-resolver_ : use an external resolver for the resolution of the model elements |

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

@@ -18,6 +18,8 @@
 import org.eclipse.esmf.ResolverConfigurationMixin;
 import org.eclipse.esmf.aspect.AspectToCommand;
 import org.eclipse.esmf.aspectmodel.generator.json.AspectModelJsonPayloadGenerator;
+import org.eclipse.esmf.aspectmodel.generator.json.JsonPayloadGenerationConfig;
+import org.eclipse.esmf.aspectmodel.generator.json.JsonPayloadGenerationConfigBuilder;
 
 import picocli.CommandLine;
 
@@ -35,6 +37,12 @@ public class AspectToJsonCommand extends AbstractCommand {
          description = "Output file path" )
    private String outputFilePath = "-";
 
+   @SuppressWarnings( "FieldCanBeLocal" )
+   @CommandLine.Option(
+         names = { "--add-type-attribute", "-ta" },
+         description = "Add @type attribute for inherited Entities" )
+   private boolean addTypeAttribute = false;
+
    @SuppressWarnings( "FieldCanBeLocal" )
    @CommandLine.Option(
          names = { "--details" },
@@ -55,8 +63,11 @@ public void run() {
       setDetails( details );
       setResolverConfig( resolverConfiguration );
 
+      final JsonPayloadGenerationConfig config = JsonPayloadGenerationConfigBuilder.builder()
+            .addTypeAttributeForEntityInheritance( addTypeAttribute )
+            .build();
       final AspectModelJsonPayloadGenerator generator = new AspectModelJsonPayloadGenerator(
-            getInputHandler( parentCommand.parentCommand.getInput() ).loadAspect() );
+            getInputHandler( parentCommand.parentCommand.getInput() ).loadAspect(), config );
       // we intentionally override the name of the generated artifact here to the name explicitly desired by the user (outputFilePath),
       // as opposed to what the model thinks it should be called (name)
       generator.generate( name -> getStreamForFile( outputFilePath ) );