Fix after rebase

Author: slawekjaranowski

.gitignore

@@ -4,7 +4,7 @@ target
 .project
 .settings
 .checkstyle
-#idea
+idea
 *.iml
 .idea
 .java-version

maven-plugin-testing-harness/src/test/java/org/apache/maven/plugin/testing/ParametersMojoJUnit4Test.java

@@ -36,21 +36,21 @@ public void testDefault() throws Exception {
 
         ParametersMojo mojo = (ParametersMojo) lookupConfiguredMojo(project, "parameters");
 
-        assertNull(mojo.plain);
-        assertNull(mojo.withProperty);
-        assertEquals("default", mojo.withDefault);
-        assertEquals("default", mojo.withPropertyAndDefault);
+        assertNull(mojo.getPlain());
+        assertNull(mojo.getWithProperty());
+        assertEquals("default", mojo.getWithDefault());
+        assertEquals("default", mojo.getWithPropertyAndDefault());
     }
 
     public void testExplicit() throws Exception {
         MavenProject project = readMavenProject(new File("src/test/projects/explicit"));
 
         ParametersMojo mojo = (ParametersMojo) lookupConfiguredMojo(project, "parameters");
 
-        assertEquals("explicitValue", mojo.plain);
-        assertEquals("explicitWithPropertyValue", mojo.withProperty);
-        assertEquals("explicitWithDefaultValue", mojo.withDefault);
-        assertEquals("explicitWithPropertyAndDefaultValue", mojo.withPropertyAndDefault);
+        assertEquals("explicitValue", mojo.getPlain());
+        assertEquals("explicitWithPropertyValue", mojo.getWithProperty());
+        assertEquals("explicitWithDefaultValue", mojo.getWithDefault());
+        assertEquals("explicitWithPropertyAndDefaultValue", mojo.getWithPropertyAndDefault());
     }
 
     public void testDefaultWithProperty() throws Exception {
@@ -61,10 +61,10 @@ public void testDefaultWithProperty() throws Exception {
         session.getUserProperties().put("property", "propertyValue");
         ParametersMojo mojo = (ParametersMojo) lookupConfiguredMojo(session, execution);
 
-        assertNull(mojo.plain);
-        assertEquals("propertyValue", mojo.withProperty);
-        assertEquals("default", mojo.withDefault);
-        assertEquals("propertyValue", mojo.withPropertyAndDefault);
+        assertNull(mojo.getPlain());
+        assertEquals("propertyValue", mojo.getWithProperty());
+        assertEquals("default", mojo.getWithDefault());
+        assertEquals("propertyValue", mojo.getWithPropertyAndDefault());
     }
 
     public void testExplicitWithProperty() throws Exception {
@@ -75,10 +75,10 @@ public void testExplicitWithProperty() throws Exception {
         session.getUserProperties().put("property", "propertyValue");
         ParametersMojo mojo = (ParametersMojo) lookupConfiguredMojo(session, execution);
 
-        assertEquals("explicitValue", mojo.plain);
-        assertEquals("explicitWithPropertyValue", mojo.withProperty);
-        assertEquals("explicitWithDefaultValue", mojo.withDefault);
-        assertEquals("explicitWithPropertyAndDefaultValue", mojo.withPropertyAndDefault);
+        assertEquals("explicitValue", mojo.getPlain());
+        assertEquals("explicitWithPropertyValue", mojo.getWithProperty());
+        assertEquals("explicitWithDefaultValue", mojo.getWithDefault());
+        assertEquals("explicitWithPropertyAndDefaultValue", mojo.getWithPropertyAndDefault());
     }
 
     protected MavenProject readMavenProject(File basedir) throws ProjectBuildingException, Exception {

maven-plugin-testing-harness/src/test/java/org/apache/maven/plugin/testing/ParametersMojoTest.java

@@ -20,20 +20,20 @@
 
 import javax.inject.Inject;
 
-import org.apache.maven.api.plugin.testing.*;
+import org.apache.maven.api.plugin.testing.Basedir;
+import org.apache.maven.api.plugin.testing.InjectMojo;
+import org.apache.maven.api.plugin.testing.MojoParameter;
 import org.apache.maven.api.plugin.testing.MojoParameters;
+import org.apache.maven.api.plugin.testing.MojoTest;
 import org.apache.maven.plugin.logging.Log;
 import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @MojoTest
 public class ParametersMojoTest {
 
-    private static final Logger logger = LoggerFactory.getLogger(ParametersMojoTest.class);
-
     private static final String POM_DOT_XML_FILE = "pom.xml";
 
     private static final String DEFAULT_POM_DIR = "src/test/projects/default/";
@@ -54,7 +54,7 @@ void testDefaultPom(ParametersMojo mojo) {
     @Test
     @InjectMojo(goal = "test:test-plugin:0.0.1-SNAPSHOT:parameters", pom = EXPLICIT_POM_DIR + POM_DOT_XML_FILE)
     void testExplicitPom(ParametersMojo mojo) {
-        assertEquals("explicitValue", mojo.plain);
+        assertEquals("explicitValue", mojo.getPlain());
         assertDoesNotThrow(mojo::execute);
     }
 
@@ -76,8 +76,8 @@ void simpleMojo(ParametersMojo mojo) {
     @MojoParameter(name = "plain", value = "plainValue")
     @MojoParameter(name = "withDefault", value = "withDefaultValue")
     void simpleMojoWithParameters(ParametersMojo mojo) {
-        assertEquals("plainValue", mojo.plain);
-        assertEquals("withDefaultValue", mojo.withDefault);
+        assertEquals("plainValue", mojo.getPlain());
+        assertEquals("withDefaultValue", mojo.getWithDefault());
         assertDoesNotThrow(mojo::execute);
     }
 
@@ -88,32 +88,32 @@ void simpleMojoWithParameters(ParametersMojo mojo) {
         @MojoParameter(name = "withDefault", value = "withDefaultValue")
     })
     void simpleMojoWithParametersGroupingAnnotation(ParametersMojo mojo) {
-        assertEquals("plainValue", mojo.plain);
-        assertEquals("withDefaultValue", mojo.withDefault);
+        assertEquals("plainValue", mojo.getPlain());
+        assertEquals("withDefaultValue", mojo.getWithDefault());
         assertDoesNotThrow(mojo::execute);
     }
 
     @Test
     @InjectMojo(goal = "test:test-plugin:0.0.1-SNAPSHOT:parameters", pom = DEFAULT_POM_DIR + POM_DOT_XML_FILE)
     @MojoParameter(name = "plain", value = "plainValue")
     void simpleMojoWithParameter(ParametersMojo mojo) {
-        assertEquals("plainValue", mojo.plain);
+        assertEquals("plainValue", mojo.getPlain());
         assertDoesNotThrow(mojo::execute);
     }
 
     @Test
     @MojoParameter(name = "plain", value = "plainValue")
     @InjectMojo(goal = "test:test-plugin:0.0.1-SNAPSHOT:parameters", pom = EXPLICIT_POM_DIR + POM_DOT_XML_FILE)
     void simpleMojoWithParameterInjectionWinsOverConfig(ParametersMojo mojo) {
-        assertEquals("plainValue", mojo.plain);
+        assertEquals("plainValue", mojo.getPlain());
         assertDoesNotThrow(mojo::execute);
     }
 
     @Test
     @Basedir("src/test/projects/basedir-set-by-annotation")
     @InjectMojo(goal = "test:test-plugin:0.0.1-SNAPSHOT:parameters", pom = POM_DOT_XML_FILE)
     void basedirInjectedWithBasedirAnnotation(ParametersMojo mojo) {
-        assertEquals("i-have-a-basedir-set-by-annotation", mojo.plain);
+        assertEquals("i-have-a-basedir-set-by-annotation", mojo.getPlain());
         assertDoesNotThrow(mojo::execute);
     }
 }