mirror of https://github.com/apache/maven.git
MNG-5805: Fix NPE in LifecyclePhase#toString()
Signed-off-by: Jason van Zyl <jason@tesla.io> closes #62
This commit is contained in:
parent
31e70dba90
commit
9f7971dadb
|
@ -55,13 +55,16 @@ public class LifecyclePhase
|
|||
{
|
||||
mojos = new ArrayList<>();
|
||||
|
||||
String[] mojoGoals = StringUtils.split( goals, "," );
|
||||
|
||||
for ( String mojoGoal: mojoGoals )
|
||||
if ( StringUtils.isNotEmpty( goals ) )
|
||||
{
|
||||
LifecycleMojo lifecycleMojo = new LifecycleMojo();
|
||||
lifecycleMojo.setGoal( mojoGoal.trim() );
|
||||
mojos.add( lifecycleMojo );
|
||||
String[] mojoGoals = StringUtils.split( goals, "," );
|
||||
|
||||
for ( String mojoGoal: mojoGoals )
|
||||
{
|
||||
LifecycleMojo lifecycleMojo = new LifecycleMojo();
|
||||
lifecycleMojo.setGoal( mojoGoal.trim() );
|
||||
mojos.add( lifecycleMojo );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -70,17 +73,21 @@ public class LifecyclePhase
|
|||
{
|
||||
StringBuilder sb = new StringBuilder();
|
||||
boolean first = true;
|
||||
for ( LifecycleMojo mojo: getMojos() )
|
||||
List<LifecycleMojo> mojos = getMojos();
|
||||
if ( mojos != null )
|
||||
{
|
||||
if ( first )
|
||||
for ( LifecycleMojo mojo: mojos )
|
||||
{
|
||||
first = false;
|
||||
if ( first )
|
||||
{
|
||||
first = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
sb.append( "," );
|
||||
}
|
||||
sb.append( mojo.getGoal() );
|
||||
}
|
||||
else
|
||||
{
|
||||
sb.append( "," );
|
||||
}
|
||||
sb.append( mojo.getGoal() );
|
||||
}
|
||||
return sb.toString();
|
||||
}
|
||||
|
|
|
@ -0,0 +1,73 @@
|
|||
package org.apache.maven.lifecycle.mapping;
|
||||
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
|
||||
* agreements. See the NOTICE file distributed with this work for additional information regarding
|
||||
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance with the License. You may obtain a
|
||||
* copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software distributed under the License
|
||||
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
|
||||
* or implied. See the License for the specific language governing permissions and limitations under
|
||||
* the License.
|
||||
*/
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
import static org.junit.Assert.assertNull;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import org.junit.Test;
|
||||
|
||||
/**
|
||||
* @author atanasenko
|
||||
*/
|
||||
public class LifecyclePhaseTest
|
||||
{
|
||||
@Test
|
||||
public void testToString()
|
||||
{
|
||||
LifecyclePhase phase = new LifecyclePhase();
|
||||
assertEquals( "", phase.toString() );
|
||||
|
||||
LifecycleMojo mojo1 = new LifecycleMojo();
|
||||
mojo1.setGoal( "jar:jar" );
|
||||
phase.setMojos( Arrays.asList( mojo1 ) );
|
||||
assertEquals( "jar:jar", phase.toString() );
|
||||
|
||||
LifecycleMojo mojo2 = new LifecycleMojo();
|
||||
mojo2.setGoal( "war:war" );
|
||||
phase.setMojos( Arrays.asList( mojo1, mojo2 ) );
|
||||
assertEquals( "jar:jar,war:war", phase.toString() );
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSet()
|
||||
{
|
||||
LifecyclePhase phase = new LifecyclePhase();
|
||||
assertNull( phase.getMojos() );
|
||||
|
||||
phase.set( "" );
|
||||
assertNotNull( phase.getMojos() );
|
||||
assertEquals( 0, phase.getMojos().size() );
|
||||
|
||||
phase.set( "jar:jar, war:war" );
|
||||
|
||||
List<LifecycleMojo> mojos = phase.getMojos();
|
||||
assertNotNull( mojos );
|
||||
assertEquals( 2, mojos.size() );
|
||||
|
||||
LifecycleMojo mojo1 = mojos.get(0);
|
||||
assertNotNull( mojo1 );
|
||||
assertEquals( "jar:jar", mojo1.getGoal() );
|
||||
|
||||
LifecycleMojo mojo2 = mojos.get(1);
|
||||
assertNotNull( mojo2 );
|
||||
assertEquals( "war:war", mojo2.getGoal() );
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue