Revert exception type change due to its inconvenience for scm file re…

…solving service (#126) Signed-off-by: Max Shaposhnik <mshaposh@redhat.com>
eclipse-che · Sep 20, 2021 · adadf59 · adadf59
1 parent a79cc94
commit adadf59
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/...main/java/org/eclipse/che/api/factory/server/github/GithubPersonalAccessTokenFetcher.java b/...main/java/org/eclipse/che/api/factory/server/github/GithubPersonalAccessTokenFetcher.java
@@ -184,7 +184,7 @@ public PersonalAccessToken fetchPersonalAccessToken(Subject cheSubject, String s
         | ScmItemNotFoundException
         | ScmBadRequestException
         | ConflictException e) {
-      LOG.error(e.getMessage(), e);
+      LOG.error(e.getMessage());
       throw new ScmCommunicationException(e.getMessage(), e);
     }
   }

diff --git a/.../src/main/java/org/eclipse/che/api/factory/server/scm/AuthorizingFileContentProvider.java b/.../src/main/java/org/eclipse/che/api/factory/server/scm/AuthorizingFileContentProvider.java
@@ -87,18 +87,17 @@ public String fetchContent(String fileURL) throws IOException, DevfileException
           } catch (ScmUnauthorizedException | UnknownScmProviderException e) {
             throw new DevfileException(e.getMessage(), e);
           } catch (ScmCommunicationException e) {
-            throw new DevfileException(
-                e.getMessage(),
-                new ScmCommunicationException(
-                    String.format(
-                        "Failed to fetch a content from URL %s. Make sure the URL"
-                            + " is correct. For private repository, make sure authentication is configured."
-                            + " Additionally, if you're using "
-                            + " relative form, make sure the referenced file are actually stored"
-                            + " relative to the devfile on the same host,"
-                            + " or try to specify URL in absolute form. The current attempt to authenticate"
-                            + " request, failed with the following error message: %s",
-                        fileURL, e.getMessage())));
+            throw new IOException(
+                String.format(
+                    "Failed to fetch a content from URL %s. Make sure the URL"
+                        + " is correct. For private repository, make sure authentication is configured."
+                        + " Additionally, if you're using "
+                        + " relative form, make sure the referenced file are actually stored"
+                        + " relative to the devfile on the same host,"
+                        + " or try to specify URL in absolute form. The current attempt to authenticate"
+                        + " request, failed with the following error message: %s",
+                    fileURL, e.getMessage()),
+                e);
           }
         }
       }