Use the version of Quarkus platform recommended for the current project for recipe filtering instead of the latest version recommended by the registry

(cherry picked from commit e064d4d)

Author: aloubyansky

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

@@ -74,6 +74,13 @@ public UpdateProject rewriteDryRun(boolean rewriteDryRun) {
         return this;
     }
 
+    /**
+     * This method is not used since currently the version passed in here might not be the final target platform version
+     * but the latest recommended w/o taking into account extensions found in the current project.
+     *
+     * @param targetPlatformVersion latest recommended Quarkus platform version
+     * @return this instance
+     */
     public UpdateProject targetPlatformVersion(String targetPlatformVersion) {
         invocation.setValue(TARGET_PLATFORM_VERSION, targetPlatformVersion);
         return this;

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

@@ -71,37 +71,41 @@ public QuarkusCommandOutcome execute(QuarkusCommandInvocation invocation) throws
         }
         final ApplicationModel appModel = invocation.getValue(UpdateProject.APP_MODEL);
         final ExtensionCatalog targetCatalog = invocation.getValue(UpdateProject.TARGET_CATALOG);
-        final String targetPlatformVersion = invocation.getValue(UpdateProject.TARGET_PLATFORM_VERSION);
         final ProjectState currentState = resolveProjectState(appModel,
                 invocation.getQuarkusProject().getExtensionsCatalog());
-        final ArtifactCoords projectQuarkusPlatformBom = getProjectQuarkusPlatformBOM(currentState);
-        if (projectQuarkusPlatformBom == null) {
-            String error = "The project does not import any Quarkus platform BOM";
-
-            invocation.log().error(error);
-            return QuarkusCommandOutcome.failure(error);
+        final ArtifactCoords currentQuarkusPlatformBom = getProjectQuarkusPlatformBOM(currentState);
+        var failure = ensureQuarkusBomVersionIsNotNull(currentQuarkusPlatformBom, invocation.log());
+        if (failure != null) {
+            return failure;
         }
-        final QuarkusProject quarkusProject = invocation.getQuarkusProject();
         final ProjectState recommendedState = resolveRecommendedState(currentState, targetCatalog,
                 invocation.log());
+        final ArtifactCoords recommendedQuarkusPlatformBom = getProjectQuarkusPlatformBOM(recommendedState);
+        failure = ensureQuarkusBomVersionIsNotNull(recommendedQuarkusPlatformBom, invocation.log());
+        if (failure != null) {
+            return failure;
+        }
+
         final ProjectPlatformUpdateInfo platformUpdateInfo = resolvePlatformUpdateInfo(currentState,
                 recommendedState);
         final ProjectExtensionsUpdateInfo extensionsUpdateInfo = ProjectUpdateInfos.resolveExtensionsUpdateInfo(
                 currentState,
                 recommendedState);
         boolean shouldUpdate = logUpdates(invocation.getQuarkusProject(), currentState, recommendedState, platformUpdateInfo,
                 extensionsUpdateInfo,
-                quarkusProject.log());
+                invocation.log());
         Boolean rewrite = invocation.getValue(UpdateProject.REWRITE, null);
         boolean rewriteDryRun = invocation.getValue(UpdateProject.REWRITE_DRY_RUN, false);
         if (shouldUpdate) {
+            final QuarkusProject quarkusProject = invocation.getQuarkusProject();
             final BuildTool buildTool = quarkusProject.getExtensionManager().getBuildTool();
+            // TODO targetCatalog shouldn't be used here, since it might not be the recommended one according to the calculated recommended state
             String kotlinVersion = getMetadata(targetCatalog, "project", "properties", "kotlin-version");
             final Optional<Integer> updateJavaVersion = resolveUpdateJavaVersion(extensionsUpdateInfo, projectJavaVersion);
             QuarkusUpdates.ProjectUpdateRequest request = new QuarkusUpdates.ProjectUpdateRequest(
                     buildTool,
-                    projectQuarkusPlatformBom.getVersion(),
-                    targetPlatformVersion,
+                    currentQuarkusPlatformBom.getVersion(),
+                    recommendedQuarkusPlatformBom.getVersion(),
                     kotlinVersion,
                     updateJavaVersion,
                     extensionsUpdateInfo);
@@ -239,6 +243,15 @@ private static ArtifactCoords getProjectQuarkusPlatformBOM(ProjectState currentS
         return null;
     }
 
+    private static QuarkusCommandOutcome<Void> ensureQuarkusBomVersionIsNotNull(ArtifactCoords bomCoords, MessageWriter log) {
+        if (bomCoords == null) {
+            String error = "The project state is missing the Quarkus platform BOM";
+            log.error(error);
+            return QuarkusCommandOutcome.failure(error);
+        }
+        return null;
+    }
+
     private static boolean logUpdates(QuarkusProject project, ProjectState currentState, ProjectState recommendedState,
             ProjectPlatformUpdateInfo platformUpdateInfo,
             ProjectExtensionsUpdateInfo extensionsUpdateInfo,

independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/update/ProjectUpdateInfos.java

@@ -214,18 +214,16 @@ private static List<ExtensionCatalog> getRecommendedOrigins(List<Extension> exte
     private static void addOrigins(final List<ExtensionOrigins> extOrigins, Extension e) {
         ExtensionOrigins.Builder eoBuilder = null;
         for (ExtensionOrigin o : e.getOrigins()) {
-            if (!(o instanceof ExtensionCatalog)) {
-                continue;
-            }
-            final ExtensionCatalog c = (ExtensionCatalog) o;
-            final OriginPreference op = (OriginPreference) c.getMetadata().get("origin-preference");
-            if (op == null) {
-                continue;
-            }
-            if (eoBuilder == null) {
-                eoBuilder = ExtensionOrigins.builder(e.getArtifact().getKey());
+            if (o instanceof ExtensionCatalog c) {
+                final OriginPreference op = (OriginPreference) c.getMetadata().get("origin-preference");
+                if (op == null) {
+                    continue;
+                }
+                if (eoBuilder == null) {
+                    eoBuilder = ExtensionOrigins.builder(e.getArtifact().getKey());
+                }
+                eoBuilder.addOrigin(c, op);
             }
-            eoBuilder.addOrigin(c, op);
         }
         if (eoBuilder != null) {
             extOrigins.add(eoBuilder.build());