Fixed comments

cloudfoundry · Nov 4, 2024 · 77e1886 · 77e1886
1 parent 6ec2096
commit 77e1886
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/...pps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/Constants.java b/...pps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/Constants.java
@@ -36,5 +36,4 @@ private Constants() {
     public static final String GOOGLE_CLOUD_STORAGE = "google-cloud-storage";
 
     public static final String RETRY_LIMIT_PROPERTY = "jdk.httpclient.auth.retrylimit";
-    public static final String AUTHORIZATION_HEADER = "Authorization";
 }
diff --git a/...src/main/java/org/cloudfoundry/multiapps/controller/web/api/impl/FilesApiServiceImpl.java b/...src/main/java/org/cloudfoundry/multiapps/controller/web/api/impl/FilesApiServiceImpl.java
@@ -69,8 +69,6 @@
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 
-import static org.cloudfoundry.multiapps.controller.web.Constants.AUTHORIZATION_HEADER;
-
 @Named
 public class FilesApiServiceImpl implements FilesApiService {
 
@@ -418,11 +416,14 @@ private HttpResponse<InputStream> callRemoteEndpointWithRetry(HttpClient client,
             var request = buildFetchFileRequest(decodedUrl);
             LOGGER.debug(Messages.CALLING_REMOTE_MTAR_ENDPOINT, request.uri());
             var response = client.send(request, BodyHandlers.ofInputStream());
-            if (response.statusCode() == 401) {
-                String errorMessage = MessageFormat.format(Messages.DEPLOY_FROM_URL_WRONG_CREDENTIALS, UriUtil.stripUserInfo(decodedUrl));
-                throw new SLException(errorMessage);
-            } else if (response.statusCode() / 100 != 2) {
+            if (response.statusCode() / 100 != 2) {
                 String error = readErrorBodyFromResponse(response);
+                LOGGER.error(error);
+                if (response.statusCode() == HttpStatus.UNAUTHORIZED.value()) {
+                    String errorMessage = MessageFormat.format(Messages.DEPLOY_FROM_URL_WRONG_CREDENTIALS,
+                                                               UriUtil.stripUserInfo(decodedUrl));
+                    throw new SLException(errorMessage);
+                }
                 throw new SLException(MessageFormat.format(Messages.ERROR_FROM_REMOTE_MTAR_ENDPOINT, request.uri(), response.statusCode(),
                                                            error));
             }
@@ -452,7 +453,7 @@ private HttpRequest buildFetchFileRequest(String decodedUrl) {
             builder.uri(URI.create(decodedUrl.replace(userInfo + "@", "")));
             String encodedAuth = Base64.getEncoder()
                                        .encodeToString(userInfo.getBytes());
-            builder.header(AUTHORIZATION_HEADER, "Basic " + encodedAuth);
+            builder.header(HttpHeaders.AUTHORIZATION, "Basic " + encodedAuth);
         } else {
             builder.uri(uri);
         }