Make MMR usable without context

Author: cstamas

extensions/mmr/src/main/java/eu/maveniverse/maven/mima/extensions/mmr/MavenModelReader.java

@@ -11,8 +11,12 @@
 
 import eu.maveniverse.maven.mima.context.Context;
 import eu.maveniverse.maven.mima.extensions.mmr.internal.MavenModelReaderImpl;
+import org.apache.maven.model.building.ModelBuilder;
+import org.apache.maven.model.interpolation.StringVisitorModelInterpolator;
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.impl.RemoteRepositoryManager;
+import org.eclipse.aether.impl.RepositoryEventDispatcher;
 import org.eclipse.aether.resolution.ArtifactDescriptorException;
 import org.eclipse.aether.resolution.ArtifactResolutionException;
 import org.eclipse.aether.resolution.VersionResolutionException;
@@ -42,21 +46,30 @@
  */
 public class MavenModelReader {
     private final Logger logger = LoggerFactory.getLogger(getClass());
+    private final Context context;
     private final MavenModelReaderImpl mavenModelReaderImpl;
 
-    /**
-     * Creates instance using passed in impl instance.
-     */
-    public MavenModelReader(MavenModelReaderImpl mavenModelReaderImpl) {
-        this.mavenModelReaderImpl = requireNonNull(mavenModelReaderImpl);
-    }
-
     /**
      * Creates instance using passed in context. As context carries "root" remote repositories, they are used
      * by default, but can be overridden in {@link ModelRequest}.
      */
     public MavenModelReader(Context context) {
-        this(new MavenModelReaderImpl(context));
+        this.context = requireNonNull(context);
+        this.mavenModelReaderImpl = new MavenModelReaderImpl(
+                context.repositorySystem(),
+                context.lookup()
+                        .lookup(RemoteRepositoryManager.class)
+                        .orElseThrow(() -> new IllegalStateException("RemoteRepositoryManager not available")),
+                context.lookup()
+                        .lookup(RepositoryEventDispatcher.class)
+                        .orElseThrow(() -> new IllegalStateException("RepositoryEventDispatcher not available")),
+                context.lookup()
+                        .lookup(ModelBuilder.class)
+                        .orElseThrow(() -> new IllegalStateException("ModelBuilder not available")),
+                context.lookup()
+                        .lookup(StringVisitorModelInterpolator.class)
+                        .orElseThrow(() -> new IllegalStateException("StringVisitorModelInterpolator not available")),
+                context.remoteRepositories());
     }
 
     /**
@@ -69,6 +82,13 @@ public MavenModelReader(Context context) {
     public ModelResponse readModel(ModelRequest request)
             throws VersionResolutionException, ArtifactResolutionException, ArtifactDescriptorException {
         requireNonNull(request, "request");
-        return mavenModelReaderImpl.readModel(request);
+        return mavenModelReaderImpl.readModel(context.repositorySystemSession(), request);
+    }
+
+    /**
+     * Just to allow easier testing.
+     */
+    public MavenModelReaderImpl getImpl() {
+        return mavenModelReaderImpl;
     }
 }

extensions/mmr/src/main/java/eu/maveniverse/maven/mima/extensions/mmr/internal/MavenModelReaderImpl.java

@@ -9,7 +9,6 @@
 
 import static java.util.Objects.requireNonNull;
 
-import eu.maveniverse.maven.mima.context.Context;
 import eu.maveniverse.maven.mima.extensions.mmr.ModelRequest;
 import eu.maveniverse.maven.mima.extensions.mmr.ModelResponse;
 import java.nio.file.Paths;
@@ -74,7 +73,6 @@
  */
 public class MavenModelReaderImpl {
     private final RepositorySystem repositorySystem;
-    private final RepositorySystemSession session;
     private final RemoteRepositoryManager remoteRepositoryManager;
     private final RepositoryEventDispatcher repositoryEventDispatcher;
     private final ModelBuilder modelBuilder;
@@ -88,44 +86,20 @@ public class MavenModelReaderImpl {
      */
     public MavenModelReaderImpl(
             RepositorySystem repositorySystem,
-            RepositorySystemSession session,
             RemoteRepositoryManager remoteRepositoryManager,
             RepositoryEventDispatcher repositoryEventDispatcher,
             ModelBuilder modelBuilder,
             StringVisitorModelInterpolator stringVisitorModelInterpolator,
             List<RemoteRepository> repositories) {
         this.repositorySystem = requireNonNull(repositorySystem);
-        this.session = requireNonNull(session);
         this.remoteRepositoryManager = requireNonNull(remoteRepositoryManager);
         this.repositoryEventDispatcher = requireNonNull(repositoryEventDispatcher);
         this.modelBuilder = requireNonNull(modelBuilder);
         this.stringVisitorModelInterpolator = requireNonNull(stringVisitorModelInterpolator);
         this.repositories = requireNonNull(repositories);
     }
 
-    /**
-     * Ctor to be used with {@link Context} when available. Fully initializes instance with remote repositories as well.
-     */
-    public MavenModelReaderImpl(Context context) {
-        this(
-                context.repositorySystem(),
-                context.repositorySystemSession(),
-                context.lookup()
-                        .lookup(RemoteRepositoryManager.class)
-                        .orElseThrow(() -> new IllegalStateException("RemoteRepositoryManager not available")),
-                context.lookup()
-                        .lookup(RepositoryEventDispatcher.class)
-                        .orElseThrow(() -> new IllegalStateException("RepositoryEventDispatcher not available")),
-                context.lookup()
-                        .lookup(ModelBuilder.class)
-                        .orElseThrow(() -> new IllegalStateException("ModelBuilder not available")),
-                context.lookup()
-                        .lookup(StringVisitorModelInterpolator.class)
-                        .orElseThrow(() -> new IllegalStateException("StringVisitorModelInterpolator not available")),
-                context.remoteRepositories());
-    }
-
-    public ModelResponse readModel(ModelRequest request)
+    public ModelResponse readModel(RepositorySystemSession session, ModelRequest request)
             throws VersionResolutionException, ArtifactResolutionException, ArtifactDescriptorException {
         return loadPom(session, request);
     }