#13 improved detection of host os and fixed MAC name for Timurin JDK …

…provider
raydac · Jun 22, 2024 · 5e6e985 · 5e6e985
1 parent a94a4c0
commit 5e6e985
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/...c/main/java/com/igormaznitsa/mvnjlink/jdkproviders/providers/AdoptiumOpenJdkProvider.java b/...c/main/java/com/igormaznitsa/mvnjlink/jdkproviders/providers/AdoptiumOpenJdkProvider.java
@@ -103,7 +103,8 @@ public Path getPathToJdk(
     final String gitRepositoryName =
         config.getOrDefault("repositoryName", "temurin" + getRawVersion(jdkVersion) + "-binaries");
     final String build = config.get("build");
-    final String jdkOs = GetUtils.ensureNonNull(config.get("os"), defaultOs.getId());
+    final String jdkOs =
+        GetUtils.ensureNonNull(config.get("os"), defaultOs.isMac() ? "mac" : defaultOs.getId());
     final String jdkArch = config.get("arch");
     final String jdkType = config.get("type");
     final String jdkImpl = config.get("impl");

diff --git a/mvn-jlink-wrapper/src/main/java/com/igormaznitsa/mvnjlink/utils/HostOs.java b/mvn-jlink-wrapper/src/main/java/com/igormaznitsa/mvnjlink/utils/HostOs.java
@@ -135,12 +135,12 @@ public String getId() {
   public static HostOs findForId(@Nonnull final String id) {
     final String normalized = id.toLowerCase(Locale.ENGLISH).trim();
     return VALUES.stream().filter(x -> x != UNKNOWN).filter(x -> x.getId().equals(normalized))
-        .findFirst().orElse(UNKNOWN);
+        .reduce((a, b) -> b).orElse(UNKNOWN);
   }
 
   @Nonnull
   public static String makeAllIdAsString() {
-    return VALUES.stream().filter(x -> x != UNKNOWN).map(x -> x.getId())
+    return VALUES.stream().filter(x -> x != UNKNOWN).map(HostOs::getId)
         .collect(Collectors.joining(","));
   }
 
@@ -152,4 +152,8 @@ public String getDefaultExtension() {
   public boolean isHostOs() {
     return this.hostChecker.get();
   }
+
+  public boolean isMac() {
+    return this == MAC || this == MAC_OSX;
+  }
 }