GH-1449: webflux index elements gets updated correctly on file changes

Fixes GH-1449

Author: martinlippert

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/BeansSymbolProvider.java

@@ -18,6 +18,7 @@
 
 import org.eclipse.jdt.core.dom.ASTNode;
 import org.eclipse.jdt.core.dom.Annotation;
+import org.eclipse.jdt.core.dom.Block;
 import org.eclipse.jdt.core.dom.IAnnotationBinding;
 import org.eclipse.jdt.core.dom.ITypeBinding;
 import org.eclipse.jdt.core.dom.MethodDeclaration;
@@ -62,7 +63,6 @@
 public class BeansSymbolProvider extends AbstractSymbolProvider {
 
 	private static final Logger log = LoggerFactory.getLogger(BeansSymbolProvider.class);
-
 	private static final String[] NAME_ATTRIBUTES = {"value", "name"};
 
 	@Override
@@ -73,21 +73,23 @@ public void addSymbols(Annotation node, ITypeBinding typeBinding, Collection<ITy
 		if (parent == null || !(parent instanceof MethodDeclaration)) return;
 
 		MethodDeclaration method = (MethodDeclaration) parent;
-
 		if (isMethodAbstract(method)) return;
 
+		List<SpringIndexElement> childElements = new ArrayList<>();
+		
 		boolean isWebfluxRouter = WebfluxRouterSymbolProvider.isWebfluxRouterBean(method);
 
 		// for webflux details, we need full method body ASTs
-		if (isWebfluxRouter && SCAN_PASS.ONE.equals(context.getPass())) {
-			context.getNextPassFiles().add(context.getFile());
-			return;
-		}
-		
-		List<SpringIndexElement> childElements = new ArrayList<>();
-		
 		if (isWebfluxRouter) {
-			WebfluxRouterSymbolProvider.createWebfluxElements(method, context, doc, childElements);
+			Block methodBody = method.getBody();
+			if ((methodBody == null || methodBody.statements() == null || methodBody.statements().size() == 0)
+					&& SCAN_PASS.ONE.equals(context.getPass())) {
+				context.getNextPassFiles().add(context.getFile());
+				return;
+			}
+			else {
+				WebfluxRouterSymbolProvider.createWebfluxElements(method, context, doc, childElements);
+			}
 		}
 
 		boolean isFunction = isFunctionBean(method);

headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/WebFluxMappingSymbolProviderTest.java

@@ -14,13 +14,16 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
+import java.net.URI;
+import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import org.apache.commons.io.FileUtils;
 import org.eclipse.lsp4j.TextDocumentIdentifier;
 import org.eclipse.lsp4j.WorkspaceSymbol;
 import org.junit.jupiter.api.BeforeEach;
@@ -36,6 +39,7 @@
 import org.springframework.ide.vscode.commons.java.IJavaProject;
 import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder;
 import org.springframework.ide.vscode.commons.protocol.spring.Bean;
+import org.springframework.ide.vscode.commons.protocol.spring.InjectionPoint;
 import org.springframework.ide.vscode.commons.protocol.spring.SpringIndexElement;
 import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
 import org.springframework.ide.vscode.project.harness.ProjectsHarness;
@@ -284,6 +288,34 @@ void testNestedRoutesMappingSymbols3() throws Exception {
         assertEquals("org.test.PersonHandler3", handlerElement6.getHandlerClass());
         assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> deletePerson(org.springframework.web.reactive.function.server.ServerRequest)", handlerElement6.getHandlerMethod());
     }
+    
+    @Test
+    void testUpdatedRouteInChangedDocument() throws Exception {
+        // update document and update index
+        String changedDocURI = directory.toPath().resolve("src/main/java/org/test/QuoteRouter.java").toUri().toString();
+
+        String newContent = FileUtils.readFileToString(new File(new URI(changedDocURI)), Charset.defaultCharset()).replace("/hello", "/hello-updated");
+        CompletableFuture<Void> updateFuture = indexer.updateDocument(changedDocURI, newContent, "test triggered");
+        updateFuture.get(5, TimeUnit.SECONDS);
+        
+        Bean[] routeBeans = springIndex.getBeansWithName(project.getElementName(), "route");
+        assertEquals(1, routeBeans.length);
+        assertEquals("route", routeBeans[0].getName());
+
+        SpringIndexElement[] children = routeBeans[0].getChildren();
+        assertEquals(8, children.length);
+        
+        WebfluxHandlerMethodIndexElement handlerElement1 = getWebfluxIndexElements(children, "/hello-updated", "GET").get(0);
+        assertEquals("/hello-updated", handlerElement1.getPath());
+        assertEquals("[GET]", Arrays.toString(handlerElement1.getHttpMethods()));
+        assertEquals(0, handlerElement1.getContentTypes().length);
+        assertEquals("[TEXT_PLAIN]", Arrays.toString(handlerElement1.getAcceptTypes()));
+        assertEquals("org.test.QuoteHandler", handlerElement1.getHandlerClass());
+        assertEquals("public Mono<org.springframework.web.reactive.function.server.ServerResponse> hello(org.springframework.web.reactive.function.server.ServerRequest)", handlerElement1.getHandlerMethod());
+
+    }
+
+
 
 	private boolean containsSymbol(List<? extends WorkspaceSymbol> symbols, String name, String uri, int startLine, int startCHaracter, int endLine, int endCharacter) {
 		for (Iterator<? extends WorkspaceSymbol> iterator = symbols.iterator(); iterator.hasNext();) {