chore: compatibility with 2024.3

Signed-off-by: azerr <[email protected]>
redhat-developer · Sep 16, 2024 · fe28668 · fe28668
1 parent 9fb002d
commit fe28668
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 16 deletions.
diff --git a/src/main/java/com/redhat/devtools/intellij/quarkus/QuarkusPostStartupActivity.java b/src/main/java/com/redhat/devtools/intellij/quarkus/QuarkusPostStartupActivity.java
@@ -13,7 +13,6 @@
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.startup.ProjectActivity;
-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;
@@ -36,7 +35,6 @@ public Object execute(@NotNull Project project, @NotNull Continuation<? super Un
         // - and after the QuarkusLanguageClient throws an event to trigger Java validation.
         // As java validation requires the properties cache, it needs that cache must be updated before.
         PsiMicroProfileProjectManager.getInstance(project);
-        QuarkusProjectService.getInstance(project);
         return null;
     }
 }
diff --git a/...tellij/quarkus/QuarkusProjectService.java → ...json/QuarkusJsonSchemaProjectService.java b/...tellij/quarkus/QuarkusProjectService.java → ...json/QuarkusJsonSchemaProjectService.java
@@ -8,7 +8,7 @@
  * Contributors:
  * Red Hat, Inc. - initial API and implementation
  ******************************************************************************/
-package com.redhat.devtools.intellij.quarkus;
+package com.redhat.devtools.intellij.quarkus.json;
 
 import com.intellij.json.JsonFileType;
 import com.intellij.openapi.Disposable;
@@ -25,6 +25,7 @@
 import com.redhat.devtools.intellij.lsp4mp4ij.classpath.ClasspathResourceChangedManager;
 import com.redhat.devtools.intellij.lsp4mp4ij.psi.core.PropertiesManager;
 import com.redhat.devtools.intellij.lsp4mp4ij.psi.internal.core.ls.PsiUtilsLSImpl;
+import com.redhat.devtools.intellij.quarkus.QuarkusPluginDisposable;
 import org.apache.commons.lang3.tuple.MutablePair;
 import org.eclipse.lsp4mp.commons.ClasspathKind;
 import org.eclipse.lsp4mp.commons.DocumentFormat;
@@ -40,23 +41,22 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-public class QuarkusProjectService implements ClasspathResourceChangedManager.Listener, Disposable {
-    private static final Logger LOGGER = LoggerFactory.getLogger(QuarkusProjectService.class);
+public class QuarkusJsonSchemaProjectService implements ClasspathResourceChangedManager.Listener, Disposable {
+    private static final Logger LOGGER = LoggerFactory.getLogger(QuarkusJsonSchemaProjectService.class);
 
     private final Map<Module, MutablePair<VirtualFile, Boolean>> schemas = new ConcurrentHashMap<>();
 
-    public static QuarkusProjectService getInstance(@NotNull Project project) {
-        return project.getService(QuarkusProjectService.class);
+    public static QuarkusJsonSchemaProjectService getInstance(@NotNull Project project) {
+        return project.getService(QuarkusJsonSchemaProjectService.class);
     }
 
     private final MessageBusConnection connection;
 
-    public QuarkusProjectService(Project project) {
+    public QuarkusJsonSchemaProjectService(Project project) {
         connection = project.getMessageBus().connect(QuarkusPluginDisposable.getInstance(project));
         connection.subscribe(ClasspathResourceChangedManager.TOPIC, this);
     }
 
-
     public VirtualFile getSchema(Module module) {
         var schemaEntry = schemas.get(module);
         if (schemaEntry == null || !schemaEntry.getRight()) {

diff --git a/src/main/java/com/redhat/devtools/intellij/quarkus/json/QuarkusJsonSchemaProvider.java b/src/main/java/com/redhat/devtools/intellij/quarkus/json/QuarkusJsonSchemaProvider.java
@@ -16,7 +16,6 @@
 import com.jetbrains.jsonSchema.extension.SchemaType;
 import com.redhat.devtools.lsp4ij.LSPIJUtils;
 import com.redhat.devtools.intellij.quarkus.QuarkusModuleUtil;
-import com.redhat.devtools.intellij.quarkus.QuarkusProjectService;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -46,7 +45,7 @@ public String getName() {
     @Nullable
     @Override
     public VirtualFile getSchemaFile() {
-        return QuarkusProjectService.getInstance(module.getProject()).getSchema(module);
+        return QuarkusJsonSchemaProjectService.getInstance(module.getProject()).getSchema(module);
     }
 
     @NotNull

diff --git a/src/main/resources/META-INF/plugin-json.xml b/src/main/resources/META-INF/plugin-json.xml
@@ -1,4 +1,10 @@
 <idea-plugin>
+
+    <extensions defaultExtensionNs="com.intellij">
+        <projectService
+                serviceImplementation="com.redhat.devtools.intellij.quarkus.json.QuarkusJsonSchemaProjectService"/>
+    </extensions>
+
     <extensions defaultExtensionNs="JavaScript.JsonSchema">
         <ProviderFactory implementation="com.redhat.devtools.intellij.quarkus.json.QuarkusSchemasProviderFactory"/>
     </extensions>

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -368,7 +368,6 @@
 
         <properties.implicitPropertyUsageProvider
                 implementation="com.redhat.devtools.intellij.quarkus.lang.QuarkusImplicitPropertyUsageProvider"/>
-        <projectService serviceImplementation="com.redhat.devtools.intellij.quarkus.QuarkusProjectService"/>
         <projectService
                 serviceImplementation="com.redhat.devtools.intellij.lsp4mp4ij.classpath.ClasspathResourceChangedManager"/>
         <projectService

diff --git a/...a/com/redhat/devtools/intellij/quarkus/completion/MavenApplicationYamlCompletionTest.java b/...a/com/redhat/devtools/intellij/quarkus/completion/MavenApplicationYamlCompletionTest.java
@@ -14,7 +14,7 @@
 import com.intellij.testFramework.fixtures.CodeInsightTestFixture;
 import com.intellij.util.ui.UIUtil;
 import com.redhat.devtools.intellij.MavenModuleImportingTestCase;
-import com.redhat.devtools.intellij.quarkus.QuarkusProjectService;
+import com.redhat.devtools.intellij.quarkus.json.QuarkusJsonSchemaProjectService;
 import org.jetbrains.yaml.schema.YamlJsonSchemaHighlightingInspection;
 import org.junit.Test;
 
@@ -36,7 +36,7 @@ public void testApplicationYamlFile() throws Exception {
 		Module module = createMavenModule(new File("projects/maven/hibernate-orm-resteasy-yaml"));
 		((CodeInsightTestFixture)myTestFixture).setTestDataPath(ModuleUtilCore.getModuleDirPath(module));
 		((CodeInsightTestFixture)myTestFixture).configureByFile("src/main/resources/application.yaml");
-		QuarkusProjectService.getInstance(module.getProject()).getSchema(module);
+		QuarkusJsonSchemaProjectService.getInstance(module.getProject()).getSchema(module);
 		UIUtil.dispatchAllInvocationEvents();
 		((CodeInsightTestFixture)myTestFixture).checkHighlighting();
 	}

diff --git a/...est/java/com/redhat/devtools/intellij/quarkus/projectWizard/QuarkusModelRegistryTest.java b/...est/java/com/redhat/devtools/intellij/quarkus/projectWizard/QuarkusModelRegistryTest.java
@@ -18,7 +18,7 @@
 import com.intellij.testFramework.fixtures.TestFixtureBuilder;
 import com.redhat.devtools.intellij.lsp4mp4ij.classpath.ClasspathResourceChangedManager;
 import com.redhat.devtools.intellij.lsp4mp4ij.psi.core.project.PsiMicroProfileProjectManager;
-import com.redhat.devtools.intellij.quarkus.QuarkusProjectService;
+import com.redhat.devtools.intellij.quarkus.json.QuarkusJsonSchemaProjectService;
 import org.jetbrains.annotations.NotNull;
 import org.junit.*;
 import org.junit.rules.TemporaryFolder;
@@ -57,7 +57,7 @@ public static void init() throws Exception {
 
     @AfterClass
     public static void tearDown() throws Exception {
-        QuarkusProjectService.getInstance(myFixture.getProject()).dispose();
+        QuarkusJsonSchemaProjectService.getInstance(myFixture.getProject()).dispose();
         PsiMicroProfileProjectManager.getInstance(myFixture.getProject()).dispose();
         ClasspathResourceChangedManager.getInstance(myFixture.getProject()).dispose();
         myFixture.tearDown();