Fix NPE when Spring Boot Maven Plugin doesn't have <configuration> (#…

…2688) * Fix NPE when null spring-boot configuration * Use Boolean.parseBoolean / fix CHANGELOG typo
GoogleContainerTools · Aug 10, 2020 · 0af20a3 · 0af20a3
1 parent 7b36544
commit 0af20a3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/jib-maven-plugin/CHANGELOG.md b/jib-maven-plugin/CHANGELOG.md
@@ -9,6 +9,8 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 
+- Fixed `NullPointerException` when the Spring Boot Maven plugin does not have a `<configuration>` block. ([#2687](https://github.com/GoogleContainerTools/jib/issues/2687))
+
 ## 2.5.0
 
 ### Added

diff --git a/jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/MavenProjectProperties.java b/jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/MavenProjectProperties.java
@@ -567,8 +567,8 @@ Optional<Xpp3Dom> getSpringBootRepackageConfiguration() {
         if (execution.getGoals().contains("repackage")) {
           Xpp3Dom configuration = (Xpp3Dom) execution.getConfiguration();
 
-          boolean skip = Boolean.valueOf(getChildValue(configuration, "skip").orElse("false"));
-          return skip ? Optional.empty() : Optional.of(configuration);
+          boolean skip = Boolean.parseBoolean(getChildValue(configuration, "skip").orElse("false"));
+          return skip ? Optional.empty() : Optional.ofNullable(configuration);
         }
       }
     }

diff --git a/...ven-plugin/src/test/java/com/google/cloud/tools/jib/maven/MavenProjectPropertiesTest.java b/...ven-plugin/src/test/java/com/google/cloud/tools/jib/maven/MavenProjectPropertiesTest.java
@@ -780,6 +780,17 @@ public void testGetSpringBootRepackageConfiguration_pluginNotApplied() {
         Optional.empty(), mavenProjectProperties.getSpringBootRepackageConfiguration());
   }
 
+  @Test
+  public void testGetSpringBootRepackageConfiguration_noConfigurationBlock() {
+    Mockito.when(mockMavenProject.getPlugin("org.springframework.boot:spring-boot-maven-plugin"))
+        .thenReturn(mockPlugin);
+    Mockito.when(mockPlugin.getExecutions()).thenReturn(Arrays.asList(mockPluginExecution));
+    Mockito.when(mockPluginExecution.getGoals()).thenReturn(Arrays.asList("repackage"));
+    Mockito.when(mockPluginExecution.getConfiguration()).thenReturn(null);
+    Assert.assertEquals(
+        Optional.empty(), mavenProjectProperties.getSpringBootRepackageConfiguration());
+  }
+
   @Test
   public void testGetSpringBootRepackageConfiguration_noExecutions() {
     Mockito.when(mockMavenProject.getPlugin("org.springframework.boot:spring-boot-maven-plugin"))