Skip to content

Commit dcd5bea

Browse files
committed
chore: compatibility with 2024.3
Signed-off-by: azerr <[email protected]>
1 parent 9fb002d commit dcd5bea

File tree

5 files changed

+14
-12
lines changed

5 files changed

+14
-12
lines changed

src/main/java/com/redhat/devtools/intellij/quarkus/QuarkusPostStartupActivity.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import com.intellij.openapi.project.DumbAware;
1414
import com.intellij.openapi.project.Project;
1515
import com.intellij.openapi.startup.ProjectActivity;
16-
import com.intellij.openapi.startup.StartupActivity;
1716
import com.redhat.devtools.intellij.lsp4mp4ij.classpath.ClasspathResourceChangedManager;
1817
import com.redhat.devtools.intellij.lsp4mp4ij.psi.core.project.PsiMicroProfileProjectManager;
1918
import com.redhat.devtools.intellij.quarkus.run.QuarkusRunConfigurationManager;
@@ -36,7 +35,6 @@ public Object execute(@NotNull Project project, @NotNull Continuation<? super Un
3635
// - and after the QuarkusLanguageClient throws an event to trigger Java validation.
3736
// As java validation requires the properties cache, it needs that cache must be updated before.
3837
PsiMicroProfileProjectManager.getInstance(project);
39-
QuarkusProjectService.getInstance(project);
4038
return null;
4139
}
4240
}

src/main/java/com/redhat/devtools/intellij/quarkus/QuarkusProjectService.java renamed to src/main/java/com/redhat/devtools/intellij/quarkus/json/QuarkusJsonSchemaProjectService.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Contributors:
99
* Red Hat, Inc. - initial API and implementation
1010
******************************************************************************/
11-
package com.redhat.devtools.intellij.quarkus;
11+
package com.redhat.devtools.intellij.quarkus.json;
1212

1313
import com.intellij.json.JsonFileType;
1414
import com.intellij.openapi.Disposable;
@@ -25,6 +25,7 @@
2525
import com.redhat.devtools.intellij.lsp4mp4ij.classpath.ClasspathResourceChangedManager;
2626
import com.redhat.devtools.intellij.lsp4mp4ij.psi.core.PropertiesManager;
2727
import com.redhat.devtools.intellij.lsp4mp4ij.psi.internal.core.ls.PsiUtilsLSImpl;
28+
import com.redhat.devtools.intellij.quarkus.QuarkusPluginDisposable;
2829
import org.apache.commons.lang3.tuple.MutablePair;
2930
import org.eclipse.lsp4mp.commons.ClasspathKind;
3031
import org.eclipse.lsp4mp.commons.DocumentFormat;
@@ -40,23 +41,22 @@
4041
import java.util.Set;
4142
import java.util.concurrent.ConcurrentHashMap;
4243

43-
public class QuarkusProjectService implements ClasspathResourceChangedManager.Listener, Disposable {
44-
private static final Logger LOGGER = LoggerFactory.getLogger(QuarkusProjectService.class);
44+
public class QuarkusJsonSchemaProjectService implements ClasspathResourceChangedManager.Listener, Disposable {
45+
private static final Logger LOGGER = LoggerFactory.getLogger(QuarkusJsonSchemaProjectService.class);
4546

4647
private final Map<Module, MutablePair<VirtualFile, Boolean>> schemas = new ConcurrentHashMap<>();
4748

48-
public static QuarkusProjectService getInstance(@NotNull Project project) {
49-
return project.getService(QuarkusProjectService.class);
49+
public static QuarkusJsonSchemaProjectService getInstance(@NotNull Project project) {
50+
return project.getService(QuarkusJsonSchemaProjectService.class);
5051
}
5152

5253
private final MessageBusConnection connection;
5354

54-
public QuarkusProjectService(Project project) {
55+
public QuarkusJsonSchemaProjectService(Project project) {
5556
connection = project.getMessageBus().connect(QuarkusPluginDisposable.getInstance(project));
5657
connection.subscribe(ClasspathResourceChangedManager.TOPIC, this);
5758
}
5859

59-
6060
public VirtualFile getSchema(Module module) {
6161
var schemaEntry = schemas.get(module);
6262
if (schemaEntry == null || !schemaEntry.getRight()) {

src/main/java/com/redhat/devtools/intellij/quarkus/json/QuarkusJsonSchemaProvider.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import com.jetbrains.jsonSchema.extension.SchemaType;
1717
import com.redhat.devtools.lsp4ij.LSPIJUtils;
1818
import com.redhat.devtools.intellij.quarkus.QuarkusModuleUtil;
19-
import com.redhat.devtools.intellij.quarkus.QuarkusProjectService;
2019
import org.jetbrains.annotations.NotNull;
2120
import org.jetbrains.annotations.Nullable;
2221

@@ -46,7 +45,7 @@ public String getName() {
4645
@Nullable
4746
@Override
4847
public VirtualFile getSchemaFile() {
49-
return QuarkusProjectService.getInstance(module.getProject()).getSchema(module);
48+
return QuarkusJsonSchemaProjectService.getInstance(module.getProject()).getSchema(module);
5049
}
5150

5251
@NotNull

src/main/resources/META-INF/plugin-json.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
<idea-plugin>
2+
3+
<extensions defaultExtensionNs="com.intellij">
4+
<projectService
5+
serviceImplementation="com.redhat.devtools.intellij.quarkus.json.QuarkusJsonSchemaProjectService"/>
6+
</extensions>
7+
28
<extensions defaultExtensionNs="JavaScript.JsonSchema">
39
<ProviderFactory implementation="com.redhat.devtools.intellij.quarkus.json.QuarkusSchemasProviderFactory"/>
410
</extensions>

src/main/resources/META-INF/plugin.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,6 @@
368368

369369
<properties.implicitPropertyUsageProvider
370370
implementation="com.redhat.devtools.intellij.quarkus.lang.QuarkusImplicitPropertyUsageProvider"/>
371-
<projectService serviceImplementation="com.redhat.devtools.intellij.quarkus.QuarkusProjectService"/>
372371
<projectService
373372
serviceImplementation="com.redhat.devtools.intellij.lsp4mp4ij.classpath.ClasspathResourceChangedManager"/>
374373
<projectService

0 commit comments

Comments
 (0)