Apache/maven
1
0
Fork 0
mirror of https://github.com/apache/maven.git synced 2025-02-22 01:45:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

avoid NPE if there are no parameters in the mojo

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@234155 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-08-21 07:27:29 +00:00
parent 3715ac2a6c
commit 5d3ebf4434
1 changed files with 58 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
View File

@ -279,7 +279,7 @@ protected void addPlugin( Plugin plugin, Artifact pluginArtifact, MavenProject p
throws ArtifactResolutionException, PlexusContainerException
{
artifactResolver.resolve( pluginArtifact, project.getPluginArtifactRepositories(), localRepository );
PlexusContainer child = container.createChildContainer( plugin.getKey(),
Collections.singletonList( pluginArtifact.getFile() ),
Collections.EMPTY_MAP,
@ -511,7 +511,7 @@ private Mojo getConfiguredMojo( MojoDescriptor mojoDescriptor, MavenSession sess
// mojoDescriptor.getConfiguration() );
ExpressionEvaluator expressionEvaluator = new PluginParameterExpressionEvaluator( session, mojoDescriptor,
pathTranslator, getLogger(),
pathTranslator, getLogger(),
project );
PlexusConfiguration extractedMojoConfiguration = extractMojoConfiguration( mergedConfiguration,
@ -769,7 +769,7 @@ private void checkRequiredParameters( MojoDescriptor goal, PlexusConfiguration c
}
// only mark as invalid if there are no child nodes
if ( fieldValue == null && (value == null || value.getChildCount() == 0 ) )
if ( fieldValue == null && ( value == null || value.getChildCount() == 0 ) )
{
parameter.setExpression( expression );
invalidParameters.add( parameter );
@ -829,95 +829,98 @@ private void validatePomConfiguration( MojoDescriptor goal, PlexusConfiguration
}
}
}
private PlexusConfiguration mergeMojoConfiguration( XmlPlexusConfiguration fromPom, MojoDescriptor mojoDescriptor )
{
XmlPlexusConfiguration result = new XmlPlexusConfiguration( fromPom.getName() );
result.setValue( fromPom.getValue( null ) );
PlexusConfiguration fromMojo = mojoDescriptor.getMojoConfiguration();
for ( Iterator it = mojoDescriptor.getParameters().iterator(); it.hasNext(); )
if ( mojoDescriptor.getParameters() != null )
{
Parameter parameter = (Parameter) it.next();
PlexusConfiguration fromMojo = mojoDescriptor.getMojoConfiguration();
String paramName = parameter.getName();
String alias = parameter.getAlias();
for ( Iterator it = mojoDescriptor.getParameters().iterator(); it.hasNext(); )
{
Parameter parameter = (Parameter) it.next();
PlexusConfiguration pomConfig = fromPom.getChild( paramName );
PlexusConfiguration aliased = null;
if ( alias != null )
{
aliased = fromPom.getChild( alias );
}
PlexusConfiguration mojoConfig = fromMojo.getChild( paramName, false );
// first we'll merge configurations from the aliased and real params.
// TODO: Is this the right thing to do?
if ( aliased != null )
{
if ( pomConfig == null )
String paramName = parameter.getName();
String alias = parameter.getAlias();
PlexusConfiguration pomConfig = fromPom.getChild( paramName );
PlexusConfiguration aliased = null;
if ( alias != null )
{
pomConfig = new XmlPlexusConfiguration( paramName );
aliased = fromPom.getChild( alias );
}
pomConfig = buildTopDownMergedConfiguration( pomConfig, aliased );
}
boolean addedPomConfig = false;
if ( pomConfig != null )
{
pomConfig = buildTopDownMergedConfiguration( pomConfig, mojoConfig );
PlexusConfiguration mojoConfig = fromMojo.getChild( paramName, false );
if ( StringUtils.isNotEmpty( pomConfig.getValue( null ) ) || pomConfig.getChildCount() > 0 )
// first we'll merge configurations from the aliased and real params.
// TODO: Is this the right thing to do?
if ( aliased != null )
{
result.addChild( pomConfig );
addedPomConfig = true;
if ( pomConfig == null )
{
pomConfig = new XmlPlexusConfiguration( paramName );
}
pomConfig = buildTopDownMergedConfiguration( pomConfig, aliased );
}
boolean addedPomConfig = false;
if ( pomConfig != null )
{
pomConfig = buildTopDownMergedConfiguration( pomConfig, mojoConfig );
if ( StringUtils.isNotEmpty( pomConfig.getValue( null ) ) || pomConfig.getChildCount() > 0 )
{
result.addChild( pomConfig );
addedPomConfig = true;
}
}
if ( !addedPomConfig && mojoConfig != null )
{
result.addChild( copyConfiguration( mojoConfig ) );
}
}
if ( !addedPomConfig && mojoConfig != null )
{
result.addChild( copyConfiguration( mojoConfig ) );
}
}
return result;
}
private XmlPlexusConfiguration buildTopDownMergedConfiguration( PlexusConfiguration dominant, PlexusConfiguration recessive )
private XmlPlexusConfiguration buildTopDownMergedConfiguration( PlexusConfiguration dominant,
PlexusConfiguration recessive )
{
XmlPlexusConfiguration result = new XmlPlexusConfiguration( dominant.getName() );
String value = dominant.getValue( null );
if ( StringUtils.isEmpty( value ) && recessive != null )
{
value = recessive.getValue( null );
}
if ( StringUtils.isNotEmpty( value ) )
{
result.setValue( value );
}
String[] attributeNames = dominant.getAttributeNames();
for ( int i = 0; i < attributeNames.length; i++ )
{
String attributeValue = dominant.getAttribute( attributeNames[i], null );
result.setAttribute( attributeNames[i], attributeValue );
}
if ( recessive != null )
{
attributeNames = recessive.getAttributeNames();
for ( int i = 0; i < attributeNames.length; i++ )
{
String attributeValue = recessive.getAttribute( attributeNames[i], null );
@ -942,7 +945,7 @@ private XmlPlexusConfiguration buildTopDownMergedConfiguration( PlexusConfigurat
result.addChild( copyConfiguration( childDom ) );
}
}
return result;
}