#691 Review comments addressed

Author: CSV1KOR

core/esmf-aspect-model-java-generator/src/main/java/org/eclipse/esmf/aspectmodel/java/JavaCodeGenerationConfig.java

@@ -35,7 +35,7 @@
 @RecordBuilder
 public record JavaCodeGenerationConfig(
       boolean enableJacksonAnnotations,
-      boolean disableJsonFormatJacksonAnnotation,
+      boolean enableJacksonAnnotationJsonFormatShapeObject,
       JsonTypeInfoType jsonTypeInfo,
       String packageName,
       ImportTracker importTracker,
@@ -45,6 +45,7 @@ public record JavaCodeGenerationConfig(
       String namePostfix
 
 ) implements GenerationConfig {
+   enableJacksonAnnotationJsonFormatShapeObject = true;
    public enum JsonTypeInfoType {
       NONE, CLASS, MINIMAL_CLASS, NAME, SIMPLE_NAME, DEDUCTION, CUSTOM
    }

core/esmf-aspect-model-java-generator/src/main/resources/java-enumeration-class-body-lib.vm

@@ -22,7 +22,7 @@ $codeGenerationConfig.importTracker().importExplicit( $Arrays )
 /**
 * Generated class {@link ${enumeration.name}}.
 */
-#if( !$codeGenerationConfig.disableJsonFormatJacksonAnnotation() && $codeGenerationConfig.enableJacksonAnnotations() )@JsonFormat(shape = JsonFormat.Shape.OBJECT) #end
+#if( $codeGenerationConfig.enableJacksonAnnotationJsonFormatShapeObject() && $codeGenerationConfig.enableJacksonAnnotations() )@JsonFormat(shape = JsonFormat.Shape.OBJECT) #end
 public enum ${enumeration.name} {
 #foreach( $value in $enumeration.values )
     $util.generateEnumKey($value)($util.generateEnumValue($value, $codeGenerationConfig))

documentation/developer-guide/modules/tooling-guide/pages/maven-plugin.adoc

@@ -156,6 +156,7 @@ are replaced using `packageName` | `String` | none | {nok}
 | `templateFile` | The path and name of the velocity template file containing the macro library. See xref:java-aspect-tooling.adoc#providing-custom-macros-for-code-generation[Providing Custom Macros for Code Generation]. | `String` | none | {nok}
 | `executeLibraryMacros` | Execute the macros provided in the velocity macro library. | `Boolean` | `false` | {nok}
 | `disableJacksonAnnotations` | Leads to generated Java code that does not contain https://github.com/FasterXML/jackson[Jackson] annotations. | `Boolean` | `false` | {nok}
+| `disableJacksonAnnotationJsonFormatShapeObject` | Leads to generated Java code that does not contain https://github.com/FasterXML/jackson-annotations/blob/2.19/src/main/java/com/fasterxml/jackson/annotation/JsonFormat.java[JsonFormat.Shape] annotation. | `Boolean` | `false` | {nok}
 | `jsonTypeInfo` | If Jackson annotations are enabled, determines the value of `JsonTypeInfo.Id`, e.g., `NAME`.  | `String` | `DEDUCTION` | {nok}
 | `skip` | Skip execution of plugin and generation | `Boolean` | `false` | {nok}
 | `namePrefix` | Name prefix for generated Aspect, Entity Java classes | `String` | none | {nok}

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

@@ -111,6 +111,8 @@ of model resolution] for more information.
                                    | _--package-name, -pn_ : package to use for generated Java classes                       | `samm aspect AspectModel.ttl to java -pn org.company.product`
                                    | _--no-jackson, -nj_ : disable https://github.com/FasterXML/jackson[Jackson] annotation
                                        generation in generated Java classes                                                  |
+                                   | _--no-jackson-jsonformat-shape, -njjs_ : disable https://github.com/FasterXML/jackson-annotations/blob/2.19/src/main/java/com/fasterxml/jackson/annotation/JsonFormat.java[JsonFormat.Shape] annotation
+                                       generation in generated Java classes               |
                                    | _--json-type-info_, _-jti_ : If Jackson annotations are enabled, determines the value
                                        of JsonTypeInfo.Id. Default: DEDUCTION                                                |
                                    | _--template-library-file, -tlf_ : the path and name of the

tools/esmf-aspect-model-maven-plugin/src/main/java/org/eclipse/esmf/aspectmodel/GenerateJavaClasses.java

@@ -38,6 +38,9 @@ public class GenerateJavaClasses extends CodeGenerationMojo {
    @Parameter( defaultValue = "false" )
    private boolean disableJacksonAnnotations;
 
+   @Parameter( defaultValue = "false" )
+   private boolean disableJacksonAnnotationJsonFormatShapeObject;
+
    @Parameter( defaultValue = "deduction" )
    protected String jsonTypeInfo;
 
@@ -49,6 +52,7 @@ public GenerateJavaClasses() {
 
    public GenerateJavaClasses(
          final boolean disableJacksonAnnotations,
+         boolean disableJacksonAnnotationJsonFormatShapeObject,
          final String jsonTypeInfo,
          final String packageName,
          final String templateFile,
@@ -58,6 +62,7 @@ public GenerateJavaClasses(
          final String namePostfix
    ) {
       this.disableJacksonAnnotations = disableJacksonAnnotations;
+      this.disableJacksonAnnotationJsonFormatShapeObject = disableJacksonAnnotationJsonFormatShapeObject;
       this.jsonTypeInfo = jsonTypeInfo;
       this.packageName = packageName;
       this.templateFile = templateFile;
@@ -76,6 +81,7 @@ public void executeGeneration() throws MojoExecutionException {
          try {
             final JavaCodeGenerationConfig config = JavaCodeGenerationConfigBuilder.builder()
                   .enableJacksonAnnotations( !disableJacksonAnnotations )
+                  .enableJacksonAnnotationJsonFormatShapeObject( !disableJacksonAnnotationJsonFormatShapeObject )
                   .jsonTypeInfo( JavaCodeGenerationConfig.JsonTypeInfoType.valueOf(
                         Optional.ofNullable( jsonTypeInfo ).map( String::toUpperCase ).orElse( "DEDUCTION" ) ) )
                   .packageName( determinePackageName( aspect ) )

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

@@ -45,6 +45,11 @@ public class AspectToJavaCommand extends AbstractCommand {
          description = "Disable Jackson annotation generation in generated Java classes." )
    private boolean disableJacksonAnnotations = false;
 
+   @CommandLine.Option(
+         names = { "--no-jackson-jsonformat-shape", "-njjs" },
+         description = "Disable Jackson annotation JsonFormat.Shape object generation in generated Java classes." )
+   private boolean disableJacksonAnnotationJsonFormatShapeObject = false;
+
    @CommandLine.Option(
          names = { "--json-type-info", "-jti" },
          description = "If Jackson annotations are enabled, determines the value of JsonTypeInfo.Id. Default: DEDUCTION",
@@ -141,6 +146,7 @@ private JavaCodeGenerationConfig buildConfig( final Aspect aspect ) {
             .jsonTypeInfo( jsonTypeInfo )
             .templateLibFile( templateLibFile )
             .enableJacksonAnnotations( !disableJacksonAnnotations )
+            .enableJacksonAnnotationJsonFormatShapeObject(!disableJacksonAnnotationJsonFormatShapeObject)
             .packageName( pkgName )
             .namePrefix( namePrefix )
             .namePostfix( namePostfix )