Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PT #159307292: Anonymous inner class bean type wiring

Browse Source
This commit is contained in:
BoykoAlex
2018-07-31 00:26:02 -04:00
parent 5480b1812a
commit 21e0543730
4 changed files with 97 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/livebean/LiveBean.java
View File

@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2017 Pivotal, Inc.
* Copyright (c) 2017, 2018 Pivotal, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -103,9 +103,6 @@ public class LiveBean {
type = type.substring(0, chop);
}
}
// convert inner classes from $ to . notation
type = type.replace('$', '.');
}
return type;

12
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/AutowiredHoverProvider.java
View File

@@ -209,12 +209,12 @@ public class AutowiredHoverProvider implements HoverProvider {
if (type != null) {
String fqName = type.getQualifiedName();
if (fqName != null) {
relevant = matchBeans(project, beans, fqName);
relevant = matchBeans(project, beans, fqName, true);
if (relevant.isEmpty()) {
IType indexType = project.findType(fqName);
if (indexType != null) {
relevant = project.allSubtypesOf(indexType)
.map(subType -> matchBeans(project, beans, subType.getFullyQualifiedName()))
.map(subType -> matchBeans(project, beans, subType.getFullyQualifiedName(), false))
.filter(relevantBeans -> !relevantBeans.isEmpty())
.blockFirst();
if (relevant == null) {
@@ -227,9 +227,13 @@ public class AutowiredHoverProvider implements HoverProvider {
return relevant;
}
private List<LiveBean> matchBeans(IJavaProject project, Collection<LiveBean> beans, String fqName) {
private List<LiveBean> matchBeans(IJavaProject project, Collection<LiveBean> beans, String fqName, boolean allDots) {
if (fqName != null) {
return beans.stream().filter(b -> fqName.equals(b.getType(true))).collect(Collectors.toList());
if (allDots) {
return beans.stream().filter(b -> fqName.equals(b.getType(true).replace('$', '.'))).collect(Collectors.toList());
} else {
return beans.stream().filter(b -> fqName.equals(b.getType(true))).collect(Collectors.toList());
}
} else {
return Collections.emptyList();
}

14
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/ComponentInjectionsHoverProvider.java
View File

@@ -61,7 +61,7 @@ public class ComponentInjectionsHoverProvider extends AbstractInjectedIntoHoverP
if (beanType != null) {
String id = getBeanId(annotation, beanType);
if (StringUtil.hasText(id)) {
return LiveBean.builder().id(id).type(beanType.getQualifiedName()).build();
return LiveBean.builder().id(id).type(getBeanType(beanType).toString()).build();
}
}
}
@@ -86,6 +86,18 @@ public class ComponentInjectionsHoverProvider extends AbstractInjectedIntoHoverP
});
}
private static StringBuilder getBeanType(ITypeBinding beanType) {
ITypeBinding declaringClass = beanType.getDeclaringClass();
if (declaringClass == null) {
return new StringBuilder(beanType.getQualifiedName());
} else {
StringBuilder sb = getBeanType(declaringClass);
sb.append('$');
sb.append(beanType.getName());
return sb;
}
}
@Override
public Collection<Range> getLiveHoverHints(IJavaProject project, TypeDeclaration typeDeclaration, TextDocument doc,
SpringBootApp[] runningApps) {

75
headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/autowired/test/AutowiredHoverProviderTest.java
View File

@@ -14,6 +14,8 @@ import static org.junit.Assert.assertTrue;
import java.nio.file.Paths;
import java.time.Duration;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.junit.Before;
import org.junit.Test;
@@ -84,6 +86,34 @@ public class AutowiredHoverProviderTest {
"}\n"
);
p.createType("com.example.RuntimeBeanFactory",
Stream.of(
"package com.example;",
"public interface RuntimeBeanFactory {",
"void createRuntimeBean(String info);",
"}"
).collect(Collectors.joining("\n"))
);
p.createType("com.example.SomeComponent",
Stream.of("package com.example;",
"",
"import org.springframework.context.annotation.Bean;",
"",
// "@Component",
"public class SomeComponent {",
"",
"@Bean",
"public RuntimeBeanFactory getBeanFactory() {",
"\treturn new RuntimeBeanFactory() {",
"\t\tpublic void createRuntimeBean(String info){}",
"\t};",
"}",
"",
"}"
).collect(Collectors.joining("\n"))
);
p.createType("com.example.FooImplementation", FOO_IMPL_CONTENTS);
};
@@ -577,4 +607,49 @@ public class AutowiredHoverProviderTest {
}
}
@Test
public void anonymousInnerClassBeanWiring() throws Exception {
LiveBeansModel beans = LiveBeansModel.builder()
.add(LiveBean.builder()
.id("anotherComponent")
.type("com.example.AnotherComponent")
.dependencies("anonymousBeanFactory")
.build()
)
.add(LiveBean.builder()
.id("anonymousBeanFactory")
.type("com.example.SomeComponent$1")
.build()
)
.build();
mockAppProvider.builder()
.isSpringBootApp(true)
.processId("111")
.processName("the-app")
.beans(beans)
.build();
Editor editor = harness.newEditor(LanguageId.JAVA,
"package com.example;\n" +
"\n" +
"import org.springframework.beans.factory.annotation.Autowired;\n" +
"import org.springframework.stereotype.Component;\n" +
"\n" +
"@Component\n" +
"public class AnotherComponent {\n" +
"\n" +
" @Autowired\n" +
" RuntimeBeanFactory beanFactory;\n" +
"}\n"
);
editor.assertHighlights("@Component", "@Autowired");
editor.assertTrimmedHover("@Autowired", 1,
"**Autowired `anotherComponent` &rarr; `anonymousBeanFactory`**\n" +
"- Bean: `anonymousBeanFactory` \n" +
" Type: `com.example.SomeComponent$1`\n" +
" \n" +
"Process [PID=111, name=`the-app`]\n"
);
}
}