Skip to content

fix: restore multi-JDK features lost in aesh migration #2513

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

Closed
maxandersen wants to merge 1 commit into from
+110 −18
Closed

fix: restore multi-JDK features lost in aesh migration #2513

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
87 changes: 69 additions & 18 deletions src/main/java/dev/jbang/cli/Jdk.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

import dev.jbang.Cache;
import dev.jbang.Settings;
import dev.jbang.devkitman.JdkDistroQuery;
import dev.jbang.devkitman.JdkManager;
import dev.jbang.devkitman.JdkProvider;
import dev.jbang.util.CommandBuffer;
Expand Down Expand Up @@ -162,6 +163,12 @@ public static class JdkList extends BaseCommand {
@Option(shortName = 'a', name = "available", hasValue = false, description = "Shows versions available for installation")
boolean available;

@Option(shortName = 'P', name = "providers", hasValue = false, description = "Shows available providers")
boolean listProviders;

@Option(shortName = 'D', name = "distros", hasValue = false, description = "Shows distributions available for installation")
boolean listDistros;

@Option(shortName = 'd', name = "show-details", aliases = {
"details" }, hasValue = false, description = "Shows detailed information for each JDK (only when format=text)")
boolean details;
Expand All @@ -173,24 +180,58 @@ public static class JdkList extends BaseCommand {
public Integer doCall() throws IOException {
JdkManager jdkMan = jdkMixin.getJdkManager();
dev.jbang.devkitman.Jdk defaultJdk = jdkMan.getDefaultJdk();
int defMajorVersion = defaultJdk != null ? defaultJdk.majorVersion() : 0;
String defVersion = defaultJdk != null ? defaultJdk.version() : "";
PrintStream out = System.out;
List<? extends dev.jbang.devkitman.Jdk> jdks;

if (listProviders) {
List<JdkProvider> providers = new ArrayList<>(jdkMan.providers());
providers.sort(Comparator.comparing(JdkProvider::name));
if (format == OutputFormat.json) {
Gson parser = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting().create();
parser.toJson(providers, out);
} else {
out.println("Available JDK Providers:");
providers.forEach(p -> out.println(" " + p.name()));
}
return EXIT_OK;
} else if (listDistros) {
List<JdkDistroQuery.JdkDistro> distros = jdkMan.listDistros();
distros.sort(Comparator.comparing(JdkDistroQuery.JdkDistro::name));
if (format == OutputFormat.json) {
Gson parser = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting().create();
parser.toJson(distros, out);
} else {
out.println("Available JDK Distributions:");
distros.forEach(d -> out.println(" " + d.name()));
}
return EXIT_OK;
}

List<JdkOut> jdkOuts;
if (available) {
jdks = jdkMan.listAvailableJdks();
List<dev.jbang.devkitman.Jdk.AvailableJdk> jdks = jdkMan.listAvailableJdks();
jdkOuts = jdks.stream()
.map(jdk -> new JdkOut(jdk.id(), jdk.version(), jdk.provider().name(),
null, null,
details ? jdk.equals(defaultJdk)
: jdk.version().equals(defVersion),
jdk.tags()))
.collect(Collectors.toList());
} else {
jdks = jdkMan.listInstalledJdks();
List<dev.jbang.devkitman.Jdk.InstalledJdk> jdks = jdkMan.listInstalledJdks();
jdkOuts = jdks.stream()
.map(jdk -> new JdkOut(jdk.id(), jdk.version(), jdk.provider().name(),
jdk.home(),
jdk instanceof dev.jbang.devkitman.Jdk.LinkedJdk
? ((dev.jbang.devkitman.Jdk.LinkedJdk) jdk).linked().id()
: null,
details ? jdk.equals(defaultJdk)
: jdk.version().equals(defVersion),
jdk.tags()))
.collect(Collectors.toList());
}
List<JdkOut> jdkOuts = jdks.stream()
.map(jdk -> new JdkOut(jdk.id(), jdk.version(), jdk.provider().name(),
jdk.isInstalled() ? ((dev.jbang.devkitman.Jdk.InstalledJdk) jdk).home() : null,
null,
details ? jdk.equals(defaultJdk)
: jdk.majorVersion() == defMajorVersion,
jdk.tags()))
.collect(Collectors.toList());
if (!details) {
// Only keep a list of unique major versions
// Only keep a list of unique versions
Set<JdkOut> uniqueJdks = new TreeSet<>(Comparator.<JdkOut>comparingInt(j -> j.version).reversed());
uniqueJdks.addAll(jdkOuts);
jdkOuts = new ArrayList<>(uniqueJdks);
Expand All @@ -207,12 +248,17 @@ public Integer doCall() throws IOException {
out.print(" ");
out.print(jdk.version);
out.print(" (");
out.print(jdk.fullVersion);
if (details) {
out.print(jdk.fullVersion);
out.print(", " + jdk.providerName + ", " + jdk.id);
if (jdk.javaHomeDir != null) {
out.print(", " + jdk.javaHomeDir);
}
if (!jdk.tags.isEmpty()) {
out.print(", " + jdk.tags);
}
} else {
out.print(available ? jdk.id : jdk.fullVersion);
}
out.print(")");
if (!available) {
Expand Down Expand Up @@ -243,13 +289,18 @@ public static class JdkUninstall extends BaseCommand {
@Override
public Integer doCall() throws IOException {
JdkManager jdkMan = jdkMixin.getJdkManager();
// This will first select for JDKs from providers that can actually install JDKs
dev.jbang.devkitman.Jdk.InstalledJdk jdk = jdkMan.getInstalledJdk(versionOrId,
JdkProvider.Predicates.canUpdate);
JdkProvider.Predicates.canInstall);
if (jdk == null) {
throw new ExitException(EXIT_INVALID_INPUT, "JDK " + versionOrId + " is not installed");
// If necessary we select JDKs from providers that can update JDKs
jdk = jdkMan.getInstalledJdk(versionOrId, JdkProvider.Predicates.canUpdate);
if (jdk == null) {
throw new ExitException(EXIT_INVALID_INPUT, "JDK " + versionOrId + " is not installed");
}
}
jdk.uninstall();
Util.infoMsg("Uninstalled JDK:\n " + versionOrId);
Util.infoMsg("Uninstalled JDK:\n " + jdk.id());
return EXIT_OK;
}
}
Expand Down Expand Up @@ -291,7 +342,7 @@ public Integer doCall() throws IOException {
JdkManager jdkMan = jdkMixin.getJdkManager();
dev.jbang.devkitman.Jdk jdk = null;
if (versionOrId != null && JavaUtil.isRequestedVersion(versionOrId)) {
jdk = jdkMan.getJdk(versionOrId, JdkProvider.Predicates.canUpdate);
jdk = jdkMan.getJdk(versionOrId, JdkProvider.Predicates.canInstall);
}
if (jdk == null || !jdk.isInstalled()) {
jdk = jdkMan.getOrInstallJdk(versionOrId);
Expand Down
41 changes: 41 additions & 0 deletions src/test/java/dev/jbang/cli/TestJdk.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,23 @@ void testJdkInstallWithLinkingToExistingJdkPathWhenJBangManagedVersionExistsAndI
assertTrue(Files.isSameFile(javaDir.toPath(), jdkPath.resolve("my11-linked").toRealPath()));
}

@Test
void testJdkInstallWithLinkingAndIntegerId() {
assertThrows(IllegalArgumentException.class,
() -> checkedRun("install", "--force", "11", "/non-existent-path"),
"When providing an existing JDK path, the versionOrId parameter must be a non-integer id");
}

@Test
void testJdkInstallWithLinkingToExistingJBangJdkPath() {
final Path jdkPath = Settings.getCacheDir(Cache.CacheClass.jdks).resolve("11");
initMockJdkDir(jdkPath, "11.0.14");

assertThrows(IllegalArgumentException.class,
() -> checkedRun("install", "my11", jdkPath.toString()),
"The provided path cannot point to a JBang managed JDK");
}

@Test
void testJdkInstallWithLinkingToExistingJdkPathWithDifferentVersion(@TempDir File javaDir) {
initMockJdkDir(javaDir.toPath(), "11.0.14");
Expand Down Expand Up @@ -363,6 +380,30 @@ void testJdkInstallWithLinkingToExistingBrokenLink(
assertTrue(Files.isSameFile(jdkOk, (jdkPath.resolve("my11-linked").toRealPath())));
}

@Test
void testJdkInstallSameVersion() throws Exception {
Arrays.asList(11).forEach(TestJdk::createMockJdk);

CaptureResult<Integer> result = checkedRun("install", "11");

assertThat(result.result, equalTo(SUCCESS_EXIT));
assertThat(result.normalizedErr(), containsString("JDK is already installed"));
assertThat(result.normalizedErr(), containsString("Use --force to install anyway"));
}

@Test
void testJdkInstallSameVersionForced() throws Exception {
Arrays.asList(11).forEach(TestJdk::createMockJdk);
Path jdkPath = Settings.getCacheDir(Cache.CacheClass.jdks);

CaptureResult<Integer> result = checkedRun("install", "--force", "11");

assertThat(result.result, equalTo(SUCCESS_EXIT));
assertThat(result.normalizedErr(), containsString("Installing Mock JDK 11.1"));
assertTrue(Files.isDirectory(jdkPath.resolve("11.1")));
assertTrue(Util.isLink(jdkPath.resolve("11")));
}

@Test
void testExistingJdkUninstall() throws Exception {
int jdkVersion = 14;
Expand Down
Loading