From df675c3c7582d7c4efe54da5925abf0de52d580b Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Sat, 8 Feb 2025 22:08:32 +0100 Subject: [PATCH] Add setRepositories() to ModelRequest (fixes #166) See https://github.com/maveniverse/mima/issues/166. --- .../maven/mima/extensions/mmr/ModelRequest.java | 17 +++++++++++++++-- .../mmr/internal/MavenModelReaderImpl.java | 6 +++++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/extensions/mmr/src/main/java/eu/maveniverse/maven/mima/extensions/mmr/ModelRequest.java b/extensions/mmr/src/main/java/eu/maveniverse/maven/mima/extensions/mmr/ModelRequest.java index 1dd79d7..b8e8b1b 100644 --- a/extensions/mmr/src/main/java/eu/maveniverse/maven/mima/extensions/mmr/ModelRequest.java +++ b/extensions/mmr/src/main/java/eu/maveniverse/maven/mima/extensions/mmr/ModelRequest.java @@ -27,11 +27,14 @@ public static Builder builder() { private final Artifact artifact; private final String requestContext; private final RequestTrace trace; + private final List repositories; - private ModelRequest(Artifact artifact, String requestContext, RequestTrace trace) { + private ModelRequest( + Artifact artifact, String requestContext, RequestTrace trace, List repositories) { this.artifact = requireNonNull(artifact); this.requestContext = requestContext == null ? "" : requestContext; this.trace = trace; + this.repositories = repositories; } public Artifact getArtifact() { @@ -46,6 +49,10 @@ public RequestTrace getTrace() { return trace; } + public List getRepositories() { + return repositories; + } + public Builder toBuilder() { return new Builder(this); } @@ -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) { @@ -88,5 +96,10 @@ public Builder setTrace(RequestTrace trace) { this.trace = trace; return this; } + + public Builder setRepositories(List repositories) { + this.repositories = repositories; + return this; + } } } diff --git a/extensions/mmr/src/main/java/eu/maveniverse/maven/mima/extensions/mmr/internal/MavenModelReaderImpl.java b/extensions/mmr/src/main/java/eu/maveniverse/maven/mima/extensions/mmr/internal/MavenModelReaderImpl.java index 343670c..9e711c7 100644 --- a/extensions/mmr/src/main/java/eu/maveniverse/maven/mima/extensions/mmr/internal/MavenModelReaderImpl.java +++ b/extensions/mmr/src/main/java/eu/maveniverse/maven/mima/extensions/mmr/internal/MavenModelReaderImpl.java @@ -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);