commit

dist/setup/index.js

@@ -128794,21 +128794,8 @@ class JavaBase {
             else {
                 core.info('Trying to resolve the latest version from remote');
                 try {
-                    const javaRelease = { version: this.version };
+                    const javaRelease = yield this.findPackageForDownload(this.version);
-                    const jdkUrl = core.getInput('jdk-url');
-                    if (jdkUrl) {
-                        if (!this.version) {
-                            throw new Error('You must specify a version when using a custom JDK URL.');
-                        }
-                        core.info(`Using custom JDK URL: ${jdkUrl}`);
-                        javaRelease.url = jdkUrl;
-                    }
-                    else {
-                        const jdkPkg = yield this.findPackageForDownload(this.version);
                     core.info(`Resolved latest version as ${javaRelease.version}`);
-                        javaRelease.version = jdkPkg.version;
-                        javaRelease.url = jdkPkg.url;
-                    }
                     if ((foundJava === null || foundJava === void 0 ? void 0 : foundJava.version) === javaRelease.version) {
                         core.info(`Resolved Java ${foundJava.version} from tool-cache`);
                     }
@@ -128819,20 +128806,16 @@ class JavaBase {
                     }
                 }
                 catch (error) {
-                    if (error instanceof tc.HTTPError) {
+                    if (error instanceof tc.HTTPError && error.httpStatusCode === 403) {
-                        if (error.httpStatusCode === 403) {
+                        core.error(`Received HTTP 403: Permission denied or restricted access.`);
-                            core.error('HTTP 403: Permission denied or access restricted.');
-                        }
-                        else if (error.httpStatusCode === 429) {
-                            core.warning('HTTP 429: Rate limit exceeded. Please retry later.');
-                        }
-                        else {
-                            core.error(`HTTP ${error.httpStatusCode}: ${error.message}`);
                     }
+                    else if (error instanceof tc.HTTPError &&
+                        error.httpStatusCode === 429) {
+                        core.warning(`Received HTTP 429: Rate limit exceeded. Try again later.`);
                     }
                     else {
                         const message = error instanceof Error ? error.message : JSON.stringify(error);
-                        core.error(`Java setup failed due to network issue or timeout: ${message}`);
+                        core.error(`Failed to set up Java due to a network issue or timeout: ${message}`);
                     }
                     if (error instanceof Error && error.stack) {
                         core.debug(error.stack);

src/distributions/base-installer.ts

@@ -52,22 +52,8 @@ export abstract class JavaBase {
     } else {
       core.info('Trying to resolve the latest version from remote');
       try {
-        const javaRelease = { version: this.version } as JavaDownloadRelease;
+        const javaRelease = await this.findPackageForDownload(this.version);
-        const jdkUrl = core.getInput('jdk-url');
-        if (jdkUrl) {
-          if (!this.version) {
-            throw new Error(
-              'You must specify a version when using a custom JDK URL.'
-            );
-          }
-          core.info(`Using custom JDK URL: ${jdkUrl}`);
-          javaRelease.url = jdkUrl;
-        } else {
-          const jdkPkg = await this.findPackageForDownload(this.version)
         core.info(`Resolved latest version as ${javaRelease.version}`);
-          javaRelease.version = jdkPkg.version;
-          javaRelease.url = jdkPkg.url;
-        }
         if (foundJava?.version === javaRelease.version) {
           core.info(`Resolved Java ${foundJava.version} from tool-cache`);
         } else {
@@ -76,24 +62,28 @@ export abstract class JavaBase {
           core.info(`Java ${foundJava.version} was downloaded`);
         }
       } catch (error: any) {
-        if (error instanceof tc.HTTPError) {
+        if (error instanceof tc.HTTPError && error.httpStatusCode === 403) {
-          if (error.httpStatusCode === 403) {
+          core.error(
-            core.error('HTTP 403: Permission denied or access restricted.');
+            `Received HTTP 403: Permission denied or restricted access.`
-          } else if (error.httpStatusCode === 429) {
+          );
-            core.warning('HTTP 429: Rate limit exceeded. Please retry later.');
+        } else if (
-          } else {
+          error instanceof tc.HTTPError &&
-            core.error(`HTTP ${error.httpStatusCode}: ${error.message}`);
+          error.httpStatusCode === 429
-          }
+        ) {
+          core.warning(
+            `Received HTTP 429: Rate limit exceeded. Try again later.`
+          );
         } else {
           const message =
             error instanceof Error ? error.message : JSON.stringify(error);
           core.error(
-            `Java setup failed due to network issue or timeout: ${message}`
+            `Failed to set up Java due to a network issue or timeout: ${message}`
           );
         }
         if (error instanceof Error && error.stack) {
           core.debug(error.stack);
         }
+
         throw error;
       }
     }