commit 5c8fddd95dd048c629f912cd7d90cea3103a02d6
author Michael Osipov <michaelo@apache.org> Sun Apr 09 21:58:58 2023 +0200
committer Michael Osipov <michaelo@apache.org> Sat Apr 15 13:05:00 2023 +0200
tree f50e6e00ad4e69f68970703cd0d10ad097609a70
parent 60e5b6748d616cbbbf4f486ccf09da4c80b016a9

[DOXIASITETOOLS-303] Implement workaround for MNG-7758/MRESOLVER-335

This closes #103

doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java

diff --git a/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java b/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
index 98ded34..ece115c 100644
--- a/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
+++ b/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
@@ -358,10 +358,13 @@
         Objects.requireNonNull(locale, "locale cannot be null");
 
         try {
-            return resolveSiteDescriptor(project, repoSession, remoteProjectRepositories, locale);
-        } catch (ArtifactNotFoundException e) {
-            LOGGER.debug("Unable to locate site descriptor", e);
-            return null;
+            File siteDescriptor = resolveSiteDescriptor(project, repoSession, remoteProjectRepositories, locale);
+            if (siteDescriptor == null) {
+                LOGGER.debug("Site descriptor not found");
+                return null;
+            } else {
+                return siteDescriptor;
+            }
         } catch (ArtifactResolutionException e) {
             throw new SiteToolException("Unable to locate site descriptor", e);
         } catch (IOException e) {
@@ -815,17 +818,16 @@
      * @param repoSession the repository system session not null
      * @param remoteProjectRepositories not null
      * @param locale not null
-     * @return the resolved site descriptor
+     * @return the resolved site descriptor or null if not found in repositories.
      * @throws IOException if any
      * @throws ArtifactResolutionException if any
-     * @throws ArtifactNotFoundException if any
      */
     private File resolveSiteDescriptor(
             MavenProject project,
             RepositorySystemSession repoSession,
             List<RemoteRepository> remoteProjectRepositories,
             Locale locale)
-            throws IOException, ArtifactResolutionException, ArtifactNotFoundException {
+            throws IOException, ArtifactResolutionException {
         String variant = locale.getVariant();
         String country = locale.getCountry();
         String language = locale.getLanguage();
@@ -847,7 +849,8 @@
                 siteDescriptor = result.getArtifact().getFile();
                 found = true;
             } catch (ArtifactResolutionException e) {
-                if (e.getCause() instanceof ArtifactNotFoundException) {
+                // This is a workaround for MNG-7758/MRESOLVER-335
+                if (e.getResult().getExceptions().stream().anyMatch(re -> re instanceof ArtifactNotFoundException)) {
                     LOGGER.debug("No site descriptor found for '" + project.getId() + "' for locale '" + localeStr
                             + "', trying without variant...");
                 } else {
@@ -869,7 +872,8 @@
                 siteDescriptor = result.getArtifact().getFile();
                 found = true;
             } catch (ArtifactResolutionException e) {
-                if (e.getCause() instanceof ArtifactNotFoundException) {
+                // This is a workaround for MNG-7758/MRESOLVER-335
+                if (e.getResult().getExceptions().stream().anyMatch(re -> re instanceof ArtifactNotFoundException)) {
                     LOGGER.debug("No site descriptor found for '" + project.getId() + "' for locale '" + localeStr
                             + "', trying without country...");
                 } else {
@@ -891,7 +895,8 @@
                 siteDescriptor = result.getArtifact().getFile();
                 found = true;
             } catch (ArtifactResolutionException e) {
-                if (e.getCause() instanceof ArtifactNotFoundException) {
+                // This is a workaround for MNG-7758/MRESOLVER-335
+                if (e.getResult().getExceptions().stream().anyMatch(re -> re instanceof ArtifactNotFoundException)) {
                     LOGGER.debug("No site descriptor found for '" + project.getId() + "' for locale '" + localeStr
                             + "', trying without language (default locale)...");
                 } else {
@@ -912,9 +917,10 @@
 
                 siteDescriptor = result.getArtifact().getFile();
             } catch (ArtifactResolutionException e) {
-                if (e.getCause() instanceof ArtifactNotFoundException) {
+                // This is a workaround for MNG-7758/MRESOLVER-335
+                if (e.getResult().getExceptions().stream().anyMatch(re -> re instanceof ArtifactNotFoundException)) {
                     LOGGER.debug("No site descriptor found for '" + project.getId() + "' with default locale");
-                    throw (ArtifactNotFoundException) e.getCause();
+                    return null;
                 }
 
                 throw e;