From 8c6c6f47c0ed82838fab64d71a28b020263468e1 Mon Sep 17 00:00:00 2001 From: Tako Schotanus Date: Thu, 5 Mar 2026 13:27:58 +0100 Subject: [PATCH] fix: fixed API typo --- .../jdkinstallers/MetadataJdkInstaller.java | 26 +++++++++---------- .../MetadataJdkInstallerTest.java | 4 +-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/dev/jbang/devkitman/jdkinstallers/MetadataJdkInstaller.java b/src/main/java/dev/jbang/devkitman/jdkinstallers/MetadataJdkInstaller.java index 3f73c34..86e4279 100644 --- a/src/main/java/dev/jbang/devkitman/jdkinstallers/MetadataJdkInstaller.java +++ b/src/main/java/dev/jbang/devkitman/jdkinstallers/MetadataJdkInstaller.java @@ -28,11 +28,11 @@ public class MetadataJdkInstaller implements JdkInstaller { protected final @NonNull JdkProvider jdkProvider; protected final Function jdkId; protected RemoteAccessProvider remoteAccessProvider; - protected @NonNull String distro = DEFAULT_DISTRO; + protected @NonNull String distros = DEFAULT_DISTROS; protected String jvmImpl = DEFAULT_JVM_IMPL; public static final String METADATA_BASE_URL = "https://joschi.github.io/java-metadata/metadata/"; - public static final String DEFAULT_DISTRO = "temurin,adoptopenjdk"; + public static final String DEFAULT_DISTROS = "temurin,adoptopenjdk"; public static final String DEFAULT_JVM_IMPL = "hotspot"; private static final Logger LOGGER = Logger.getLogger(MetadataJdkInstaller.class.getName()); @@ -110,8 +110,8 @@ public MetadataJdkInstaller(@NonNull JdkProvider jdkProvider, @NonNull Function< return this; } - public @NonNull MetadataJdkInstaller distro(@Nullable String distro) { - this.distro = distro != null && !distro.isEmpty() ? distro : DEFAULT_DISTRO; + public @NonNull MetadataJdkInstaller distros(@Nullable String distros) { + this.distros = distros != null && !distros.isEmpty() ? distros : DEFAULT_DISTROS; return this; } @@ -136,9 +136,9 @@ private List readMetadataForList() throws IOException { List allResults = new ArrayList<>(); IOException lastException = null; - String[] distros = distro.split(","); + String[] dists = distros.split(","); // Query for GA releases first - for (String d : distros) { + for (String d : dists) { try { List results = readJsonFromUrl( getMetadataUrl("ga", OsUtils.getOS(), OsUtils.getArch(), "jdk", jvmImpl, d.trim())); @@ -148,7 +148,7 @@ private List readMetadataForList() throws IOException { } } // And for EA releases second - for (String d : distros) { + for (String d : dists) { try { List results = readJsonFromUrl( getMetadataUrl("ea", OsUtils.getOS(), OsUtils.getArch(), "jdk", jvmImpl, d.trim())); @@ -201,16 +201,16 @@ private List readMetadataForList() throws IOException { } private List readMetadataForVersion(int version, boolean openVersion) throws IOException { - String[] distros = distro.split(","); + String[] dists = distros.split(","); // Try GA first for all selected distros, return the first that has results - for (String d : distros) { + for (String d : dists) { List results = readMetadataForVersionAndDistro(version, openVersion, "ga", d.trim()); if (!results.isEmpty()) { return results; } } // Try EA if no GA found - for (String d : distros) { + for (String d : dists) { List results = readMetadataForVersionAndDistro(version, openVersion, "ea", d.trim()); if (!results.isEmpty()) { return results; @@ -220,9 +220,9 @@ private List readMetadataForVersion(int version, boolean openVer } private List readMetadataForVersionAndDistro(int version, boolean openVersion, String releaseType, - String distro) throws IOException { + String distros) throws IOException { List gaResults = readJsonFromUrl( - getMetadataUrl(releaseType, OsUtils.getOS(), OsUtils.getArch(), "jdk", jvmImpl, distro)); + getMetadataUrl(releaseType, OsUtils.getOS(), OsUtils.getArch(), "jdk", jvmImpl, distros)); return filterByVersion(gaResults, version, openVersion); } @@ -458,7 +458,7 @@ public static class Discovery implements JdkInstallers.Discovery { public @NonNull JdkInstaller create(Config config) { MetadataJdkInstaller installer = new MetadataJdkInstaller(config.jdkProvider()); installer - .distro(config.properties().getOrDefault("distro", null)) + .distros(config.properties().getOrDefault("distro", null)) .jvmImpl(config.properties().getOrDefault("impl", null)); HttpClientBuilder httpClientBuilder = NetUtils.createCachingHttpClientBuilder(config.cachePath()); RemoteAccessProvider rap = RemoteAccessProvider.createDefaultRemoteAccessProvider(httpClientBuilder); diff --git a/src/test/java/dev/jbang/devkitman/jdkinstallers/MetadataJdkInstallerTest.java b/src/test/java/dev/jbang/devkitman/jdkinstallers/MetadataJdkInstallerTest.java index 08b425c..167d8d4 100644 --- a/src/test/java/dev/jbang/devkitman/jdkinstallers/MetadataJdkInstallerTest.java +++ b/src/test/java/dev/jbang/devkitman/jdkinstallers/MetadataJdkInstallerTest.java @@ -45,7 +45,7 @@ protected void initEnv(@TempDir Path tempPath) throws IOException { RemoteAccessProvider rap = createRemoteAccessProvider(); provider = new JBangJdkProvider(config.installPath()); installer = new MetadataJdkInstaller(provider) - .distro("temurin") + .distros("temurin") .jvmImpl("hotspot") .remoteAccessProvider(rap); provider.installer(installer); @@ -139,7 +139,7 @@ public void testGetAvailableByVersionNotFound() { } @Test - public void testDetermineIdIncludesDistro() { + public void testDetermineIdIncludesDistros() { List jdks = installer.listAvailable().collect(Collectors.toList()); assertThat(jdks, is(not(empty())));