First check if it is likely a valid descriptor before issue validation

eclipse-tycho · Jul 29, 2023 · 7e0f9db · 7e0f9db
1 parent 0adc55e
commit 7e0f9db
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/MavenDependencyInjector.java b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/MavenDependencyInjector.java
@@ -312,7 +312,10 @@ private Dependency createScopedDependency(ArtifactDescriptor descriptor, String
         return dependency;
     }
 
-    private boolean isValidMavenDescriptor(MavenDependencyDescriptor dependencyDescriptor) {
+    public static boolean isValidMavenDescriptor(MavenDependencyDescriptor dependencyDescriptor) {
+        if (dependencyDescriptor == null) {
+            return false;
+        }
         //TODO we should make this configurable maybe on the tycho plugin level e.g.
         //        <plugin>
         //            <groupId>org.eclipse.tycho</groupId>

diff --git a/tycho-core/src/main/java/org/eclipse/tycho/p2resolver/P2DependencyResolver.java b/tycho-core/src/main/java/org/eclipse/tycho/p2resolver/P2DependencyResolver.java
@@ -401,23 +401,27 @@ public void injectDependenciesIntoMavenModel(MavenProject project, AbstractTycho
         if (configuration.getP2MetadataHandling() == InjectP2MavenMetadataHandling.inject) {
             descriptorMapping = resolverFactory::resolveDependencyDescriptor;
         } else if (configuration.getP2MetadataHandling() == InjectP2MavenMetadataHandling.validate) {
-            descriptorMapping = descriptor -> {
-                MavenDependencyDescriptor result = resolverFactory.resolveDependencyDescriptor(descriptor);
-                if (result != null) {
-                    try {
-                        dependenciesResolver.resolveArtifact(project, context.getSession(), result.getGroupId(),
-                                result.getArtifactId(), result.getVersion());
-                    } catch (ArtifactResolutionException e) {
-                        logger.warn("Mapping P2 > Maven Coordinates failed: " + e.getMessage());
-                    }
-                }
-                return null;
-            };
+            descriptorMapping = descriptor -> resolveDescriptorWithValidation(project, logger, descriptor);
         } else {
             descriptorMapping = null;
         }
         MavenDependencyInjector.injectMavenDependencies(project, dependencyArtifacts, testDependencyArtifacts,
                 bundleReader, descriptorMapping, logger, repositorySystem, context.getSession().getSettings(),
                 buildPropertiesParser);
     }
+
+    private MavenDependencyDescriptor resolveDescriptorWithValidation(MavenProject project, Logger logger,
+            ArtifactDescriptor descriptor) {
+        MavenDependencyDescriptor result = resolverFactory.resolveDependencyDescriptor(descriptor);
+        if (MavenDependencyInjector.isValidMavenDescriptor(result)) {
+            try {
+                dependenciesResolver.resolveArtifact(project, context.getSession(), result.getGroupId(),
+                        result.getArtifactId(), result.getVersion());
+            } catch (ArtifactResolutionException e) {
+                logger.warn("Mapping P2 > Maven Coordinates failed: " + e.getMessage());
+                return null;
+            }
+        }
+        return result;
+    }
 }