Skip to content

Commit

Permalink
Add setRepositories() to ModelRequest (fixes #166) (#167)
Browse files Browse the repository at this point in the history
See #166.
  • Loading branch information
vorburger authored Feb 8, 2025
1 parent 2b9f1bb commit 37e0c3f
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,14 @@ public static Builder builder() {
private final Artifact artifact;
private final String requestContext;
private final RequestTrace trace;
private final List<RemoteRepository> repositories;

private ModelRequest(Artifact artifact, String requestContext, RequestTrace trace) {
private ModelRequest(
Artifact artifact, String requestContext, RequestTrace trace, List<RemoteRepository> repositories) {
this.artifact = requireNonNull(artifact);
this.requestContext = requestContext == null ? "" : requestContext;
this.trace = trace;
this.repositories = repositories;
}

public Artifact getArtifact() {
Expand All @@ -46,6 +49,10 @@ public RequestTrace getTrace() {
return trace;
}

public List<RemoteRepository> getRepositories() {
return repositories;
}

public Builder toBuilder() {
return new Builder(this);
}
Expand All @@ -62,10 +69,11 @@ private Builder(ModelRequest request) {
this.artifact = request.artifact;
this.requestContext = request.requestContext;
this.trace = request.trace;
this.repositories = request.repositories;
}

public ModelRequest build() {
return new ModelRequest(artifact, requestContext, trace);
return new ModelRequest(artifact, requestContext, trace, repositories);
}

public Builder setPomFile(Path pomFile) {
Expand All @@ -88,5 +96,10 @@ public Builder setTrace(RequestTrace trace) {
this.trace = trace;
return this;
}

public Builder setRepositories(List<RemoteRepository> repositories) {
this.repositories = repositories;
return this;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,11 @@ private ModelResponse loadPom(RepositorySystemSession session, ModelRequest requ
throws VersionResolutionException, ArtifactResolutionException, ArtifactDescriptorException {
ArtifactDescriptorRequest artifactDescriptorRequest = new ArtifactDescriptorRequest();
artifactDescriptorRequest.setArtifact(request.getArtifact());
artifactDescriptorRequest.setRepositories(repositories);
if (request.getRepositories() != null) {
artifactDescriptorRequest.setRepositories(request.getRepositories());
} else {
artifactDescriptorRequest.setRepositories(this.repositories);
}
artifactDescriptorRequest.setRequestContext(request.getRequestContext());
artifactDescriptorRequest.setTrace(request.getTrace());
ArtifactDescriptorResult artifactDescriptorResult = new ArtifactDescriptorResult(artifactDescriptorRequest);
Expand Down

0 comments on commit 37e0c3f

Please sign in to comment.