Add Prefix and Postfix to Java Generation

Author: Yauhenikapl

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

@@ -29,6 +29,7 @@
 import org.eclipse.esmf.aspectmodel.java.exception.CodeGenerationException;
 import org.eclipse.esmf.aspectmodel.visitor.AspectStreamTraversalVisitor;
 import org.eclipse.esmf.metamodel.AbstractEntity;
+import org.eclipse.esmf.metamodel.Aspect;
 import org.eclipse.esmf.metamodel.Characteristic;
 import org.eclipse.esmf.metamodel.ComplexType;
 import org.eclipse.esmf.metamodel.Entity;
@@ -559,6 +560,13 @@ public static String genericClassSignature( final StructureElement element ) {
       return generics.isEmpty() ? "" : "<" + generics + ">";
    }
 
+   public static String generateClassName( final StructureElement element, final JavaCodeGenerationConfig config ) {
+      if ( ( !config.aspectPrefix().isBlank() || !config.aspectPostfix().isBlank() ) && element instanceof Aspect ) {
+         return config.aspectPrefix() + element.getName() + config.aspectPostfix();
+      }
+      return element.getName();
+   }
+
    /**
     * Generates the comma-separated list of arguments in a constructor call
     *

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

@@ -29,7 +29,10 @@ public record JavaCodeGenerationConfig(
       String packageName,
       ImportTracker importTracker,
       boolean executeLibraryMacros,
-      File templateLibFile
+      File templateLibFile,
+      String aspectPrefix,
+      String aspectPostfix
+
 ) implements GenerationConfig {
    public JavaCodeGenerationConfig {
       if ( packageName == null ) {
@@ -44,5 +47,11 @@ public record JavaCodeGenerationConfig(
       if ( executeLibraryMacros && !templateLibFile.exists() ) {
          throw new CodeGenerationException( "Incorrect configuration. Please provide a valid path to the velocity template library file." );
       }
+      if ( aspectPrefix == null ) {
+         aspectPrefix = "";
+      }
+      if ( aspectPostfix == null ) {
+         aspectPostfix = "";
+      }
    }
 }

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

@@ -131,7 +131,7 @@ public JavaArtifact apply( final E element, final JavaCodeGenerationConfig confi
 
       final String generatedSource = new TemplateEngine( context, engineConfiguration ).apply( "java-pojo" );
       try {
-         return new JavaArtifact( Roaster.format( generatedSource ), element.getName(),
+         return new JavaArtifact( Roaster.format( generatedSource ), AspectModelJavaUtil.generateClassName( element, config ),
                config.packageName() );
       } catch ( final Exception exception ) {
          throw new CodeGenerationException( generatedSource, exception );

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

@@ -28,7 +28,7 @@ ${util.determineCollectionAspectClassDefinition( $element, $codeGenerationConfig
 ${util.generateAbstractEntityClassAnnotations( $complexElement, $codeGenerationConfig, $extendingEntities )}
 ${util.determineComplexTypeClassDefinition( $complexElement, $codeGenerationConfig )}
 #else
-public class $element.getName()${util.genericClassSignature( $element )} {
+public class ${util.generateClassName( $element, $codeGenerationConfig )}${util.genericClassSignature( $element )} {
 #end
 #foreach( $property in $element.properties )
     #javaPojoProperty( $property )

core/esmf-aspect-model-java-generator/src/main/resources/java-pojo-constructor-lib.vm

@@ -18,7 +18,7 @@
         $codeGenerationConfig.importTracker().importExplicit( $JsonCreator )
         @JsonCreator
     #end
-    public ${element.name}(
+    public ${util.generateClassName( $element, $codeGenerationConfig )}(
     $util.constructorArguments( $allProperties, $codeGenerationConfig, $enableJacksonAnnotations )
     ) #if( $needInitializer ) throws DatatypeConfigurationException #end {
     super(

core/esmf-aspect-model-java-generator/src/main/resources/java-pojo-equals-method-lib.vm

@@ -31,8 +31,9 @@ if (o == null || getClass() != o.getClass()) {
     #if( $element.getProperties().isEmpty() ) return true
     #else
         #set( $objectEqualsExpression = $util.objectEqualsExpression( $element ) )
+        #set( $className = ${util.generateClassName( $element, $codeGenerationConfig )} )
         #if( $objectEqualsExpression && !$objectEqualsExpression.empty )
-            final $element.getName() that = ($element.getName())o;
+            final $className that = ($className)o;
             return $objectEqualsExpression
         #else
             return true

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

@@ -13,11 +13,12 @@
 #parse( "java-static-class-property-lib.vm" )
 
 #macro( javaStaticClassBody )
-$codeGenerationConfig.importTracker().importExplicit( "${codeGenerationConfig.packageName()}.${element.getName()}" )
+#set( $className = ${util.generateClassName( $element, $codeGenerationConfig )} )
+$codeGenerationConfig.importTracker().importExplicit( "${codeGenerationConfig.packageName()}.${className}" )
 /**
-* Generated class {@link Meta${element.getName()}}.
+* Generated class {@link Meta${className}}.
 */
-public class Meta${element.getName()} implements StaticMetaClass<${element.getName()}>, PropertyContainer {
+public class Meta${className} implements StaticMetaClass<${className}>, PropertyContainer {
 public static final String NAMESPACE = "${modelUrnPrefix}";
 public static final String MODEL_ELEMENT_URN = NAMESPACE + "${element.getName()}";
 
@@ -49,8 +50,8 @@ static {
     #end
 #end
 
-    public Class<${element.getName()}> getModelClass() {
-        return ${element.getName()}.class;
+    public Class<${className}> getModelClass() {
+        return ${className}.class;
     }
 
     @Override
@@ -65,13 +66,13 @@ static {
 
     @Override
     public String getName() {
-        return "${element.getName()}";
+        return "${className}";
     }
 
     #if( $element.getExtends().isPresent() )
-        #set( $propertyTypeParameter = "? super ${element.getName()}" )
+        #set( $propertyTypeParameter = "? super ${className}" )
     #else
-        #set( $propertyTypeParameter = ${element.getName()} )
+        #set( $propertyTypeParameter = ${className} )
     #end
     @Override
     public List<StaticProperty<$propertyTypeParameter, ?>> getProperties() {