Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .justfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ clean:

# build without tests
build:
./gradlew spotlessApply build -x test
./gradlew spotlessApply build publishToMavenLocal -x test

# run tests
test:
Expand Down
34 changes: 13 additions & 21 deletions src/main/java/dev/jbang/devkitman/Jdk.java
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,7 @@ public Default(
@Override
@NonNull
public InstalledJdk install() {
if (!provider.canUpdate()) {
throw new UnsupportedOperationException(
"Installing a JDK is not supported by " + provider);
}
return provider.install(this);
return provider.manager().installJdk(this);
}

@Override
Expand All @@ -101,11 +97,6 @@ interface InstalledJdk extends Jdk {
@NonNull
Path home();

/**
* Determines if the JDK version is fixed or that it can change
*/
boolean isFixedVersion();

@Override
default boolean isInstalled() {
return true;
Expand All @@ -117,7 +108,6 @@ default boolean isInstalled() {
void uninstall();

class Default extends Jdk.Default implements InstalledJdk {
private final boolean fixedVersion;
@Nullable
private final Path home;

Expand All @@ -130,18 +120,11 @@ public Default(
@NonNull String id,
@Nullable Path home,
@NonNull String version,
boolean fixedVersion,
@Nullable Set<String> tags) {
super(provider, id, version, tags != null ? tags : determineTagsFromJdkHome(home));
this.fixedVersion = fixedVersion;
this.home = home;
}

@Override
public boolean isFixedVersion() {
return fixedVersion;
}

@Override
@NonNull
public Path home() {
Expand All @@ -154,7 +137,7 @@ public Path home() {

@Override
public void uninstall() {
provider.uninstall(this);
provider.manager().uninstallJdk(this);
}

@Override
Expand Down Expand Up @@ -184,7 +167,8 @@ public int compareTo(Jdk o) {

@Override
public String toString() {
return majorVersion() + " (" + version + (isFixedVersion() ? " [fixed]" : " [dynamic]") + ", " + id
return majorVersion() + " (" + version + (provider.hasFixedVersions() ? " [fixed]" : " [dynamic]")
+ ", " + id
+ ", "
+ home + ", " + tags + "))";
}
Expand Down Expand Up @@ -310,6 +294,14 @@ public static <T extends Jdk> Predicate<T> openVersion(int version) {
return jdk -> jdk.majorVersion() >= version;
}

public static <T extends Jdk> Predicate<T> minVersion(int version) {
return jdk -> jdk.majorVersion() >= version;
}

public static <T extends Jdk> Predicate<T> maxVersion(int version) {
return jdk -> jdk.majorVersion() <= version;
}

public static <T extends Jdk> Predicate<T> forVersion(String version) {
int v = JavaUtils.parseJavaVersion(version);
return forVersion(v, JavaUtils.isOpenVersion(version));
Expand All @@ -328,7 +320,7 @@ public static <T extends Jdk> Predicate<T> allTags(Set<String> tags) {
}

public static <T extends InstalledJdk> Predicate<T> fixedVersion() {
return InstalledJdk::isFixedVersion;
return jdk -> jdk.provider().hasFixedVersions();
}

public static <T extends InstalledJdk> Predicate<T> path(Path jdkPath) {
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/dev/jbang/devkitman/JdkInstaller.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package dev.jbang.devkitman;

import java.nio.file.Path;
import java.util.List;
import java.util.stream.Stream;

import org.jspecify.annotations.NonNull;
import org.jspecify.annotations.Nullable;
Expand All @@ -23,7 +23,7 @@ public interface JdkInstaller {
* @return List of <code>Jdk</code> objects
*/
@NonNull
default List<Jdk.AvailableJdk> listAvailable() {
default Stream<Jdk.AvailableJdk> listAvailable() {
throw new UnsupportedOperationException(
"Listing available JDKs is not supported by " + getClass().getName());
}
Expand All @@ -38,7 +38,7 @@ default List<Jdk.AvailableJdk> listAvailable() {
* @return A <code>Jdk</code> object or <code>null</code>
*/
default Jdk.@Nullable AvailableJdk getAvailableByVersion(int version, boolean openVersion) {
return listAvailable().stream()
return listAvailable()
.filter(Jdk.Predicates.forVersion(version, openVersion))
.findFirst()
.orElse(null);
Expand All @@ -58,7 +58,7 @@ default List<Jdk.AvailableJdk> listAvailable() {
* @return A <code>Jdk</code> object or <code>null</code>
*/
default Jdk.@Nullable AvailableJdk getAvailableByIdOrToken(String idOrToken) {
return listAvailable().stream()
return listAvailable()
.filter(Jdk.Predicates.id(idOrToken))
.findFirst()
.orElse(null);
Expand Down
Loading