Use resolve() method that actually throws exception. Respect remote r…

…epository chaching.
mbien · Jul 15, 2023 · e2a14bf · e2a14bf
1 parent e9cbd83
commit e2a14bf
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/java/maven.embedder/src/org/netbeans/modules/maven/embedder/MavenEmbedder.java b/java/maven.embedder/src/org/netbeans/modules/maven/embedder/MavenEmbedder.java
@@ -45,6 +45,7 @@
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
 import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
+import org.apache.maven.artifact.resolver.ArtifactResolver;
 import org.apache.maven.cli.configuration.SettingsXmlConfigurationProcessor;
 import org.apache.maven.execution.DefaultMavenExecutionRequest;
 import org.apache.maven.execution.DefaultMavenExecutionResult;
@@ -93,6 +94,7 @@
 import org.openide.util.BaseUtilities;
 import org.eclipse.aether.repository.Authentication;
 import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.internal.impl.EnhancedLocalRepositoryManagerFactory;
 import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
 import org.eclipse.aether.repository.LocalRepository;
 import org.eclipse.aether.repository.NoLocalRepositoryManagerException;
@@ -370,17 +372,13 @@ public ArtifactRepository createRemoteRepository(String url, String id) {
      */
     public void resolve(Artifact sources, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository) throws ArtifactResolutionException, ArtifactNotFoundException {
         setUpLegacySupport();
-        ArtifactResolutionRequest req = new ArtifactResolutionRequest();
-        req.setLocalRepository(localRepository);
-        req.setRemoteRepositories(remoteRepositories);
-        req.setArtifact(sources);
-        req.setOffline(isOffline());
-        ArtifactResolutionResult result = repositorySystem.resolve(req);
+
+        // must call internal Resolver API directly, as the RepositorySystem does not report an exception, 
+        // even in ArtifactResolutionResult: resolve(ArtifactResolutionRequest request) catches the exception and
+        // swallows ArtifactNotFoundException.
+        // The existing calling code that handles these exception cannot work, in fact, when using resolve(ArtifactResolutionRequest request) API.
+        lookupComponent(ArtifactResolver.class).resolveAlways(sources, remoteRepositories, localRepository);
         normalizePath(sources);
-        // XXX check result for exceptions and throw them now?
-        for (Exception ex : result.getExceptions()) {
-            LOG.log(Level.FINE, null, ex);
-        }
     }
 
     //TODO possibly rename.. build sounds like something else..
@@ -511,7 +509,7 @@ public MavenExecutionRequest createMavenExecutionRequest(){
 
         return req;
     }
-
+    
     /**
      * Needed to avoid an NPE in {@link org.eclipse.org.eclipse.aether.DefaultArtifactResolver#resolveArtifacts} under some conditions.
      * (Also {@link org.eclipse.org.eclipse.aether.DefaultMetadataResolver#resolve}; wherever a {@link org.eclipse.aether.RepositorySystemSession} is used.)
@@ -524,7 +522,7 @@ public void setUpLegacySupport() {
         }
         DefaultRepositorySystemSession session = new DefaultRepositorySystemSession();
         session.setOffline(isOffline());
-        SimpleLocalRepositoryManagerFactory f = new SimpleLocalRepositoryManagerFactory();        
+        EnhancedLocalRepositoryManagerFactory f = lookupComponent(EnhancedLocalRepositoryManagerFactory.class);
         try {
             session.setLocalRepositoryManager(f.newInstance(session, new LocalRepository(getLocalRepository().getBasedir())));
         } catch (NoLocalRepositoryManagerException ex) {

diff --git a/.../test/unit/src/org/netbeans/modules/maven/classpath/AbstractProjectClassPathImplTest.java b/.../test/unit/src/org/netbeans/modules/maven/classpath/AbstractProjectClassPathImplTest.java
@@ -23,6 +23,7 @@
 import java.util.Collections;
 import java.util.logging.Level;
 import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
 import org.codehaus.plexus.util.FileUtils;
 import org.netbeans.junit.NbTestCase;
 import org.netbeans.modules.maven.embedder.EmbedderFactory;
@@ -60,7 +61,11 @@ public void testGetFile() throws Exception {
         File downloaded = new File(repo, "nbtest/grp/art/1.10-SNAPSHOT/art-1.10-20210520.222429-1.jar");
         Artifact a = EmbedderFactory.getProjectEmbedder().createArtifact("nbtest.grp", "art", "1.10-20210520.222429-1", "jar");
         assertNull(AbstractProjectClassPathImpl.getFile(a));
-        EmbedderFactory.getProjectEmbedder().resolve(a, Collections.emptyList(), EmbedderFactory.getProjectEmbedder().getLocalRepository());
+        try {
+            EmbedderFactory.getProjectEmbedder().resolve(a, Collections.emptyList(), EmbedderFactory.getProjectEmbedder().getLocalRepository());
+        } catch (ArtifactNotFoundException ex) {
+            // the downloaded artifact was not found, expected as only -SNAPSHOT is installed.
+        }
         assertEquals(installed, a.getFile());
         assertEquals(installed, AbstractProjectClassPathImpl.getFile(a));
         FileUtils.mkdir(downloaded.getParent());