From 4afc1bcf80e1a9d111d1acbc60729d386c7941b6 Mon Sep 17 00:00:00 2001 From: Oliver Date: Sun, 16 Mar 2025 18:19:45 +0100 Subject: [PATCH] quick-e2e: Refactor PaperDownloadService to use Context for server file downloads --- .../main/java/de/oliver/quicke2e/Main.java | 4 ++-- .../quicke2e/paper/PaperDownloadService.java | 22 +++++++++++-------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/tools/quick-e2e/src/main/java/de/oliver/quicke2e/Main.java b/tools/quick-e2e/src/main/java/de/oliver/quicke2e/Main.java index 9c63a3cf..05282034 100644 --- a/tools/quick-e2e/src/main/java/de/oliver/quicke2e/Main.java +++ b/tools/quick-e2e/src/main/java/de/oliver/quicke2e/Main.java @@ -22,11 +22,11 @@ public class Main { Context context = new Context(config); PaperDownloadService paper = new PaperDownloadService(); -// paper.downloadServerFile(config.type(), config.version(), config.build()); + paper.downloadServerFile(context); EulaService eula = new EulaService(); if (config.eula()) { - eula.setEulaToTrue(String.format("servers/%s_%s_%s/eula.txt", config.type(), config.version(), config.build())); + eula.setEulaToTrue(String.format("%s/eula.txt", context.serverEnvPath().toString())); } StartScriptService startScript = new StartScriptService(); diff --git a/tools/quick-e2e/src/main/java/de/oliver/quicke2e/paper/PaperDownloadService.java b/tools/quick-e2e/src/main/java/de/oliver/quicke2e/paper/PaperDownloadService.java index 83cf9d52..d5f06ff8 100644 --- a/tools/quick-e2e/src/main/java/de/oliver/quicke2e/paper/PaperDownloadService.java +++ b/tools/quick-e2e/src/main/java/de/oliver/quicke2e/paper/PaperDownloadService.java @@ -1,6 +1,7 @@ package de.oliver.quicke2e.paper; import com.google.gson.Gson; +import de.oliver.quicke2e.config.Context; import java.net.URI; import java.net.http.HttpClient; @@ -21,23 +22,26 @@ public class PaperDownloadService { this.client = HttpClient.newHttpClient(); } - public void downloadServerFile( - String project, - String version, - String build - ) { - Path folderPath = Paths.get(String.format("%s/%s_%s_%s/", destination, project, version, build)); + public void downloadServerFile(Context context) { + final String type = context.configuration().type(); + final String version = context.configuration().version(); + final String build = context.configuration().build(); + + Path folderPath = Paths.get(String.format("%s/%s_%s_%s/", destination, type, version, build)); if (!folderPath.toFile().exists()) { folderPath.toFile().mkdirs(); } + context.setServerEnvPath(folderPath); - String buildNumber = build.equals("latest") ? getLatestBuildNumber(project, version) : build; + String buildNumber = build.equals("latest") ? getLatestBuildNumber(type, version) : build; + context.setActualBuildNumber(buildNumber); - Path filePath = Paths.get(String.format("%s/%s_%s_%s/%s-%s-%s.jar", destination, project, version, build, project, version, buildNumber)); + Path filePath = Paths.get(String.format("%s/%s_%s_%s/%s-%s-%s.jar", destination, type, version, build, type, version, buildNumber)); + context.setServerJarPath(filePath); HttpRequest req = HttpRequest.newBuilder() .GET() - .uri(URI.create(String.format("%s/projects/%s/versions/%s/builds/%s/downloads/%s-%s-%s.jar", BASE_URL, project, version, buildNumber, project, version, buildNumber))) + .uri(URI.create(String.format("%s/projects/%s/versions/%s/builds/%s/downloads/%s-%s-%s.jar", BASE_URL, type, version, buildNumber, type, version, buildNumber))) .build(); client.sendAsync(req, HttpResponse.BodyHandlers.ofFile(filePath))