Use index V2

Author: repolevedavaj

README.md

@@ -124,7 +124,7 @@ Note that the flag needs to be added as prefix (e.g. `version = "^11.0.16.1+1"`)
 After running the `upgrade` command, the `install` command needs to be executed again to install the upgraded tools.
 
 ## Custom index
-The `PROJECT_ENV_TOOL_INDEX` env var can be used to specify a custom index URL.
+The `PROJECT_ENV_TOOL_INDEX` env var can be used to specify a custom index URL. Note that the custom index needs to follow the format of the V2 format (see https://github.com/Project-Env/project-env-tools/blob/main/index-v2.json).
 
 ## Installation
 

code/cli/pom.xml

@@ -74,6 +74,10 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-collections4</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>info.picocli</groupId>

code/cli/src/main/java/io/projectenv/core/cli/index/DefaultToolsIndexManager.java

@@ -4,12 +4,13 @@
 import io.projectenv.commons.gson.GsonFactory;
 import io.projectenv.core.cli.ProjectEnvException;
 import io.projectenv.core.commons.process.ProcessOutput;
+import io.projectenv.core.commons.system.CpuArchitecture;
 import io.projectenv.core.commons.system.EnvironmentVariables;
 import io.projectenv.core.commons.system.OperatingSystem;
 import io.projectenv.core.toolsupport.commons.ToolVersionHelper;
-import io.projectenv.core.toolsupport.spi.index.ToolsIndex;
 import io.projectenv.core.toolsupport.spi.index.ToolsIndexException;
 import io.projectenv.core.toolsupport.spi.index.ToolsIndexManager;
+import io.projectenv.core.toolsupport.spi.index.ToolsIndexV2;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -27,7 +28,7 @@
 
 public class DefaultToolsIndexManager implements ToolsIndexManager {
 
-    private static final String DEFAULT_TOOLS_INDEX_URL = "https://raw.githubusercontent.com/Project-Env/project-env-tools/main/index.json";
+    private static final String DEFAULT_TOOLS_INDEX_URL = "https://raw.githubusercontent.com/Project-Env/project-env-tools/main/index-v2.json";
     private static final String PROJECT_ENV_TOOL_INDEX_ENV = "PROJECT_ENV_TOOL_INDEX";
     private static final String TOOLS_INDEX_FILE = "tools-index.json";
 
@@ -39,13 +40,13 @@ public class DefaultToolsIndexManager implements ToolsIndexManager {
 
     private final File toolsRoot;
 
-    private ToolsIndex toolsIndex;
+    private ToolsIndexV2 toolsIndexV2;
 
     public DefaultToolsIndexManager(File toolsRoot) {
         this.toolsRoot = toolsRoot;
     }
 
-    private ToolsIndex loadToolsIndex() throws IOException {
+    private ToolsIndexV2 loadToolsIndex() throws IOException {
         var toolsIndexFile = new File(toolsRoot, TOOLS_INDEX_FILE);
         FileUtils.forceMkdirParent(toolsIndexFile);
 
@@ -64,7 +65,7 @@ private ToolsIndex loadToolsIndex() throws IOException {
         }
 
         try (Reader reader = new FileReader(toolsIndexFile, StandardCharsets.UTF_8)) {
-            return GSON.fromJson(reader, ToolsIndex.class);
+            return GSON.fromJson(reader, ToolsIndexV2.class);
         }
     }
 
@@ -133,6 +134,7 @@ public Set<String> getGradleVersions() {
     public String resolveNodeJsDistributionUrl(String version) {
         return Optional.ofNullable(getToolsIndex().getNodeVersions().get(ToolVersionHelper.getVersionWithoutPrefix(version)))
                 .map(versionEntry -> versionEntry.get(OperatingSystem.getCurrentOperatingSystem()))
+                .map(this::resolveDownloadUrlForCpuArchitecture)
                 .orElseThrow(() -> new ToolsIndexException("failed to resolve NodeJS " + version + " from tool index"));
     }
 
@@ -147,6 +149,7 @@ public String resolveJdkDistributionUrl(String jdkDistribution, String version)
                 .map(jdkDistributionId -> getToolsIndex().getJdkVersions().get(jdkDistributionId))
                 .map(jdkDistributionEntry -> jdkDistributionEntry.get(ToolVersionHelper.getVersionWithoutPrefix(version)))
                 .map(versionEntry -> versionEntry.get(OperatingSystem.getCurrentOperatingSystem()))
+                .map(this::resolveDownloadUrlForCpuArchitecture)
                 .orElseThrow(() -> new ToolsIndexException("failed to resolve " + jdkDistribution + " " + version + " from tool index"));
     }
 
@@ -158,6 +161,19 @@ public Set<String> getJdkDistributionVersions(String jdkDistribution) {
                 .orElse(Collections.emptySet());
     }
 
+    private String resolveDownloadUrlForCpuArchitecture(Map<CpuArchitecture, String> downloadUrls) {
+        String downloadUrl = downloadUrls.get(CpuArchitecture.getCurrentCpuArchitecture());
+
+        // In case there is no download URL for Apple Silicon, we use the amd64 as fallback
+        if (downloadUrl == null &&
+                CpuArchitecture.getCurrentCpuArchitecture() == CpuArchitecture.AARCH64 &&
+                OperatingSystem.getCurrentOperatingSystem() == OperatingSystem.MACOS) {
+            downloadUrl = downloadUrls.get(CpuArchitecture.AMD64);
+        }
+
+        return downloadUrl;
+    }
+
     private Optional<String> resolveJdkDistributionId(String jdkDistribution) {
         var jdkDistributionSynonyms = getToolsIndex().getJdkDistributionSynonyms();
         if (jdkDistributionSynonyms.containsKey(jdkDistribution)) {
@@ -173,13 +189,13 @@ private Optional<String> resolveJdkDistributionId(String jdkDistribution) {
         return Optional.empty();
     }
 
-    private ToolsIndex getToolsIndex() {
+    private ToolsIndexV2 getToolsIndex() {
         try {
-            if (toolsIndex == null) {
-                toolsIndex = loadToolsIndex();
+            if (toolsIndexV2 == null) {
+                toolsIndexV2 = loadToolsIndex();
             }
 
-            return toolsIndex;
+            return toolsIndexV2;
         } catch (IOException e) {
             throw new ProjectEnvException("failed to load tool index", e);
         }

code/commons/pom.xml

@@ -18,7 +18,6 @@
     <modules>
         <module>native-image</module>
         <module>process</module>
-        <module>string-substitutor</module>
         <module>archive</module>
         <module>system</module>
         <module>system-test</module>

code/commons/string-substitutor/pom.xml

@@ -0,0 +1,22 @@
+package io.projectenv.core.commons.system;
+
+import com.google.gson.annotations.SerializedName;
+import org.apache.commons.lang3.SystemUtils;
+
+public enum CpuArchitecture {
+
+    @SerializedName("amd64")
+    AMD64,
+    @SerializedName("aarch64")
+    AARCH64;
+
+    public static CpuArchitecture getCurrentCpuArchitecture() {
+        try {
+            return valueOf(SystemUtils.OS_ARCH.toUpperCase());
+        } catch (IllegalArgumentException e) {
+            throw new IllegalStateException("unsupported CPU architecture " + SystemUtils.OS_ARCH);
+        }
+    }
+
+
+}

code/commons/string-substitutor/src/main/java/io/projectenv/core/commons/download/DownloadUrlDictionary.java

@@ -25,12 +25,6 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>io.projectenv.core.commons</groupId>
-            <artifactId>string-substitutor</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.immutables</groupId>
             <artifactId>value</artifactId>

code/commons/string-substitutor/src/main/java/io/projectenv/core/commons/download/DownloadUrlSubstitutorFactory.java

@@ -25,12 +25,6 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>io.projectenv.core.commons</groupId>
-            <artifactId>string-substitutor</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.immutables</groupId>
             <artifactId>value</artifactId>

code/commons/string-substitutor/src/main/java/io/projectenv/core/commons/download/impl/DownloadUrlVariableLookup.java

@@ -1,5 +1,6 @@
 package io.projectenv.core.toolsupport.spi.index;
 
+import io.projectenv.core.commons.system.CpuArchitecture;
 import io.projectenv.core.commons.system.OperatingSystem;
 import org.immutables.gson.Gson;
 import org.immutables.value.Value;
@@ -9,16 +10,16 @@
 
 @Gson.TypeAdapters
 @Value.Immutable
-public interface ToolsIndex {
+public interface ToolsIndexV2 {
 
-    Map<String, Map<String, Map<OperatingSystem, String>>> getJdkVersions();
+    Map<String, Map<String, Map<OperatingSystem, Map<CpuArchitecture, String>>>> getJdkVersions();
 
     Map<String, Set<String>> getJdkDistributionSynonyms();
 
     Map<String, String> getGradleVersions();
 
     Map<String, String> getMavenVersions();
 
-    Map<String, Map<OperatingSystem, String>> getNodeVersions();
+    Map<String, Map<OperatingSystem, Map<CpuArchitecture, String>>> getNodeVersions();
 
 }

code/commons/system/src/main/java/io/projectenv/core/commons/system/CPUArchitecture.java

@@ -69,11 +69,6 @@
             <artifactId>process</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>io.projectenv.core.commons</groupId>
-            <artifactId>string-substitutor</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>io.projectenv.core.commons</groupId>
             <artifactId>archive</artifactId>