New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[MNG-7432] Resolver session contains non-MavenWorkspaceReader #695
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
106 changes: 106 additions & 0 deletions
106
maven-core/src/main/java/org/apache/maven/internal/aether/MavenChainedWorkspaceReader.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,106 @@ | ||
package org.apache.maven.internal.aether; | ||
|
||
/* | ||
* 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.io.File; | ||
import java.util.Collection; | ||
import java.util.List; | ||
|
||
import org.apache.maven.model.Model; | ||
import org.apache.maven.repository.internal.MavenWorkspaceReader; | ||
import org.eclipse.aether.artifact.Artifact; | ||
import org.eclipse.aether.repository.WorkspaceReader; | ||
import org.eclipse.aether.repository.WorkspaceRepository; | ||
import org.eclipse.aether.util.repository.ChainedWorkspaceReader; | ||
|
||
/** | ||
* A maven workspace reader that delegates to a chain of other readers, effectively aggregating their contents. | ||
*/ | ||
public final class MavenChainedWorkspaceReader | ||
implements MavenWorkspaceReader | ||
{ | ||
|
||
private ChainedWorkspaceReader delegate; | ||
|
||
private WorkspaceReader[] readers; | ||
|
||
/** | ||
* Creates a new workspace reader by chaining the specified readers. | ||
* | ||
* @param readers The readers to chain must not be {@code null}. | ||
*/ | ||
private MavenChainedWorkspaceReader( WorkspaceReader... readers ) | ||
{ | ||
this.delegate = new ChainedWorkspaceReader( readers ); | ||
this.readers = readers; | ||
} | ||
|
||
@Override | ||
public Model findModel( Artifact artifact ) | ||
{ | ||
for ( WorkspaceReader workspaceReader : readers ) | ||
{ | ||
if ( workspaceReader instanceof MavenWorkspaceReader ) | ||
{ | ||
Model model = ( (MavenWorkspaceReader) workspaceReader ).findModel( artifact ); | ||
if ( model != null ) | ||
{ | ||
return model; | ||
} | ||
} | ||
} | ||
return null; | ||
} | ||
|
||
@Override | ||
public WorkspaceRepository getRepository() | ||
{ | ||
return delegate.getRepository(); | ||
} | ||
|
||
@Override | ||
public File findArtifact( Artifact artifact ) | ||
{ | ||
return delegate.findArtifact( artifact ); | ||
} | ||
|
||
@Override | ||
public List<String> findVersions( Artifact artifact ) | ||
{ | ||
return delegate.findVersions( artifact ); | ||
} | ||
|
||
/** | ||
* chains a collection of {@link WorkspaceReader}s | ||
* @param workspaceReaderCollection the collection of readers, might be empty but never <code>null</code> | ||
* @return if the collection contains only one item returns the single item, otherwise creates a new | ||
* {@link MavenChainedWorkspaceReader} chaining all readers in the order of the given collection. | ||
*/ | ||
public static WorkspaceReader of( Collection<WorkspaceReader> workspaceReaderCollection ) | ||
{ | ||
WorkspaceReader[] readers = workspaceReaderCollection.toArray( new WorkspaceReader[0] ); | ||
if ( readers.length == 1 ) | ||
{ | ||
return readers[0]; | ||
} | ||
return new MavenChainedWorkspaceReader( readers ); | ||
} | ||
|
||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd personally just remove this length check, and make it always wrapped (is simpler).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the complexity is manageable given that in most cases there is only one WSP and we save useless loop calls in that case when it is used across the maven build.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Still, the check could happen then on collection, not after conversion to array, no?nvm, am fine with it as it isThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I just used the "toArray" as we accept a collection and then getting the first element from collection requires to iterate over the collection, but if size is larger requires an toArray as well... in the end it dosn't make much a difference given that this only happens once per maven invocation.