From 1a3cd386c6af2962b1902a3f31b6603fd2575145 Mon Sep 17 00:00:00 2001
From: Nikolai Laevskii <nikolai.laevskii@akvelon.com>
Date: Thu, 8 Jun 2023 12:15:00 +0200
Subject: [PATCH] Update Oracle JDK URL calculation

---
 __tests__/distributors/oracle-installer.test.ts | 11 ++++-------
 src/distributions/oracle/installer.ts           | 11 ++---------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/__tests__/distributors/oracle-installer.test.ts b/__tests__/distributors/oracle-installer.test.ts
index 2f133fc..baf1d8e 100644
--- a/__tests__/distributors/oracle-installer.test.ts
+++ b/__tests__/distributors/oracle-installer.test.ts
@@ -25,7 +25,7 @@ describe('findPackageForDownload', () => {
     [
       '20',
       '20',
-      'https://download.oracle.com/java/20/latest/jdk-20_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
+      'https://download.oracle.com/java/20/archive/jdk-20_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
     ],
     [
       '20.0.1',
@@ -35,7 +35,7 @@ describe('findPackageForDownload', () => {
     [
       '17',
       '17',
-      'https://download.oracle.com/java/17/latest/jdk-17_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
+      'https://download.oracle.com/java/17/archive/jdk-17_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
     ],
     [
       '17.0.1',
@@ -43,7 +43,7 @@ describe('findPackageForDownload', () => {
       'https://download.oracle.com/java/17/archive/jdk-17.0.1_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
     ]
   ])('version is %s -> %s', async (input, expectedVersion, expectedUrl) => {
-    /* Needed only for this particular test because /latest/ urls tend to change */
+    /* Needed only for this particular test because some urls might change */
     spyHttpClient = jest.spyOn(HttpClient.prototype, 'head');
     spyHttpClient.mockReturnValue(
       Promise.resolve({
@@ -89,7 +89,7 @@ describe('findPackageForDownload', () => {
       }
       const archiveType = getDownloadArchiveExtension();
       const result = await distro['findPackageForDownload'](version);
-      const expectedUrl = `https://download.oracle.com/java/17/latest/jdk-17_${osType}-${distroArch}_bin.${archiveType}`;
+      const expectedUrl = `https://download.oracle.com/java/17/archive/jdk-17_${osType}-${distroArch}_bin.${archiveType}`;
 
       expect(result.url).toBe(expectedUrl);
     }
@@ -102,8 +102,5 @@ describe('findPackageForDownload', () => {
     await expect(distribution['findPackageForDownload']('11')).rejects.toThrow(
       /Oracle JDK is only supported for JDK 17 and later/
     );
-    await expect(distribution['findPackageForDownload']('18')).rejects.toThrow(
-      /Could not find Oracle JDK for SemVer */
-    );
   });
 });
diff --git a/src/distributions/oracle/installer.ts b/src/distributions/oracle/installer.ts
index 2093339..8f68d9d 100644
--- a/src/distributions/oracle/installer.ts
+++ b/src/distributions/oracle/installer.ts
@@ -65,15 +65,8 @@ export class OracleDistribution extends JavaBase {
 
     const platform = this.getPlatform();
     const extension = getDownloadArchiveExtension();
-    let major;
-    let fileUrl;
-    if (range.includes('.')) {
-      major = range.split('.')[0];
-      fileUrl = `${ORACLE_DL_BASE}/${major}/archive/jdk-${range}_${platform}-${arch}_bin.${extension}`;
-    } else {
-      major = range;
-      fileUrl = `${ORACLE_DL_BASE}/${range}/latest/jdk-${range}_${platform}-${arch}_bin.${extension}`;
-    }
+    const major = range.includes('.') ? range.split('.')[0] : range;
+    const fileUrl = `${ORACLE_DL_BASE}/${major}/archive/jdk-${range}_${platform}-${arch}_bin.${extension}`;
 
     if (parseInt(major) < 17) {
       throw new Error('Oracle JDK is only supported for JDK 17 and later');