Merge pull request #204 from groovy/203_fix

keeganwitt · web-flow · commit 5fcfa68eef53 · 2021-11-23T15:56:28.000-05:00
Check that user property exists before adding to properties
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <groupId>org.codehaus.gmavenplus</groupId>
   <artifactId>gmavenplus-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>1.14.0-SNAPSHOT</version>
+  <version>1.13.1-SNAPSHOT</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/java/org/codehaus/gmavenplus/mojo/AbstractToolsMojo.java b/src/main/java/org/codehaus/gmavenplus/mojo/AbstractToolsMojo.java
@@ -185,7 +185,9 @@ protected void initializeProperties() {
                 properties.putAll(session.getUserProperties());
             } else if (bindAllProjectProperties && bindSessionUserOverrideProperties && project != null) {
                 for (Object key : project.getProperties().keySet()) {
-                    properties.put(key, session.getUserProperties().get(key));
+                    if (session.getUserProperties().get(key) != null) {
+                        properties.put(key, session.getUserProperties().get(key));
+                    }
                 }
             }
         }
diff --git a/src/test/java/org/codehaus/gmavenplus/mojo/AbstractToolsMojoTest.java b/src/test/java/org/codehaus/gmavenplus/mojo/AbstractToolsMojoTest.java
@@ -142,6 +142,20 @@ public void testAddAllSessionUserProperties() {
         assertEquals("bar", testMojo.properties.get("foo"));
     }
 
+    @Test
+    public void testBindAllProjectPropertiesAndBindSessionUserOverridePropertiesWhenEmpty() {
+        MavenSession session = mock(MavenSession.class);
+        Properties projectProperties = new Properties();
+        projectProperties.put("foo", "bar");
+        doReturn(new Properties()).when(session).getUserProperties();
+        doReturn(projectProperties).when(project).getProperties();
+        testMojo.session = session;
+        testMojo.bindAllProjectProperties = true;
+        testMojo.bindSessionUserOverrideProperties = true;
+
+        testMojo.initializeProperties();
+    }
+
     @Test
     public void testSessionPropertiesOverrideProjectPropertiesAndIncludesOthers() {
         Properties projectProperties = new Properties();

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,9 @@ protected void initializeProperties() {`
`185`	`185`	`properties.putAll(session.getUserProperties());`
`186`	`186`	`} else if (bindAllProjectProperties && bindSessionUserOverrideProperties && project != null) {`
`187`	`187`	`for (Object key : project.getProperties().keySet()) {`
`188`		`- properties.put(key, session.getUserProperties().get(key));`
	`188`	`+ if (session.getUserProperties().get(key) != null) {`
	`189`	`+ properties.put(key, session.getUserProperties().get(key));`
	`190`	`+ }`
`189`	`191`	`}`
`190`	`192`	`}`
`191`	`193`	`}`