Skip to content

Commit 9c367fd

Browse files
martinlippertmartinlippert
committed
cleanup
1 parent 060a24c commit 9c367fd

File tree

9 files changed

+10
-34
lines changed

9 files changed

+10
-34
lines changed

‎headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootJavaCompletionEngineConfigurer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.springframework.ide.vscode.boot.java.beans.ProfileCompletionProvider;
3333
import org.springframework.ide.vscode.boot.java.beans.QualifierCompletionProvider;
3434
import org.springframework.ide.vscode.boot.java.beans.ResourceCompletionProvider;
35-
import org.springframework.ide.vscode.boot.java.conditionalonresource.ConditionalOnResourceCompletionProcessor;
35+
import org.springframework.ide.vscode.boot.java.conditionals.ConditionalOnResourceCompletionProcessor;
3636
import org.springframework.ide.vscode.boot.java.contextconfiguration.ContextConfigurationProcessor;
3737
import org.springframework.ide.vscode.boot.java.cron.CronExpressionCompletionProvider;
3838
import org.springframework.ide.vscode.boot.java.data.DataRepositoryCompletionProcessor;

‎headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerBootApp.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
import org.springframework.ide.vscode.boot.java.beans.NamedDefinitionProvider;
5050
import org.springframework.ide.vscode.boot.java.beans.QualifierDefinitionProvider;
5151
import org.springframework.ide.vscode.boot.java.beans.ResourceDefinitionProvider;
52-
import org.springframework.ide.vscode.boot.java.conditionalonresource.ConditionalOnResourceDefinitionProvider;
52+
import org.springframework.ide.vscode.boot.java.conditionals.ConditionalOnBeanDefinitionProvider;
53+
import org.springframework.ide.vscode.boot.java.conditionals.ConditionalOnResourceDefinitionProvider;
5354
import org.springframework.ide.vscode.boot.java.copilot.util.ResponseModifier;
54-
import org.springframework.ide.vscode.boot.java.beans.ConditionalOnBeanDefinitionProvider;
5555
import org.springframework.ide.vscode.boot.java.data.jpa.queries.DataQueryParameterDefinitionProvider;
5656
import org.springframework.ide.vscode.boot.java.data.jpa.queries.JdtDataQuerySemanticTokensProvider;
5757
import org.springframework.ide.vscode.boot.java.handlers.BootJavaCodeActionProvider;

‎headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ConditionalOnBeanDefinitionProvider.java‎ renamed to ‎headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalOnBeanDefinitionProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Contributors:
99
* Broadcom - initial API and implementation
1010
*******************************************************************************/
11-
package org.springframework.ide.vscode.boot.java.beans;
11+
package org.springframework.ide.vscode.boot.java.conditionals;
1212

1313
import java.util.Arrays;
1414
import java.util.Collections;

‎headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionalonresource/ConditionalOnResourceCompletionProcessor.java‎ renamed to ‎headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalOnResourceCompletionProcessor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Contributors:
99
* Broadcom, Inc. - initial API and implementation
1010
*******************************************************************************/
11-
package org.springframework.ide.vscode.boot.java.conditionalonresource;
11+
package org.springframework.ide.vscode.boot.java.conditionals;
1212

1313
import java.nio.file.Paths;
1414
import java.util.Comparator;

‎headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionalonresource/ConditionalOnResourceDefinitionProvider.java‎ renamed to ‎headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalOnResourceDefinitionProvider.java‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,44 +8,25 @@
88
* Contributors:
99
* Broadcom, Inc. - initial API and implementation
1010
*******************************************************************************/
11-
package org.springframework.ide.vscode.boot.java.conditionalonresource;
11+
package org.springframework.ide.vscode.boot.java.conditionals;
1212

13-
import java.nio.file.Paths;
1413
import java.util.ArrayList;
1514
import java.util.Collections;
16-
import java.util.Comparator;
17-
import java.util.HashMap;
1815
import java.util.List;
19-
import java.util.Map;
20-
import java.util.Optional;
2116

2217
import org.eclipse.jdt.core.dom.ASTNode;
23-
import org.eclipse.jdt.core.dom.Annotation;
2418
import org.eclipse.jdt.core.dom.CompilationUnit;
25-
import org.eclipse.jdt.core.dom.Expression;
26-
import org.eclipse.jdt.core.dom.IAnnotationBinding;
27-
import org.eclipse.jdt.core.dom.MemberValuePair;
28-
import org.eclipse.jdt.core.dom.NormalAnnotation;
29-
import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
3019
import org.eclipse.jdt.core.dom.StringLiteral;
31-
import org.eclipse.lsp4j.Location;
3220
import org.eclipse.lsp4j.LocationLink;
3321
import org.eclipse.lsp4j.Position;
3422
import org.eclipse.lsp4j.Range;
3523
import org.eclipse.lsp4j.TextDocumentIdentifier;
3624
import org.eclipse.lsp4j.jsonrpc.CancelChecker;
37-
import org.eclipse.lsp4j.jsonrpc.CancelChecker;
3825
import org.slf4j.Logger;
3926
import org.slf4j.LoggerFactory;
40-
import org.springframework.ide.vscode.boot.java.Annotations;
4127
import org.springframework.ide.vscode.boot.java.IJavaDefinitionProvider;
42-
import org.springframework.ide.vscode.boot.properties.BootPropertiesLanguageServerComponents;
4328
import org.springframework.ide.vscode.commons.java.IClasspathUtil;
4429
import org.springframework.ide.vscode.commons.java.IJavaProject;
45-
import org.yaml.snakeyaml.nodes.Node;
46-
47-
import com.google.common.collect.ImmutableList;
48-
import com.google.common.collect.ImmutableList.Builder;
4930

5031
public class ConditionalOnResourceDefinitionProvider implements IJavaDefinitionProvider {
5132

‎headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionalonbean/test/ConditionalOnBeanCompletionTest.java‎ renamed to ‎headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalOnBeanCompletionTest.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Contributors:
99
* Broadcom - initial API and implementation
1010
*******************************************************************************/
11-
package org.springframework.ide.vscode.boot.java.conditionalonbean.test;
11+
package org.springframework.ide.vscode.boot.java.conditionals.test;
1212

1313
import static org.junit.Assert.assertEquals;
1414

@@ -22,7 +22,6 @@
2222
import org.eclipse.lsp4j.Position;
2323
import org.eclipse.lsp4j.Range;
2424
import org.eclipse.lsp4j.TextDocumentIdentifier;
25-
import org.junit.jupiter.api.AfterEach;
2625
import org.junit.jupiter.api.BeforeEach;
2726
import org.junit.jupiter.api.Test;
2827
import org.junit.jupiter.api.extension.ExtendWith;
@@ -56,7 +55,6 @@ public class ConditionalOnBeanCompletionTest {
5655

5756
private File directory;
5857
private IJavaProject project;
59-
private Bean[] indexedBeans;
6058
private String tempJavaDocUri;
6159
private Bean bean1;
6260
private Bean bean2;
@@ -73,8 +71,6 @@ public void setup() throws Exception {
7371
CompletableFuture<Void> initProject = indexer.waitOperation();
7472
initProject.get(5, TimeUnit.SECONDS);
7573

76-
indexedBeans = springIndex.getBeansOfProject(project.getElementName());
77-
7874
tempJavaDocUri = directory.toPath().resolve("src/main/java/org/test/TempClass.java").toUri().toString();
7975
bean1 = new Bean("bean1", "org.example.type1", new Location(tempJavaDocUri, new Range(new Position(1,1), new Position(1, 20))), null, null, null);
8076
bean2 = new Bean("bean2", "org.example.type2", new Location(tempJavaDocUri, new Range(new Position(1,1), new Position(1, 20))), null, null, null);

‎headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionalonbean/test/ConditionalOnBeanDefinitionProviderTest.java‎ renamed to ‎headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalOnBeanDefinitionProviderTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Contributors:
99
* Broadcom - initial API and implementation
1010
*******************************************************************************/
11-
package org.springframework.ide.vscode.boot.java.conditionalonbean.test;
11+
package org.springframework.ide.vscode.boot.java.conditionals.test;
1212

1313
import static org.junit.Assert.assertEquals;
1414

‎headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionalonresource/test/ConditionalOnResourceCompletionTest.java‎ renamed to ‎headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalOnResourceCompletionTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Contributors:
99
* Broadcom, Inc. - initial API and implementation
1010
*******************************************************************************/
11-
package org.springframework.ide.vscode.boot.java.conditionalonresource.test;
11+
package org.springframework.ide.vscode.boot.java.conditionals.test;
1212

1313
import static org.junit.jupiter.api.Assertions.assertEquals;
1414
import static org.junit.jupiter.api.Assertions.fail;

‎headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionalonresource/test/ConditionalOnResourceDefinitionProviderTest.java‎ renamed to ‎headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalOnResourceDefinitionProviderTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Contributors:
99
* Broadcom, Inc. - initial API and implementation
1010
*******************************************************************************/
11-
package org.springframework.ide.vscode.boot.java.conditionalonresource.test;
11+
package org.springframework.ide.vscode.boot.java.conditionals.test;
1212

1313
import java.io.IOException;
1414
import java.nio.charset.StandardCharsets;
@@ -31,7 +31,6 @@
3131
import org.springframework.context.annotation.Import;
3232
import org.springframework.ide.vscode.boot.bootiful.AdHocPropertyHarnessTestConf;
3333
import org.springframework.ide.vscode.boot.bootiful.BootLanguageServerTest;
34-
import org.springframework.ide.vscode.boot.java.conditionalonresource.ConditionalOnResourceDefinitionProvider;
3534
import org.springframework.ide.vscode.commons.java.IJavaProject;
3635
import org.springframework.ide.vscode.commons.util.text.LanguageId;
3736
import org.springframework.ide.vscode.languageserver.testharness.Editor;

0 commit comments

Comments
 (0)