modrinth: ensure requested loader for modpack is optional (#291)

itzg · web-flow · commit 6a69200c5c66 · 2023-08-17T16:41:59.000-05:00
diff --git a/src/main/java/me/itzg/helpers/modrinth/InstallModrinthModpackCommand.java b/src/main/java/me/itzg/helpers/modrinth/InstallModrinthModpackCommand.java
@@ -116,7 +116,7 @@ private ModrinthPackFetcher buildModpackFetcher(
         } else {
             return new ModrinthApiPackFetcher(
                 apiClient, projectRef, this.outputDirectory, this.gameVersion,
-                this.defaultVersionType, this.loader.asLoader());
+                defaultVersionType, loader != null ? loader.asLoader() : null);
         }
     }
 }
diff --git a/src/main/java/me/itzg/helpers/modrinth/ModrinthApiClient.java b/src/main/java/me/itzg/helpers/modrinth/ModrinthApiClient.java
@@ -25,6 +25,7 @@
 import me.itzg.helpers.modrinth.model.Version;
 import me.itzg.helpers.modrinth.model.VersionFile;
 import me.itzg.helpers.modrinth.model.VersionType;
+import org.jetbrains.annotations.Nullable;
 import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Schedulers;
 
@@ -114,7 +115,7 @@ public Mono<List<ResolvedProject>> bulkGetProjects(Stream<ProjectRef> projectRef
      * @param gameVersion can be null for any
      */
     public Mono<Version> resolveProjectVersion(Project project, ProjectRef projectRef,
-                                               Loader loader, String gameVersion,
+                                               @Nullable Loader loader, String gameVersion,
                                                VersionType defaultVersionType) {
         if (projectRef.hasVersionName()) {
             return getVersionsForProject(project.getId(), loader, gameVersion)
@@ -161,7 +162,7 @@ public Mono<Path> downloadMrPack(VersionFile versionFile) {
      * @param gameVersion can be null for any
      */
     public Mono<List<Version>> getVersionsForProject(String projectIdOrSlug,
-                                                     Loader loader, String gameVersion
+                                                     @Nullable Loader loader, String gameVersion
     ) {
         return sharedFetch.fetch(
                 uriBuilder.resolve("/v2/project/{id|slug}/version",
diff --git a/src/main/java/me/itzg/helpers/modrinth/ModrinthApiPackFetcher.java b/src/main/java/me/itzg/helpers/modrinth/ModrinthApiPackFetcher.java
@@ -7,23 +7,24 @@
 import me.itzg.helpers.files.Manifests;
 import me.itzg.helpers.http.FailedRequestException;
 import me.itzg.helpers.modrinth.model.*;
+import org.jetbrains.annotations.Nullable;
 import reactor.core.publisher.Mono;
 
 @Slf4j
 public class ModrinthApiPackFetcher implements ModrinthPackFetcher {
-    private ModrinthApiClient apiClient;
+    private final ModrinthApiClient apiClient;
 
-    private ProjectRef modpackProjectRef;
+    private final ProjectRef modpackProjectRef;
 
-    private Loader modLoaderType;
-    private String gameVersion;
-    private VersionType defaultVersionType;
-    private Path modpackOutputDirectory;
+    private final Loader modLoaderType;
+    private final String gameVersion;
+    private final VersionType defaultVersionType;
+    private final Path modpackOutputDirectory;
 
     ModrinthApiPackFetcher(
             ModrinthApiClient apiClient, ProjectRef projectRef,
             Path outputDirectory, String gameVersion,
-            VersionType defaultVersionType, Loader loader)
+            VersionType defaultVersionType, @Nullable Loader loader)
     {
         this.apiClient = apiClient;
         this.modpackProjectRef = projectRef;
@@ -38,7 +39,7 @@ public Mono<Path> fetchModpack(ModrinthModpackManifest prevManifest) {
             .filter(version -> needsInstall(prevManifest, version))
             .flatMap(version ->
                 Mono.just(ModrinthApiClient.pickVersionFile(version)))
-            .flatMap(versionFile -> apiClient.downloadMrPack(versionFile));
+            .flatMap(apiClient::downloadMrPack);
     }
 
     private Mono<Version> resolveModpackVersion() {
diff --git a/src/main/java/me/itzg/helpers/modrinth/ResolvedProject.java b/src/main/java/me/itzg/helpers/modrinth/ResolvedProject.java
@@ -6,7 +6,7 @@
 
 @RequiredArgsConstructor
 @Data
-class ResolvedProject {
+public class ResolvedProject {
     final private ProjectRef projectRef;
     final private Project project;
 }
diff --git a/src/test/java/me/itzg/helpers/modrinth/InstallModrinthModpackCommandTest.java b/src/test/java/me/itzg/helpers/modrinth/InstallModrinthModpackCommandTest.java
@@ -1,31 +1,27 @@
 package me.itzg.helpers.modrinth;
 
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-
-import static org.assertj.core.api.Assertions.*;
-import static me.itzg.helpers.modrinth.ModrinthTestHelpers.*;
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.nio.file.*;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
+import static me.itzg.helpers.modrinth.ModrinthTestHelpers.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
 import com.github.tomakehurst.wiremock.junit5.WireMockTest;
-
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
 import me.itzg.helpers.files.Manifests;
-import me.itzg.helpers.modrinth.model.*;
+import me.itzg.helpers.modrinth.model.ModpackIndex;
 import me.itzg.helpers.modrinth.model.ModpackIndex.ModpackFile;
+import me.itzg.helpers.modrinth.model.Version;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 @WireMockTest
 public class InstallModrinthModpackCommandTest {
-    private String projectName = "test_project1";
-    private String projectId = "efgh5678";
-    private String projectVersionId = "abcd1234";
-    private Version projectVersion =
+    private final String projectName = "test_project1";
+    private final String projectId = "efgh5678";
+    private final String projectVersionId = "abcd1234";
+    private final Version projectVersion =
         createModrinthProjectVersion(projectVersionId);
 
     static InstallModrinthModpackCommand createInstallModrinthModpackCommand(
@@ -46,7 +42,7 @@ static InstallModrinthModpackCommand createInstallModrinthModpackCommand(
     @Test
     void downloadsAndInstallsModrinthModpack(
             WireMockRuntimeInfo wm, @TempDir Path tempDir
-        ) throws JsonProcessingException, IOException, URISyntaxException
+        ) throws IOException, URISyntaxException
     {
         String expectedFileData = "some test data";
         String relativeFilePath = "test_file";
@@ -71,11 +67,41 @@ void downloadsAndInstallsModrinthModpack(
             .isEqualTo(expectedFileData);
     }
 
+    @Test
+    void downloadsAndInstallsModrinthModpack_versionNumberAndAnyLoader(
+            WireMockRuntimeInfo wm, @TempDir Path tempDir
+        ) throws IOException, URISyntaxException
+    {
+        String expectedFileData = "some test data";
+        String relativeFilePath = "test_file";
+        ModpackFile testFile = createHostedModpackFile(
+            relativeFilePath, expectedFileData, wm.getHttpBaseUrl());
+
+        ModpackIndex index = createBasicModpackIndex();
+        index.getFiles().add(testFile);
+
+        String projectVersionNumber = "1.6.1";
+        stubModrinthModpackApi(
+            wm, projectName, this.projectId,
+            createModrinthProjectVersion(projectVersionId).setVersionNumber(projectVersionNumber),
+            createModrinthPack(index)
+        );
+
+        InstallModrinthModpackCommand commandUT =
+            createInstallModrinthModpackCommand(wm.getHttpBaseUrl(), tempDir,
+                projectName, projectVersionNumber, null);
+
+        int commandStatus = commandUT.call();
+
+        assertThat(commandStatus).isEqualTo(0);
+        assertThat(tempDir.resolve(relativeFilePath)).content()
+            .isEqualTo(expectedFileData);
+    }
+
     @Test
     void createsModrinthModpackManifestForModpackInstallation(
                 WireMockRuntimeInfo wm, @TempDir Path tempDir
-        ) throws JsonProcessingException, IOException, URISyntaxException
-    {
+        ) throws IOException {
         ModpackIndex index = createBasicModpackIndex();
 
         stubModrinthModpackApi(
@@ -107,7 +133,7 @@ void createsModrinthModpackManifestForModpackInstallation(
     @Test
     void removesFilesNoLongerNeedeByUpdatedModpack(
             WireMockRuntimeInfo wm, @TempDir Path tempDir
-        ) throws JsonProcessingException, IOException, URISyntaxException
+        ) throws IOException, URISyntaxException
     {
         String expectedFileData = "some test data";
         String relativeFilePath = "test_file";
@@ -146,7 +172,7 @@ void removesFilesNoLongerNeedeByUpdatedModpack(
     @Test
     void downloadsAndInstallsGenericModpacksOverHttp(
             WireMockRuntimeInfo wm, @TempDir Path tempDir
-        ) throws JsonProcessingException, IOException, URISyntaxException
+        ) throws IOException, URISyntaxException
     {
         String expectedFileData = "some test data";
         String relativeFilePath = "test_file";
diff --git a/src/test/java/me/itzg/helpers/modrinth/ModrinthTestHelpers.java b/src/test/java/me/itzg/helpers/modrinth/ModrinthTestHelpers.java
@@ -1,5 +1,10 @@
 package me.itzg.helpers.modrinth;
 
+import static com.github.tomakehurst.wiremock.client.WireMock.*;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.net.URI;
@@ -9,29 +14,25 @@
 import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
-import static com.github.tomakehurst.wiremock.client.WireMock.*;
-
-import me.itzg.helpers.modrinth.model.*;
+import me.itzg.helpers.modrinth.model.DependencyId;
+import me.itzg.helpers.modrinth.model.ModpackIndex;
+import me.itzg.helpers.modrinth.model.Project;
+import me.itzg.helpers.modrinth.model.Version;
+import me.itzg.helpers.modrinth.model.VersionFile;
 
 class ModrinthTestHelpers {
     static final ObjectMapper mapper = new ObjectMapper();
 
     static Version createModrinthProjectVersion(String versionId) {
         return new Version()
             .setId(versionId)
-            .setFiles(new ArrayList<VersionFile>());
+            .setFiles(new ArrayList<>());
     }
 
     static void stubModrinthModpackApi(
             WireMockRuntimeInfo wm, String projectName, String projectId,
             Version projectVersion, byte[] expectedData
-        ) throws JsonProcessingException, IOException
-    {
+        ) {
         String modpackDownloadPath = "/download/test_project1.mrpack";
 
         JsonNode responseProject = mapper.valueToTree(
@@ -45,7 +46,7 @@ static void stubModrinthModpackApi(
             .setUrl(wm.getHttpBaseUrl() + modpackDownloadPath));
         JsonNode responseVersion = mapper.valueToTree(projectVersion);
 
-        List<Version> projectVersionList = new ArrayList<Version>();
+        List<Version> projectVersionList = new ArrayList<>();
         projectVersionList.add(projectVersion);
         JsonNode responseVersionList = mapper.valueToTree(projectVersionList);
 
@@ -58,6 +59,10 @@ static void stubModrinthModpackApi(
             .willReturn(ok()
             .withHeader("Content-Type", "application/json")
             .withJsonBody(responseVersionList)));
+        stubFor(get(urlPathMatching("/v2/project/" + projectId + "/version"))
+            .willReturn(ok()
+            .withHeader("Content-Type", "application/json")
+            .withJsonBody(responseVersionList)));
         stubFor(get("/v2/version/" + projectVersion.getId())
             .willReturn(ok()
             .withHeader("Content-Type", "application/json")
@@ -72,8 +77,8 @@ static ModpackIndex createBasicModpackIndex() {
         ModpackIndex index = new ModpackIndex()
             .setName(null)
             .setGame("minecraft")
-            .setDependencies(new HashMap<DependencyId, String>())
-            .setFiles(new ArrayList<ModpackIndex.ModpackFile>())
+            .setDependencies(new HashMap<>())
+            .setFiles(new ArrayList<>())
             .setVersionId(null);
         index.getDependencies().put(DependencyId.minecraft, "1.20.1");
 
@@ -105,7 +110,7 @@ static ModpackIndex.ModpackFile createHostedModpackFile(
             .willReturn(ok().withBody(data)));
 
         ModpackIndex.ModpackFile modpackFile = new ModpackIndex.ModpackFile()
-            .setDownloads(new ArrayList<URI>())
+            .setDownloads(new ArrayList<>())
             .setPath(relativeFileLocation);
         modpackFile.getDownloads().add(
             new URI(wmBaseUrl + "/files/" + relativeFileLocation));

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ private ModrinthPackFetcher buildModpackFetcher(`
`116`	`116`	`} else {`
`117`	`117`	`return new ModrinthApiPackFetcher(`
`118`	`118`	`apiClient, projectRef, this.outputDirectory, this.gameVersion,`
`119`		`- this.defaultVersionType, this.loader.asLoader());`
	`119`	`+ defaultVersionType, loader != null ? loader.asLoader() : null);`
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`@RequiredArgsConstructor`
`8`	`8`	`@Data`
`9`		`-class ResolvedProject {`
	`9`	`+public class ResolvedProject {`
`10`	`10`	`final private ProjectRef projectRef;`
`11`	`11`	`final private Project project;`
`12`	`12`	`}`