Skip to content

Fix: now properly removing dangling default links #103

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 3 commits into from
May 26, 2026
Merged

Fix: now properly removing dangling default links #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ac8688
test: added tests for #102
quintesse May 25, 2026
9594b9a
chore: added some logging and comment fix
quintesse May 25, 2026
9f30c12
fix: dangling default links get properly removed
quintesse May 26, 2026
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
32 changes: 20 additions & 12 deletions src/main/java/dev/jbang/devkitman/JdkManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,36 +464,44 @@ private Jdk getJdkByVersion(
}

void uninstallJdk(Jdk.@NonNull InstalledJdk jdk) {
boolean resetDefault = false;
boolean resetDefaultVer = false;
Jdk.InstalledJdk resetDefault = null;
Jdk.InstalledJdk resetDefaultVer = null;
if (hasDefaultProvider() && !jdk.provider().equals(defaultProvider)) {
// Check if the JDK is the global default JDK, if so we need to reset it
Jdk.InstalledJdk defaultJdk = getDefaultJdk();
if (defaultJdk != null) {
boolean reset;
Path defHome = defaultJdk.home();
try {
resetDefault = Files.isSameFile(defHome, jdk.home());
reset = Files.isSameFile(defHome, jdk.home());
} catch (IOException ex) {
LOGGER.log(Level.WARNING, "Error while trying to reset global default JDK", ex);
resetDefault = defHome.equals(jdk.home());
reset = defHome.equals(jdk.home());
}
if (reset) {
resetDefault = defaultJdk;
}
}
// Check if the JDK is the global default JDK, if so we need to reset it
Jdk.InstalledJdk defaultJdkVer = getDefaultJdk();
// Check if the JDK is the version default JDK, if so we need to reset it
Jdk.InstalledJdk defaultJdkVer = getDefaultJdkForVersion(jdk.majorVersion());
if (defaultJdkVer != null) {
boolean reset;
Path defHome = defaultJdkVer.home();
try {
resetDefaultVer = Files.isSameFile(defHome, jdk.home());
reset = Files.isSameFile(defHome, jdk.home());
} catch (IOException ex) {
LOGGER.log(Level.WARNING, "Error while trying to reset versioned default JDK", ex);
resetDefaultVer = defHome.equals(jdk.home());
reset = defHome.equals(jdk.home());
}
if (reset) {
resetDefaultVer = defaultJdkVer;
}
}
}

jdk.provider().uninstall(jdk);

if (resetDefault) {
if (resetDefault != null) {
Optional<Jdk.InstalledJdk> newjdk = nextInstalledJdk(Jdk.Predicates.minVersion(jdk.majorVersion()),
JdkProvider.Predicates.canInstall);
if (!newjdk.isPresent()) {
Expand All @@ -503,11 +511,11 @@ void uninstallJdk(Jdk.@NonNull InstalledJdk jdk) {
if (newjdk.isPresent()) {
setDefaultJdk(newjdk.get());
} else {
removeDefaultJdk();
resetDefault.uninstall();
LOGGER.log(Level.INFO, "Global default JDK unset");
}
}
if (resetDefaultVer) {
if (resetDefaultVer != null) {
int v = jdk.majorVersion();
Optional<Jdk.InstalledJdk> newjdk = nextInstalledJdk(Jdk.Predicates.exactVersion(v),
JdkProvider.Predicates.canInstall);
Expand All @@ -517,7 +525,7 @@ void uninstallJdk(Jdk.@NonNull InstalledJdk jdk) {
if (newjdk.isPresent()) {
setDefaultJdkForVersion(newjdk.get());
} else {
removeDefaultJdkForVersion(v);
resetDefaultVer.uninstall();
LOGGER.log(Level.INFO, "Versioned default JDK unset");
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/dev/jbang/devkitman/util/FileUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@ public static void createLink(Path link, Path target) {
// creation doesn't require any special privileges.
if (OsUtils.isWindows() && Files.isDirectory(target)) {
if (createJunction(link, target.toAbsolutePath())) {
LOGGER.log(Level.FINE, "Created link (junction) {0}", target);
return;
}
} else {
if (createSymbolicLink(link, target.toAbsolutePath())) {
LOGGER.log(Level.FINE, "Created link (symbolic) {0}", target);
return;
}
}
Expand Down
38 changes: 37 additions & 1 deletion src/test/java/dev/jbang/devkitman/TestJdkManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.LinkOption;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
Expand Down Expand Up @@ -83,6 +85,12 @@ void testDefault() {
JdkManager jm = jdkManager();
assertThat(jm.getDefaultJdk(), not(nullValue()));
assertThat(jm.getDefaultJdk().majorVersion(), is(11));
assertThat(jm.getDefaultJdkForVersion(11), not(nullValue()));
assertThat(jm.getDefaultJdkForVersion(11).majorVersion(), is(11));
assertThat(jm.getDefaultJdkForVersion(12), not(nullValue()));
assertThat(jm.getDefaultJdkForVersion(12).majorVersion(), is(12));
assertThat(jm.getDefaultJdkForVersion(13), not(nullValue()));
assertThat(jm.getDefaultJdkForVersion(13).majorVersion(), is(13));
jm.setDefaultJdk(Objects.requireNonNull(jm.getInstalledJdk("12")));
assertThat(jm.getDefaultJdk().majorVersion(), is(12));
assertThat(jm.getDefaultJdk().linked().id(), startsWith("12.0.7-distro-jbang"));
Expand All @@ -94,6 +102,12 @@ void testDefaultPlus() {
JdkManager jm = jdkManager();
assertThat(jm.getDefaultJdk(), not(nullValue()));
assertThat(jm.getDefaultJdk().majorVersion(), is(11));
assertThat(jm.getDefaultJdkForVersion(11), not(nullValue()));
assertThat(jm.getDefaultJdkForVersion(11).majorVersion(), is(11));
assertThat(jm.getDefaultJdkForVersion(14), not(nullValue()));
assertThat(jm.getDefaultJdkForVersion(14).majorVersion(), is(14));
assertThat(jm.getDefaultJdkForVersion(17), not(nullValue()));
assertThat(jm.getDefaultJdkForVersion(17).majorVersion(), is(17));
jm.setDefaultJdk(Objects.requireNonNull(jm.getInstalledJdk("16+")));
assertThat(jm.getDefaultJdk().majorVersion(), is(17));
}
Expand Down Expand Up @@ -194,9 +208,18 @@ void testDefaultUninstallNext() {
JdkManager jm = jdkManager();
assertThat(jm.getDefaultJdk(), not(nullValue()));
assertThat(jm.getDefaultJdk().majorVersion(), is(14));
assertThat(jm.getDefaultJdkForVersion(11), not(nullValue()));
assertThat(jm.getDefaultJdkForVersion(11).majorVersion(), is(11));
assertThat(jm.getDefaultJdkForVersion(14), not(nullValue()));
assertThat(jm.getDefaultJdkForVersion(14).majorVersion(), is(14));
assertThat(jm.getDefaultJdkForVersion(17), not(nullValue()));
assertThat(jm.getDefaultJdkForVersion(17).majorVersion(), is(17));
Jdk.LinkedJdk jdk14 = jm.getDefaultJdkForVersion(14);
jm.getInstalledJdk("14", JdkProvider.Predicates.canInstall).uninstall();
assertThat(jm.getDefaultJdk(), not(nullValue()));
assertThat(jm.getDefaultJdk().majorVersion(), is(17));
assertThat(jm.getDefaultJdkForVersion(14), nullValue());
assertThat(Files.exists(jdk14.home(), LinkOption.NOFOLLOW_LINKS), is(false));
}

@Test
Expand All @@ -205,9 +228,17 @@ void testDefaultUninstallPrev() {
JdkManager jm = jdkManager();
assertThat(jm.getDefaultJdk(), not(nullValue()));
assertThat(jm.getDefaultJdk().majorVersion(), is(17));
assertThat(jm.getDefaultJdkForVersion(11), not(nullValue()));
assertThat(jm.getDefaultJdkForVersion(11).majorVersion(), is(11));
assertThat(jm.getDefaultJdkForVersion(14), not(nullValue()));
assertThat(jm.getDefaultJdkForVersion(14).majorVersion(), is(14));
assertThat(jm.getDefaultJdkForVersion(17), not(nullValue()));
assertThat(jm.getDefaultJdkForVersion(17).majorVersion(), is(17));
Jdk.LinkedJdk jdk17 = jm.getDefaultJdkForVersion(17);
jm.getInstalledJdk("17", JdkProvider.Predicates.canInstall).uninstall();
assertThat(jm.getDefaultJdk(), not(nullValue()));
assertThat(jm.getDefaultJdk().majorVersion(), is(14));
assertThat(Files.exists(jdk17.home(), LinkOption.NOFOLLOW_LINKS), is(false));
}

@Test
Expand Down Expand Up @@ -455,7 +486,9 @@ void testUninstallNumberLink() {
assertThat(jdks.stream().map(Jdk::majorVersion).collect(Collectors.toList()), containsInAnyOrder(11, 11, 11));
assertThat(jdks.stream().map(Jdk::id).collect(Collectors.toList()),
containsInAnyOrder("default", "12-default", "11-jbang"));
jdkManager().getOrInstallJdk("12", JdkProvider.Predicates.canUpdate).uninstall();
Jdk.InstalledJdk jdk12 = jdkManager().getOrInstallJdk("12", JdkProvider.Predicates.canUpdate);
jdk12.uninstall();
assertThat(Files.exists(jdk12.home(), LinkOption.NOFOLLOW_LINKS), is(false));
jdks = jdkManager().listInstalledJdks();
assertThat(jdks, hasSize(2));
assertThat(jdks.stream().map(Jdk::majorVersion).collect(Collectors.toList()), containsInAnyOrder(11, 11));
Expand Down Expand Up @@ -484,6 +517,9 @@ void testUninstallAll() {
assertThat(jdks.stream().map(Jdk::id).collect(Collectors.toList()),
containsInAnyOrder("default", "13-default", "13.0.7-distro-jbang"));
jm.getOrInstallJdk("13", JdkProvider.Predicates.canInstall).uninstall();
for (Jdk.InstalledJdk jdk : jdks) {
assertThat(Files.exists(jdk.home(), LinkOption.NOFOLLOW_LINKS), is(false));
}
jdks = jm.listInstalledJdks();
assertThat(jdks, empty());
}
Expand Down