test coverage

jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/MavenProjectProperties.java

@@ -115,19 +115,20 @@ public static MavenProjectProperties getForProject(
     Supplier<List<JibMavenPluginExtension<?>>> extensionLoader =
         () -> {
           List<JibMavenPluginExtension<?>> extensions = new ArrayList<>();
-          // Add the injected extensions at first to prefer them over the ones from JDK service
-          // loader.
-          // Extensions might support both approaches (injection and JDK service loader) at the same
-          // time for compatibility reasons.
-          extensions.addAll(injectedExtensions);
           for (JibMavenPluginExtension<?> extension :
               ServiceLoader.load(JibMavenPluginExtension.class)) {
             extensions.add(extension);
           }
           return extensions;
         };
     return new MavenProjectProperties(
-        jibPluginDescriptor, project, session, log, tempDirectoryProvider, extensionLoader);
+        jibPluginDescriptor,
+        project,
+        session,
+        log,
+        tempDirectoryProvider,
+        injectedExtensions,
+        extensionLoader);
   }
 
   /**
@@ -221,6 +222,7 @@ static Optional<String> getChildValue(@Nullable Xpp3Dom dom, String... childNode
   private final SingleThreadedExecutor singleThreadedExecutor = new SingleThreadedExecutor();
   private final ConsoleLogger consoleLogger;
   private final TempDirectoryProvider tempDirectoryProvider;
+  private final Collection<JibMavenPluginExtension<?>> injectedExtensions;
   private final Supplier<List<JibMavenPluginExtension<?>>> extensionLoader;
 
   @VisibleForTesting
@@ -230,11 +232,13 @@ static Optional<String> getChildValue(@Nullable Xpp3Dom dom, String... childNode
       MavenSession session,
       Log log,
       TempDirectoryProvider tempDirectoryProvider,
+      Collection<JibMavenPluginExtension<?>> injectedExtensions,
       Supplier<List<JibMavenPluginExtension<?>>> extensionLoader) {
     this.jibPluginDescriptor = jibPluginDescriptor;
     this.project = project;
     this.session = session;
     this.tempDirectoryProvider = tempDirectoryProvider;
+    this.injectedExtensions = injectedExtensions;
     this.extensionLoader = extensionLoader;
     ConsoleLoggerBuilder consoleLoggerBuilder =
         (isProgressFooterEnabled(session)
@@ -605,7 +609,12 @@ public JibContainerBuilder runPluginExtensions(
       return jibContainerBuilder;
     }
 
-    List<JibMavenPluginExtension<?>> loadedExtensions = extensionLoader.get();
+    // Add the injected extensions at first to prefer them over the ones from JDK service
+    // loader.
+    // Extensions might support both approaches (injection and JDK service loader) at the same
+    // time for compatibility reasons.
+    List<JibMavenPluginExtension<?>> loadedExtensions = new ArrayList<>(injectedExtensions);
+    loadedExtensions.addAll(extensionLoader.get());
     JibMavenPluginExtension<?> extension = null;
     ContainerBuildPlan buildPlan = jibContainerBuilder.toContainerBuildPlan();
     try {

jib-maven-plugin/src/test/java/com/google/cloud/tools/jib/maven/JibPluginConfigurationTest.java

@@ -79,6 +79,7 @@ public void testDefaults() {
     Assert.assertEquals("exploded", testPluginConfiguration.getContainerizingMode());
     Assert.assertEquals("EPOCH_PLUS_SECOND", testPluginConfiguration.getFilesModificationTime());
     Assert.assertEquals("EPOCH", testPluginConfiguration.getCreationTime());
+    Assert.assertTrue(testPluginConfiguration.getInjectedPluginExtensions().isEmpty());
   }
 
   @Test

jib-maven-plugin/src/test/java/com/google/cloud/tools/jib/maven/MavenProjectPropertiesExtensionTest.java

@@ -209,6 +209,7 @@ public void setUp() {
             mockMavenSession,
             mockLog,
             mockTempDirectoryProvider,
+            Collections.emptyList(),
             () -> loadedExtensions);
   }
 
@@ -450,4 +451,76 @@ public void testRunPluginExtensions_runtimeExceptionFromExtension() {
       Assert.assertEquals("extension crashed: buggy extension", ex.getMessage());
     }
   }
+
+  @Test
+  public void testRunPluginExtensions_injected() throws JibPluginExtensionException {
+    FooExtension injectedExtension =
+        new FooExtension(
+            (buildPlan, properties, extraConfig, mavenData, logger) -> {
+              logger.log(LogLevel.ERROR, "awesome error from my extension");
+              return buildPlan.toBuilder().setUser("user from extension").build();
+            });
+
+    mavenProjectProperties =
+        new MavenProjectProperties(
+            mockJibPluginDescriptor,
+            mockMavenProject,
+            mockMavenSession,
+            mockLog,
+            mockTempDirectoryProvider,
+            Arrays.asList(injectedExtension),
+            () -> Collections.emptyList());
+
+    JibContainerBuilder extendedBuilder =
+        mavenProjectProperties.runPluginExtensions(
+            Arrays.asList(new FooExtensionConfig()), containerBuilder);
+    Assert.assertEquals("user from extension", extendedBuilder.toContainerBuildPlan().getUser());
+
+    mavenProjectProperties.waitForLoggingThread();
+    Mockito.verify(mockLog).error("awesome error from my extension");
+    Mockito.verify(mockLog)
+        .info(
+            Mockito.startsWith(
+                "Running extension: com.google.cloud.tools.jib.maven.MavenProjectProperties"));
+  }
+
+  @Test
+  public void testRunPluginExtensions_preferInjectionOverServiceLoader()
+      throws JibPluginExtensionException {
+    FooExtension injectedExtension =
+        new FooExtension(
+            (buildPlan, properties, extraConfig, mavenData, logger) -> {
+              logger.log(LogLevel.ERROR, "awesome error from my extension");
+              return buildPlan.toBuilder().setUser("user from injected extension").build();
+            });
+
+    FooExtension loadedExtension =
+        new FooExtension(
+            (buildPlan, properties, extraConfig, mavenData, logger) -> {
+              return buildPlan.toBuilder().setUser("user from extension").build();
+            });
+
+    mavenProjectProperties =
+        new MavenProjectProperties(
+            mockJibPluginDescriptor,
+            mockMavenProject,
+            mockMavenSession,
+            mockLog,
+            mockTempDirectoryProvider,
+            Arrays.asList(injectedExtension),
+            () -> Arrays.asList(loadedExtension));
+
+    JibContainerBuilder extendedBuilder =
+        mavenProjectProperties.runPluginExtensions(
+            Arrays.asList(new FooExtensionConfig()), containerBuilder);
+    Assert.assertEquals(
+        "user from injected extension", extendedBuilder.toContainerBuildPlan().getUser());
+
+    mavenProjectProperties.waitForLoggingThread();
+    Mockito.verify(mockLog).error("awesome error from my extension");
+    Mockito.verify(mockLog)
+        .info(
+            Mockito.startsWith(
+                "Running extension: com.google.cloud.tools.jib.maven.MavenProjectProperties"));
+  }
 }

jib-maven-plugin/src/test/java/com/google/cloud/tools/jib/maven/MavenProjectPropertiesTest.java

@@ -259,6 +259,7 @@ public void setUp() throws IOException, URISyntaxException {
             mockMavenSession,
             mockLog,
             mockTempDirectoryProvider,
+            Collections.emptyList(),
             mockExtensionLoader);
 
     Path outputPath = getResource("maven/application/output");