Fix validation issues (#124)

Cumulative fixes for validation.

Changes:
* rename classes (they were long time ago Factories, they are not today)
* for main JAR artifacts: do not rely in their presence only, add "contains Java classes" detection as well
* use detection in sources and javadoc validator
* model provider is totally busted, we need MIMA MMR here instead. MMR is able to build effective model and does NOT follow relocation. It does exactly what we need.

Fixes #121 
Fixes #122 
Fixes #123

Author: cstamas

core/pom.xml

@@ -77,6 +77,17 @@
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>eu.maveniverse.maven.mima.extensions</groupId>
+      <artifactId>mmr</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
@@ -92,9 +103,21 @@
       <artifactId>jcl-over-slf4j</artifactId>
       <scope>test</scope>
     </dependency>
+
     <dependency>
-      <groupId>org.apache.maven.resolver</groupId>
-      <artifactId>maven-resolver-impl</artifactId>
+      <groupId>eu.maveniverse.maven.mima</groupId>
+      <artifactId>context</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>eu.maveniverse.maven.mima.runtime</groupId>
+      <artifactId>standalone-sisu</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
+      <classifier>classes</classifier>
       <scope>test</scope>
     </dependency>
   </dependencies>

core/src/main/java/eu/maveniverse/maven/njord/shared/Session.java

@@ -20,7 +20,11 @@
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.Collection;
+import java.util.List;
 import java.util.Optional;
+import org.apache.maven.model.Model;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.repository.RemoteRepository;
 
 public interface Session extends Closeable {
     /**
@@ -76,6 +80,13 @@ default Optional<ArtifactStoreComparator> selectArtifactStoreComparator(String n
                 .findFirst();
     }
 
+    /**
+     * Reads the effective model of given artifact. The artifact does not have to be POM artifact. The repositories
+     * must be given, and caller must ensure that provided list of repositories makes artifact model buildable,
+     * like parents are resolvable.
+     */
+    Optional<Model> readEffectiveModel(Artifact artifact, List<RemoteRepository> remoteRepositories);
+
     /**
      * Selects template based on provided URL (see {@link #getOrCreateSessionArtifactStore(String)} method for syntax).
      * For existing stores it will return the template of the store.

core/src/main/java/eu/maveniverse/maven/njord/shared/impl/DefaultSession.java

@@ -9,6 +9,9 @@
 
 import static java.util.Objects.requireNonNull;
 
+import eu.maveniverse.maven.mima.extensions.mmr.ModelRequest;
+import eu.maveniverse.maven.mima.extensions.mmr.ModelResponse;
+import eu.maveniverse.maven.mima.extensions.mmr.internal.MavenModelReaderImpl;
 import eu.maveniverse.maven.njord.shared.Session;
 import eu.maveniverse.maven.njord.shared.SessionConfig;
 import eu.maveniverse.maven.njord.shared.publisher.ArtifactPublisherRedirector;
@@ -36,36 +39,39 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
+import org.apache.maven.model.Model;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.repository.RemoteRepository;
 
 public class DefaultSession extends CloseableConfigSupport<SessionConfig> implements Session {
     private final String sessionBoundStoreKey;
-    private final DefaultSessionFactory defaultSessionFactory;
     private final InternalArtifactStoreManager internalArtifactStoreManager;
     private final ArtifactStoreWriter artifactStoreWriter;
     private final ArtifactStoreMerger artifactStoreMerger;
     private final ArtifactPublisherRedirector artifactPublisherRedirector;
     private final Map<String, ArtifactStorePublisherFactory> artifactStorePublisherFactories;
     private final Map<String, ArtifactStoreComparatorFactory> artifactStoreComparatorFactories;
+    private final MavenModelReaderImpl mavenModelReader;
 
     public DefaultSession(
             SessionConfig sessionConfig,
-            DefaultSessionFactory defaultSessionFactory,
             InternalArtifactStoreManagerFactory internalArtifactStoreManagerFactory,
             ArtifactStoreWriterFactory artifactStoreWriterFactory,
             ArtifactStoreMergerFactory artifactStoreMergerFactory,
             ArtifactPublisherRedirectorFactory artifactPublisherRedirectorFactory,
             Map<String, ArtifactStorePublisherFactory> artifactStorePublisherFactories,
-            Map<String, ArtifactStoreComparatorFactory> artifactStoreComparatorFactories) {
+            Map<String, ArtifactStoreComparatorFactory> artifactStoreComparatorFactories,
+            MavenModelReaderImpl mavenModelReader) {
         super(sessionConfig);
         this.sessionBoundStoreKey = Session.class.getName() + "." + ArtifactStore.class + "." + UUID.randomUUID();
-        this.defaultSessionFactory = requireNonNull(defaultSessionFactory);
         this.internalArtifactStoreManager = internalArtifactStoreManagerFactory.create(sessionConfig);
         this.artifactStoreWriter = requireNonNull(artifactStoreWriterFactory).create(sessionConfig);
         this.artifactStoreMerger = requireNonNull(artifactStoreMergerFactory).create(sessionConfig);
         this.artifactPublisherRedirector =
                 requireNonNull(artifactPublisherRedirectorFactory).create(this);
         this.artifactStorePublisherFactories = requireNonNull(artifactStorePublisherFactories);
         this.artifactStoreComparatorFactories = requireNonNull(artifactStoreComparatorFactories);
+        this.mavenModelReader = requireNonNull(mavenModelReader);
     }
 
     @Override
@@ -113,8 +119,30 @@ public Collection<ArtifactStoreComparator> availableComparators() {
                 .collect(Collectors.toList());
     }
 
+    @Override
+    public Optional<Model> readEffectiveModel(Artifact artifact, List<RemoteRepository> remoteRepositories) {
+        requireNonNull(artifact);
+        requireNonNull(remoteRepositories);
+        checkClosed();
+        try {
+            ModelResponse response = mavenModelReader.readModel(
+                    config.session(),
+                    ModelRequest.builder()
+                            .setArtifact(artifact)
+                            .setRepositories(remoteRepositories)
+                            .setRequestContext("njord")
+                            .build());
+            return Optional.ofNullable(response.getEffectiveModel());
+        } catch (Exception e) {
+            logger.warn("Could not read effective model: {}", e.getMessage());
+            return Optional.empty();
+        }
+    }
+
     @Override
     public ArtifactStoreTemplate selectSessionArtifactStoreTemplate(String uri) {
+        requireNonNull(uri);
+        checkClosed();
         try {
             if (!uri.contains(":")) {
                 if (uri.isEmpty()) {
@@ -151,7 +179,7 @@ public ArtifactStoreTemplate selectSessionArtifactStoreTemplate(String uri) {
     @Override
     public ArtifactStore getOrCreateSessionArtifactStore(String uri) {
         requireNonNull(uri);
-
+        checkClosed();
         ConcurrentMap<String, String> sessionBoundStore = getSessionBoundStore();
         String storeName = sessionBoundStore.computeIfAbsent(uri, k -> {
             try {
@@ -179,6 +207,12 @@ public ArtifactStore getOrCreateSessionArtifactStore(String uri) {
                 } else if (uri.startsWith("store:")) {
                     // store:xxx
                     artifactStoreName = uri.substring(6);
+                    Optional<ArtifactStore> existingStore =
+                            internalArtifactStoreManager.selectArtifactStore(artifactStoreName);
+                    if (!existingStore.isPresent()) {
+                        throw new IllegalArgumentException("Non existing store: " + artifactStoreName);
+                    }
+                    existingStore.orElseThrow(J8Utils.OET).close();
                 } else {
                     throw new IllegalArgumentException("Invalid repository URI: " + uri);
                 }
@@ -221,6 +255,7 @@ private String createUsingTemplate(String templateName) throws IOException {
 
     @Override
     public int publishSessionArtifactStores() throws IOException {
+        checkClosed();
         ConcurrentMap<String, String> sessionBoundStore = getSessionBoundStore();
         if (sessionBoundStore.isEmpty()) {
             return 0;
@@ -252,6 +287,7 @@ public int publishSessionArtifactStores() throws IOException {
 
     @Override
     public int dropSessionArtifactStores() {
+        checkClosed();
         ConcurrentMap<String, String> sessionBoundStore = getSessionBoundStore();
         if (sessionBoundStore.isEmpty()) {
             return 0;

core/src/main/java/eu/maveniverse/maven/njord/shared/impl/DefaultSessionFactory.java

@@ -9,6 +9,7 @@
 
 import static java.util.Objects.requireNonNull;
 
+import eu.maveniverse.maven.mima.extensions.mmr.internal.MavenModelReaderImpl;
 import eu.maveniverse.maven.njord.shared.SessionConfig;
 import eu.maveniverse.maven.njord.shared.SessionFactory;
 import eu.maveniverse.maven.njord.shared.publisher.ArtifactPublisherRedirectorFactory;
@@ -30,6 +31,7 @@ public class DefaultSessionFactory implements SessionFactory {
     private final ArtifactPublisherRedirectorFactory artifactPublisherRedirectorFactory;
     private final Map<String, ArtifactStorePublisherFactory> artifactStorePublisherFactories;
     private final Map<String, ArtifactStoreComparatorFactory> artifactStoreComparatorFactories;
+    private final MavenModelReaderImpl mavenModelReader;
 
     @Inject
     public DefaultSessionFactory(
@@ -38,25 +40,27 @@ public DefaultSessionFactory(
             ArtifactStoreMergerFactory artifactStoreMergerFactory,
             ArtifactPublisherRedirectorFactory artifactPublisherRedirectorFactory,
             Map<String, ArtifactStorePublisherFactory> artifactStorePublisherFactories,
-            Map<String, ArtifactStoreComparatorFactory> artifactStoreComparatorFactories) {
+            Map<String, ArtifactStoreComparatorFactory> artifactStoreComparatorFactories,
+            MavenModelReaderImpl mavenModelReader) {
         this.internalArtifactStoreManagerFactory = requireNonNull(internalArtifactStoreManagerFactory);
         this.artifactStoreWriterFactory = requireNonNull(artifactStoreWriterFactory);
         this.artifactStoreMergerFactory = requireNonNull(artifactStoreMergerFactory);
         this.artifactPublisherRedirectorFactory = requireNonNull(artifactPublisherRedirectorFactory);
         this.artifactStorePublisherFactories = requireNonNull(artifactStorePublisherFactories);
         this.artifactStoreComparatorFactories = requireNonNull(artifactStoreComparatorFactories);
+        this.mavenModelReader = requireNonNull(mavenModelReader);
     }
 
     @Override
     public DefaultSession create(SessionConfig sessionConfig) {
         return new DefaultSession(
                 sessionConfig,
-                this,
                 internalArtifactStoreManagerFactory,
                 artifactStoreWriterFactory,
                 artifactStoreMergerFactory,
                 artifactPublisherRedirectorFactory,
                 artifactStorePublisherFactories,
-                artifactStoreComparatorFactories);
+                artifactStoreComparatorFactories,
+                mavenModelReader);
     }
 }

core/src/main/java/eu/maveniverse/maven/njord/shared/impl/Maven3ModelProvider.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2023-2024 Maveniverse Org.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+package eu.maveniverse.maven.njord.shared.impl;
+
+import eu.maveniverse.maven.mima.extensions.mmr.internal.MavenModelReaderImpl;
+import java.util.Collections;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Provider;
+import javax.inject.Singleton;
+import org.apache.maven.model.building.ModelBuilder;
+import org.apache.maven.model.interpolation.StringVisitorModelInterpolator;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.impl.RemoteRepositoryManager;
+import org.eclipse.aether.impl.RepositoryEventDispatcher;
+
+@Singleton
+@Named
+public class MavenModelReaderProvider implements Provider<MavenModelReaderImpl> {
+    private final MavenModelReaderImpl instance;
+
+    @Inject
+    public MavenModelReaderProvider(
+            RepositorySystem repositorySystem,
+            RemoteRepositoryManager remoteRepositoryManager,
+            RepositoryEventDispatcher repositoryEventDispatcher,
+            ModelBuilder modelBuilder,
+            StringVisitorModelInterpolator stringVisitorModelInterpolator) {
+        this.instance = new MavenModelReaderImpl(
+                repositorySystem,
+                remoteRepositoryManager,
+                repositoryEventDispatcher,
+                modelBuilder,
+                stringVisitorModelInterpolator,
+                Collections.emptyList());
+    }
+
+    @Override
+    public MavenModelReaderImpl get() {
+        return instance;
+    }
+}