Update functionality

Author: Yauhenikapl

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

@@ -29,7 +29,6 @@
 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;
@@ -354,7 +353,7 @@ public static String toConstant( final String upperOrLowerCamel ) {
       }
       return TO_CONSTANT.convert( StringUtils.capitalize( upperOrLowerCamel ) );
    }
-   
+
    public static boolean isAllUppercaseWithUnderscore( final String upperOrLowerCamel ) {
       return upperOrLowerCamel != null && upperOrLowerCamel.matches( "[A-Z0-9_]+" );
    }
@@ -561,8 +560,8 @@ public static String genericClassSignature( final StructureElement element ) {
    }
 
    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();
+      if ( ( !config.namePrefix().isBlank() || !config.namePostfix().isBlank() ) && element.is( StructureElement.class ) ) {
+         return config.namePrefix() + element.getName() + config.namePostfix();
       }
       return element.getName();
    }

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

@@ -30,8 +30,8 @@ public record JavaCodeGenerationConfig(
       ImportTracker importTracker,
       boolean executeLibraryMacros,
       File templateLibFile,
-      String aspectPrefix,
-      String aspectPostfix
+      String namePrefix,
+      String namePostfix
 
 ) implements GenerationConfig {
    public JavaCodeGenerationConfig {
@@ -47,11 +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 ( namePrefix == null ) {
+         namePrefix = "";
       }
-      if ( aspectPostfix == null ) {
-         aspectPostfix = "";
+      if ( namePostfix == null ) {
+         namePostfix = "";
       }
    }
 }

core/esmf-aspect-model-java-generator/src/test/java/org/eclipse/esmf/aspectmodel/java/AspectModelJavaGeneratorTest.java

@@ -99,14 +99,14 @@ private Collection<JavaGenerator> getGenerators( final AspectModel aspectModel )
       return List.of( new AspectModelJavaGenerator( aspectModel.aspect(), config ) );
    }
 
-   private Collection<JavaGenerator> getGenerators( final TestAspect testAspect, final String aspectPrefix, final String aspectPostfix ) {
+   private Collection<JavaGenerator> getGenerators( final TestAspect testAspect, final String namePrefix, final String namePostfix ) {
       final AspectModel aspectModel = TestResources.load( testAspect );
       final JavaCodeGenerationConfig config = JavaCodeGenerationConfigBuilder.builder()
             .enableJacksonAnnotations( true )
             .executeLibraryMacros( false )
             .packageName( aspectModel.aspect().urn().getNamespaceMainPart() )
-            .aspectPrefix( aspectPrefix )
-            .aspectPostfix( aspectPostfix )
+            .namePrefix( namePrefix )
+            .namePostfix( namePostfix )
             .build();
       return List.of( new AspectModelJavaGenerator( aspectModel.aspect(), config ) );
    }

core/esmf-aspect-model-java-generator/src/test/java/org/eclipse/esmf/aspectmodel/java/JavaCodeGenerationConfigurationTest.java

@@ -36,8 +36,8 @@ public void testValidTemplateLibConfig() {
                   .packageName( "" )
                   .executeLibraryMacros( true )
                   .templateLibFile( templateLibFile )
-                  .aspectPrefix( "" )
-                  .aspectPostfix( "" )
+                  .namePrefix( "" )
+                  .namePostfix( "" )
                   .build()
       ).doesNotThrowAnyException();
 
@@ -47,8 +47,8 @@ public void testValidTemplateLibConfig() {
                   .packageName( "" )
                   .executeLibraryMacros( false )
                   .templateLibFile( emptyTemplateLibFile )
-                  .aspectPrefix( "" )
-                  .aspectPostfix( "" )
+                  .namePrefix( "" )
+                  .namePostfix( "" )
                   .build()
       ).doesNotThrowAnyException();
    }

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

@@ -39,10 +39,10 @@ public abstract class CodeGenerationMojo extends AspectModelMojo {
    protected String stripNamespace = "";
 
    @Parameter
-   protected String aspectPrefix = "";
+   protected String namePrefix = "";
 
    @Parameter
-   protected String aspectPostfix = "";
+   protected String namePostfix = "";
 
    protected void validateParameters( final File templateLibFile ) throws MojoExecutionException {
       if ( executeLibraryMacros && !templateLibFile.exists() ) {

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

@@ -47,8 +47,8 @@ public void executeGeneration() throws MojoExecutionException {
                .packageName( determinePackageName( aspect ) )
                .executeLibraryMacros( executeLibraryMacros )
                .templateLibFile( templateLibFile )
-               .aspectPrefix( aspectPrefix )
-               .aspectPostfix( aspectPostfix )
+               .namePrefix( namePrefix )
+               .namePostfix( namePostfix )
                .build();
          new AspectModelJavaGenerator( aspect, config ).generate( nameMapper );
       }

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

@@ -42,8 +42,8 @@ public void executeGeneration() throws MojoExecutionException {
                .packageName( determinePackageName( aspect ) )
                .executeLibraryMacros( executeLibraryMacros )
                .templateLibFile( templateLibFile )
-               .aspectPrefix( aspectPrefix )
-               .aspectPostfix( aspectPostfix )
+               .namePrefix( namePrefix )
+               .namePostfix( namePostfix )
                .build();
          new StaticMetaModelJavaGenerator( aspect, config ).generate( nameMapper );
       }

tools/esmf-aspect-model-maven-plugin/src/test/resources/generate-java-classes-pom-with-prefix-and-postfix.xml

@@ -33,8 +33,8 @@
                </includes>
                <outputDirectory>${basedir}/target/test-artifacts</outputDirectory>
                <packageName>example.com</packageName>
-               <aspectPrefix>Base</aspectPrefix>
-               <aspectPostfix>Postfix</aspectPostfix>
+               <namePrefix>Base</namePrefix>
+               <namePostfix>Postfix</namePostfix>
             </configuration>
          </plugin>
       </plugins>

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

@@ -60,11 +60,11 @@ public class AspectToJavaCommand extends AbstractCommand {
    @CommandLine.Option( names = { "--static", "-s" }, description = "Generate Java domain classes for a Static Meta Model" )
    private boolean generateStaticMetaModelJavaClasses = false;
 
-   @CommandLine.Option( names = { "--aspect-prefix", "-prefix" }, description = "Aspect prefix for generated Java class of Aspect" )
-   private String aspectPrefix = "";
+   @CommandLine.Option( names = { "--name-prefix", "-namePrefix" }, description = "Name prefix for generated Java class of Aspect" )
+   private String namePrefix = "";
 
-   @CommandLine.Option( names = { "--aspect-postfix", "-postfix" }, description = "Aspect postfix for generated Java class of Aspect" )
-   private String aspectPostfix = "";
+   @CommandLine.Option( names = { "--name-postfix", "-namePostfix" }, description = "Name postfix for generated Java class of Aspect" )
+   private String namePostfix = "";
 
    @CommandLine.ParentCommand
    private AspectToCommand parentCommand;
@@ -98,8 +98,8 @@ private JavaCodeGenerationConfig buildConfig( final Aspect aspect ) {
             .templateLibFile( templateLibFile )
             .enableJacksonAnnotations( !disableJacksonAnnotations )
             .packageName( pkgName )
-            .aspectPrefix( aspectPrefix )
-            .aspectPostfix( aspectPostfix )
+            .namePrefix( namePrefix )
+            .namePostfix( namePostfix )
             .build();
    }