Fix code formatting and extract base class for Java code generating Mojos

Author: andreas-schilling

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

@@ -81,7 +81,7 @@ public enum SetterStyle {
       if ( namePostfix == null ) {
          namePostfix = "";
       }
-      if (setterStyle == null ) {
+      if ( setterStyle == null ) {
          setterStyle = SetterStyle.STANDARD;
       }
    }

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

@@ -148,13 +148,13 @@ public void assertMethods( final String className, final Map<String, String> exp
 
    /**
     * Allows the assertion of method bodies for static meta properties in a generated meta class.
-    *
+    * <p>
     * Method bodies are asserted in a relaxed way:
     * <ul>
     *    <li>all whitespace is trimmed before comparing</li>
     *    <li>the given method body may also be just a part of the full method body, i.e. the check is performed using .contains()</li>
     * </ul>
-    *
+    * </p>
     * @param className the name of the meta class
     * @param propertyName the name of the property (given in CONSTANT_CASE)
     * @param expectedMethodBodies the expected (partial) contents of the static meta property methods, where the key is the method name
@@ -174,10 +174,12 @@ public void assertStaticMetaPropertyMethods( final String className, final Strin
                .stream()
                .map( VariableDeclarator::getInitializer )
                .flatMap( Optional::stream )
-               .filter( exp -> exp instanceof ObjectCreationExpr )
+               .filter( ObjectCreationExpr.class::isInstance )
                .map( ObjectCreationExpr.class::cast )
-               .flatMap(
-                     oc -> oc.getChildNodes().stream().filter( n -> n instanceof MethodDeclaration ).map( MethodDeclaration.class::cast ) )
+               .flatMap( oc -> oc.getChildNodes()
+                     .stream()
+                     .filter( MethodDeclaration.class::isInstance )
+                     .map( MethodDeclaration.class::cast ) )
                .anyMatch( md -> md.getBody()
                      .map( b -> b.getStatements().stream().anyMatch(
                            s -> expectedMethodBodies.containsKey( md.getName().toString() ) && s.toString().trim()

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

@@ -28,6 +28,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.regex.Pattern;
+
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
 
@@ -463,7 +464,7 @@ void testCharacteristicInstantiationForEnums() throws IOException {
       final String expectedTestPropertyCharacteristicConstructorCall =
             """
                   new DefaultEnumeration(MetaModelBaseAttributes.builder().withUrn(AspectModelUrn.fromUrn(NAMESPACE + "TestEnumeration")).build(), new DefaultScalar("http://www.w3.org/2001/XMLSchema#integer"), new ArrayList<Value>() {
-
+                  
                       {
                           add(new DefaultScalarValue(MetaModelBaseAttributes.builder().build(), new BigInteger("1"), new DefaultScalar("http://www.w3.org/2001/XMLSchema#integer")));
                           add(new DefaultScalarValue(MetaModelBaseAttributes.builder().build(), new BigInteger("2"), new DefaultScalar("http://www.w3.org/2001/XMLSchema#integer")));
@@ -680,7 +681,8 @@ void testStaticMetaModelWithSetters() throws IOException {
       final StaticClassGenerationResult result = TestContext.generateStaticAspectCode().apply( getGenerators( aspect, true,
             JavaCodeGenerationConfig.SetterStyle.STANDARD ) );
 
-      result.assertStaticMetaPropertyMethods( "MetaAspectWithEntity", "TEST_PROPERTY", Map.of("setValue","object.setTestProperty(value)") );
+      result.assertStaticMetaPropertyMethods( "MetaAspectWithEntity", "TEST_PROPERTY",
+            Map.of( "setValue", "object.setTestProperty(value)" ) );
    }
 
    @Test
@@ -689,6 +691,6 @@ void testStaticMetaModelWithFluentCompactSetters() throws IOException {
       final StaticClassGenerationResult result = TestContext.generateStaticAspectCode().apply( getGenerators( aspect, true,
             JavaCodeGenerationConfig.SetterStyle.FLUENT_COMPACT ) );
 
-      result.assertStaticMetaPropertyMethods( "MetaAspectWithEntity", "TEST_PROPERTY", Map.of("setValue","object.testProperty(value)") );
+      result.assertStaticMetaPropertyMethods( "MetaAspectWithEntity", "TEST_PROPERTY", Map.of( "setValue", "object.testProperty(value)" ) );
    }
 }

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

@@ -30,7 +30,7 @@
 import org.slf4j.LoggerFactory;
 
 @Mojo( name = GenerateJavaClasses.MAVEN_GOAL, defaultPhase = LifecyclePhase.GENERATE_SOURCES )
-public class GenerateJavaClasses extends CodeGenerationMojo {
+public class GenerateJavaClasses extends JavaCodeGenerationMojo {
    public static final String MAVEN_GOAL = "generateJavaClasses";
    private static final Logger LOG = LoggerFactory.getLogger( GenerateJavaClasses.class );
 
@@ -43,12 +43,6 @@ public class GenerateJavaClasses extends CodeGenerationMojo {
    @Parameter( defaultValue = "deduction" )
    protected String jsonTypeInfo;
 
-   @Parameter( defaultValue = "false" )
-   protected boolean enableSetters;
-
-   @Parameter( defaultValue = "standard" )
-   protected String setterStyle;
-
    /**
     * Default constructor used by Maven plugin instantiation
     */

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

@@ -25,21 +25,14 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @Mojo( name = GenerateStaticJavaClasses.MAVEN_GOAL, defaultPhase = LifecyclePhase.GENERATE_SOURCES )
-public class GenerateStaticJavaClasses extends CodeGenerationMojo {
+public class GenerateStaticJavaClasses extends JavaCodeGenerationMojo {
    public static final String MAVEN_GOAL = "generateStaticJavaClasses";
    private static final Logger LOG = LoggerFactory.getLogger( GenerateStaticJavaClasses.class );
 
-   @Parameter( defaultValue = "false" )
-   protected boolean enableSetters;
-
-   @Parameter( defaultValue = "standard" )
-   protected String setterStyle;
-
    @Override
    public void executeGeneration() throws MojoExecutionException {
       final Set<Aspect> aspects = loadAspects();

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

@@ -0,0 +1,14 @@
+package org.eclipse.esmf.aspectmodel;
+
+import org.apache.maven.plugins.annotations.Parameter;
+
+/**
+ * Base class for all Mojos that generate Java code.
+ */
+public abstract class JavaCodeGenerationMojo extends CodeGenerationMojo {
+   @Parameter( defaultValue = "false" )
+   protected boolean enableSetters;
+
+   @Parameter( defaultValue = "standard" )
+   protected String setterStyle;
+}

tools/samm-cli/src/test/java/org/eclipse/esmf/SammCliTest.java

@@ -704,7 +704,8 @@ void testAspectToJavaWithSetters() {
    void testAspectToJavaWithFluentSetters() {
       final File outputDir = outputDirectory.toFile();
       final ExecutionResult result = sammCli.runAndExpectSuccess( "--disable-color", "aspect", defaultInputFile, "to", "java",
-            "--output-directory", outputDir.getAbsolutePath(), "--custom-resolver", resolverCommand(), "--enable-setters", "--setter-style", "FLUENT" );
+            "--output-directory", outputDir.getAbsolutePath(), "--custom-resolver", resolverCommand(), "--enable-setters", "--setter-style",
+            "FLUENT" );
       assertThat( result.stdout() ).isEmpty();
       assertThat( result.stderr() ).isEmpty();
 
@@ -721,7 +722,8 @@ void testAspectToJavaWithFluentSetters() {
    void testAspectToJavaWithFluentCompactSetters() {
       final File outputDir = outputDirectory.toFile();
       final ExecutionResult result = sammCli.runAndExpectSuccess( "--disable-color", "aspect", defaultInputFile, "to", "java",
-            "--output-directory", outputDir.getAbsolutePath(), "--custom-resolver", resolverCommand(), "--enable-setters", "--setter-style", "FLUENT_COMPACT" );
+            "--output-directory", outputDir.getAbsolutePath(), "--custom-resolver", resolverCommand(), "--enable-setters", "--setter-style",
+            "FLUENT_COMPACT" );
       assertThat( result.stdout() ).isEmpty();
       assertThat( result.stderr() ).isEmpty();
 
@@ -1642,7 +1644,7 @@ private File inputFile( final String filename ) {
     * Returns the File object for a test model file
     */
    private File inputFile( final TestModel testModel ) {
-      final boolean isValid = !( testModel instanceof InvalidTestAspect );
+      final boolean isValid = !(testModel instanceof InvalidTestAspect);
       final String resourcePath = String.format(
             "%s/../../core/esmf-test-aspect-models/src/main/resources/%s/org.eclipse.esmf.test/1.0.0/%s.ttl",
             System.getProperty( "user.dir" ), isValid ? "valid" : "invalid", testModel.getName() );
@@ -1693,8 +1695,8 @@ private String resolverCommand() {
       // are not resolved to the file system but to the jar)
       try {
          final String resolverScript = new File(
-               System.getProperty( "user.dir" ) + "/target/test-classes/model_resolver" + ( OS.WINDOWS.isCurrentOs()
-                     ? ".bat" : ".sh" ) ).getCanonicalPath();
+               System.getProperty( "user.dir" ) + "/target/test-classes/model_resolver" + (OS.WINDOWS.isCurrentOs()
+                     ? ".bat" : ".sh") ).getCanonicalPath();
          final String modelsRoot = new File( System.getProperty( "user.dir" ) + "/target/classes/valid" ).getCanonicalPath();
          final String metaModelVersion = KnownVersion.getLatest().toString().toLowerCase();
          return resolverScript + " " + modelsRoot + " " + metaModelVersion;