From 9c367fd7381f17f7cd037f5d00c2d623749c8dce Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Fri, 25 Oct 2024 21:34:14 +0200 Subject: [PATCH] cleanup --- .../BootJavaCompletionEngineConfigurer.java | 2 +- .../boot/app/BootLanguageServerBootApp.java | 4 ++-- .../ConditionalOnBeanDefinitionProvider.java | 2 +- ...ditionalOnResourceCompletionProcessor.java | 2 +- ...nditionalOnResourceDefinitionProvider.java | 21 +------------------ .../test/ConditionalOnBeanCompletionTest.java | 6 +----- ...nditionalOnBeanDefinitionProviderTest.java | 2 +- .../ConditionalOnResourceCompletionTest.java | 2 +- ...ionalOnResourceDefinitionProviderTest.java | 3 +-- 9 files changed, 10 insertions(+), 34 deletions(-) rename headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/{beans => conditionals}/ConditionalOnBeanDefinitionProvider.java (98%) rename headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/{conditionalonresource => conditionals}/ConditionalOnResourceCompletionProcessor.java (96%) rename headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/{conditionalonresource => conditionals}/ConditionalOnResourceDefinitionProvider.java (80%) rename headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/{conditionalonbean => conditionals}/test/ConditionalOnBeanCompletionTest.java (98%) rename headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/{conditionalonbean => conditionals}/test/ConditionalOnBeanDefinitionProviderTest.java (99%) rename headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/{conditionalonresource => conditionals}/test/ConditionalOnResourceCompletionTest.java (99%) rename headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/{conditionalonresource => conditionals}/test/ConditionalOnResourceDefinitionProviderTest.java (95%) diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootJavaCompletionEngineConfigurer.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootJavaCompletionEngineConfigurer.java index a45bf11af..f01e2f9e8 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootJavaCompletionEngineConfigurer.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootJavaCompletionEngineConfigurer.java @@ -32,7 +32,7 @@ import org.springframework.ide.vscode.boot.java.beans.NamedCompletionProvider; import org.springframework.ide.vscode.boot.java.beans.ProfileCompletionProvider; import org.springframework.ide.vscode.boot.java.beans.QualifierCompletionProvider; import org.springframework.ide.vscode.boot.java.beans.ResourceCompletionProvider; -import org.springframework.ide.vscode.boot.java.conditionalonresource.ConditionalOnResourceCompletionProcessor; +import org.springframework.ide.vscode.boot.java.conditionals.ConditionalOnResourceCompletionProcessor; import org.springframework.ide.vscode.boot.java.contextconfiguration.ContextConfigurationProcessor; import org.springframework.ide.vscode.boot.java.cron.CronExpressionCompletionProvider; import org.springframework.ide.vscode.boot.java.data.DataRepositoryCompletionProcessor; diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerBootApp.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerBootApp.java index a61416f8a..82a258777 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerBootApp.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerBootApp.java @@ -49,9 +49,9 @@ import org.springframework.ide.vscode.boot.java.beans.DependsOnDefinitionProvide import org.springframework.ide.vscode.boot.java.beans.NamedDefinitionProvider; import org.springframework.ide.vscode.boot.java.beans.QualifierDefinitionProvider; import org.springframework.ide.vscode.boot.java.beans.ResourceDefinitionProvider; -import org.springframework.ide.vscode.boot.java.conditionalonresource.ConditionalOnResourceDefinitionProvider; +import org.springframework.ide.vscode.boot.java.conditionals.ConditionalOnBeanDefinitionProvider; +import org.springframework.ide.vscode.boot.java.conditionals.ConditionalOnResourceDefinitionProvider; import org.springframework.ide.vscode.boot.java.copilot.util.ResponseModifier; -import org.springframework.ide.vscode.boot.java.beans.ConditionalOnBeanDefinitionProvider; import org.springframework.ide.vscode.boot.java.data.jpa.queries.DataQueryParameterDefinitionProvider; import org.springframework.ide.vscode.boot.java.data.jpa.queries.JdtDataQuerySemanticTokensProvider; import org.springframework.ide.vscode.boot.java.handlers.BootJavaCodeActionProvider; diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ConditionalOnBeanDefinitionProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalOnBeanDefinitionProvider.java similarity index 98% rename from headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ConditionalOnBeanDefinitionProvider.java rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalOnBeanDefinitionProvider.java index 76da16f74..3e9623fc7 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ConditionalOnBeanDefinitionProvider.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalOnBeanDefinitionProvider.java @@ -8,7 +8,7 @@ * Contributors: * Broadcom - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.java.beans; +package org.springframework.ide.vscode.boot.java.conditionals; import java.util.Arrays; import java.util.Collections; diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionalonresource/ConditionalOnResourceCompletionProcessor.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalOnResourceCompletionProcessor.java similarity index 96% rename from headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionalonresource/ConditionalOnResourceCompletionProcessor.java rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalOnResourceCompletionProcessor.java index 389fa70b1..a602e789a 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionalonresource/ConditionalOnResourceCompletionProcessor.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalOnResourceCompletionProcessor.java @@ -8,7 +8,7 @@ * Contributors: * Broadcom, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.java.conditionalonresource; +package org.springframework.ide.vscode.boot.java.conditionals; import java.nio.file.Paths; import java.util.Comparator; diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionalonresource/ConditionalOnResourceDefinitionProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalOnResourceDefinitionProvider.java similarity index 80% rename from headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionalonresource/ConditionalOnResourceDefinitionProvider.java rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalOnResourceDefinitionProvider.java index 3cae2bda6..b0cd1d4b4 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionalonresource/ConditionalOnResourceDefinitionProvider.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalOnResourceDefinitionProvider.java @@ -8,44 +8,25 @@ * Contributors: * Broadcom, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.java.conditionalonresource; +package org.springframework.ide.vscode.boot.java.conditionals; -import java.nio.file.Paths; import java.util.ArrayList; import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.Optional; import org.eclipse.jdt.core.dom.ASTNode; -import org.eclipse.jdt.core.dom.Annotation; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jdt.core.dom.Expression; -import org.eclipse.jdt.core.dom.IAnnotationBinding; -import org.eclipse.jdt.core.dom.MemberValuePair; -import org.eclipse.jdt.core.dom.NormalAnnotation; -import org.eclipse.jdt.core.dom.SingleMemberAnnotation; import org.eclipse.jdt.core.dom.StringLiteral; -import org.eclipse.lsp4j.Location; import org.eclipse.lsp4j.LocationLink; import org.eclipse.lsp4j.Position; import org.eclipse.lsp4j.Range; import org.eclipse.lsp4j.TextDocumentIdentifier; import org.eclipse.lsp4j.jsonrpc.CancelChecker; -import org.eclipse.lsp4j.jsonrpc.CancelChecker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.ide.vscode.boot.java.Annotations; import org.springframework.ide.vscode.boot.java.IJavaDefinitionProvider; -import org.springframework.ide.vscode.boot.properties.BootPropertiesLanguageServerComponents; import org.springframework.ide.vscode.commons.java.IClasspathUtil; import org.springframework.ide.vscode.commons.java.IJavaProject; -import org.yaml.snakeyaml.nodes.Node; - -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableList.Builder; public class ConditionalOnResourceDefinitionProvider implements IJavaDefinitionProvider { diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionalonbean/test/ConditionalOnBeanCompletionTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalOnBeanCompletionTest.java similarity index 98% rename from headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionalonbean/test/ConditionalOnBeanCompletionTest.java rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalOnBeanCompletionTest.java index 2584af9e9..a34e6fd60 100644 --- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionalonbean/test/ConditionalOnBeanCompletionTest.java +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalOnBeanCompletionTest.java @@ -8,7 +8,7 @@ * Contributors: * Broadcom - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.java.conditionalonbean.test; +package org.springframework.ide.vscode.boot.java.conditionals.test; import static org.junit.Assert.assertEquals; @@ -22,7 +22,6 @@ import org.eclipse.lsp4j.Location; import org.eclipse.lsp4j.Position; import org.eclipse.lsp4j.Range; import org.eclipse.lsp4j.TextDocumentIdentifier; -import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -56,7 +55,6 @@ public class ConditionalOnBeanCompletionTest { private File directory; private IJavaProject project; - private Bean[] indexedBeans; private String tempJavaDocUri; private Bean bean1; private Bean bean2; @@ -73,8 +71,6 @@ public class ConditionalOnBeanCompletionTest { CompletableFuture initProject = indexer.waitOperation(); initProject.get(5, TimeUnit.SECONDS); - indexedBeans = springIndex.getBeansOfProject(project.getElementName()); - tempJavaDocUri = directory.toPath().resolve("src/main/java/org/test/TempClass.java").toUri().toString(); bean1 = new Bean("bean1", "org.example.type1", new Location(tempJavaDocUri, new Range(new Position(1,1), new Position(1, 20))), null, null, null); bean2 = new Bean("bean2", "org.example.type2", new Location(tempJavaDocUri, new Range(new Position(1,1), new Position(1, 20))), null, null, null); diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionalonbean/test/ConditionalOnBeanDefinitionProviderTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalOnBeanDefinitionProviderTest.java similarity index 99% rename from headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionalonbean/test/ConditionalOnBeanDefinitionProviderTest.java rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalOnBeanDefinitionProviderTest.java index 8fbc40148..50c37b6cd 100644 --- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionalonbean/test/ConditionalOnBeanDefinitionProviderTest.java +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalOnBeanDefinitionProviderTest.java @@ -8,7 +8,7 @@ * Contributors: * Broadcom - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.java.conditionalonbean.test; +package org.springframework.ide.vscode.boot.java.conditionals.test; import static org.junit.Assert.assertEquals; diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionalonresource/test/ConditionalOnResourceCompletionTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalOnResourceCompletionTest.java similarity index 99% rename from headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionalonresource/test/ConditionalOnResourceCompletionTest.java rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalOnResourceCompletionTest.java index 013ffa726..2d46693be 100644 --- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionalonresource/test/ConditionalOnResourceCompletionTest.java +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalOnResourceCompletionTest.java @@ -8,7 +8,7 @@ * Contributors: * Broadcom, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.java.conditionalonresource.test; +package org.springframework.ide.vscode.boot.java.conditionals.test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionalonresource/test/ConditionalOnResourceDefinitionProviderTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalOnResourceDefinitionProviderTest.java similarity index 95% rename from headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionalonresource/test/ConditionalOnResourceDefinitionProviderTest.java rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalOnResourceDefinitionProviderTest.java index 62b9f67b4..6bb2f12a3 100644 --- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionalonresource/test/ConditionalOnResourceDefinitionProviderTest.java +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalOnResourceDefinitionProviderTest.java @@ -8,7 +8,7 @@ * Contributors: * Broadcom, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.java.conditionalonresource.test; +package org.springframework.ide.vscode.boot.java.conditionals.test; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -31,7 +31,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Import; import org.springframework.ide.vscode.boot.bootiful.AdHocPropertyHarnessTestConf; import org.springframework.ide.vscode.boot.bootiful.BootLanguageServerTest; -import org.springframework.ide.vscode.boot.java.conditionalonresource.ConditionalOnResourceDefinitionProvider; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.util.text.LanguageId; import org.springframework.ide.vscode.languageserver.testharness.Editor;