getting rid of code duplication

kohsuke · kohsuke · commit 946bb40f515d · 2011-12-16T17:32:20.000-08:00
diff --git a/maven-plugin/src/main/java/hudson/maven/Maven3Builder.java b/maven-plugin/src/main/java/hudson/maven/Maven3Builder.java
@@ -458,11 +458,7 @@ private void recordMojoStarted(ExecutionEvent event) {
             initMojoStartTime( event.getProject() );
             
             MavenProject mavenProject = event.getProject();
-            XmlPlexusConfiguration xmlPlexusConfiguration = new XmlPlexusConfiguration( event.getMojoExecution().getConfiguration() );
-
-            MojoInfo mojoInfo =
-                new MojoInfo( event.getMojoExecution(), null, xmlPlexusConfiguration,
-                              getExpressionEvaluator( event.getSession(), event.getMojoExecution() ) );
+            MojoInfo mojoInfo = new MojoInfo(event);
 
             List<MavenReporter> mavenReporters = getMavenReporters( mavenProject );                
             
@@ -495,13 +491,7 @@ public void mojoSucceeded( ExecutionEvent event ) {
         
         private void recordMojoSucceeded(ExecutionEvent event) {
             MavenProject mavenProject = event.getProject();
-            XmlPlexusConfiguration xmlPlexusConfiguration = new XmlPlexusConfiguration( event.getMojoExecution().getConfiguration() );
-
-            Mojo mojo = null;//getMojo( event.getMojoExecution(), event.getSession() );
-
-            MojoInfo mojoInfo =
-                new MojoInfo( event.getMojoExecution(), mojo, xmlPlexusConfiguration,
-                              getExpressionEvaluator( event.getSession(), event.getMojoExecution() ) );
+            MojoInfo mojoInfo = new MojoInfo(event);
 
             recordExecutionTime(event,mojoInfo);
 
@@ -557,13 +547,7 @@ private void debug(String msg) {
         
         private void recordMojoFailed(ExecutionEvent event) {
             MavenProject mavenProject = event.getProject();
-            XmlPlexusConfiguration xmlPlexusConfiguration = new XmlPlexusConfiguration( event.getMojoExecution().getConfiguration() );
-
-            Mojo mojo = null;//getMojo( event.getMojoExecution(), event.getSession() );
-
-            MojoInfo mojoInfo =
-                new MojoInfo( event.getMojoExecution(), mojo, xmlPlexusConfiguration,
-                              getExpressionEvaluator( event.getSession(), event.getMojoExecution() ) );
+            MojoInfo mojoInfo = new MojoInfo(event);
 
             recordExecutionTime(event,mojoInfo);
 
diff --git a/maven-plugin/src/main/java/hudson/maven/MojoInfo.java b/maven-plugin/src/main/java/hudson/maven/MojoInfo.java
@@ -23,11 +23,13 @@
  */
 package hudson.maven;
 
+import org.apache.maven.execution.ExecutionEvent;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecution;
 import org.apache.maven.plugin.Mojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.PluginParameterExpressionEvaluator;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
 import org.codehaus.classworlds.ClassRealm;
 import org.codehaus.plexus.configuration.PlexusConfiguration;
@@ -45,6 +47,7 @@
 
 import hudson.util.InvocationInterceptor;
 import hudson.util.ReflectionUtils;
+import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
 
 /**
  * Information about Mojo to be executed. This object provides
@@ -111,6 +114,12 @@ public MojoInfo(MojoExecution mojoExecution, Mojo mojo, PlexusConfiguration conf
         this.pluginName = new PluginName(mojoExecution.getMojoDescriptor().getPluginDescriptor());
     }
 
+    public MojoInfo(ExecutionEvent event) {
+        this(event.getMojoExecution(), null,
+                new XmlPlexusConfiguration( event.getMojoExecution().getConfiguration() ),
+                new PluginParameterExpressionEvaluator( event.getSession(), event.getMojoExecution() ));
+    }
+
     /**
      * Gets the goal name of the mojo to be executed,
      * such as "javadoc". This is local to the plugin name.
