feat: Auto create Quarkus run config while importing project

Fixes #1233 Signed-off-by: azerr <[email protected]>
redhat-developer · Nov 14, 2023 · f501ffa · f501ffa
1 parent 95f8798
commit f501ffa
Show file tree

Hide file tree

Showing 31 changed files with 688 additions and 107 deletions.
diff --git a/src/main/java/com/redhat/devtools/intellij/lsp4ij/LanguageServiceAccessor.java b/src/main/java/com/redhat/devtools/intellij/lsp4ij/LanguageServiceAccessor.java
@@ -13,7 +13,6 @@
 import com.intellij.lang.Language;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ReadAction;
-import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -41,7 +40,7 @@ public class LanguageServiceAccessor {
     private final Project project;
 
     public static LanguageServiceAccessor getInstance(Project project) {
-        return ServiceManager.getService(project, LanguageServiceAccessor.class);
+        return project.getService(LanguageServiceAccessor.class);
     }
 
     private LanguageServiceAccessor(Project project) {

diff --git a/...in/java/com/redhat/devtools/intellij/lsp4ij/lifecycle/LanguageServerLifecycleManager.java b/...in/java/com/redhat/devtools/intellij/lsp4ij/lifecycle/LanguageServerLifecycleManager.java
@@ -13,7 +13,6 @@
  *******************************************************************************/
 package com.redhat.devtools.intellij.lsp4ij.lifecycle;
 
-import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.project.Project;
 import com.redhat.devtools.intellij.lsp4ij.LanguageServerWrapper;
 import org.eclipse.lsp4j.jsonrpc.MessageConsumer;
@@ -30,7 +29,7 @@
 public class LanguageServerLifecycleManager {
 
     public static LanguageServerLifecycleManager getInstance(Project project) {
-        return ServiceManager.getService(project, LanguageServerLifecycleManager.class);
+        return project.getService(LanguageServerLifecycleManager.class);
     }
 
     private static final Logger LOGGER = LoggerFactory.getLogger(LanguageServerLifecycleManager.class);//$NON-NLS-1$

diff --git a/...ava/com/redhat/devtools/intellij/lsp4mp4ij/classpath/ClasspathResourceChangedManager.java b/...ava/com/redhat/devtools/intellij/lsp4mp4ij/classpath/ClasspathResourceChangedManager.java
@@ -16,7 +16,6 @@
 import com.intellij.ProjectTopics;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar;
@@ -27,8 +26,6 @@
 import com.intellij.util.messages.MessageBusConnection;
 import com.intellij.util.messages.Topic;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Set;
 
 /**
@@ -57,7 +54,7 @@ public class ClasspathResourceChangedManager implements Disposable {
 	private final ClasspathResourceChangedListener listener;
 
 	public static ClasspathResourceChangedManager getInstance(Project project) {
-		return ServiceManager.getService(project, ClasspathResourceChangedManager.class);
+		return project.getService(ClasspathResourceChangedManager.class);
 	}
 
 	public interface Listener {

diff --git a/...om/redhat/devtools/intellij/lsp4mp4ij/psi/core/project/PsiMicroProfileProjectManager.java b/...om/redhat/devtools/intellij/lsp4mp4ij/psi/core/project/PsiMicroProfileProjectManager.java
@@ -11,7 +11,6 @@
 
 import com.intellij.ProjectTopics;
 import com.intellij.openapi.Disposable;
-import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.project.ModuleListener;
@@ -38,7 +37,7 @@ public final class PsiMicroProfileProjectManager implements Disposable {
 	private static final String JAVA_FILE_EXTENSION = "java";
 
 	public static PsiMicroProfileProjectManager getInstance(Project project) {
-		return ServiceManager.getService(project, PsiMicroProfileProjectManager.class);
+		return project.getService(PsiMicroProfileProjectManager.class);
 	}
 
 	private final MessageBusConnection connection;

diff --git a/src/main/java/com/redhat/devtools/intellij/quarkus/QuarkusConstants.java b/src/main/java/com/redhat/devtools/intellij/quarkus/QuarkusConstants.java
@@ -13,10 +13,10 @@
 import com.intellij.openapi.util.Key;
 import com.redhat.devtools.intellij.quarkus.projectWizard.QuarkusExtensionsModel;
 import com.redhat.devtools.intellij.quarkus.projectWizard.QuarkusModel;
-import com.redhat.devtools.intellij.quarkus.tool.ToolDelegate;
+import com.redhat.devtools.intellij.quarkus.buildtool.BuildToolDelegate;
 
 public class QuarkusConstants {
-    public final static Key<ToolDelegate> WIZARD_TOOL_KEY = Key.create(QuarkusConstants.class.getPackage().getName() + ".tool");
+    public final static Key<BuildToolDelegate> WIZARD_TOOL_KEY = Key.create(QuarkusConstants.class.getPackage().getName() + ".tool");
     public final static Key<Boolean> WIZARD_EXAMPLE_KEY = Key.create(QuarkusConstants.class.getPackage().getName() + ".example");
     public final static Key<String> WIZARD_GROUPID_KEY = Key.create(QuarkusConstants.class.getPackage().getName() + ".groupId");
     public final static Key<String> WIZARD_ARTIFACTID_KEY = Key.create(QuarkusConstants.class.getPackage().getName() + ".artifactId");

diff --git a/src/main/java/com/redhat/devtools/intellij/quarkus/QuarkusDeploymentSupport.java b/src/main/java/com/redhat/devtools/intellij/quarkus/QuarkusDeploymentSupport.java
@@ -13,7 +13,6 @@
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.WriteAction;
-import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.progress.ProcessCanceledException;
@@ -33,8 +32,8 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.messages.MessageBusConnection;
 import com.redhat.devtools.intellij.lsp4mp4ij.classpath.ClasspathResourceChangedManager;
+import com.redhat.devtools.intellij.quarkus.buildtool.BuildToolDelegate;
 import com.redhat.devtools.intellij.quarkus.search.QuarkusModuleComponent;
-import com.redhat.devtools.intellij.quarkus.tool.ToolDelegate;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -60,7 +59,7 @@ public class QuarkusDeploymentSupport implements ClasspathResourceChangedManager
     private final Project project;
 
     public static QuarkusDeploymentSupport getInstance(Project project) {
-        return ServiceManager.getService(project, QuarkusDeploymentSupport.class);
+        return project.getService(QuarkusDeploymentSupport.class);
     }
 
     public QuarkusDeploymentSupport(Project project) {
@@ -94,7 +93,7 @@ public static void updateClasspathWithQuarkusDeployment(Module module, ProgressI
             return;
         LOGGER.info("Ensuring library to " + module.getName());
         long start = System.currentTimeMillis();
-        ToolDelegate toolDelegate = ToolDelegate.getDelegate(module);
+        BuildToolDelegate toolDelegate = BuildToolDelegate.getDelegate(module);
         if (toolDelegate != null) {
             LOGGER.info("Tool delegate found for " + module.getName());
             if (isQuarkusModule(module)) {
@@ -190,11 +189,11 @@ private static void addLibrary(ModifiableRootModel model, List<VirtualFile>[] qu
         LibraryEx.ModifiableModelEx libraryModel = library.getModifiableModel();
 
         // Add quarkus deployment dependencies binaries
-        for (VirtualFile rootFile : quarkusDeploymentDependencies[ToolDelegate.BINARY]) {
+        for (VirtualFile rootFile : quarkusDeploymentDependencies[BuildToolDelegate.BINARY]) {
             libraryModel.addRoot(rootFile, OrderRootType.CLASSES);
         }
         // Add quarkus deployment dependencies sources
-        for (VirtualFile rootFile : quarkusDeploymentDependencies[ToolDelegate.SOURCES]) {
+        for (VirtualFile rootFile : quarkusDeploymentDependencies[BuildToolDelegate.SOURCES]) {
             libraryModel.addRoot(rootFile, OrderRootType.SOURCES);
         }
 
@@ -235,7 +234,7 @@ private static boolean isQuarkusDeploymentLibrary(@NotNull LibraryOrderEntry lib
     private static boolean isQuarkusExtensionWithDeploymentArtifact(@Nullable Library library) {
         if (library != null) {
             for (VirtualFile vFile : library.getFiles(OrderRootType.CLASSES)) {
-                if (vFile.isDirectory() && ToolDelegate.hasExtensionProperties(VfsUtilCore.virtualToIoFile(vFile))) {
+                if (vFile.isDirectory() && BuildToolDelegate.hasExtensionProperties(VfsUtilCore.virtualToIoFile(vFile))) {
                     return true;
                 }
             }

diff --git a/src/main/java/com/redhat/devtools/intellij/quarkus/QuarkusModuleUtil.java b/src/main/java/com/redhat/devtools/intellij/quarkus/QuarkusModuleUtil.java
@@ -11,42 +11,25 @@
 package com.redhat.devtools.intellij.quarkus;
 
 import com.intellij.facet.FacetManager;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.WriteAction;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.module.ModuleUtilCore;
-import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.roots.DependencyScope;
 import com.intellij.openapi.roots.LibraryOrderEntry;
-import com.intellij.openapi.roots.ModifiableRootModel;
 import com.intellij.openapi.roots.ModuleRootManager;
-import com.intellij.openapi.roots.ModuleRootModificationUtil;
 import com.intellij.openapi.roots.OrderEnumerator;
-import com.intellij.openapi.roots.OrderRootType;
 import com.intellij.openapi.roots.RootPolicy;
-import com.intellij.openapi.roots.impl.OrderEntryUtil;
-import com.intellij.openapi.roots.impl.libraries.LibraryEx;
-import com.intellij.openapi.roots.libraries.Library;
-import com.intellij.openapi.roots.libraries.LibraryTable;
 import com.intellij.openapi.vfs.VfsUtil;
-import com.intellij.openapi.vfs.VfsUtilCore;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.redhat.devtools.intellij.lsp4mp4ij.psi.internal.core.ls.PsiUtilsLSImpl;
 import com.redhat.devtools.intellij.quarkus.facet.QuarkusFacet;
-import com.redhat.devtools.intellij.quarkus.search.QuarkusModuleComponent;
-import com.redhat.devtools.intellij.quarkus.tool.ToolDelegate;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
-import java.text.MessageFormat;
 import java.util.Arrays;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Predicate;

diff --git a/src/main/java/com/redhat/devtools/intellij/quarkus/QuarkusPostStartupActivity.java b/src/main/java/com/redhat/devtools/intellij/quarkus/QuarkusPostStartupActivity.java
@@ -15,11 +15,13 @@
 import com.intellij.openapi.startup.StartupActivity;
 import com.redhat.devtools.intellij.lsp4mp4ij.classpath.ClasspathResourceChangedManager;
 import com.redhat.devtools.intellij.lsp4mp4ij.psi.core.project.PsiMicroProfileProjectManager;
+import com.redhat.devtools.intellij.quarkus.run.QuarkusRunConfigurationManager;
 import org.jetbrains.annotations.NotNull;
 
 public class QuarkusPostStartupActivity implements StartupActivity, DumbAware {
     @Override
     public void runActivity(@NotNull Project project) {
+        QuarkusRunConfigurationManager.getInstance(project);
         ClasspathResourceChangedManager.getInstance(project);
         // Force the instantiation of the manager to be sure that classpath listener
         // are registered before QuarkusLanguageClient classpath listener

diff --git a/src/main/java/com/redhat/devtools/intellij/quarkus/QuarkusProjectService.java b/src/main/java/com/redhat/devtools/intellij/quarkus/QuarkusProjectService.java
@@ -13,7 +13,6 @@
 import com.intellij.json.JsonFileType;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.progress.EmptyProgressIndicator;
 import com.intellij.openapi.progress.ProcessCanceledException;
@@ -46,7 +45,7 @@ public class QuarkusProjectService implements ClasspathResourceChangedManager.Li
     private final Map<Module, MutablePair<VirtualFile, Boolean>> schemas = new ConcurrentHashMap<>();
 
     public static QuarkusProjectService getInstance(Project project) {
-        return ServiceManager.getService(project, QuarkusProjectService.class);
+        return project.getService(QuarkusProjectService.class);
     }
 
     private final MessageBusConnection connection;

diff --git a/...s/intellij/quarkus/tool/ToolDelegate.java → .../quarkus/buildtool/BuildToolDelegate.java b/...s/intellij/quarkus/tool/ToolDelegate.java → .../quarkus/buildtool/BuildToolDelegate.java
@@ -8,15 +8,17 @@
  * Contributors:
  * Red Hat, Inc. - initial API and implementation
  ******************************************************************************/
-package com.redhat.devtools.intellij.quarkus.tool;
+package com.redhat.devtools.intellij.quarkus.buildtool;
 
 import com.intellij.execution.RunnerAndConfigurationSettings;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.progress.ProgressIndicator;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.JarFileSystem;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.util.messages.MessageBusConnection;
 import com.redhat.devtools.intellij.quarkus.run.QuarkusRunConfiguration;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.idea.maven.model.MavenId;
@@ -36,7 +38,7 @@
 import static com.redhat.devtools.intellij.quarkus.QuarkusConstants.QUARKUS_DEPLOYMENT_PROPERTY_NAME;
 import static com.redhat.devtools.intellij.quarkus.QuarkusConstants.QUARKUS_EXTENSION_PROPERTIES;
 
-public interface ToolDelegate  {
+public interface BuildToolDelegate {
 
     static boolean shouldResolveArtifactTransitively(MavenId deploymentId) {
         // The kubernetes support is only available if quarkus-kubernetes artifact is
@@ -88,8 +90,8 @@ static String getQuarkusExtension(Reader r) throws IOException {
         return p.getProperty(QUARKUS_DEPLOYMENT_PROPERTY_NAME);
     }
 
-    public static ToolDelegate getDelegate(Module module) {
-        for(ToolDelegate toolDelegate : getDelegates()) {
+    public static BuildToolDelegate getDelegate(Module module) {
+        for(BuildToolDelegate toolDelegate : getDelegates()) {
             if (toolDelegate.isValid(module)) {
                 return toolDelegate;
             }
@@ -161,7 +163,7 @@ default VirtualFile getJarFile(File file) {
         return virtualFile != null? JarFileSystem.getInstance().getJarRootForLocalFile(virtualFile):null;
     }
 
-    static final ExtensionPointName<ToolDelegate> EP_NAME = ExtensionPointName.create("com.redhat.devtools.intellij.quarkus.toolDelegate");
+    static final ExtensionPointName<BuildToolDelegate> EP_NAME = ExtensionPointName.create("com.redhat.devtools.intellij.quarkus.toolDelegate");
 
     @NotNull
     static List<VirtualFile>[] initDeploymentFiles() {
@@ -171,11 +173,20 @@ static List<VirtualFile>[] initDeploymentFiles() {
         return result;
     }
 
-    public static ToolDelegate[] getDelegates() {
-        ToolDelegate[] delegates = EP_NAME.getExtensions();
+    public static BuildToolDelegate[] getDelegates() {
+        BuildToolDelegate[] delegates = EP_NAME.getExtensions();
         Arrays.sort(delegates, (a,b) -> a.getOrder() - b.getOrder());
         return delegates;
     }
 
     RunnerAndConfigurationSettings getConfigurationDelegate(Module module, QuarkusRunConfiguration configuration);
+
+    /**
+     * Add project import listener.
+     *
+     * @param project the project.
+     * @param connection the project connection used to subscribe maven, gradle listener which tracks project import.
+     * @param listener the project import listener.
+     */
+    void addProjectImportListener(@NotNull Project project,  @NotNull MessageBusConnection connection, @NotNull ProjectImportListener listener);
 }
diff --git a/src/main/java/com/redhat/devtools/intellij/quarkus/buildtool/ProjectImportListener.java b/src/main/java/com/redhat/devtools/intellij/quarkus/buildtool/ProjectImportListener.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2023 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v2.0 which accompanies this distribution,
+ * and is available at https://www.eclipse.org/legal/epl-v20.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package com.redhat.devtools.intellij.quarkus.buildtool;
+
+import com.intellij.openapi.module.Module;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+/**
+ * Project import listener API.
+ *
+ */
+public interface ProjectImportListener {
+
+    /**
+     * On import finished.
+     *
+     * @param modules imported modules.
+     */
+    void importFinished(@NotNull List<Module> modules);
+
+}