diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilderSource.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilderSource.java index 1add18cb12fb..579097f1d871 100644 --- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilderSource.java +++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilderSource.java @@ -35,4 +35,18 @@ public interface ProjectBuilderSource InputStream getInputStream() throws IOException; String getLocation(); + + /** + * Returns a new source identified by a relative path. Implementation MUST + * be able to accept relPath parameter values that + * + * + * @param relative is the path of the requested source relative to this source. + * @return related source or null if no such source. + */ + ProjectBuilderSource resolve( String relative ); } diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectBuilder.java index d9911c20148d..2fed6e25b4b4 100644 --- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectBuilder.java @@ -24,6 +24,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.net.URI; import java.nio.file.Path; import java.util.Collection; import java.util.List; @@ -46,7 +47,7 @@ import org.apache.maven.artifact.DefaultArtifact; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.model.building.ModelProblem; -import org.apache.maven.model.building.ModelSource; +import org.apache.maven.model.building.ModelSource2; import org.apache.maven.project.DefaultProjectBuildingRequest; import org.apache.maven.project.ProjectBuildingException; import org.apache.maven.project.ProjectBuildingRequest; @@ -88,20 +89,7 @@ public ProjectBuilderResult build( ProjectBuilderRequest request ) else if ( request.getSource().isPresent() ) { ProjectBuilderSource source = request.getSource().get(); - ModelSource modelSource = new ModelSource() - { - @Override - public InputStream getInputStream() throws IOException - { - return source.getInputStream(); - } - - @Override - public String getLocation() - { - return source.getLocation(); - } - }; + ModelSource2 modelSource = new ProjectBuilderSourceWrapper( source ); res = builder.build( modelSource, req ); } else if ( request.getArtifact().isPresent() ) @@ -264,4 +252,39 @@ public Node getRoot() throw new ProjectBuilderException( "Unable to build project", e ); } } + + private static class ProjectBuilderSourceWrapper implements ModelSource2 + { + private final ProjectBuilderSource source; + + ProjectBuilderSourceWrapper( ProjectBuilderSource source ) + { + this.source = source; + } + + @Override + public InputStream getInputStream() throws IOException + { + return source.getInputStream(); + } + + @Override + public String getLocation() + { + return source.getLocation(); + } + + @Override + public ModelSource2 getRelatedSource( String relPath ) + { + ProjectBuilderSource rel = source.resolve( relPath ); + return rel != null ? new ProjectBuilderSourceWrapper( rel ) : null; + } + + @Override + public URI getLocationURI() + { + return null; + } + } } diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java index 7fe5a23b1314..860b7440d4a4 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java @@ -19,6 +19,10 @@ * under the License. */ +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; + import java.io.File; import java.io.IOException; import java.util.AbstractMap; @@ -32,12 +36,12 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ForkJoinPool; +import java.util.concurrent.ForkJoinTask; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; - +import org.apache.maven.ProjectCycleException; import org.apache.maven.RepositoryUtils; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.InvalidArtifactRTException; @@ -56,7 +60,6 @@ import org.apache.maven.model.Profile; import org.apache.maven.model.ReportPlugin; import org.apache.maven.model.building.ArtifactModelSource; -import org.apache.maven.model.building.TransformerContextBuilder; import org.apache.maven.model.building.DefaultModelBuildingRequest; import org.apache.maven.model.building.DefaultModelProblem; import org.apache.maven.model.building.FileModelSource; @@ -69,11 +72,13 @@ import org.apache.maven.model.building.ModelSource; import org.apache.maven.model.building.StringModelSource; import org.apache.maven.model.building.TransformerContext; +import org.apache.maven.model.building.TransformerContextBuilder; import org.apache.maven.model.resolution.ModelResolver; import org.apache.maven.repository.internal.ArtifactDescriptorUtils; import org.apache.maven.repository.internal.ModelCacheFactory; import org.codehaus.plexus.util.Os; import org.codehaus.plexus.util.StringUtils; +import org.codehaus.plexus.util.dag.CycleDetectedException; import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.RequestTrace; @@ -94,6 +99,8 @@ public class DefaultProjectBuilder implements ProjectBuilder { + private static final String BUILDER_PARALLELISM = "maven.projectBuilder.parallelism"; + private final Logger logger = LoggerFactory.getLogger( getClass() ); private final ModelBuilder modelBuilder; private final ModelProcessor modelProcessor; @@ -133,488 +140,471 @@ public DefaultProjectBuilder( public ProjectBuildingResult build( File pomFile, ProjectBuildingRequest request ) throws ProjectBuildingException { - return build( pomFile, new FileModelSource( pomFile ), - new InternalConfig( request, null, null ) ); + return new BuildSession( request, false ).build( pomFile, new FileModelSource( pomFile ) ); } @Override public ProjectBuildingResult build( ModelSource modelSource, ProjectBuildingRequest request ) throws ProjectBuildingException { - return build( null, modelSource, - new InternalConfig( request, null, null ) ); + return new BuildSession( request, false ).build( null, modelSource ); } - private ProjectBuildingResult build( File pomFile, ModelSource modelSource, InternalConfig config ) + @Override + public ProjectBuildingResult build( Artifact artifact, ProjectBuildingRequest request ) throws ProjectBuildingException { - ClassLoader oldContextClassLoader = Thread.currentThread().getContextClassLoader(); - - try - { - ProjectBuildingRequest projectBuildingRequest = config.request; - - MavenProject project = projectBuildingRequest.getProject(); - - List modelProblems = null; - Throwable error = null; - - if ( project == null ) - { - ModelBuildingRequest request = getModelBuildingRequest( config ); + return build( artifact, false, request ); + } - project = new MavenProject(); - project.setFile( pomFile ); + @Override + public ProjectBuildingResult build( Artifact artifact, boolean allowStubModel, ProjectBuildingRequest request ) + throws ProjectBuildingException + { + return new BuildSession( request, false ).build( artifact, allowStubModel ); + } - DefaultModelBuildingListener listener = - new DefaultModelBuildingListener( project, projectBuildingHelper, projectBuildingRequest ); - request.setModelBuildingListener( listener ); + @Override + public List build( List pomFiles, boolean recursive, ProjectBuildingRequest request ) + throws ProjectBuildingException + { + return new BuildSession( request, true ).build( pomFiles, recursive ); + } - request.setPomFile( pomFile ); - request.setModelSource( modelSource ); - request.setLocationTracking( true ); + static class InterimResult + { - ModelBuildingResult result; - try - { - result = modelBuilder.build( request ); - } - catch ( ModelBuildingException e ) - { - result = e.getResult(); - if ( result == null || result.getEffectiveModel() == null ) - { - throw new ProjectBuildingException( e.getModelId(), e.getMessage(), pomFile, e ); - } - // validation error, continue project building and delay failing to help IDEs - error = e; - } + File pomFile; - modelProblems = result.getProblems(); + ModelBuildingRequest request; - initProject( project, Collections.emptyMap(), true, - result, new HashMap<>(), projectBuildingRequest ); - } - else if ( projectBuildingRequest.isResolveDependencies() ) - { - projectBuildingHelper.selectProjectRealm( project ); - } + ModelBuildingResult result; - DependencyResolutionResult resolutionResult = null; + DefaultModelBuildingListener listener; - if ( projectBuildingRequest.isResolveDependencies() ) - { - resolutionResult = resolveDependencies( project, config.session ); - } + boolean root; - ProjectBuildingResult result = new DefaultProjectBuildingResult( project, modelProblems, resolutionResult ); + List modules = Collections.emptyList(); - if ( error != null ) - { - ProjectBuildingException e = new ProjectBuildingException( Arrays.asList( result ) ); - e.initCause( error ); - throw e; - } + ProjectBuildingResult projectBuildingResult; - return result; + InterimResult( File pomFile, ModelBuildingRequest request, ModelBuildingResult result, + DefaultModelBuildingListener listener, boolean root ) + { + this.pomFile = pomFile; + this.request = request; + this.result = result; + this.listener = listener; + this.root = root; } - finally + + InterimResult( ProjectBuildingResult projectBuildingResult ) { - Thread.currentThread().setContextClassLoader( oldContextClassLoader ); + this.projectBuildingResult = projectBuildingResult; } } - private DependencyResolutionResult resolveDependencies( MavenProject project, RepositorySystemSession session ) + class BuildSession { - DependencyResolutionResult resolutionResult; + private final ProjectBuildingRequest request; + private final RepositorySystemSession session; + private final List repositories; + private final ReactorModelPool.Builder poolBuilder; + private final ReactorModelPool modelPool; + private final TransformerContextBuilder transformerContextBuilder; + private final ForkJoinPool forkJoinPool; - try + BuildSession( ProjectBuildingRequest request, boolean localProjects ) { - DefaultDependencyResolutionRequest resolution = new DefaultDependencyResolutionRequest( project, session ); - resolutionResult = dependencyResolver.resolve( resolution ); - } - catch ( DependencyResolutionException e ) - { - resolutionResult = e.getResult(); + this.request = request; + this.session = LegacyLocalRepositoryManager.overlay( + request.getLocalRepository(), request.getRepositorySession(), repoSystem ); + this.repositories = RepositoryUtils.toRepos( request.getRemoteRepositories() ); + if ( localProjects ) + { + this.poolBuilder = new ReactorModelPool.Builder(); + this.modelPool = poolBuilder.build(); + this.transformerContextBuilder = modelBuilder.newTransformerContextBuilder(); + this.forkJoinPool = new ForkJoinPool( getParallelism( request ) ); + } + else + { + this.poolBuilder = null; + this.modelPool = null; + this.transformerContextBuilder = null; + this.forkJoinPool = null; + } } - Set artifacts = new LinkedHashSet<>(); - if ( resolutionResult.getDependencyGraph() != null ) + private int getParallelism( ProjectBuildingRequest request ) { - RepositoryUtils.toArtifacts( artifacts, resolutionResult.getDependencyGraph().getChildren(), - Collections.singletonList( project.getArtifact().getId() ), null ); - - // Maven 2.x quirk: an artifact always points at the local repo, regardless whether resolved or not - LocalRepositoryManager lrm = session.getLocalRepositoryManager(); - for ( Artifact artifact : artifacts ) + int parallelism = Runtime.getRuntime().availableProcessors(); + try { - if ( !artifact.isResolved() ) + String str = request.getUserProperties().getProperty( BUILDER_PARALLELISM ); + if ( str == null ) + { + str = request.getSystemProperties().getProperty( BUILDER_PARALLELISM ); + } + if ( str != null ) { - String path = lrm.getPathForLocalArtifact( RepositoryUtils.toArtifact( artifact ) ); - artifact.setFile( new File( lrm.getRepository().getBasedir(), path ) ); + parallelism = Integer.parseInt( str ); } } + catch ( Exception e ) + { + // ignore + } + return parallelism; } - project.setResolvedArtifacts( artifacts ); - project.setArtifacts( artifacts ); - return resolutionResult; - } - - private List getProfileIds( List profiles ) - { - return profiles.stream().map( org.apache.maven.model.Profile::getId ).collect( Collectors.toList() ); - } - - private ModelBuildingRequest getModelBuildingRequest( InternalConfig config ) - { - ProjectBuildingRequest configuration = config.request; - - ModelBuildingRequest request = new DefaultModelBuildingRequest(); - - RequestTrace trace = RequestTrace.newChild( null, configuration ).newChild( request ); - - ModelResolver resolver = - new ProjectModelResolver( config.session, trace, repoSystem, repositoryManager, config.repositories, - configuration.getRepositoryMerging(), config.modelPool ); - - request.setValidationLevel( configuration.getValidationLevel() ); - request.setProcessPlugins( configuration.isProcessPlugins() ); - request.setProfiles( configuration.getProfiles() ); - request.setActiveProfileIds( configuration.getActiveProfileIds() ); - request.setInactiveProfileIds( configuration.getInactiveProfileIds() ); - request.setSystemProperties( configuration.getSystemProperties() ); - request.setUserProperties( configuration.getUserProperties() ); - request.setBuildStartTime( configuration.getBuildStartTime() ); - request.setModelResolver( resolver ); - // this is a hint that we want to build 1 file, so don't cache. See MNG-7063 - if ( config.modelPool != null ) + ProjectBuildingResult build( File pomFile, ModelSource modelSource ) + throws ProjectBuildingException { - request.setModelCache( modelCacheFactory.createCache( config.session ) ); - } - request.setTransformerContextBuilder( config.transformerContextBuilder ); + ClassLoader oldContextClassLoader = Thread.currentThread().getContextClassLoader(); - return request; - } + try + { + MavenProject project = request.getProject(); - @Override - public ProjectBuildingResult build( Artifact artifact, ProjectBuildingRequest request ) - throws ProjectBuildingException - { - return build( artifact, false, request ); - } + List modelProblems = null; + Throwable error = null; - @Override - public ProjectBuildingResult build( Artifact artifact, boolean allowStubModel, ProjectBuildingRequest request ) - throws ProjectBuildingException - { - org.eclipse.aether.artifact.Artifact pomArtifact = RepositoryUtils.toArtifact( artifact ); - pomArtifact = ArtifactDescriptorUtils.toPomArtifact( pomArtifact ); + if ( project == null ) + { + ModelBuildingRequest modelBuildingRequest = getModelBuildingRequest(); - InternalConfig config = - new InternalConfig( request, null, null ); + project = new MavenProject(); + project.setFile( pomFile ); - boolean localProject; + DefaultModelBuildingListener listener = + new DefaultModelBuildingListener( project, projectBuildingHelper, request ); + modelBuildingRequest.setModelBuildingListener( listener ); - try - { - ArtifactRequest pomRequest = new ArtifactRequest(); - pomRequest.setArtifact( pomArtifact ); - pomRequest.setRepositories( config.repositories ); - ArtifactResult pomResult = repoSystem.resolveArtifact( config.session, pomRequest ); + modelBuildingRequest.setPomFile( pomFile ); + modelBuildingRequest.setModelSource( modelSource ); + modelBuildingRequest.setLocationTracking( true ); - pomArtifact = pomResult.getArtifact(); - localProject = pomResult.getRepository() instanceof WorkspaceRepository; - } - catch ( org.eclipse.aether.resolution.ArtifactResolutionException e ) - { - if ( e.getResults().get( 0 ).isMissing() && allowStubModel ) - { - return build( null, createStubModelSource( artifact ), config ); - } - throw new ProjectBuildingException( artifact.getId(), - "Error resolving project artifact: " + e.getMessage(), e ); - } + ModelBuildingResult result; + try + { + result = modelBuilder.build( modelBuildingRequest ); + } + catch ( ModelBuildingException e ) + { + result = e.getResult(); + if ( result == null || result.getEffectiveModel() == null ) + { + throw new ProjectBuildingException( e.getModelId(), e.getMessage(), pomFile, e ); + } + // validation error, continue project building and delay failing to help IDEs + error = e; + } - File pomFile = pomArtifact.getFile(); + modelProblems = result.getProblems(); - if ( "pom".equals( artifact.getType() ) ) - { - artifact.selectVersion( pomArtifact.getVersion() ); - artifact.setFile( pomFile ); - artifact.setResolved( true ); - } + initProject( project, Collections.emptyMap(), result ); + } + else if ( request.isResolveDependencies() ) + { + projectBuildingHelper.selectProjectRealm( project ); + } - if ( localProject ) - { - return build( pomFile, new FileModelSource( pomFile ), config ); - } - else - { - return build( null, new ArtifactModelSource( pomFile, artifact.getGroupId(), artifact.getArtifactId(), - artifact.getVersion() ), - config ); - } - } + DependencyResolutionResult resolutionResult = null; - private ModelSource createStubModelSource( Artifact artifact ) - { - StringBuilder buffer = new StringBuilder( 1024 ); + if ( request.isResolveDependencies() ) + { + resolutionResult = resolveDependencies( project ); + } - buffer.append( "" ); - buffer.append( "" ); - buffer.append( "4.0.0" ); - buffer.append( "" ).append( artifact.getGroupId() ).append( "" ); - buffer.append( "" ).append( artifact.getArtifactId() ).append( "" ); - buffer.append( "" ).append( artifact.getBaseVersion() ).append( "" ); - buffer.append( "" ).append( artifact.getType() ).append( "" ); - buffer.append( "" ); + ProjectBuildingResult result = + new DefaultProjectBuildingResult( project, modelProblems, resolutionResult ); - return new StringModelSource( buffer, artifact.getId() ); - } + if ( error != null ) + { + ProjectBuildingException e = new ProjectBuildingException( Arrays.asList( result ) ); + e.initCause( error ); + throw e; + } - @Override - public List build( List pomFiles, boolean recursive, ProjectBuildingRequest request ) - throws ProjectBuildingException - { - List results = new ArrayList<>(); + return result; + } + finally + { + Thread.currentThread().setContextClassLoader( oldContextClassLoader ); + } + } - List interimResults = new ArrayList<>(); + ProjectBuildingResult build( Artifact artifact, boolean allowStubModel ) + throws ProjectBuildingException + { + org.eclipse.aether.artifact.Artifact pomArtifact = RepositoryUtils.toArtifact( artifact ); + pomArtifact = ArtifactDescriptorUtils.toPomArtifact( pomArtifact ); - ReactorModelPool.Builder poolBuilder = new ReactorModelPool.Builder(); - final ReactorModelPool modelPool = poolBuilder.build(); + boolean localProject; - InternalConfig config = - new InternalConfig( request, modelPool, modelBuilder.newTransformerContextBuilder() ); + try + { + ArtifactRequest pomRequest = new ArtifactRequest(); + pomRequest.setArtifact( pomArtifact ); + pomRequest.setRepositories( repositories ); + ArtifactResult pomResult = repoSystem.resolveArtifact( session, pomRequest ); - Map projectIndex = new HashMap<>( 256 ); + pomArtifact = pomResult.getArtifact(); + localProject = pomResult.getRepository() instanceof WorkspaceRepository; + } + catch ( org.eclipse.aether.resolution.ArtifactResolutionException e ) + { + if ( e.getResults().get( 0 ).isMissing() && allowStubModel ) + { + return build( null, createStubModelSource( artifact ) ); + } + throw new ProjectBuildingException( artifact.getId(), + "Error resolving project artifact: " + e.getMessage(), e ); + } - // phase 1: get file Models from the reactor. - boolean noErrors = - build( results, interimResults, projectIndex, pomFiles, new LinkedHashSet<>(), true, recursive, - config, poolBuilder ); + File pomFile = pomArtifact.getFile(); - ClassLoader oldContextClassLoader = Thread.currentThread().getContextClassLoader(); + if ( "pom".equals( artifact.getType() ) ) + { + artifact.selectVersion( pomArtifact.getVersion() ); + artifact.setFile( pomFile ); + artifact.setResolved( true ); + } - try - { - // Phase 2: get effective models from the reactor - noErrors = - build( results, new ArrayList<>(), projectIndex, interimResults, request, - new HashMap<>(), config.session ) && noErrors; - } - finally - { - Thread.currentThread().setContextClassLoader( oldContextClassLoader ); + if ( localProject ) + { + return build( pomFile, new FileModelSource( pomFile ) ); + } + else + { + return build( null, new ArtifactModelSource( + pomFile, artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion() ) ); + } } - if ( Features.buildConsumer( request.getUserProperties() ).isActive() ) - { - request.getRepositorySession().getData().set( TransformerContext.KEY, - config.transformerContextBuilder.build() ); - } - if ( !noErrors ) + List build( List pomFiles, boolean recursive ) + throws ProjectBuildingException { - throw new ProjectBuildingException( results ); - } - - return results; - } - - @SuppressWarnings( "checkstyle:parameternumber" ) - private boolean build( List results, List interimResults, - Map projectIndex, List pomFiles, Set aggregatorFiles, - boolean root, boolean recursive, InternalConfig config, - ReactorModelPool.Builder poolBuilder ) - { - boolean noErrors = true; + ForkJoinTask> task = forkJoinPool.submit( + () -> doBuild( pomFiles, recursive ) ); - for ( File pomFile : pomFiles ) - { - aggregatorFiles.add( pomFile ); + // ForkJoinTask.getException rewraps the exception in a weird way + // which cause an additional layer of exception, so try to unwrap it + task.quietlyJoin(); + if ( task.isCompletedAbnormally() ) + { + Throwable e = task.getException(); + Throwable c = e.getCause(); + uncheckedThrow( c != null && c.getClass() == e.getClass() ? c : e ); + } - if ( !build( results, interimResults, projectIndex, pomFile, aggregatorFiles, root, recursive, config, - poolBuilder ) ) + List results = task.getRawResult(); + if ( results.stream().flatMap( r -> r.getProblems().stream() ) + .anyMatch( p -> p.getSeverity() != ModelProblem.Severity.WARNING ) ) { - noErrors = false; + ModelProblem cycle = results.stream().flatMap( r -> r.getProblems().stream() ) + .filter( p -> p.getException() instanceof CycleDetectedException ) + .findAny().orElse( null ); + if ( cycle != null ) + { + throw new RuntimeException( new ProjectCycleException( + "The projects in the reactor contain a cyclic reference: " + cycle.getMessage(), + ( CycleDetectedException ) cycle.getException() ) ); + } + throw new ProjectBuildingException( results ); } - aggregatorFiles.remove( pomFile ); + return results; } - return noErrors; - } + List doBuild( List pomFiles, boolean recursive ) + { + Map projectIndex = new ConcurrentHashMap<>( 256 ); - @SuppressWarnings( "checkstyle:parameternumber" ) - private boolean build( List results, List interimResults, - Map projectIndex, File pomFile, Set aggregatorFiles, - boolean isRoot, boolean recursive, InternalConfig config, - ReactorModelPool.Builder poolBuilder ) - { - boolean noErrors = true; + // phase 1: get file Models from the reactor. + List interimResults = build( + projectIndex, pomFiles, new LinkedHashSet<>(), true, recursive ); - MavenProject project = new MavenProject(); - project.setFile( pomFile ); + ClassLoader oldContextClassLoader = Thread.currentThread().getContextClassLoader(); - ModelBuildingRequest request = getModelBuildingRequest( config ) - .setPomFile( pomFile ) - .setTwoPhaseBuilding( true ) - .setLocationTracking( true ); + try + { + // Phase 2: get effective models from the reactor + List results = build( projectIndex, interimResults ); - DefaultModelBuildingListener listener = - new DefaultModelBuildingListener( project, projectBuildingHelper, config.request ); - request.setModelBuildingListener( listener ); + if ( Features.buildConsumer( request.getUserProperties() ).isActive() ) + { + request.getRepositorySession().getData().set( TransformerContext.KEY, + transformerContextBuilder.build() ); + } - ModelBuildingResult result; - try - { - result = modelBuilder.build( request ); + return results; + } + finally + { + Thread.currentThread().setContextClassLoader( oldContextClassLoader ); + } } - catch ( ModelBuildingException e ) + + @SuppressWarnings( "checkstyle:parameternumber" ) + private List build( + Map projectIndex, List pomFiles, Set aggregatorFiles, + boolean root, boolean recursive ) { - result = e.getResult(); - if ( result == null || result.getFileModel() == null ) - { - results.add( new DefaultProjectBuildingResult( e.getModelId(), pomFile, e.getProblems() ) ); + List> tasks = pomFiles.stream().map( pomFile -> ForkJoinTask.adapt( + () -> build( projectIndex, pomFile, + concat( aggregatorFiles, pomFile ), root, recursive ) ) ) + .collect( Collectors.toList() ); + + return ForkJoinTask.invokeAll( tasks ).stream() + .map( ForkJoinTask::getRawResult ) + .collect( Collectors.toList() ); + } - return false; - } - // validation error, continue project building and delay failing to help IDEs - // result.getProblems().addAll(e.getProblems()) ? - noErrors = false; + private Set concat( Set set, T elem ) + { + Set newSet = new HashSet<>( set ); + newSet.add( elem ); + return newSet; } - Model model = result.getFileModel(); + @SuppressWarnings( "checkstyle:parameternumber" ) + private InterimResult build( + Map projectIndex, File pomFile, Set aggregatorFiles, + boolean isRoot, boolean recursive ) + { + MavenProject project = new MavenProject(); + project.setFile( pomFile ); - poolBuilder.put( model.getPomFile().toPath(), model ); + ModelBuildingRequest modelBuildingRequest = getModelBuildingRequest() + .setPomFile( pomFile ) + .setTwoPhaseBuilding( true ) + .setLocationTracking( true ); - InterimResult interimResult = new InterimResult( pomFile, request, result, listener, isRoot ); - interimResults.add( interimResult ); + DefaultModelBuildingListener listener = + new DefaultModelBuildingListener( project, projectBuildingHelper, request ); + modelBuildingRequest.setModelBuildingListener( listener ); - if ( recursive ) - { - File basedir = pomFile.getParentFile(); - List moduleFiles = new ArrayList<>(); - for ( String module : model.getModules() ) + ModelBuildingResult result; + try { - if ( StringUtils.isEmpty( module ) ) + result = modelBuilder.build( modelBuildingRequest ); + } + catch ( ModelBuildingException e ) + { + result = e.getResult(); + if ( result == null || result.getFileModel() == null ) { - continue; + return new InterimResult( + new DefaultProjectBuildingResult( e.getModelId(), pomFile, e.getProblems() ) ); } + // validation error, continue project building and delay failing to help IDEs + // result.getProblems().addAll(e.getProblems()) ? + } - module = module.replace( '\\', File.separatorChar ).replace( '/', File.separatorChar ); + Model model = result.getFileModel(); - File moduleFile = new File( basedir, module ); + poolBuilder.put( model.getPomFile().toPath(), model ); - if ( moduleFile.isDirectory() ) - { - moduleFile = modelProcessor.locatePom( moduleFile ); - } + InterimResult interimResult = new InterimResult( pomFile, modelBuildingRequest, result, listener, isRoot ); - if ( !moduleFile.isFile() ) + if ( recursive ) + { + File basedir = pomFile.getParentFile(); + List moduleFiles = new ArrayList<>(); + for ( String module : model.getModules() ) { - ModelProblem problem = - new DefaultModelProblem( "Child module " + moduleFile + " of " + pomFile - + " does not exist", ModelProblem.Severity.ERROR, ModelProblem.Version.BASE, - model, -1, -1, null ); - result.getProblems().add( problem ); + if ( StringUtils.isEmpty( module ) ) + { + continue; + } - noErrors = false; + module = module.replace( '\\', File.separatorChar ).replace( '/', File.separatorChar ); - continue; - } + File moduleFile = new File( basedir, module ); - if ( Os.isFamily( Os.FAMILY_WINDOWS ) ) - { - // we don't canonicalize on unix to avoid interfering with symlinks - try + if ( moduleFile.isDirectory() ) { - moduleFile = moduleFile.getCanonicalFile(); + moduleFile = modelProcessor.locatePom( moduleFile ); } - catch ( IOException e ) + + if ( !moduleFile.isFile() ) { - moduleFile = moduleFile.getAbsoluteFile(); + ModelProblem problem = + new DefaultModelProblem( "Child module " + moduleFile + " of " + pomFile + + " does not exist", ModelProblem.Severity.ERROR, ModelProblem.Version.BASE, + model, -1, -1, null ); + result.getProblems().add( problem ); + + continue; } - } - else - { - moduleFile = new File( moduleFile.toURI().normalize() ); - } - if ( aggregatorFiles.contains( moduleFile ) ) - { - StringBuilder buffer = new StringBuilder( 256 ); - for ( File aggregatorFile : aggregatorFiles ) + if ( Os.isFamily( Os.FAMILY_WINDOWS ) ) { - buffer.append( aggregatorFile ).append( " -> " ); + // we don't canonicalize on unix to avoid interfering with symlinks + try + { + moduleFile = moduleFile.getCanonicalFile(); + } + catch ( IOException e ) + { + moduleFile = moduleFile.getAbsoluteFile(); + } } - buffer.append( moduleFile ); + else + { + moduleFile = new File( moduleFile.toURI().normalize() ); + } + + if ( aggregatorFiles.contains( moduleFile ) ) + { + StringBuilder buffer = new StringBuilder( 256 ); + for ( File aggregatorFile : aggregatorFiles ) + { + buffer.append( aggregatorFile ).append( " -> " ); + } + buffer.append( moduleFile ); - ModelProblem problem = - new DefaultModelProblem( "Child module " + moduleFile + " of " + pomFile - + " forms aggregation cycle " + buffer, ModelProblem.Severity.ERROR, - ModelProblem.Version.BASE, model, -1, -1, null ); - result.getProblems().add( problem ); + ModelProblem problem = + new DefaultModelProblem( "Child module " + moduleFile + " of " + pomFile + + " forms aggregation cycle " + buffer, ModelProblem.Severity.ERROR, + ModelProblem.Version.BASE, model, -1, -1, null ); + result.getProblems().add( problem ); - noErrors = false; + continue; + } - continue; + moduleFiles.add( moduleFile ); } - moduleFiles.add( moduleFile ); + if ( !moduleFiles.isEmpty() ) + { + interimResult.modules = build( projectIndex, moduleFiles, aggregatorFiles, false, recursive ); + } } - interimResult.modules = new ArrayList<>(); + projectIndex.put( pomFile, project ); - if ( !build( results, interimResult.modules, projectIndex, moduleFiles, aggregatorFiles, false, - recursive, config, poolBuilder ) ) - { - noErrors = false; - } + return interimResult; } - projectIndex.put( pomFile, project ); - - return noErrors; - } - - static class InterimResult - { - - File pomFile; - - ModelBuildingRequest request; - - ModelBuildingResult result; - - DefaultModelBuildingListener listener; - - boolean root; - - List modules = Collections.emptyList(); - - InterimResult( File pomFile, ModelBuildingRequest request, ModelBuildingResult result, - DefaultModelBuildingListener listener, boolean root ) + private List build( Map projectIndex, + List interimResults ) { - this.pomFile = pomFile; - this.request = request; - this.result = result; - this.listener = listener; - this.root = root; + return interimResults.parallelStream() + .map( interimResult -> doBuild( projectIndex, interimResult ) ) + .flatMap( List::stream ) + .collect( Collectors.toList() ); } - } - - private boolean build( List results, List projects, - Map projectIndex, List interimResults, - ProjectBuildingRequest request, Map profilesXmls, - RepositorySystemSession session ) - { - boolean noErrors = true; - - for ( InterimResult interimResult : interimResults ) + private List doBuild( Map projectIndex, InterimResult interimResult ) { + if ( interimResult.projectBuildingResult != null ) + { + return Collections.singletonList( interimResult.projectBuildingResult ); + } MavenProject project = interimResult.listener.getProject(); try { @@ -623,356 +613,437 @@ private boolean build( List results, List p // 2nd pass of initialization: resolve and build parent if necessary try { - initProject( project, projectIndex, true, result, profilesXmls, request ); + initProject( project, projectIndex, result ); } catch ( InvalidArtifactRTException iarte ) { - result.getProblems().add( new DefaultModelProblem( null, ModelProblem.Severity.ERROR, null, - result.getEffectiveModel(), -1, -1, iarte ) ); + result.getProblems().add( new DefaultModelProblem( null, ModelProblem.Severity.ERROR, + null, result.getEffectiveModel(), -1, -1, iarte ) ); } - List modules = new ArrayList<>(); - noErrors = - build( results, modules, projectIndex, interimResult.modules, request, profilesXmls, session ) - && noErrors; - - projects.addAll( modules ); - projects.add( project ); + List results = build( projectIndex, interimResult.modules ); project.setExecutionRoot( interimResult.root ); - project.setCollectedProjects( modules ); + project.setCollectedProjects( results.stream().map( ProjectBuildingResult::getProject ) + .collect( Collectors.toList() ) ); DependencyResolutionResult resolutionResult = null; if ( request.isResolveDependencies() ) { - resolutionResult = resolveDependencies( project, session ); + resolutionResult = resolveDependencies( project ); } - results.add( new DefaultProjectBuildingResult( project, result.getProblems(), resolutionResult ) ); + results.add( new DefaultProjectBuildingResult( + project, result.getProblems(), resolutionResult ) ); + + return results; } catch ( ModelBuildingException e ) { - DefaultProjectBuildingResult result = null; + DefaultProjectBuildingResult result; if ( project == null || interimResult.result.getEffectiveModel() == null ) { - result = new DefaultProjectBuildingResult( e.getModelId(), interimResult.pomFile, e.getProblems() ); + result = new DefaultProjectBuildingResult( + e.getModelId(), interimResult.pomFile, e.getProblems() ); } else { project.setModel( interimResult.result.getEffectiveModel() ); - result = new DefaultProjectBuildingResult( project, e.getProblems(), null ); } - results.add( result ); - - noErrors = false; + return Collections.singletonList( result ); } } - return noErrors; - } - - @SuppressWarnings( "checkstyle:methodlength" ) - private void initProject( MavenProject project, Map projects, - boolean buildParentIfNotExisting, ModelBuildingResult result, - Map profilesXmls, ProjectBuildingRequest projectBuildingRequest ) - { - project.setModel( result.getEffectiveModel() ); - project.setOriginalModel( result.getFileModel() ); - - initParent( project, projects, buildParentIfNotExisting, result, projectBuildingRequest ); - - Artifact projectArtifact = - repositorySystem.createArtifact( project.getGroupId(), project.getArtifactId(), project.getVersion(), null, - project.getPackaging() ); - project.setArtifact( projectArtifact ); - - if ( project.getFile() != null && buildParentIfNotExisting ) // only set those on 2nd phase, ignore on 1st pass + @SuppressWarnings( "checkstyle:methodlength" ) + private void initProject( MavenProject project, Map projects, ModelBuildingResult result ) { - Build build = project.getBuild(); - project.addScriptSourceRoot( build.getScriptSourceDirectory() ); - project.addCompileSourceRoot( build.getSourceDirectory() ); - project.addTestCompileSourceRoot( build.getTestSourceDirectory() ); - } + project.setModel( result.getEffectiveModel() ); + project.setOriginalModel( result.getFileModel() ); - List activeProfiles = new ArrayList<>(); - activeProfiles.addAll( result.getActivePomProfiles( result.getModelIds().get( 0 ) ) ); - activeProfiles.addAll( result.getActiveExternalProfiles() ); - project.setActiveProfiles( activeProfiles ); + initParent( project, projects, result ); - project.setInjectedProfileIds( "external", getProfileIds( result.getActiveExternalProfiles() ) ); - for ( String modelId : result.getModelIds() ) - { - project.setInjectedProfileIds( modelId, getProfileIds( result.getActivePomProfiles( modelId ) ) ); - } + Artifact projectArtifact = + repositorySystem.createArtifact( project.getGroupId(), project.getArtifactId(), + project.getVersion(), null, project.getPackaging() ); + project.setArtifact( projectArtifact ); - // - // All the parts that were taken out of MavenProject for Maven 4.0.0 - // - - project.setProjectBuildingRequest( projectBuildingRequest ); + // only set those on 2nd phase, ignore on 1st pass + if ( project.getFile() != null ) + { + Build build = project.getBuild(); + project.addScriptSourceRoot( build.getScriptSourceDirectory() ); + project.addCompileSourceRoot( build.getSourceDirectory() ); + project.addTestCompileSourceRoot( build.getTestSourceDirectory() ); + } - // pluginArtifacts - Set pluginArtifacts = new HashSet<>(); - for ( Plugin plugin : project.getBuildPlugins() ) - { - Artifact artifact = repositorySystem.createPluginArtifact( plugin ); + List activeProfiles = new ArrayList<>(); + activeProfiles.addAll( result.getActivePomProfiles( result.getModelIds().get( 0 ) ) ); + activeProfiles.addAll( result.getActiveExternalProfiles() ); + project.setActiveProfiles( activeProfiles ); - if ( artifact != null ) + project.setInjectedProfileIds( "external", getProfileIds( result.getActiveExternalProfiles() ) ); + for ( String modelId : result.getModelIds() ) { - pluginArtifacts.add( artifact ); + project.setInjectedProfileIds( modelId, getProfileIds( result.getActivePomProfiles( modelId ) ) ); } - } - project.setPluginArtifacts( pluginArtifacts ); - // reportArtifacts - Set reportArtifacts = new HashSet<>(); - for ( ReportPlugin report : project.getReportPlugins() ) - { - Plugin pp = new Plugin(); - pp.setGroupId( report.getGroupId() ); - pp.setArtifactId( report.getArtifactId() ); - pp.setVersion( report.getVersion() ); + // + // All the parts that were taken out of MavenProject for Maven 4.0.0 + // - Artifact artifact = repositorySystem.createPluginArtifact( pp ); + project.setProjectBuildingRequest( request ); - if ( artifact != null ) + // pluginArtifacts + Set pluginArtifacts = new HashSet<>(); + for ( Plugin plugin : project.getBuildPlugins() ) { - reportArtifacts.add( artifact ); - } - } - project.setReportArtifacts( reportArtifacts ); + Artifact artifact = repositorySystem.createPluginArtifact( plugin ); - // extensionArtifacts - Set extensionArtifacts = new HashSet<>(); - List extensions = project.getBuildExtensions(); - if ( extensions != null ) - { - for ( Extension ext : extensions ) - { - String version; - if ( StringUtils.isEmpty( ext.getVersion() ) ) - { - version = "RELEASE"; - } - else + if ( artifact != null ) { - version = ext.getVersion(); + pluginArtifacts.add( artifact ); } + } + project.setPluginArtifacts( pluginArtifacts ); - Artifact artifact = - repositorySystem.createArtifact( ext.getGroupId(), ext.getArtifactId(), version, null, "jar" ); + // reportArtifacts + Set reportArtifacts = new HashSet<>(); + for ( ReportPlugin report : project.getReportPlugins() ) + { + Plugin pp = new Plugin(); + pp.setGroupId( report.getGroupId() ); + pp.setArtifactId( report.getArtifactId() ); + pp.setVersion( report.getVersion() ); + + Artifact artifact = repositorySystem.createPluginArtifact( pp ); if ( artifact != null ) { - extensionArtifacts.add( artifact ); + reportArtifacts.add( artifact ); } } - } - project.setExtensionArtifacts( extensionArtifacts ); + project.setReportArtifacts( reportArtifacts ); - // managedVersionMap - Map map = null; - if ( repositorySystem != null ) - { - final DependencyManagement dependencyManagement = project.getDependencyManagement(); - if ( ( dependencyManagement != null ) && ( ( dependencyManagement.getDependencies() ) != null ) - && ( dependencyManagement.getDependencies().size() > 0 ) ) + // extensionArtifacts + Set extensionArtifacts = new HashSet<>(); + List extensions = project.getBuildExtensions(); + if ( extensions != null ) { - map = new AbstractMap() + for ( Extension ext : extensions ) { - HashMap delegate; - - @Override - public Set> entrySet() + String version; + if ( StringUtils.isEmpty( ext.getVersion() ) ) { - return Collections.unmodifiableSet( compute().entrySet() ); + version = "RELEASE"; } - - @Override - public Set keySet() + else { - return Collections.unmodifiableSet( compute().keySet() ); + version = ext.getVersion(); } - @Override - public Collection values() - { - return Collections.unmodifiableCollection( compute().values() ); - } + Artifact artifact = repositorySystem.createArtifact( + ext.getGroupId(), ext.getArtifactId(), version, null, "jar" ); - @Override - public boolean containsValue( Object value ) + if ( artifact != null ) { - return compute().containsValue( value ); + extensionArtifacts.add( artifact ); } + } + } + project.setExtensionArtifacts( extensionArtifacts ); - @Override - public boolean containsKey( Object key ) + // managedVersionMap + Map map = null; + if ( repositorySystem != null ) + { + final DependencyManagement dependencyManagement = project.getDependencyManagement(); + if ( ( dependencyManagement != null ) && ( ( dependencyManagement.getDependencies() ) != null ) + && ( dependencyManagement.getDependencies().size() > 0 ) ) + { + map = new AbstractMap() { - return compute().containsKey( key ); - } + HashMap delegate; - @Override - public Artifact get( Object key ) - { - return compute().get( key ); - } + @Override + public Set> entrySet() + { + return Collections.unmodifiableSet( compute().entrySet() ); + } - HashMap compute() - { - if ( delegate == null ) + @Override + public Set keySet() { - delegate = new HashMap<>(); - for ( Dependency d : dependencyManagement.getDependencies() ) - { - Artifact artifact = repositorySystem.createDependencyArtifact( d ); + return Collections.unmodifiableSet( compute().keySet() ); + } - if ( artifact != null ) + @Override + public Collection values() + { + return Collections.unmodifiableCollection( compute().values() ); + } + + @Override + public boolean containsValue( Object value ) + { + return compute().containsValue( value ); + } + + @Override + public boolean containsKey( Object key ) + { + return compute().containsKey( key ); + } + + @Override + public Artifact get( Object key ) + { + return compute().get( key ); + } + + HashMap compute() + { + if ( delegate == null ) + { + delegate = new HashMap<>(); + for ( Dependency d : dependencyManagement.getDependencies() ) { - delegate.put( d.getManagementKey(), artifact ); + Artifact artifact = repositorySystem.createDependencyArtifact( d ); + + if ( artifact != null ) + { + delegate.put( d.getManagementKey(), artifact ); + } } } - } - return delegate; - } - }; - } - else - { - map = Collections.emptyMap(); + return delegate; + } + }; + } + else + { + map = Collections.emptyMap(); + } } - } - project.setManagedVersionMap( map ); + project.setManagedVersionMap( map ); - // release artifact repository - if ( project.getDistributionManagement() != null - && project.getDistributionManagement().getRepository() != null ) - { - try + // release artifact repository + if ( project.getDistributionManagement() != null + && project.getDistributionManagement().getRepository() != null ) { - DeploymentRepository r = project.getDistributionManagement().getRepository(); - if ( !StringUtils.isEmpty( r.getId() ) && !StringUtils.isEmpty( r.getUrl() ) ) + try { - ArtifactRepository repo = MavenRepositorySystem.buildArtifactRepository( r ); - repositorySystem.injectProxy( projectBuildingRequest.getRepositorySession(), - Arrays.asList( repo ) ); - repositorySystem.injectAuthentication( projectBuildingRequest.getRepositorySession(), - Arrays.asList( repo ) ); - project.setReleaseArtifactRepository( repo ); + DeploymentRepository r = project.getDistributionManagement().getRepository(); + if ( !StringUtils.isEmpty( r.getId() ) && !StringUtils.isEmpty( r.getUrl() ) ) + { + ArtifactRepository repo = MavenRepositorySystem.buildArtifactRepository( r ); + repositorySystem.injectProxy( request.getRepositorySession(), + Arrays.asList( repo ) ); + repositorySystem.injectAuthentication( request.getRepositorySession(), + Arrays.asList( repo ) ); + project.setReleaseArtifactRepository( repo ); + } + } + catch ( InvalidRepositoryException e ) + { + throw new IllegalStateException( "Failed to create release distribution repository for " + + project.getId(), e ); } } - catch ( InvalidRepositoryException e ) - { - throw new IllegalStateException( "Failed to create release distribution repository for " - + project.getId(), e ); - } - } - // snapshot artifact repository - if ( project.getDistributionManagement() != null - && project.getDistributionManagement().getSnapshotRepository() != null ) - { - try + // snapshot artifact repository + if ( project.getDistributionManagement() != null + && project.getDistributionManagement().getSnapshotRepository() != null ) { - DeploymentRepository r = project.getDistributionManagement().getSnapshotRepository(); - if ( !StringUtils.isEmpty( r.getId() ) && !StringUtils.isEmpty( r.getUrl() ) ) + try { - ArtifactRepository repo = MavenRepositorySystem.buildArtifactRepository( r ); - repositorySystem.injectProxy( projectBuildingRequest.getRepositorySession(), - Arrays.asList( repo ) ); - repositorySystem.injectAuthentication( projectBuildingRequest.getRepositorySession(), - Arrays.asList( repo ) ); - project.setSnapshotArtifactRepository( repo ); + DeploymentRepository r = project.getDistributionManagement().getSnapshotRepository(); + if ( !StringUtils.isEmpty( r.getId() ) && !StringUtils.isEmpty( r.getUrl() ) ) + { + ArtifactRepository repo = MavenRepositorySystem.buildArtifactRepository( r ); + repositorySystem.injectProxy( request.getRepositorySession(), + Arrays.asList( repo ) ); + repositorySystem.injectAuthentication( request.getRepositorySession(), + Arrays.asList( repo ) ); + project.setSnapshotArtifactRepository( repo ); + } + } + catch ( InvalidRepositoryException e ) + { + throw new IllegalStateException( "Failed to create snapshot distribution repository for " + + project.getId(), e ); } - } - catch ( InvalidRepositoryException e ) - { - throw new IllegalStateException( "Failed to create snapshot distribution repository for " - + project.getId(), e ); } } - } - private void initParent( MavenProject project, Map projects, boolean buildParentIfNotExisting, - ModelBuildingResult result, ProjectBuildingRequest projectBuildingRequest ) - { - Model parentModel = result.getModelIds().size() > 1 && !result.getModelIds().get( 1 ).isEmpty() - ? result.getRawModel( result.getModelIds().get( 1 ) ) - : null; - - if ( parentModel != null ) + private void initParent( MavenProject project, Map projects, ModelBuildingResult result ) { - final String parentGroupId = inheritedGroupId( result, 1 ); - final String parentVersion = inheritedVersion( result, 1 ); - - project.setParentArtifact( repositorySystem.createProjectArtifact( parentGroupId, - parentModel.getArtifactId(), - parentVersion ) ); - - // org.apache.maven.its.mng4834:parent:0.1 - String parentModelId = result.getModelIds().get( 1 ); - File parentPomFile = result.getRawModel( parentModelId ).getPomFile(); - MavenProject parent = projects.get( parentPomFile ); - if ( parent == null && buildParentIfNotExisting ) + Model parentModel = result.getModelIds().size() > 1 && !result.getModelIds().get( 1 ).isEmpty() + ? result.getRawModel( result.getModelIds().get( 1 ) ) + : null; + + if ( parentModel != null ) { - // - // At this point the DefaultModelBuildingListener has fired and it populates the - // remote repositories with those found in the pom.xml, along with the existing externally - // defined repositories. - // - projectBuildingRequest.setRemoteRepositories( project.getRemoteArtifactRepositories() ); - if ( parentPomFile != null ) + final String parentGroupId = inheritedGroupId( result, 1 ); + final String parentVersion = inheritedVersion( result, 1 ); + + project.setParentArtifact( repositorySystem.createProjectArtifact( parentGroupId, + parentModel.getArtifactId(), + parentVersion ) ); + + // org.apache.maven.its.mng4834:parent:0.1 + String parentModelId = result.getModelIds().get( 1 ); + File parentPomFile = result.getRawModel( parentModelId ).getPomFile(); + MavenProject parent = parentPomFile != null ? projects.get( parentPomFile ) : null; + if ( parent == null ) { - project.setParentFile( parentPomFile ); - try + // + // At this point the DefaultModelBuildingListener has fired and it populates the + // remote repositories with those found in the pom.xml, along with the existing externally + // defined repositories. + // + request.setRemoteRepositories( project.getRemoteArtifactRepositories() ); + if ( parentPomFile != null ) { - parent = build( parentPomFile, projectBuildingRequest ).getProject(); - } - catch ( ProjectBuildingException e ) - { - // MNG-4488 where let invalid parents slide on by - if ( logger.isDebugEnabled() ) + project.setParentFile( parentPomFile ); + try { - // Message below is checked for in the MNG-2199 core IT. - logger.warn( "Failed to build parent project for " + project.getId(), e ); + parent = build( parentPomFile, new FileModelSource( parentPomFile ) ).getProject(); } - else + catch ( ProjectBuildingException e ) { - // Message below is checked for in the MNG-2199 core IT. - logger.warn( "Failed to build parent project for " + project.getId() ); + // MNG-4488 where let invalid parents slide on by + if ( logger.isDebugEnabled() ) + { + // Message below is checked for in the MNG-2199 core IT. + logger.warn( "Failed to build parent project for " + project.getId(), e ); + } + else + { + // Message below is checked for in the MNG-2199 core IT. + logger.warn( "Failed to build parent project for " + project.getId() ); + } } } - } - else - { - Artifact parentArtifact = project.getParentArtifact(); - try + else { - parent = build( parentArtifact, projectBuildingRequest ).getProject(); - } - catch ( ProjectBuildingException e ) - { - // MNG-4488 where let invalid parents slide on by - if ( logger.isDebugEnabled() ) + Artifact parentArtifact = project.getParentArtifact(); + try { - // Message below is checked for in the MNG-2199 core IT. - logger.warn( "Failed to build parent project for " + project.getId(), e ); + parent = build( parentArtifact, false ).getProject(); } - else + catch ( ProjectBuildingException e ) { - // Message below is checked for in the MNG-2199 core IT. - logger.warn( "Failed to build parent project for " + project.getId() ); + // MNG-4488 where let invalid parents slide on by + if ( logger.isDebugEnabled() ) + { + // Message below is checked for in the MNG-2199 core IT. + logger.warn( "Failed to build parent project for " + project.getId(), e ); + } + else + { + // Message below is checked for in the MNG-2199 core IT. + logger.warn( "Failed to build parent project for " + project.getId() ); + } } } } + project.setParent( parent ); + if ( project.getParentFile() == null && parent != null ) + { + project.setParentFile( parent.getFile() ); + } + } + } + + private ModelBuildingRequest getModelBuildingRequest() + { + ModelBuildingRequest modelBuildingRequest = new DefaultModelBuildingRequest(); + + RequestTrace trace = RequestTrace.newChild( null, request ).newChild( modelBuildingRequest ); + + ModelResolver resolver = + new ProjectModelResolver( session, trace, repoSystem, repositoryManager, repositories, + request.getRepositoryMerging(), modelPool ); + + modelBuildingRequest.setValidationLevel( request.getValidationLevel() ); + modelBuildingRequest.setProcessPlugins( request.isProcessPlugins() ); + modelBuildingRequest.setProfiles( request.getProfiles() ); + modelBuildingRequest.setActiveProfileIds( request.getActiveProfileIds() ); + modelBuildingRequest.setInactiveProfileIds( request.getInactiveProfileIds() ); + modelBuildingRequest.setSystemProperties( request.getSystemProperties() ); + modelBuildingRequest.setUserProperties( request.getUserProperties() ); + modelBuildingRequest.setBuildStartTime( request.getBuildStartTime() ); + modelBuildingRequest.setModelResolver( resolver ); + // this is a hint that we want to build 1 file, so don't cache. See MNG-7063 + if ( modelPool != null ) + { + modelBuildingRequest.setModelCache( modelCacheFactory.createCache( session ) ); } - project.setParent( parent ); - if ( project.getParentFile() == null && parent != null ) + modelBuildingRequest.setTransformerContextBuilder( transformerContextBuilder ); + + return modelBuildingRequest; + } + + private DependencyResolutionResult resolveDependencies( MavenProject project ) + { + DependencyResolutionResult resolutionResult; + + try + { + DefaultDependencyResolutionRequest resolution = + new DefaultDependencyResolutionRequest( project, session ); + resolutionResult = dependencyResolver.resolve( resolution ); + } + catch ( DependencyResolutionException e ) + { + resolutionResult = e.getResult(); + } + + Set artifacts = new LinkedHashSet<>(); + if ( resolutionResult.getDependencyGraph() != null ) { - project.setParentFile( parent.getFile() ); + RepositoryUtils.toArtifacts( artifacts, resolutionResult.getDependencyGraph().getChildren(), + Collections.singletonList( project.getArtifact().getId() ), null ); + + // Maven 2.x quirk: an artifact always points at the local repo, regardless whether resolved or not + LocalRepositoryManager lrm = session.getLocalRepositoryManager(); + for ( Artifact artifact : artifacts ) + { + if ( !artifact.isResolved() ) + { + String path = lrm.getPathForLocalArtifact( RepositoryUtils.toArtifact( artifact ) ); + artifact.setFile( new File( lrm.getRepository().getBasedir(), path ) ); + } + } } + project.setResolvedArtifacts( artifacts ); + project.setArtifacts( artifacts ); + + return resolutionResult; } + + } + + private List getProfileIds( List profiles ) + { + return profiles.stream().map( org.apache.maven.model.Profile::getId ).collect( Collectors.toList() ); + } + + private static ModelSource createStubModelSource( Artifact artifact ) + { + StringBuilder buffer = new StringBuilder( 1024 ); + + buffer.append( "" ); + buffer.append( "" ); + buffer.append( "4.0.0" ); + buffer.append( "" ).append( artifact.getGroupId() ).append( "" ); + buffer.append( "" ).append( artifact.getArtifactId() ).append( "" ); + buffer.append( "" ).append( artifact.getBaseVersion() ).append( "" ); + buffer.append( "" ).append( artifact.getType() ).append( "" ); + buffer.append( "" ); + + return new StringModelSource( buffer, artifact.getId() ); } private static String inheritedGroupId( final ModelBuildingResult result, final int modelIndex ) @@ -1009,36 +1080,9 @@ private static String inheritedVersion( final ModelBuildingResult result, final return version; } - /** - * InternalConfig - */ - class InternalConfig + static void uncheckedThrow( Throwable t ) throws T { - - private final ProjectBuildingRequest request; - - private final RepositorySystemSession session; - - private final List repositories; - - private final ReactorModelPool modelPool; - - private final TransformerContextBuilder transformerContextBuilder; - - InternalConfig( ProjectBuildingRequest request, ReactorModelPool modelPool, - TransformerContextBuilder transformerContextBuilder ) - { - this.request = request; - this.modelPool = modelPool; - this.transformerContextBuilder = transformerContextBuilder; - - session = - LegacyLocalRepositoryManager.overlay( request.getLocalRepository(), request.getRepositorySession(), - repoSystem ); - repositories = RepositoryUtils.toRepos( request.getRemoteRepositories() ); - - } - + throw (T) t; // rely on vacuous cast } } diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java index 148d21586231..e3243c05d9a1 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java +++ b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java @@ -72,6 +72,22 @@ public ProjectBuildingException( List results ) this.results = results; } + public ProjectBuildingException( Throwable cause ) + { + super( cause ); + if ( cause instanceof ProjectBuildingException ) + { + ProjectBuildingException pbe = (ProjectBuildingException) cause; + this.projectId = pbe.projectId; + this.pomFile = pbe.pomFile; + this.results = pbe.results; + } + else + { + throw new IllegalArgumentException(); + } + } + public File getPomFile() { return pomFile; diff --git a/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java b/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java index de8af7e5e6bc..89a239f4ed11 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java +++ b/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java @@ -22,11 +22,11 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Objects; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import org.apache.maven.model.Model; @@ -39,9 +39,9 @@ */ class ReactorModelPool { - private final Map> modelsByGa = new HashMap<>(); + private final Map> modelsByGa = new ConcurrentHashMap<>(); - private final Map modelsByPath = new HashMap<>(); + private final Map modelsByPath = new ConcurrentHashMap<>(); /** * Get the model by its GAV or (since 4.0.0) by its GA if there is only one. diff --git a/maven-core/src/test/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformerTest.java b/maven-core/src/test/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformerTest.java index 50506239fb99..15a3ad5cc5af 100644 --- a/maven-core/src/test/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformerTest.java +++ b/maven-core/src/test/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformerTest.java @@ -55,14 +55,14 @@ public String getUserProperty( String key ) } @Override - public Model getRawModel( String groupId, String artifactId ) + public Model getRawModel( Path from, String groupId, String artifactId ) throws IllegalStateException { return null; } @Override - public Model getRawModel( Path p ) + public Model getRawModel( Path from, Path p ) { return null; } diff --git a/maven-core/src/test/projects/default-maven/cyclic-reference/module-a/pom.xml b/maven-core/src/test/projects/default-maven/cyclic-reference/module-a/pom.xml index ec8d8055c3be..e100aa605c96 100644 --- a/maven-core/src/test/projects/default-maven/cyclic-reference/module-a/pom.xml +++ b/maven-core/src/test/projects/default-maven/cyclic-reference/module-a/pom.xml @@ -13,7 +13,6 @@ cyclic-reference module-b - 1.0-SNAPSHOT diff --git a/maven-core/src/test/projects/default-maven/cyclic-reference/module-b/pom.xml b/maven-core/src/test/projects/default-maven/cyclic-reference/module-b/pom.xml index 119fb5f16e10..52b5f74c6326 100644 --- a/maven-core/src/test/projects/default-maven/cyclic-reference/module-b/pom.xml +++ b/maven-core/src/test/projects/default-maven/cyclic-reference/module-b/pom.xml @@ -13,7 +13,6 @@ cyclic-reference module-a - 1.0-SNAPSHOT diff --git a/maven-core/src/test/remote-repo/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom b/maven-core/src/test/remote-repo/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom index 5db5973762fc..c1d5cc0b836a 100644 --- a/maven-core/src/test/remote-repo/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom +++ b/maven-core/src/test/remote-repo/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom @@ -13,7 +13,7 @@ junit junit - + 4.13.1 test diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom b/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom index 1e8675857945..bdcd0e3874fc 100644 --- a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom +++ b/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom @@ -23,7 +23,7 @@ junit junit - + 4.13.1 compile diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom index 1e8675857945..bdcd0e3874fc 100644 --- a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom +++ b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom @@ -23,7 +23,7 @@ junit junit - + 4.13.1 compile diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultBuildPomXMLFilterFactory.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultBuildPomXMLFilterFactory.java index e4154612817b..b5d4c7c9dc90 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultBuildPomXMLFilterFactory.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultBuildPomXMLFilterFactory.java @@ -20,10 +20,7 @@ */ -import java.nio.file.Path; import java.util.Optional; -import java.util.function.BiFunction; -import java.util.function.Function; import org.apache.maven.model.Model; import org.apache.maven.model.transform.BuildToRawPomXMLFilterFactory; @@ -52,16 +49,16 @@ public DefaultBuildPomXMLFilterFactory( TransformerContext context, } @Override - protected Function> getRelativePathMapper() + protected RelativePathMapper getRelativePathMapper() { - return p -> Optional.ofNullable( context.getRawModel( p ) ) + return ( from, p ) -> Optional.ofNullable( context.getRawModel( from, p ) ) .map( DefaultBuildPomXMLFilterFactory::toRelativeProject ); } @Override - protected BiFunction getDependencyKeyToVersionMapper() + protected DependencyKeyToVersionMapper getDependencyKeyToVersionMapper() { - return ( g, a ) -> Optional.ofNullable( context.getRawModel( g, a ) ) + return ( from, g, a ) -> Optional.ofNullable( context.getRawModel( from, g, a ) ) .map( DefaultBuildPomXMLFilterFactory::toVersion ) .orElse( null ); } diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java index 3e21fc72e735..e977b5b3e2d3 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java @@ -25,21 +25,21 @@ import java.io.File; import java.io.IOException; import java.lang.reflect.Field; -import java.nio.file.Files; -import java.nio.file.Path; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.Optional; import java.util.Properties; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.Callable; +import java.util.concurrent.ForkJoinTask; +import java.util.function.Function; +import java.util.function.Supplier; +import java.util.stream.Collectors; import javax.inject.Inject; import javax.inject.Named; @@ -51,7 +51,6 @@ import org.apache.maven.building.Source; import org.apache.maven.feature.Features; import org.apache.maven.model.Activation; -import org.apache.maven.model.ActivationFile; import org.apache.maven.model.Build; import org.apache.maven.model.Dependency; import org.apache.maven.model.DependencyManagement; @@ -62,7 +61,6 @@ import org.apache.maven.model.Plugin; import org.apache.maven.model.PluginManagement; import org.apache.maven.model.Profile; -import org.apache.maven.model.Repository; import org.apache.maven.model.building.ModelProblem.Severity; import org.apache.maven.model.building.ModelProblem.Version; import org.apache.maven.model.composition.DependencyManagementImporter; @@ -429,7 +427,7 @@ public DefaultModelBuilder setProfileActivationFilePathInterpolator( @Override public DefaultTransformerContextBuilder newTransformerContextBuilder() { - return new DefaultTransformerContextBuilder(); + return new DefaultTransformerContextBuilder( this ); } @Override @@ -494,7 +492,7 @@ private void activateFileModel( final ModelBuildingRequest request, final Defaul profileActivationContext.setUserProperties( profileProps ); } - profileActivationContext.setProjectProperties( inputModel.getProperties() ); + profileActivationContext.setProjectProperties( inputModel.getDelegate().getProperties() ); problems.setSource( inputModel ); List activePomProfiles = profileSelector.getActiveProfiles( inputModel.getProfiles(), profileActivationContext, problems ); @@ -525,6 +523,10 @@ private Model readEffectiveModel( final ModelBuildingRequest request, final Defa { Model inputModel = readRawModel( request, problems ); + if ( problems.hasFatalErrors() ) + { + throw problems.newModelBuildingException(); + } problems.setRootModel( inputModel ); @@ -556,55 +558,40 @@ private Model readEffectiveModel( final ModelBuildingRequest request, final Defa String modelId = currentData.getId(); result.addModelId( modelId ); - Model rawModel = currentData.getModel(); - result.setRawModel( modelId, rawModel ); - - profileActivationContext.setProjectProperties( rawModel.getProperties() ); - problems.setSource( rawModel ); - List activePomProfiles = profileSelector.getActiveProfiles( rawModel.getProfiles(), - profileActivationContext, problems ); - result.setActivePomProfiles( modelId, activePomProfiles ); - - Model tmpModel = rawModel.clone(); - - problems.setSource( tmpModel ); + Model model = currentData.getModel(); + result.setRawModel( modelId, model ); + problems.setSource( model ); + org.apache.maven.api.model.Model modelv4 = model.getDelegate(); // model normalization - tmpModel = new Model( modelNormalizer.mergeDuplicates( tmpModel.getDelegate(), request, problems ) ); + modelv4 = modelNormalizer.mergeDuplicates( modelv4, request, problems ); - profileActivationContext.setProjectProperties( tmpModel.getProperties() ); + // profile activation + profileActivationContext.setProjectProperties( modelv4.getProperties() ); - Map interpolatedActivations = getInterpolatedActivations( rawModel, - profileActivationContext, - problems ); - injectProfileActivations( tmpModel, interpolatedActivations ); + List interpolatedProfiles = + interpolateActivations( modelv4.getProfiles(), profileActivationContext, problems ); // profile injection - for ( Profile activeProfile : result.getActivePomProfiles( modelId ) ) - { - profileInjector.injectProfile( tmpModel, activeProfile, request, problems ); - } + List activePomProfiles = profileSelector.getActiveProfilesV4( + interpolatedProfiles, profileActivationContext, problems ); + result.setActivePomProfiles( modelId, + activePomProfiles.stream().map( Profile::new ).collect( Collectors.toList() ) ); + modelv4 = profileInjector.injectProfiles( modelv4, activePomProfiles, request, problems ); - if ( currentData == resultData ) - { - for ( Profile activeProfile : activeExternalProfiles ) - { - profileInjector.injectProfile( tmpModel, activeProfile, request, problems ); - } - result.setEffectiveModel( tmpModel ); - } - - lineage.add( tmpModel ); + lineage.add( new Model( modelv4 ) ); if ( currentData == superData ) { break; } - configureResolver( request.getModelResolver(), tmpModel, problems ); + // add repositories specified by the current model so that we can resolve the parent + configureResolver( request.getModelResolver(), modelv4, problems, false ); + // we pass a cloned model, so that resolving the parent version does not affect the returned model ModelData parentData = - readParent( currentData.getModel(), currentData.getSource(), request, result, problems ); + readParent( new Model( modelv4 ), currentData.getSource(), request, problems ); if ( parentData == null ) { @@ -630,7 +617,21 @@ else if ( !parentIds.add( parentData.getId() ) ) } } - problems.setSource( result.getRawModel() ); + Model tmpModel = lineage.get( 0 ); + + // inject interpolated activations + List interpolated = interpolateActivations( + tmpModel.getDelegate().getProfiles(), profileActivationContext, problems ); + if ( interpolated != tmpModel.getDelegate().getProfiles() ) + { + tmpModel.update( tmpModel.getDelegate().withProfiles( interpolated ) ); + } + + // inject external profile into current model + tmpModel.update( profileInjector.injectProfiles( tmpModel.getDelegate(), + activeExternalProfiles.stream().map( Profile::getDelegate ).collect( Collectors.toList() ), + request, problems ) ); + checkPluginVersions( lineage, request, problems ); // inheritance assembly @@ -650,54 +651,94 @@ else if ( !parentIds.add( parentData.getId() ) ) result.setEffectiveModel( resultModel ); // Now the fully interpolated model is available: reconfigure the resolver - configureResolver( request.getModelResolver(), resultModel, problems, true ); + configureResolver( request.getModelResolver(), resultModel.getDelegate(), problems, true ); return resultModel; } - private Map getInterpolatedActivations( Model rawModel, - DefaultProfileActivationContext context, - DefaultModelProblemCollector problems ) + private List interpolateActivations( + List profiles, + DefaultProfileActivationContext context, + DefaultModelProblemCollector problems ) { - Map interpolatedActivations = getProfileActivations( rawModel, true ); - for ( Activation activation : interpolatedActivations.values() ) + List newProfiles = null; + for ( int index = 0; index < profiles.size(); index++ ) { - if ( activation.getFile() != null ) + org.apache.maven.api.model.Profile profile = profiles.get( index ); + org.apache.maven.api.model.Activation activation = profile.getActivation(); + if ( activation != null ) { - replaceWithInterpolatedValue( activation.getFile(), context, problems ); + org.apache.maven.api.model.ActivationFile file = activation.getFile(); + if ( file != null ) + { + String oldExists = file.getExists(); + if ( isNotEmpty( oldExists ) ) + { + try + { + String newExists = interpolate( oldExists, context ); + if ( !Objects.equals( oldExists, newExists ) ) + { + if ( newProfiles == null ) + { + newProfiles = new ArrayList<>( profiles ); + } + newProfiles.set( index, profile.withActivation( + activation.withFile( file.withExists( newExists ) ) ) ); + } + } + catch ( InterpolationException e ) + { + addInterpolationProblem( problems, file, oldExists, e, "exists" ); + } + } + else + { + String oldMissing = file.getMissing(); + if ( isNotEmpty( oldMissing ) ) + { + try + { + String newMissing = interpolate( oldMissing, context ); + if ( !Objects.equals( oldMissing, newMissing ) ) + { + if ( newProfiles == null ) + { + newProfiles = new ArrayList<>( profiles ); + } + newProfiles.set( index, profile.withActivation( + activation.withFile( file.withMissing( newMissing ) ) ) ); + } + } + catch ( InterpolationException e ) + { + addInterpolationProblem( problems, file, oldMissing, e, "missing" ); + } + } + } + } } } - return interpolatedActivations; + return newProfiles != null ? newProfiles : profiles; } - private void replaceWithInterpolatedValue( ActivationFile activationFile, ProfileActivationContext context, - DefaultModelProblemCollector problems ) + private static void addInterpolationProblem( DefaultModelProblemCollector problems, + org.apache.maven.api.model.ActivationFile file, String path, + InterpolationException e, String locationKey ) { - try - { - if ( isNotEmpty( activationFile.getExists() ) ) - { - String path = activationFile.getExists(); - String absolutePath = profileActivationFilePathInterpolator.interpolate( path, context ); - activationFile.setExists( absolutePath ); - } - else if ( isNotEmpty( activationFile.getMissing() ) ) - { - String path = activationFile.getMissing(); - String absolutePath = profileActivationFilePathInterpolator.interpolate( path, context ); - activationFile.setMissing( absolutePath ); - } - } - catch ( InterpolationException e ) - { - String path = isNotEmpty( - activationFile.getExists() ) ? activationFile.getExists() : activationFile.getMissing(); + problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ) + .setMessage( "Failed to interpolate file location " + path + ": " + + e.getMessage() ) + .setLocation( Optional.ofNullable( file.getLocation( locationKey ) ) + .map( InputLocation::new ).orElse( null ) ) + .setException( e ) ); + } - problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ).setMessage( - "Failed to interpolate file location " + path + ": " + e.getMessage() ).setLocation( - activationFile.getLocation( isNotEmpty( activationFile.getExists() ) ? "exists" : "missing" ) ) - .setException( e ) ); - } + private String interpolate( String path, ProfileActivationContext context ) throws InterpolationException + { + return isNotEmpty( path ) + ? profileActivationFilePathInterpolator.interpolate( path, context ) + : path; } private static boolean isNotEmpty( String string ) @@ -810,13 +851,8 @@ private Model readFileModel( ModelBuildingRequest request, throws ModelBuildingException { ModelSource modelSource = request.getModelSource(); - org.apache.maven.api.model.Model model = fromCache( request.getModelCache(), modelSource, ModelCacheTag.FILE ); - if ( model == null ) - { - model = doReadFileModel( modelSource, request, problems ); - - intoCache( request.getModelCache(), modelSource, ModelCacheTag.FILE, model ); - } + org.apache.maven.api.model.Model model = cache( request.getModelCache(), modelSource, ModelCacheTag.FILE, + () -> doReadFileModel( modelSource, request, problems ) ); if ( modelSource instanceof FileModelSource ) { @@ -824,7 +860,7 @@ private Model readFileModel( ModelBuildingRequest request, { DefaultTransformerContextBuilder contextBuilder = (DefaultTransformerContextBuilder) request.getTransformerContextBuilder(); - contextBuilder.putSource( getGroupId( model ), model.getArtifactId(), modelSource ); + contextBuilder.putSource( getGroupId( model ), model.getArtifactId(), ( FileModelSource ) modelSource ); } } @@ -947,17 +983,21 @@ private org.apache.maven.api.model.Model doReadFileModel( ModelSource modelSourc return model; } - private Model readRawModel( ModelBuildingRequest request, DefaultModelProblemCollector problems ) + Model readRawModel( ModelBuildingRequest request, DefaultModelProblemCollector problems ) throws ModelBuildingException { ModelSource modelSource = request.getModelSource(); - ModelData cachedData = fromCache( request.getModelCache(), modelSource, ModelCacheTag.RAW ); - if ( cachedData != null ) - { - return cachedData.getModel(); - } + ModelData modelData = cache( request.getModelCache(), modelSource, ModelCacheTag.RAW, + () -> doReadRawModel( modelSource, request, problems ) ); + + return modelData.getModel(); + } + private ModelData doReadRawModel( ModelSource modelSource, ModelBuildingRequest request, + DefaultModelProblemCollector problems ) + throws ModelBuildingException + { Model rawModel; if ( Features.buildConsumer( request.getUserProperties() ).isActive() && modelSource instanceof FileModelSource ) @@ -974,10 +1014,12 @@ private Model readRawModel( ModelBuildingRequest request, DefaultModelProblemCol try { // must implement TransformContext, but should use request to access system properties/modelcache - org.apache.maven.api.model.Model transformedFileModel = modelProcessor.read( pomFile, - Collections.singletonMap( ModelReader.TRANSFORMER_CONTEXT, context ) ); + Map options = new HashMap<>(); + options.put( ModelReader.TRANSFORMER_CONTEXT, context ); + org.apache.maven.api.model.Model transformedFileModel = modelProcessor.read( pomFile, options ); // rawModel with locationTrackers, required for proper feedback during validations + // TODO: we should be able to do a single pass with location tracking // Apply enriched data rawModel = new Model( modelMerger.merge( rawModel.getDelegate(), @@ -1008,13 +1050,10 @@ else if ( request.getFileModel() == null ) String artifactId = rawModel.getArtifactId(); String version = getVersion( rawModel ); - ModelData modelData = new ModelData( modelSource, rawModel, groupId, artifactId, version ); - intoCache( request.getModelCache(), modelSource, ModelCacheTag.RAW, modelData ); - - return rawModel; + return new ModelData( modelSource, rawModel, groupId, artifactId, version ); } - private String getGroupId( Model model ) + String getGroupId( Model model ) { return getGroupId( model.getDelegate() ); } @@ -1052,34 +1091,23 @@ private DefaultProfileActivationContext getProfileActivationContext( ModelBuildi return context; } - private void configureResolver( ModelResolver modelResolver, Model model, DefaultModelProblemCollector problems ) + private void configureResolver( ModelResolver modelResolver, org.apache.maven.api.model.Model model, + DefaultModelProblemCollector problems, boolean replaceRepositories ) { - configureResolver( modelResolver, model, problems, false ); - } - - private void configureResolver( ModelResolver modelResolver, Model model, DefaultModelProblemCollector problems, - boolean replaceRepositories ) - { - if ( modelResolver == null ) - { - return; - } - - problems.setSource( model ); - - List repositories = model.getRepositories(); - - for ( Repository repository : repositories ) + if ( modelResolver != null ) { - try - { - modelResolver.addRepository( repository, replaceRepositories ); - } - catch ( InvalidRepositoryException e ) + for ( org.apache.maven.api.model.Repository repository : model.getRepositories() ) { - problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ) - .setMessage( "Invalid repository " + repository.getId() + ": " + e.getMessage() ) - .setLocation( repository.getLocation( "" ) ).setException( e ) ); + try + { + modelResolver.addRepository( repository, replaceRepositories ); + } + catch ( InvalidRepositoryException e ) + { + problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ) + .setMessage( "Invalid repository " + repository.getId() + ": " + e.getMessage() ) + .setLocation( new InputLocation( repository.getLocation( "" ) ) ).setException( e ) ); + } } } } @@ -1229,7 +1257,7 @@ private Model interpolateModel( Model model, ModelBuildingRequest request, Model } private ModelData readParent( Model childModel, Source childSource, ModelBuildingRequest request, - ModelBuildingResult result, DefaultModelProblemCollector problems ) + DefaultModelProblemCollector problems ) throws ModelBuildingException { ModelData parentData = null; @@ -1237,10 +1265,10 @@ private ModelData readParent( Model childModel, Source childSource, ModelBuildin Parent parent = childModel.getParent(); if ( parent != null ) { - parentData = readParentLocally( childModel, childSource, request, result, problems ); + parentData = readParentLocally( childModel, childSource, request, problems ); if ( parentData == null ) { - parentData = readParentExternally( childModel, request, result, problems ); + parentData = readParentExternally( childModel, request, problems ); } Model parentModel = parentData.getModel(); @@ -1257,7 +1285,7 @@ private ModelData readParent( Model childModel, Source childSource, ModelBuildin } private ModelData readParentLocally( Model childModel, Source childSource, ModelBuildingRequest request, - ModelBuildingResult result, DefaultModelProblemCollector problems ) + DefaultModelProblemCollector problems ) throws ModelBuildingException { final Parent parent = childModel.getParent(); @@ -1412,7 +1440,7 @@ private ModelSource getParentPomFile( Model childModel, Source source ) } private ModelData readParentExternally( Model childModel, ModelBuildingRequest request, - ModelBuildingResult result, DefaultModelProblemCollector problems ) + DefaultModelProblemCollector problems ) throws ModelBuildingException { problems.setSource( childModel ); @@ -1607,30 +1635,17 @@ private DependencyManagement loadDependencyManagement( Model model, ModelBuildin } org.apache.maven.api.model.DependencyManagement importMgmt = - fromCache( request.getModelCache(), groupId, artifactId, version, ModelCacheTag.IMPORT ); - if ( importMgmt == null ) - { - DependencyManagement importMgmtV3 = doLoadDependencyManagement( model, request, problems, dependency, - groupId, artifactId, version, importIds ); - if ( importMgmtV3 != null ) - { - importMgmt = importMgmtV3.getDelegate(); - intoCache( request.getModelCache(), groupId, artifactId, version, ModelCacheTag.IMPORT, - importMgmt ); - } - } + cache( request.getModelCache(), groupId, artifactId, version, ModelCacheTag.IMPORT, + () -> doLoadDependencyManagement( + model, request, problems, dependency, groupId, artifactId, version, importIds ) ); return importMgmt != null ? new DependencyManagement( importMgmt ) : null; } @SuppressWarnings( "checkstyle:parameternumber" ) - private DependencyManagement doLoadDependencyManagement( Model model, ModelBuildingRequest request, - DefaultModelProblemCollector problems, - Dependency dependency, - String groupId, - String artifactId, - String version, - Collection importIds ) + private org.apache.maven.api.model.DependencyManagement doLoadDependencyManagement( + Model model, ModelBuildingRequest request, DefaultModelProblemCollector problems, Dependency dependency, + String groupId, String artifactId, String version, Collection importIds ) { DependencyManagement importMgmt; final WorkspaceModelResolver workspaceResolver = request.getWorkspaceModelResolver(); @@ -1714,48 +1729,67 @@ private DependencyManagement doLoadDependencyManagement( Model model, ModelBuild { importMgmt = new DependencyManagement(); } - return importMgmt; + return importMgmt.getDelegate(); } - private void intoCache( ModelCache modelCache, String groupId, String artifactId, String version, - ModelCacheTag tag, T data ) + private static T cache( ModelCache cache, String groupId, String artifactId, String version, + ModelCacheTag tag, Callable supplier ) { - if ( modelCache != null ) - { - modelCache.put( groupId, artifactId, version, tag, data ); - } + return doWithCache( cache, supplier, s -> cache.computeIfAbsent( groupId, artifactId, version, tag, s ) ); } - private void intoCache( ModelCache modelCache, Source source, ModelCacheTag tag, T data ) + private static T cache( ModelCache cache, Source source, + ModelCacheTag tag, Callable supplier ) { - if ( modelCache != null ) - { - modelCache.put( source, tag, data ); - } + return doWithCache( cache, supplier, s -> cache.computeIfAbsent( source, tag, s ) ); } - private static T fromCache( ModelCache modelCache, String groupId, String artifactId, String version, - ModelCacheTag tag ) + private static T doWithCache( ModelCache cache, Callable supplier, + Function>, T> asyncSupplierConsumer ) { - if ( modelCache != null ) + if ( cache != null ) { - return modelCache.get( groupId, artifactId, version, tag ); + return asyncSupplierConsumer.apply( () -> + { + ForkJoinTask task = ForkJoinTask.adapt( supplier ); + task.fork(); + return () -> + { + task.quietlyJoin(); + if ( task.isCompletedAbnormally() ) + { + Throwable e = task.getException(); + while ( e instanceof RuntimeException && e.getCause() != null ) + { + e = e.getCause(); + } + uncheckedThrow( e ); + } + return task.getRawResult(); + }; + } ); + } + else + { + try + { + return supplier.call(); + } + catch ( Exception e ) + { + uncheckedThrow( e ); + return null; + } } - return null; } - private static T fromCache( ModelCache modelCache, Source source, ModelCacheTag tag ) + static void uncheckedThrow( Throwable t ) throws T { - if ( modelCache != null ) - { - return modelCache.get( source, tag ); - } - return null; + throw (T) t; // rely on vacuous cast } private void fireEvent( Model model, ModelBuildingRequest request, ModelProblemCollector problems, ModelBuildingEventCatapult catapult ) - throws ModelBuildingException { ModelBuildingListener listener = request.getModelBuildingListener(); @@ -1802,139 +1836,4 @@ protected boolean hasFatalErrors( ModelProblemCollectorExt problems ) } } - /** - * Builds up the transformer context. - * After the buildplan is ready, the build()-method returns the immutable context useful during distribution. - * This is an inner class, as it must be able to call readRawModel() - * - * @author Robert Scholte - * @since 4.0.0 - */ - private class DefaultTransformerContextBuilder implements TransformerContextBuilder - { - private final DefaultTransformerContext context = new DefaultTransformerContext(); - - private final Map> mappedSources - = new ConcurrentHashMap<>( 64 ); - - /** - * If an interface could be extracted, DefaultModelProblemCollector should be ModelProblemCollectorExt - * - * @param request - * @param collector - * @return - */ - @Override - public TransformerContext initialize( ModelBuildingRequest request, ModelProblemCollector collector ) - { - // We must assume the TransformerContext was created using this.newTransformerContextBuilder() - DefaultModelProblemCollector problems = (DefaultModelProblemCollector) collector; - return new TransformerContext() - { - @Override - public String getUserProperty( String key ) - { - return context.userProperties.computeIfAbsent( key, - k -> request.getUserProperties().getProperty( key ) ); - } - - @Override - public Model getRawModel( String gId, String aId ) - { - return context.modelByGA.computeIfAbsent( new DefaultTransformerContext.GAKey( gId, aId ), - k -> new DefaultTransformerContext.Holder() ) - .computeIfAbsent( () -> findRawModel( gId, aId ) ); - } - - @Override - public Model getRawModel( Path path ) - { - return context.modelByPath.computeIfAbsent( path, - k -> new DefaultTransformerContext.Holder() ) - .computeIfAbsent( () -> findRawModel( path ) ); - } - - private Model findRawModel( String groupId, String artifactId ) - { - Source source = getSource( groupId, artifactId ); - if ( source != null ) - { - try - { - ModelBuildingRequest gaBuildingRequest = new DefaultModelBuildingRequest( request ) - .setModelSource( (ModelSource) source ); - Model model = readRawModel( gaBuildingRequest, problems ); - if ( source instanceof FileModelSource ) - { - Path path = ( ( FileModelSource ) source ).getFile().toPath(); - context.modelByPath.computeIfAbsent( path, k -> new DefaultTransformerContext.Holder() ) - .computeIfAbsent( () -> model ); - } - return model; - } - catch ( ModelBuildingException e ) - { - // gathered with problem collector - } - } - return null; - } - - private Model findRawModel( Path p ) - { - if ( !Files.isRegularFile( p ) ) - { - throw new IllegalArgumentException( "Not a regular file: " + p ); - } - - DefaultModelBuildingRequest req = new DefaultModelBuildingRequest( request ) - .setPomFile( p.toFile() ) - .setModelSource( new FileModelSource( p.toFile() ) ); - - try - { - Model model = readRawModel( req, problems ); - DefaultTransformerContext.GAKey key = - new DefaultTransformerContext.GAKey( getGroupId( model ), model.getArtifactId() ); - context.modelByGA.computeIfAbsent( key, k -> new DefaultTransformerContext.Holder() ) - .computeIfAbsent( () -> model ); - return model; - } - catch ( ModelBuildingException e ) - { - // gathered with problem collector - } - return null; - } - }; - } - - @Override - public TransformerContext build() - { - return context; - } - - public Source getSource( String groupId, String artifactId ) - { - Set sources = mappedSources.get( new DefaultTransformerContext.GAKey( groupId, artifactId ) ); - if ( sources == null ) - { - return null; - } - return sources.stream().reduce( ( a, b ) -> - { - throw new IllegalStateException( String.format( "No unique Source for %s:%s: %s and %s", - groupId, artifactId, - a.getLocation(), b.getLocation() ) ); - } ).orElse( null ); - } - - public void putSource( String groupId, String artifactId, Source source ) - { - mappedSources.computeIfAbsent( new DefaultTransformerContext.GAKey( groupId, artifactId ), - k -> new HashSet<>() ).add( source ); - } - - } } diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultTransformerContext.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultTransformerContext.java index 3c70b3c9af03..010969178ae8 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultTransformerContext.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultTransformerContext.java @@ -21,9 +21,7 @@ import java.nio.file.Path; import java.util.Map; -import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Supplier; import org.apache.maven.model.Model; @@ -36,64 +34,9 @@ class DefaultTransformerContext implements TransformerContext { final Map userProperties = new ConcurrentHashMap<>(); - final Map modelByPath = new ConcurrentHashMap<>(); + final Map modelByPath = new ConcurrentHashMap<>(); - final Map modelByGA = new ConcurrentHashMap<>(); - - public static class Holder - { - private volatile boolean set; - private volatile Model model; - - Holder() - { - } - - public static Model deref( Holder holder ) - { - return holder != null ? holder.get() : null; - } - - public Model get() - { - if ( !set ) - { - synchronized ( this ) - { - if ( !set ) - { - try - { - this.wait(); - } - catch ( InterruptedException e ) - { - // Ignore - } - } - } - } - return model; - } - - public Model computeIfAbsent( Supplier supplier ) - { - if ( !set ) - { - synchronized ( this ) - { - if ( !set ) - { - this.set = true; - this.model = supplier.get(); - this.notifyAll(); - } - } - } - return model; - } - - } + final Map modelByGA = new ConcurrentHashMap<>(); @Override public String getUserProperty( String key ) @@ -102,50 +45,15 @@ public String getUserProperty( String key ) } @Override - public Model getRawModel( Path p ) + public Model getRawModel( Path from, Path p ) { - return Holder.deref( modelByPath.get( p ) ); + return modelByPath.get( p ); } @Override - public Model getRawModel( String groupId, String artifactId ) + public Model getRawModel( Path from, String groupId, String artifactId ) { - return Holder.deref( modelByGA.get( new GAKey( groupId, artifactId ) ) ); + return modelByGA.get( groupId + ":" + artifactId ); } - static class GAKey - { - private final String groupId; - private final String artifactId; - private final int hashCode; - - GAKey( String groupId, String artifactId ) - { - this.groupId = groupId; - this.artifactId = artifactId; - this.hashCode = Objects.hash( groupId, artifactId ); - } - - @Override - public int hashCode() - { - return hashCode; - } - - @Override - public boolean equals( Object obj ) - { - if ( this == obj ) - { - return true; - } - if ( !( obj instanceof GAKey ) ) - { - return false; - } - - GAKey other = (GAKey) obj; - return Objects.equals( artifactId, other.artifactId ) && Objects.equals( groupId, other.groupId ); - } - } } diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultTransformerContextBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultTransformerContextBuilder.java new file mode 100644 index 000000000000..67fa0f2c5c55 --- /dev/null +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultTransformerContextBuilder.java @@ -0,0 +1,197 @@ +package org.apache.maven.model.building; + +/* + * 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 java.nio.file.Files; +import java.nio.file.Path; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; + +import org.apache.maven.model.Model; +import org.codehaus.plexus.util.dag.CycleDetectedException; +import org.codehaus.plexus.util.dag.DAG; + +/** + * Builds up the transformer context. + * After the buildplan is ready, the build()-method returns the immutable context useful during distribution. + * It must be able to call {@link DefaultModelBuilder#readRawModel(ModelBuildingRequest, DefaultModelProblemCollector)}. + * + * @author Robert Scholte + * @since 4.0.0 + */ +class DefaultTransformerContextBuilder implements TransformerContextBuilder +{ + private final DefaultTransformerContext context = new DefaultTransformerContext(); + + private final Map> mappedSources = new ConcurrentHashMap<>( 64 ); + + private final DAG dag = new DAG(); + private final DefaultModelBuilder defaultModelBuilder; + + DefaultTransformerContextBuilder( final DefaultModelBuilder defaultModelBuilder ) + { + this.defaultModelBuilder = defaultModelBuilder; + } + + /** + * If an interface could be extracted, DefaultModelProblemCollector should be ModelProblemCollectorExt + */ + @Override + public TransformerContext initialize( ModelBuildingRequest request, ModelProblemCollector collector ) + { + // We must assume the TransformerContext was created using this.newTransformerContextBuilder() + DefaultModelProblemCollector problems = (DefaultModelProblemCollector) collector; + return new TransformerContext() + { + @Override + public String getUserProperty( String key ) + { + return context.userProperties.computeIfAbsent( key, + k -> request.getUserProperties().getProperty( key ) ); + } + + @Override + public Model getRawModel( Path from, String gId, String aId ) + { + Model model = findRawModel( from, gId, aId ); + if ( model != null ) + { + context.modelByGA.put( gId + ":" + aId, model ); + context.modelByPath.put( model.getPomFile().toPath(), model ); + } + return model; + } + + @Override + public Model getRawModel( Path from, Path path ) + { + Model model = findRawModel( from, path ); + if ( model != null ) + { + String groupId = defaultModelBuilder.getGroupId( model ); + context.modelByGA.put( groupId + ":" + model.getArtifactId(), model ); + context.modelByPath.put( path, model ); + } + return model; + } + + private Model findRawModel( Path from, String groupId, String artifactId ) + { + FileModelSource source = getSource( groupId, artifactId ); + if ( source != null ) + { + if ( !addEdge( from, source.getFile().toPath(), problems ) ) + { + return null; + } + try + { + ModelBuildingRequest gaBuildingRequest = new DefaultModelBuildingRequest( request ) + .setModelSource( source ); + return defaultModelBuilder.readRawModel( gaBuildingRequest, problems ); + } + catch ( ModelBuildingException e ) + { + // gathered with problem collector + } + } + return null; + } + + private Model findRawModel( Path from, Path p ) + { + if ( !Files.isRegularFile( p ) ) + { + throw new IllegalArgumentException( "Not a regular file: " + p ); + } + + if ( !addEdge( from, p, problems ) ) + { + return null; + } + + DefaultModelBuildingRequest req = new DefaultModelBuildingRequest( request ) + .setPomFile( p.toFile() ) + .setModelSource( new FileModelSource( p.toFile() ) ); + + try + { + return defaultModelBuilder.readRawModel( req, problems ); + } + catch ( ModelBuildingException e ) + { + // gathered with problem collector + } + return null; + } + }; + } + + private boolean addEdge( Path from, Path p, DefaultModelProblemCollector problems ) + { + try + { + synchronized ( dag ) + { + dag.addEdge( from.toString(), p.toString() ); + } + return true; + } + catch ( CycleDetectedException e ) + { + problems.add( new DefaultModelProblem( + "Cycle detected between models at " + from + " and " + p, + ModelProblem.Severity.FATAL, + null, null, 0, 0, null, + e + ) ); + return false; + } + } + + @Override + public TransformerContext build() + { + return context; + } + + public FileModelSource getSource( String groupId, String artifactId ) + { + Set sources = mappedSources.get( groupId + ":" + artifactId ); + if ( sources == null ) + { + return null; + } + return sources.stream().reduce( ( a, b ) -> + { + throw new IllegalStateException( String.format( "No unique Source for %s:%s: %s and %s", + groupId, artifactId, + a.getLocation(), b.getLocation() ) ); + } ).orElse( null ); + } + + public void putSource( String groupId, String artifactId, FileModelSource source ) + { + mappedSources.computeIfAbsent( groupId + ":" + artifactId, k -> new HashSet<>() ) + .add( source ); + } +} diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCache.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCache.java index 25fb268ae6ed..5d01cb51d2fc 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCache.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCache.java @@ -19,6 +19,8 @@ * under the License. */ +import java.util.function.Supplier; + import org.apache.maven.building.Source; /** @@ -138,4 +140,21 @@ default T get( String groupId, String artifactId, String version, ModelCache return ( obj != null ) ? tag.fromCache( tag.getType().cast( obj ) ) : null; } + default T computeIfAbsent( String groupId, String artifactId, String version, + ModelCacheTag tag, Supplier> data ) + { + Object obj = computeIfAbsent( groupId, artifactId, version, tag.getName(), ( Supplier ) data ); + return ( obj != null ) ? tag.fromCache( tag.getType().cast( obj ) ) : null; + } + + default T computeIfAbsent( Source path, ModelCacheTag tag, Supplier> data ) + { + Object obj = computeIfAbsent( path, tag.getName(), ( Supplier ) data ); + return ( obj != null ) ? tag.fromCache( tag.getType().cast( obj ) ) : null; + } + + Object computeIfAbsent( String groupId, String artifactId, String version, String tag, Supplier> data ); + + Object computeIfAbsent( Source path, String tag, Supplier> data ); + } diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/TransformerContext.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/TransformerContext.java index e041af4912db..a57d75950db5 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/TransformerContext.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/TransformerContext.java @@ -47,18 +47,20 @@ public interface TransformerContext /** * Get the model based on the path, will be used to resolve the parent based on relativePath * + * @param from the requiring model * @param pomFile the path to the pomFile * @return the model, otherwise {@code null} */ - Model getRawModel( Path pomFile ); + Model getRawModel( Path from, Path pomFile ); /** * Get the model from the reactor based on the groupId and artifactId, will be used for reactor dependencies * - * @param groupId the groupId + * @param from the requiring model + * @param groupId the groupId * @param artifactId the artifactId * @return the model, otherwise {@code null} * @throws IllegalStateException if multiple versions of the same GA are part of the reactor */ - Model getRawModel( String groupId, String artifactId ); + Model getRawModel( Path from, String groupId, String artifactId ); } diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java index 1002f29ff743..9ed5b420a456 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java @@ -52,12 +52,12 @@ public class DefaultInheritanceAssembler implements InheritanceAssembler { - private InheritanceModelMerger merger = new InheritanceModelMerger(); - private static final String CHILD_DIRECTORY = "child-directory"; private static final String CHILD_DIRECTORY_PROPERTY = "project.directory"; + private final InheritanceModelMerger merger = new InheritanceModelMerger(); + @Override public Model assembleModelInheritance( Model child, Model parent, ModelBuildingRequest request, ModelProblemCollector problems ) diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java index 4fb1b265e3ec..fd152691653c 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java @@ -25,9 +25,6 @@ import java.util.Map; import java.util.Properties; -import static java.util.stream.Collectors.collectingAndThen; -import static java.util.stream.Collectors.toMap; - /** * Describes the environmental context used to determine the activation status of profiles. * @@ -227,15 +224,11 @@ public Map getProjectProperties() return projectProperties; } - public DefaultProfileActivationContext setProjectProperties( Properties projectProperties ) + public DefaultProfileActivationContext setProjectProperties( Map projectProperties ) { if ( projectProperties != null ) { - this.projectProperties = projectProperties.entrySet().stream() - .collect( - collectingAndThen( - toMap( k -> String.valueOf( k.getKey() ), v -> String.valueOf( v ) ), - Collections::unmodifiableMap ) ); + this.projectProperties = Collections.unmodifiableMap( projectProperties ); } else { diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java index ec7eb25c763a..9eab4a3f36cc 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java @@ -27,6 +27,8 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.WeakHashMap; +import java.util.concurrent.ConcurrentHashMap; import org.apache.maven.api.model.Build; import org.apache.maven.api.model.BuildBase; @@ -35,6 +37,7 @@ import org.apache.maven.api.model.Plugin; import org.apache.maven.api.model.PluginContainer; import org.apache.maven.api.model.PluginExecution; +import org.apache.maven.api.model.Profile; import org.apache.maven.api.model.ReportPlugin; import org.apache.maven.api.model.ReportSet; import org.apache.maven.api.model.Reporting; @@ -54,6 +57,14 @@ public class DefaultProfileInjector implements ProfileInjector { + private static final Map, Model>> CACHE + = Collections.synchronizedMap( new WeakHashMap<>() ); + + // In order for the weak hash map to work correctly, we must not hold any reference to + // the model used as the key. So we use a dummy model as a placeholder to indicate that + // we want to store the model used as they key. + private static final Model KEY = Model.newInstance(); + private ProfileModelMerger merger = new ProfileModelMerger(); @Override @@ -62,21 +73,48 @@ public void injectProfile( org.apache.maven.model.Model model, ModelBuildingRequest request, ModelProblemCollector problems ) { - if ( profile != null ) - { - Model.Builder builder = Model.newBuilder( model.getDelegate() ); - merger.mergeModelBase( builder, model.getDelegate(), profile.getDelegate() ); + model.update( injectProfile( + model.getDelegate(), profile != null ? profile.getDelegate() : null, request, problems ) ); + } + + @Override + public Model injectProfile( Model model, Profile profile, ModelBuildingRequest request, + ModelProblemCollector problems ) + { + return injectProfiles( model, Collections.singletonList( profile ), request, problems ); + } - if ( profile.getBuild() != null ) + @Override + public Model injectProfiles( Model model, List profiles, ModelBuildingRequest request, + ModelProblemCollector problems ) + { + Model result = CACHE.computeIfAbsent( model, k -> new ConcurrentHashMap<>() ) + .computeIfAbsent( profiles, l -> doInjectProfiles( model, profiles ) ); + return result == KEY ? model : result; + } + + private Model doInjectProfiles( Model model, List profiles ) + { + Model orgModel = model; + for ( Profile profile : profiles ) + { + if ( profile != null ) { - Build build = model.getBuild() != null ? model.getBuild().getDelegate() : Build.newInstance(); - Build.Builder bbuilder = Build.newBuilder( build ); - merger.mergeBuildBase( bbuilder, build, profile.getBuild().getDelegate() ); - builder.build( bbuilder.build() ); - } + Model.Builder builder = Model.newBuilder( model ); + merger.mergeModelBase( builder, model, profile ); - model.update( builder.build() ); + if ( profile.getBuild() != null ) + { + Build build = model.getBuild() != null ? model.getBuild() : Build.newInstance(); + Build.Builder bbuilder = Build.newBuilder( build ); + merger.mergeBuildBase( bbuilder, build, profile.getBuild() ); + builder.build( bbuilder.build() ); + } + + model = builder.build(); + } } + return model == orgModel ? KEY : model; } /** diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java index 75dc10f794a8..6580aae0fb41 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java @@ -23,6 +23,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; +import java.util.stream.Collectors; import javax.inject.Inject; import javax.inject.Named; @@ -64,6 +65,15 @@ public DefaultProfileSelector addProfileActivator( ProfileActivator profileActiv return this; } + @Override + public List getActiveProfilesV4( + Collection profiles, ProfileActivationContext context, + ModelProblemCollector problems ) + { + return getActiveProfiles( profiles.stream().map( Profile::new ).collect( Collectors.toList() ), + context, problems ).stream().map( Profile::getDelegate ).collect( Collectors.toList() ); + } + @Override public List getActiveProfiles( Collection profiles, ProfileActivationContext context, ModelProblemCollector problems ) diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileInjector.java index fbd7ddf02285..01f1ff7f66aa 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileInjector.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileInjector.java @@ -19,6 +19,8 @@ * under the License. */ +import java.util.List; + import org.apache.maven.model.Model; import org.apache.maven.model.Profile; import org.apache.maven.model.building.ModelBuildingRequest; @@ -43,4 +45,13 @@ public interface ProfileInjector */ void injectProfile( Model model, Profile profile, ModelBuildingRequest request, ModelProblemCollector problems ); + org.apache.maven.api.model.Model injectProfile( + org.apache.maven.api.model.Model model, + org.apache.maven.api.model.Profile profile, + ModelBuildingRequest request, ModelProblemCollector problems ); + + org.apache.maven.api.model.Model injectProfiles( + org.apache.maven.api.model.Model model, + List profiles, + ModelBuildingRequest request, ModelProblemCollector problems ); } diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileSelector.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileSelector.java index 53ea8d9c04d0..834a2b5cf096 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileSelector.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileSelector.java @@ -46,4 +46,8 @@ public interface ProfileSelector List getActiveProfiles( Collection profiles, ProfileActivationContext context, ModelProblemCollector problems ); + List getActiveProfilesV4( + Collection profiles, + ProfileActivationContext context, + ModelProblemCollector problems ); } diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java b/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java index bb6a82025677..227004532385 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java @@ -23,6 +23,7 @@ import java.io.InputStream; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import javax.inject.Inject; import javax.inject.Named; @@ -48,7 +49,7 @@ public class DefaultSuperPomProvider /** * The cached super POM, lazily created. */ - private Model superModel; + private static final Map SUPER_MODELS = new ConcurrentHashMap<>(); @Inject public DefaultSuperPomProvider( ModelProcessor modelProcessor ) @@ -59,9 +60,9 @@ public DefaultSuperPomProvider( ModelProcessor modelProcessor ) @Override public Model getSuperModel( String version ) { - if ( superModel == null ) + return SUPER_MODELS.computeIfAbsent( version, v -> { - String resource = "/org/apache/maven/model/pom-" + version + ".xml"; + String resource = "/org/apache/maven/model/pom-" + v + ".xml"; InputStream is = getClass().getResourceAsStream( resource ); @@ -82,16 +83,14 @@ public Model getSuperModel( String version ) modelId, getClass().getResource( resource ).toExternalForm() ); options.put( ModelProcessor.INPUT_SOURCE, inputSource ); - superModel = modelProcessor.read( is, options ); + return modelProcessor.read( is, options ); } catch ( IOException e ) { throw new IllegalStateException( "The super POM " + resource + " is damaged" + ", please verify the integrity of your Maven installation", e ); } - } - - return superModel; + } ); } } diff --git a/maven-model-transform/src/main/java/org/apache/maven/model/transform/BuildToRawPomXMLFilterFactory.java b/maven-model-transform/src/main/java/org/apache/maven/model/transform/BuildToRawPomXMLFilterFactory.java index dba9026b12f3..ef7b6534f69a 100644 --- a/maven-model-transform/src/main/java/org/apache/maven/model/transform/BuildToRawPomXMLFilterFactory.java +++ b/maven-model-transform/src/main/java/org/apache/maven/model/transform/BuildToRawPomXMLFilterFactory.java @@ -21,8 +21,6 @@ import java.nio.file.Path; import java.util.Optional; -import java.util.function.BiFunction; -import java.util.function.Function; import org.codehaus.plexus.util.xml.pull.XmlPullParser; @@ -36,6 +34,16 @@ public class BuildToRawPomXMLFilterFactory { private final boolean consume; + public interface RelativePathMapper + { + Optional apply( Path from, Path path ); + } + + public interface DependencyKeyToVersionMapper + { + String apply( Path from, String g, String a ); + } + public BuildToRawPomXMLFilterFactory() { this( false ); @@ -59,12 +67,12 @@ public final XmlPullParser get( XmlPullParser orgParser, Path projectFile ) if ( getDependencyKeyToVersionMapper() != null ) { - parser = new ReactorDependencyXMLFilter( parser, getDependencyKeyToVersionMapper() ); + parser = new ReactorDependencyXMLFilter( parser, getDependencyKeyToVersionMapper(), projectFile ); } if ( getRelativePathMapper() != null ) { - parser = new ParentXMLFilter( parser, getRelativePathMapper(), projectFile.getParent() ); + parser = new ParentXMLFilter( parser, getRelativePathMapper(), projectFile ); } CiFriendlyXMLFilter ciFriendlyFilter = new CiFriendlyXMLFilter( parser, consume ); @@ -79,12 +87,12 @@ public final XmlPullParser get( XmlPullParser orgParser, Path projectFile ) /** * @return the mapper or {@code null} if relativePaths don't need to be mapped */ - protected Function> getRelativePathMapper() + protected RelativePathMapper getRelativePathMapper() { return null; } - protected BiFunction getDependencyKeyToVersionMapper() + protected DependencyKeyToVersionMapper getDependencyKeyToVersionMapper() { return null; } diff --git a/maven-model-transform/src/main/java/org/apache/maven/model/transform/ParentXMLFilter.java b/maven-model-transform/src/main/java/org/apache/maven/model/transform/ParentXMLFilter.java index 37ac28b62404..6ba754a2c6f8 100644 --- a/maven-model-transform/src/main/java/org/apache/maven/model/transform/ParentXMLFilter.java +++ b/maven-model-transform/src/main/java/org/apache/maven/model/transform/ParentXMLFilter.java @@ -25,10 +25,10 @@ import java.util.List; import java.util.Objects; import java.util.Optional; -import java.util.function.Function; import org.apache.maven.model.transform.pull.NodeBufferingParser; import org.codehaus.plexus.util.xml.pull.XmlPullParser; +import org.apache.maven.model.transform.BuildToRawPomXMLFilterFactory.RelativePathMapper; /** *

@@ -46,19 +46,20 @@ class ParentXMLFilter extends NodeBufferingParser { - private final Function> relativePathMapper; + private final RelativePathMapper relativePathMapper; - private final Path projectPath; + private final Path projectFile; /** * @param relativePathMapper */ ParentXMLFilter( XmlPullParser parser, - Function> relativePathMapper, Path projectPath ) + RelativePathMapper relativePathMapper, + Path projectFile ) { super( parser, "parent" ); this.relativePathMapper = relativePathMapper; - this.projectPath = projectPath; + this.projectFile = projectFile; } protected void process( List buffer ) @@ -108,39 +109,34 @@ else if ( "version".equals( tagName ) ) } else if ( event.event == END_TAG && "parent".equals( event.name ) ) { - Optional resolvedParent; if ( !hasVersion && ( !hasRelativePath || relativePath != null ) ) { Path relPath = Paths.get( Objects.toString( relativePath, "../pom.xml" ) ); - resolvedParent = resolveRelativePath( relPath, groupId, artifactId ); - } - else - { - resolvedParent = Optional.empty(); - } - if ( !hasVersion && resolvedParent.isPresent() ) - { - int pos = buffer.get( i - 1 ).event == TEXT ? i - 1 : i; - Event e = new Event(); - e.event = TEXT; - e.text = whitespaceAfterParentStart; - buffer.add( pos++, e ); - e = new Event(); - e.event = START_TAG; - e.namespace = buffer.get( 0 ).namespace; - e.prefix = buffer.get( 0 ).prefix; - e.name = "version"; - buffer.add( pos++, e ); - e = new Event(); - e.event = TEXT; - e.text = resolvedParent.get().getVersion(); - buffer.add( pos++, e ); - e = new Event(); - e.event = END_TAG; - e.name = "version"; - e.namespace = buffer.get( 0 ).namespace; - e.prefix = buffer.get( 0 ).prefix; - buffer.add( pos++, e ); + Optional resolvedParent = resolveRelativePath( relPath, groupId, artifactId ); + if ( resolvedParent.isPresent() ) + { + int pos = buffer.get( i - 1 ).event == TEXT ? i - 1 : i; + Event e = new Event(); + e.event = TEXT; + e.text = whitespaceAfterParentStart; + buffer.add( pos++, e ); + e = new Event(); + e.event = START_TAG; + e.namespace = buffer.get( 0 ).namespace; + e.prefix = buffer.get( 0 ).prefix; + e.name = "version"; + buffer.add( pos++, e ); + e = new Event(); + e.event = TEXT; + e.text = resolvedParent.get().getVersion(); + buffer.add( pos++, e ); + e = new Event(); + e.event = END_TAG; + e.name = "version"; + e.namespace = buffer.get( 0 ).namespace; + e.prefix = buffer.get( 0 ).prefix; + buffer.add( pos++, e ); + } } break; } @@ -151,13 +147,13 @@ else if ( event.event == END_TAG && "parent".equals( event.name ) ) protected Optional resolveRelativePath( Path relativePath, String groupId, String artifactId ) { - Path pomPath = projectPath.resolve( relativePath ); + Path pomPath = projectFile.resolveSibling( relativePath ); if ( Files.isDirectory( pomPath ) ) { pomPath = pomPath.resolve( "pom.xml" ); } - Optional mappedProject = relativePathMapper.apply( pomPath.normalize() ); + Optional mappedProject = relativePathMapper.apply( projectFile, pomPath.normalize() ); if ( mappedProject.isPresent() ) { diff --git a/maven-model-transform/src/main/java/org/apache/maven/model/transform/ReactorDependencyXMLFilter.java b/maven-model-transform/src/main/java/org/apache/maven/model/transform/ReactorDependencyXMLFilter.java index 7f9dd3ba4f41..1d7141e16b0a 100644 --- a/maven-model-transform/src/main/java/org/apache/maven/model/transform/ReactorDependencyXMLFilter.java +++ b/maven-model-transform/src/main/java/org/apache/maven/model/transform/ReactorDependencyXMLFilter.java @@ -19,11 +19,12 @@ * under the License. */ +import java.nio.file.Path; import java.util.List; -import java.util.function.BiFunction; import org.apache.maven.model.transform.pull.NodeBufferingParser; import org.codehaus.plexus.util.xml.pull.XmlPullParser; +import org.apache.maven.model.transform.BuildToRawPomXMLFilterFactory.DependencyKeyToVersionMapper; /** * Will apply the version if the dependency is part of the reactor @@ -34,13 +35,16 @@ */ public class ReactorDependencyXMLFilter extends NodeBufferingParser { - private final BiFunction reactorVersionMapper; + private final DependencyKeyToVersionMapper reactorVersionMapper; + private final Path projectFile; public ReactorDependencyXMLFilter( XmlPullParser xmlPullParser, - BiFunction reactorVersionMapper ) + DependencyKeyToVersionMapper reactorVersionMapper, + Path projectFile ) { super( xmlPullParser, "dependency" ); this.reactorVersionMapper = reactorVersionMapper; + this.projectFile = projectFile; } protected void process( List buffer ) @@ -79,30 +83,33 @@ else if ( "artifactId".equals( tagName ) ) } else if ( event.event == END_TAG && "dependency".equals( event.name ) ) { - String version = reactorVersionMapper.apply( groupId, artifactId ); - if ( !hasVersion && version != null ) + if ( !hasVersion ) { - int pos = buffer.get( i - 1 ).event == TEXT ? i - 1 : i; - Event e = new Event(); - e.event = TEXT; - e.text = dependencyWhitespace; - buffer.add( pos++, e ); - e = new Event(); - e.event = START_TAG; - e.namespace = buffer.get( 0 ).namespace; - e.prefix = buffer.get( 0 ).prefix; - e.name = "version"; - buffer.add( pos++, e ); - e = new Event(); - e.event = TEXT; - e.text = version; - buffer.add( pos++, e ); - e = new Event(); - e.event = END_TAG; - e.name = "version"; - e.namespace = buffer.get( 0 ).namespace; - e.prefix = buffer.get( 0 ).prefix; - buffer.add( pos++, e ); + String version = reactorVersionMapper.apply( projectFile, groupId, artifactId ); + if ( version != null ) + { + int pos = buffer.get( i - 1 ).event == TEXT ? i - 1 : i; + Event e = new Event(); + e.event = TEXT; + e.text = dependencyWhitespace; + buffer.add( pos++, e ); + e = new Event(); + e.event = START_TAG; + e.namespace = buffer.get( 0 ).namespace; + e.prefix = buffer.get( 0 ).prefix; + e.name = "version"; + buffer.add( pos++, e ); + e = new Event(); + e.event = TEXT; + e.text = version; + buffer.add( pos++, e ); + e = new Event(); + e.event = END_TAG; + e.name = "version"; + e.namespace = buffer.get( 0 ).namespace; + e.prefix = buffer.get( 0 ).prefix; + buffer.add( pos++, e ); + } } break; } diff --git a/maven-model-transform/src/test/java/org/apache/maven/model/transform/ConsumerPomXMLFilterTest.java b/maven-model-transform/src/test/java/org/apache/maven/model/transform/ConsumerPomXMLFilterTest.java index ee77d1244e54..6dc5b9adbe2e 100644 --- a/maven-model-transform/src/test/java/org/apache/maven/model/transform/ConsumerPomXMLFilterTest.java +++ b/maven-model-transform/src/test/java/org/apache/maven/model/transform/ConsumerPomXMLFilterTest.java @@ -38,13 +38,13 @@ protected XmlPullParser getFilter( XmlPullParser orgParser ) final BuildToRawPomXMLFilterFactory buildPomXMLFilterFactory = new BuildToRawPomXMLFilterFactory( true ) { @Override - protected Function> getRelativePathMapper() + protected RelativePathMapper getRelativePathMapper() { return null; } @Override - protected BiFunction getDependencyKeyToVersionMapper() + protected DependencyKeyToVersionMapper getDependencyKeyToVersionMapper() { return null; } diff --git a/maven-model-transform/src/test/java/org/apache/maven/model/transform/ParentXMLFilterTest.java b/maven-model-transform/src/test/java/org/apache/maven/model/transform/ParentXMLFilterTest.java index 85714934dd3c..adb42c2a4a05 100644 --- a/maven-model-transform/src/test/java/org/apache/maven/model/transform/ParentXMLFilterTest.java +++ b/maven-model-transform/src/test/java/org/apache/maven/model/transform/ParentXMLFilterTest.java @@ -50,11 +50,11 @@ protected XmlPullParser getFilter( XmlPullParser parser ) protected XmlPullParser createFilter( XmlPullParser parser ) { return createFilter( parser, - x -> Optional.of(new RelativeProject("GROUPID", "ARTIFACTID", "1.0.0")), + (from, x) -> Optional.of(new RelativeProject("GROUPID", "ARTIFACTID", "1.0.0")), Paths.get( "pom.xml").toAbsolutePath() ); } - protected XmlPullParser createFilter( XmlPullParser parser, Function> pathMapper, Path projectPath ) { + protected XmlPullParser createFilter( XmlPullParser parser, BuildToRawPomXMLFilterFactory.RelativePathMapper pathMapper, Path projectPath ) { return new ParentXMLFilter( new FastForwardFilter( parser ), pathMapper, projectPath ); } @@ -230,7 +230,7 @@ public void testNoVersion() public void testInvalidRelativePath() throws Exception { - filterCreator = parser -> createFilter(parser, x -> Optional.ofNullable( null ), Paths.get( "pom.xml").toAbsolutePath() ); + filterCreator = parser -> createFilter(parser, (from, x) -> Optional.ofNullable( null ), Paths.get( "pom.xml").toAbsolutePath() ); String input = "" + "GROUPID" diff --git a/maven-model-transform/src/test/java/org/apache/maven/model/transform/ReactorDependencyXMLFilterTest.java b/maven-model-transform/src/test/java/org/apache/maven/model/transform/ReactorDependencyXMLFilterTest.java index 0304ea606a73..a462b7398d2f 100644 --- a/maven-model-transform/src/test/java/org/apache/maven/model/transform/ReactorDependencyXMLFilterTest.java +++ b/maven-model-transform/src/test/java/org/apache/maven/model/transform/ReactorDependencyXMLFilterTest.java @@ -19,6 +19,7 @@ * under the License. */ +import java.nio.file.Paths; import java.util.function.BiFunction; import org.codehaus.plexus.util.xml.pull.XmlPullParser; @@ -30,7 +31,7 @@ public class ReactorDependencyXMLFilterTest extends AbstractXMLFilterTests { - private BiFunction reactorVersionMapper; + private BuildToRawPomXMLFilterFactory.DependencyKeyToVersionMapper reactorVersionMapper; @BeforeEach protected void reset() { @@ -41,7 +42,8 @@ protected void reset() { protected ReactorDependencyXMLFilter getFilter(XmlPullParser parser) { return new ReactorDependencyXMLFilter( parser, - reactorVersionMapper != null ? reactorVersionMapper : (g, a) -> "1.0.0" ); + reactorVersionMapper != null ? reactorVersionMapper : (from, g, a) -> "1.0.0", + Paths.get( "theproject/pom.xml" ) ); } @Test @@ -64,7 +66,7 @@ public void testDefaultDependency() public void testManagedDependency() throws Exception { - reactorVersionMapper = (g, a) -> null; + reactorVersionMapper = (from, g, a) -> null; String input = "" + "GROUPID" diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java index 339bc08b8bf0..62545f6595d0 100644 --- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java +++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java @@ -22,6 +22,7 @@ import java.util.Map; import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Supplier; import org.apache.maven.building.Source; import org.apache.maven.model.building.ModelCache; @@ -38,11 +39,11 @@ public class DefaultModelCache private static final String KEY = DefaultModelCache.class.getName(); - private final Map cache; + private final Map> cache; public static ModelCache newInstance( RepositorySystemSession session ) { - Map cache; + Map> cache; if ( session.getCache() == null ) { cache = new ConcurrentHashMap<>(); @@ -59,7 +60,7 @@ public static ModelCache newInstance( RepositorySystemSession session ) return new DefaultModelCache( cache ); } - private DefaultModelCache( Map cache ) + private DefaultModelCache( Map> cache ) { this.cache = cache; } @@ -86,12 +87,32 @@ public void put( String groupId, String artifactId, String version, String tag, protected Object get( Object key ) { - return cache.get( key ); + Supplier s = cache.get( key ); + return s != null ? s.get() : null; } protected void put( Object key, Object data ) { - cache.put( key, data ); + cache.put( key, () -> data ); + } + + @Override + public Object computeIfAbsent( String groupId, String artifactId, String version, String tag, + Supplier> data ) + { + return computeIfAbsent( new GavCacheKey( groupId, artifactId, version, tag ), data ); + } + + @Override + public Object computeIfAbsent( Source path, String tag, Supplier> data ) + { + return computeIfAbsent( new SourceCacheKey( path, tag ), data ); + } + + protected Object computeIfAbsent( Object key, Supplier> data ) + { + Supplier s = cache.computeIfAbsent( key, k -> data.get() ); + return s != null ? s.get() : null; } static class GavCacheKey