Merge pull request #31725 from ia3andy/check-min-java

Add check for extensions min Java

Author: gsmet

independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateProjectHelper.java

@@ -34,7 +34,7 @@ public class CreateProjectHelper {
 
     // ordering is important here, so let's keep them ordered
     public static final SortedSet<Integer> JAVA_VERSIONS_LTS = new TreeSet<>(List.of(11, 17));
-    private static final int DEFAULT_JAVA_VERSION = 11;
+    public static final int DEFAULT_JAVA_VERSION = 11;
     private static final int MAX_LTS_SUPPORTED_BY_KOTLIN = 17;
     public static final String DETECT_JAVA_RUNTIME_VERSION = "<<detect java runtime version>>";
     private static final Pattern JAVA_VERSION_PATTERN = Pattern.compile("(\\d+)(?:\\..*)?");

independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java

@@ -1,19 +1,9 @@
 package io.quarkus.devtools.commands.handlers;
 
-import static io.quarkus.devtools.commands.CreateProject.CreateProjectKey.DATA;
-import static io.quarkus.devtools.commands.CreateProject.CreateProjectKey.EXAMPLE;
-import static io.quarkus.devtools.commands.CreateProject.CreateProjectKey.EXTENSIONS;
-import static io.quarkus.devtools.commands.CreateProject.CreateProjectKey.EXTRA_CODESTARTS;
-import static io.quarkus.devtools.commands.CreateProject.CreateProjectKey.NO_BUILDTOOL_WRAPPER;
-import static io.quarkus.devtools.commands.CreateProject.CreateProjectKey.NO_CODE;
-import static io.quarkus.devtools.commands.CreateProject.CreateProjectKey.NO_DOCKERFILES;
-import static io.quarkus.devtools.commands.CreateProject.CreateProjectKey.PACKAGE_NAME;
-import static io.quarkus.devtools.commands.CreateProject.CreateProjectKey.PROJECT_GROUP_ID;
-import static io.quarkus.devtools.commands.CreateProject.CreateProjectKey.QUARKUS_VERSION;
-import static io.quarkus.devtools.commands.CreateProject.CreateProjectKey.RESOURCE_CLASS_NAME;
+import static io.quarkus.devtools.commands.CreateProject.CreateProjectKey.*;
 import static io.quarkus.devtools.commands.handlers.CreateProjectCodestartDataConverter.toCodestartData;
 import static io.quarkus.devtools.commands.handlers.QuarkusCommandHandlers.computeExtensionsFromQuery;
-import static io.quarkus.devtools.messagewriter.MessageIcons.ERROR_ICON;
+import static io.quarkus.platform.catalog.processor.ExtensionProcessor.getMinimumJavaVersion;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -30,6 +20,7 @@
 import io.quarkus.devtools.codestarts.CodestartType;
 import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartCatalog;
 import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartProjectInput;
+import io.quarkus.devtools.commands.CreateProjectHelper;
 import io.quarkus.devtools.commands.data.QuarkusCommandException;
 import io.quarkus.devtools.commands.data.QuarkusCommandInvocation;
 import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
@@ -74,15 +65,14 @@ public QuarkusCommandOutcome execute(QuarkusCommandInvocation invocation) throws
 
         List<Extension> extensionsToAdd = computeRequiredExtensions(invocation.getExtensionsCatalog(), extensionsQuery,
                 invocation.log());
-
-        ExtensionCatalog mainCatalog = invocation.getExtensionsCatalog(); // legacy platform initialization
         final List<ExtensionCatalog> extensionOrigins;
+        ExtensionCatalog mainCatalog = invocation.getExtensionsCatalog(); // legacy platform initialization
+        final String javaVersion = invocation.getStringValue(JAVA_VERSION);
         try {
+            checkMinimumJavaVersion(javaVersion, extensionsToAdd);
             extensionOrigins = getExtensionOrigins(mainCatalog, extensionsToAdd);
         } catch (QuarkusCommandException e) {
-            final StringBuilder buf = new StringBuilder();
-            buf.append(ERROR_ICON).append(' ').append(e.getLocalizedMessage());
-            invocation.log().info(buf.toString());
+            invocation.log().error(e.getLocalizedMessage());
             return QuarkusCommandOutcome.failure();
         }
 
@@ -244,4 +234,24 @@ private static void addOrigins(final List<ExtensionOrigins> extOrigins, Extensio
             extOrigins.add(eoBuilder.build());
         }
     }
+
+    private void checkMinimumJavaVersion(String javaVersionString, List<Extension> extensions) throws QuarkusCommandException {
+        final List<Extension> incompatibleExtensions = new ArrayList<>();
+        final int javaVersion = javaVersionString == null ? CreateProjectHelper.DEFAULT_JAVA_VERSION
+                : Integer.parseInt(javaVersionString);
+        for (Extension extension : extensions) {
+            Integer extMinJavaVersion = getMinimumJavaVersion(extension);
+            if (extMinJavaVersion != null
+                    && javaVersion < extMinJavaVersion) {
+                incompatibleExtensions.add(extension);
+            }
+        }
+        if (!incompatibleExtensions.isEmpty()) {
+            final String list = incompatibleExtensions.stream()
+                    .map(e -> String.format("- %s (min: %s)", e.managementKey(), getMinimumJavaVersion(e)))
+                    .collect(Collectors.joining("\n  "));
+            throw new QuarkusCommandException(String
+                    .format("Some extensions are not compatible with the selected Java version (%s):\n %s", javaVersion, list));
+        }
+    }
 }

independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/ExtensionProcessor.java

@@ -50,6 +50,10 @@ public static String getGuide(Extension extension) {
         return getMetadataValue(extension, MD_GUIDE).asString();
     }
 
+    public static Integer getMinimumJavaVersion(Extension extension) {
+        return getMetadataValue(extension, MD_MINIMUM_JAVA_VERSION).asInteger();
+    }
+
     public static List<String> getCategories(Extension extension) {
         return getMetadataValue(extension, MD_CATEGORIES).asStringList();
     }
@@ -200,6 +204,10 @@ public List<String> getKeywords() {
         return getKeywords(extension);
     }
 
+    public Integer getMinimumJavaVersion() {
+        return getMinimumJavaVersion(extension);
+    }
+
     /**
      * List of strings to use for matching.
      * <br/>

independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/MetadataValue.java

@@ -38,6 +38,20 @@ public String asString() {
         return null;
     }
 
+    public Integer asInteger() {
+        if (val instanceof String) {
+            try {
+                return Integer.parseInt((String) val);
+            } catch (NumberFormatException e) {
+                return null;
+            }
+        }
+        if (val instanceof Integer) {
+            return (Integer) val;
+        }
+        return null;
+    }
+
     @SuppressWarnings("unchecked")
     public List<String> asStringList() {
         if (val instanceof String) {

independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/Extension.java

@@ -17,6 +17,8 @@ public interface Extension {
     String MD_NESTED_CODESTART_ARTIFACT = "codestart.artifact";
 
     String MD_GUIDE = "guide";
+
+    String MD_MINIMUM_JAVA_VERSION = "minimum-java-version";
     String MD_KEYWORDS = "keywords";
     String MD_UNLISTED = "unlisted";
     String MD_CATEGORIES = "categories";