Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed errors reported by Checkstyle

This commit is contained in:
Hervé Boutemy 2014-05-25 00:00:26 +02:00
parent 3729324a13
commit 73d35ba959
14 changed files with 73 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
maven-core/src/main/java/org/apache/maven/DefaultProjectDependencyGraph.java
View File

@ -76,12 +76,9 @@ class DefaultProjectDependencyGraph
{
for ( String id : sorter.getDependents( projectId ) )
{
if ( projectIds.add( id ) )
if ( projectIds.add( id ) && transitive )
{
if ( transitive )
{
getDownstreamProjects( id, projectIds, transitive );
}
getDownstreamProjects( id, projectIds, transitive );
}
}
}

2
maven-core/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java
View File

@ -48,7 +48,7 @@ public class InvalidRepositoryException
@Deprecated
public InvalidRepositoryException( String message, Throwable t )
{
super( message );
super( message, t );
this.repositoryId = null;
}

7
maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java
View File

@ -242,12 +242,9 @@ public class DefaultMavenExecutionRequestPopulator
private void baseDirectory( MavenExecutionRequest request )
{
if ( request.getBaseDirectory() == null )
if ( request.getBaseDirectory() == null && request.getPom() != null )
{
if ( request.getPom() != null )
{
request.setBaseDirectory( request.getPom().getAbsoluteFile().getParentFile() );
}
request.setBaseDirectory( request.getPom().getAbsoluteFile().getParentFile() );
}
}

4
maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
View File

@ -177,12 +177,12 @@ public interface MavenExecutionRequest
*
* @param degreeOfConcurrency
*/
public void setDegreeOfConcurrency( final int degreeOfConcurrency );
void setDegreeOfConcurrency( int degreeOfConcurrency );
/**
* @return the degree of concurrency for the build.
*/
public int getDegreeOfConcurrency();
int getDegreeOfConcurrency();
// Recursive (really to just process the top-level POM)
MavenExecutionRequest setRecursive( boolean recursive );

7
maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java
View File

@ -75,12 +75,9 @@ public class DefaultLifecycleTaskSegmentCalculator
List<String> tasks = session.getGoals();
if ( tasks == null || tasks.isEmpty() )
if ( ( tasks == null || tasks.isEmpty() ) && !StringUtils.isEmpty( rootProject.getDefaultGoal() ) )
{
if ( !StringUtils.isEmpty( rootProject.getDefaultGoal() ) )
{
tasks = Arrays.asList( StringUtils.split( rootProject.getDefaultGoal() ) );
}
tasks = Arrays.asList( StringUtils.split( rootProject.getDefaultGoal() ) );
}
return calculateTaskSegments( session, tasks );

1
maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java
View File

@ -27,7 +27,6 @@ import org.apache.maven.project.MavenProject;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
/**
* Wraps individual MojoExecutions, containing information about completion status and scheduling.

2
maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java
View File

@ -51,7 +51,7 @@ public interface LifecycleTaskSegmentCalculator
MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
PluginVersionResolutionException, LifecyclePhaseNotFoundException, LifecycleNotFoundException;
public List<TaskSegment> calculateTaskSegments( MavenSession session, List<String> tasks )
List<TaskSegment> calculateTaskSegments( MavenSession session, List<String> tasks )
throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
PluginVersionResolutionException;

2
maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java
View File

@ -37,7 +37,7 @@ import org.eclipse.aether.artifact.Artifact;
public interface ExtensionRealmCache
{
public static class CacheRecord
static class CacheRecord
{
public final ClassRealm realm;

2
maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java
View File

@ -47,7 +47,7 @@ public interface PluginArtifactsCache
// marker interface for cache keys
}
public static class CacheRecord
static class CacheRecord
{
public final List<Artifact> artifacts;

2
maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
View File

@ -41,7 +41,7 @@ import org.eclipse.aether.repository.RemoteRepository;
public interface PluginRealmCache
{
public static class CacheRecord
static class CacheRecord
{
public final ClassRealm realm;

2
maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
View File

@ -224,7 +224,7 @@ public class DefaultPluginDependenciesResolver
org.eclipse.aether.graph.Dependency dep = node.getDependency();
if ( dep != null )
{
org.eclipse.aether.artifact.Artifact art = dep.getArtifact();
Artifact art = dep.getArtifact();
buffer.append( art );
buffer.append( ':' ).append( dep.getScope() );

133
maven-core/src/main/java/org/apache/maven/project/MavenProject.java
View File

@ -71,7 +71,6 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
@ -486,12 +485,9 @@ public class MavenProject
if ( path != null )
{
path = path.trim();
if ( path.length() != 0 )
if ( path.length() != 0 && !getScriptSourceRoots().contains( path ) )
{
if ( !getScriptSourceRoots().contains( path ) )
{
getScriptSourceRoots().add( path );
}
getScriptSourceRoots().add( path );
}
}
}
@ -529,13 +525,11 @@ public class MavenProject
for ( Artifact a : getArtifacts() )
{
if ( a.getArtifactHandler().isAddedToClasspath() )
if ( a.getArtifactHandler().isAddedToClasspath()
// TODO: let the scope handler deal with this
&& ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_PROVIDED.equals( a.getScope() ) || Artifact.SCOPE_SYSTEM.equals( a.getScope() ) ) )
{
// TODO: let the scope handler deal with this
if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_PROVIDED.equals( a.getScope() ) || Artifact.SCOPE_SYSTEM.equals( a.getScope() ) )
{
addArtifactPath( a, list );
}
addArtifactPath( a, list );
}
}
@ -550,13 +544,11 @@ public class MavenProject
for ( Artifact a : getArtifacts() )
{
// TODO: classpath check doesn't belong here - that's the other method
if ( a.getArtifactHandler().isAddedToClasspath() )
if ( a.getArtifactHandler().isAddedToClasspath()
// TODO: let the scope handler deal with this
&& ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_PROVIDED.equals( a.getScope() ) || Artifact.SCOPE_SYSTEM.equals( a.getScope() ) ) )
{
// TODO: let the scope handler deal with this
if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_PROVIDED.equals( a.getScope() ) || Artifact.SCOPE_SYSTEM.equals( a.getScope() ) )
{
list.add( a );
}
list.add( a );
}
}
return list;
@ -681,13 +673,11 @@ public class MavenProject
for ( Artifact a : getArtifacts() )
{
if ( a.getArtifactHandler().isAddedToClasspath() )
if ( a.getArtifactHandler().isAddedToClasspath()
// TODO: let the scope handler deal with this
&& ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_RUNTIME.equals( a.getScope() ) ) )
{
// TODO: let the scope handler deal with this
if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_RUNTIME.equals( a.getScope() ) )
{
addArtifactPath( a, list );
}
addArtifactPath( a, list );
}
}
return list;
@ -701,13 +691,11 @@ public class MavenProject
for ( Artifact a : getArtifacts() )
{
// TODO: classpath check doesn't belong here - that's the other method
if ( a.getArtifactHandler().isAddedToClasspath() )
if ( a.getArtifactHandler().isAddedToClasspath()
// TODO: let the scope handler deal with this
&& ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_RUNTIME.equals( a.getScope() ) ) )
{
// TODO: let the scope handler deal with this
if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_RUNTIME.equals( a.getScope() ) )
{
list.add( a );
}
list.add( a );
}
}
return list;
@ -758,13 +746,11 @@ public class MavenProject
for ( Artifact a : getArtifacts() )
{
if ( a.getArtifactHandler().isAddedToClasspath() )
if ( a.getArtifactHandler().isAddedToClasspath()
// TODO: let the scope handler deal with this
&& Artifact.SCOPE_SYSTEM.equals( a.getScope() ) )
{
// TODO: let the scope handler deal with this
if ( Artifact.SCOPE_SYSTEM.equals( a.getScope() ) )
{
addArtifactPath( a, list );
}
addArtifactPath( a, list );
}
}
return list;
@ -778,13 +764,11 @@ public class MavenProject
for ( Artifact a : getArtifacts() )
{
// TODO: classpath check doesn't belong here - that's the other method
if ( a.getArtifactHandler().isAddedToClasspath() )
if ( a.getArtifactHandler().isAddedToClasspath()
// TODO: let the scope handler deal with this
&& Artifact.SCOPE_SYSTEM.equals( a.getScope() ) )
{
// TODO: let the scope handler deal with this
if ( Artifact.SCOPE_SYSTEM.equals( a.getScope() ) )
{
list.add( a );
}
list.add( a );
}
}
return list;
@ -1892,26 +1876,22 @@ public class MavenProject
protected ArtifactRepository getReleaseArtifactRepository()
{
if ( releaseArtifactRepository == null )
if ( releaseArtifactRepository == null && getDistributionManagement() != null
&& getDistributionManagement().getRepository() != null )
{
if ( getDistributionManagement() != null && getDistributionManagement().getRepository() != null )
checkProjectBuildingRequest();
try
{
checkProjectBuildingRequest();
try
{
ArtifactRepository repo =
repositorySystem.buildArtifactRepository( getDistributionManagement().getRepository() );
repositorySystem.injectProxy( projectBuilderConfiguration.getRepositorySession(),
Arrays.asList( repo ) );
repositorySystem.injectAuthentication( projectBuilderConfiguration.getRepositorySession(),
Arrays.asList( repo ) );
setReleaseArtifactRepository( repo );
}
catch ( InvalidRepositoryException e )
{
throw new IllegalStateException( "Failed to create release distribution repository for " + getId(),
e );
}
ArtifactRepository repo =
repositorySystem.buildArtifactRepository( getDistributionManagement().getRepository() );
repositorySystem.injectProxy( projectBuilderConfiguration.getRepositorySession(), Arrays.asList( repo ) );
repositorySystem.injectAuthentication( projectBuilderConfiguration.getRepositorySession(),
Arrays.asList( repo ) );
setReleaseArtifactRepository( repo );
}
catch ( InvalidRepositoryException e )
{
throw new IllegalStateException( "Failed to create release distribution repository for " + getId(), e );
}
}
@ -1920,27 +1900,22 @@ public class MavenProject
protected ArtifactRepository getSnapshotArtifactRepository()
{
if ( snapshotArtifactRepository == null )
if ( snapshotArtifactRepository == null && getDistributionManagement() != null
&& getDistributionManagement().getSnapshotRepository() != null )
{
if ( getDistributionManagement() != null && getDistributionManagement().getSnapshotRepository() != null )
checkProjectBuildingRequest();
try
{
checkProjectBuildingRequest();
try
{
ArtifactRepository repo =
repositorySystem.buildArtifactRepository( getDistributionManagement().getSnapshotRepository() );
repositorySystem.injectProxy( projectBuilderConfiguration.getRepositorySession(),
Arrays.asList( repo ) );
repositorySystem.injectAuthentication( projectBuilderConfiguration.getRepositorySession(),
Arrays.asList( repo ) );
setSnapshotArtifactRepository( repo );
}
catch ( InvalidRepositoryException e )
{
throw new IllegalStateException(
"Failed to create snapshot distribution repository for " + getId(),
e );
}
ArtifactRepository repo =
repositorySystem.buildArtifactRepository( getDistributionManagement().getSnapshotRepository() );
repositorySystem.injectProxy( projectBuilderConfiguration.getRepositorySession(), Arrays.asList( repo ) );
repositorySystem.injectAuthentication( projectBuilderConfiguration.getRepositorySession(),
Arrays.asList( repo ) );
setSnapshotArtifactRepository( repo );
}
catch ( InvalidRepositoryException e )
{
throw new IllegalStateException( "Failed to create snapshot distribution repository for " + getId(), e );
}
}

2
maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java
View File

@ -35,7 +35,7 @@ import org.eclipse.aether.graph.DependencyFilter;
public interface ProjectRealmCache
{
public static class CacheRecord
static class CacheRecord
{
public final ClassRealm realm;

10
maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
View File

@ -157,13 +157,11 @@ public class MavenMetadataSource
cache.get( artifact, request.isResolveManagedVersions(), request.getLocalRepository(),
request.getRemoteRepositories() );
if ( cached != null )
if ( cached != null
// if the POM has no file, we cached a missing artifact, only return the cached data if no update forced
&& ( !request.isForceUpdate() || hasFile( cached.getPomArtifact() ) ) )
{
// if the POM has no file, we cached a missing artifact, only return the cached data if no update forced
if ( !request.isForceUpdate() || hasFile( cached.getPomArtifact() ) )
{
return cached;
}
return cached;
}
List<Dependency> dependencies;