Skip to content

fix: fixed API typo #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
quintesse merged 1 commit into from
Mar 5, 2026
Merged

fix: fixed API typo #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions src/main/java/dev/jbang/devkitman/jdkinstallers/MetadataJdkInstaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ public class MetadataJdkInstaller implements JdkInstaller {
protected final @NonNull JdkProvider jdkProvider;
protected final Function<MetadataResult, String> 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());
Expand Down Expand Up @@ -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;
}

Expand All @@ -136,9 +136,9 @@ private List<MetadataResult> readMetadataForList() throws IOException {
List<MetadataResult> 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<MetadataResult> results = readJsonFromUrl(
getMetadataUrl("ga", OsUtils.getOS(), OsUtils.getArch(), "jdk", jvmImpl, d.trim()));
Expand All @@ -148,7 +148,7 @@ private List<MetadataResult> readMetadataForList() throws IOException {
}
}
// And for EA releases second
for (String d : distros) {
for (String d : dists) {
try {
List<MetadataResult> results = readJsonFromUrl(
getMetadataUrl("ea", OsUtils.getOS(), OsUtils.getArch(), "jdk", jvmImpl, d.trim()));
Expand Down Expand Up @@ -201,16 +201,16 @@ private List<MetadataResult> readMetadataForList() throws IOException {
}

private List<MetadataResult> 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<MetadataResult> 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<MetadataResult> results = readMetadataForVersionAndDistro(version, openVersion, "ea", d.trim());
if (!results.isEmpty()) {
return results;
Expand All @@ -220,9 +220,9 @@ private List<MetadataResult> readMetadataForVersion(int version, boolean openVer
}

private List<MetadataResult> readMetadataForVersionAndDistro(int version, boolean openVersion, String releaseType,
String distro) throws IOException {
String distros) throws IOException {
List<MetadataResult> 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);
}

Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/dev/jbang/devkitman/jdkinstallers/MetadataJdkInstallerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -139,7 +139,7 @@ public void testGetAvailableByVersionNotFound() {
}

@Test
public void testDetermineIdIncludesDistro() {
public void testDetermineIdIncludesDistros() {
List<Jdk.AvailableJdk> jdks = installer.listAvailable().collect(Collectors.toList());

assertThat(jdks, is(not(empty())));
Expand Down