function bean symbols now generated if function interface is found in inheritance hierarchy

headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/SpringIndexerFunctionBeansTest.java

@@ -69,6 +69,39 @@ public class SpringIndexerFunctionBeansTest {
 		);
 	}
 
+	@Test
+	public void testScanSpecializedFunctionClass() throws Exception {
+		SpringIndexerHarness indexer = new SpringIndexerHarness(harness.getServer(), projectFinder, symbolProviders);
+		File directory = new File(ProjectsHarness.class.getResource("/test-projects/test-annotation-indexing-beans/").toURI());
+		indexer.initialize(indexer.wsFolder(directory));
+
+		String uriPrefix = "file://" + directory.getAbsolutePath();
+		indexer.assertDocumentSymbols(uriPrefix + "/src/main/java/org/test/FunctionFromSpecializedClass.java",
+				symbol("FunctionFromSpecializedClass", "@> 'functionFromSpecializedClass' (@Bean) Function<String,String>")
+		);
+	}
+
+	@Test
+	public void testScanSpecializedFunctionInterface() throws Exception {
+		SpringIndexerHarness indexer = new SpringIndexerHarness(harness.getServer(), projectFinder, symbolProviders);
+		File directory = new File(ProjectsHarness.class.getResource("/test-projects/test-annotation-indexing-beans/").toURI());
+		indexer.initialize(indexer.wsFolder(directory));
+
+		String uriPrefix = "file://" + directory.getAbsolutePath();
+		indexer.assertDocumentSymbols(uriPrefix + "/src/main/java/org/test/FunctionFromSpecializedInterface.java",
+				symbol("FunctionFromSpecializedInterface", "@> 'functionFromSpecializedInterface' (@Bean) Function<String,String>")
+		);
+	}
+
+	@Test
+	public void testScanInconsistentInterfaceHierarchy() throws Exception {
+		SpringIndexerHarness indexer = new SpringIndexerHarness(harness.getServer(), projectFinder, symbolProviders);
+		File directory = new File(ProjectsHarness.class.getResource("/test-projects/test-annotation-indexing-beans/").toURI());
+		indexer.initialize(indexer.wsFolder(directory));
+
+		String uriPrefix = "file://" + directory.getAbsolutePath();
+		indexer.assertDocumentSymbols(uriPrefix + "/src/main/java/org/test/LoopedFunctionClass.java");
+	}
 
 	////////////////////////////////
 	// harness code

headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/FunctionFromSpecializedClass.java

@@ -0,0 +1,10 @@
+package org.test;
+
+public class FunctionFromSpecializedClass extends SpecializedFunctionClass {
+
+	@Override
+	public String apply(String t) {
+		return null;
+	}
+
+}

headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/FunctionFromSpecializedInterface.java

@@ -0,0 +1,10 @@
+package org.test;
+
+public class FunctionFromSpecializedInterface implements SpecializedFunctionInterface {
+
+	@Override
+	public String apply(String t) {
+		return null;
+	}
+
+}

headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/LoopedFunctionClass.java

@@ -0,0 +1,4 @@
+package org.test;
+
+public class LoopedFunctionClass implements LoopedInterface1 {
+}

headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/LoopedInterface1.java

@@ -0,0 +1,6 @@
+package org.test;
+
+import java.util.function.Function;
+
+public interface LoopedInterface1 extends LoopedInterface2 {
+}

headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/LoopedInterface2.java

@@ -0,0 +1,4 @@
+package org.test;
+
+public interface LoopedInterface2 extends LoopedInterface1 {
+}

headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SpecializedFunctionClass.java

@@ -0,0 +1,6 @@
+package org.test;
+
+import java.util.function.Function;
+
+public abstract class SpecializedFunctionClass implements Function<String, String> {
+}

headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SpecializedFunctionInterface.java

@@ -0,0 +1,6 @@
+package org.test;
+
+import java.util.function.Function;
+
+public interface SpecializedFunctionInterface extends Function<String, String> {
+}