take multiple version resolver strategies into account, not just one

Author: martinlippert

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

@@ -96,7 +96,7 @@ private CodeLens createCodeLens(WebConfigIndexElement webConfig, TypeDeclaration
 		}
 
 		if (webConfig.isVersioningSupported()) {
-			label += " - Versioning via " + webConfig.getVersionSupportStrategy();
+			label += " - Versioning via " + String.join(", ", webConfig.getVersionSupportStrategies());
 			label += " - Supported Versions: " + String.join(", ", webConfig.getSupportedVersions());
 		}
 

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

@@ -21,14 +21,14 @@ public class WebConfigIndexElement extends AbstractSpringIndexElement {
 	private final String pathPrefix;
 
 	private final boolean isVersioningSupported;
-	private final String versionSupportStrategy;
-	private final String[] supportedVersions;
+	private final List<String> versionSupportStrategies;
+	private final List<String> supportedVersions;
 	private final Location location;
 
-	public WebConfigIndexElement(String pathPrefix, boolean isVersioningSupported, String versionSupportStrategy, String[] supportedVersions, Location location) {
+	public WebConfigIndexElement(String pathPrefix, boolean isVersioningSupported, List<String> versionSupportStrategies, List<String> supportedVersions, Location location) {
 		this.pathPrefix = pathPrefix;
 		this.isVersioningSupported = isVersioningSupported;
-		this.versionSupportStrategy = versionSupportStrategy;
+		this.versionSupportStrategies = versionSupportStrategies;
 		this.supportedVersions = supportedVersions;
 		this.location = location;
 	}
@@ -41,11 +41,11 @@ public boolean isVersioningSupported() {
 		return isVersioningSupported;
 	}
 
-	public String getVersionSupportStrategy() {
-		return versionSupportStrategy;
+	public List<String> getVersionSupportStrategies() {
+		return versionSupportStrategies;
 	}
 
-	public String[] getSupportedVersions() {
+	public List<String> getSupportedVersions() {
 		return supportedVersions;
 	}
 
@@ -56,17 +56,18 @@ public Location getLocation() {
 	public static class Builder {
 
 		private String pathPrefix = null;
+
 		private boolean isVersioningSupported = false;
-		private String versionSupportStrategy = null;
-		private List<String> supportedVersions = new ArrayList<>(10);
+		private List<String> versionSupportStrategies = new ArrayList<>(2);
+		private List<String> supportedVersions = new ArrayList<>(2);
 
 		public Builder pathPrefix(String pathPrefix) {
 			this.pathPrefix = pathPrefix;
 			return this;
 		}
 
 		public Builder versionStrategy(String versionSupportStrategy) {
-			this.versionSupportStrategy = versionSupportStrategy;
+			this.versionSupportStrategies.add(versionSupportStrategy);
 			this.isVersioningSupported = true;
 			return this;
 		}
@@ -78,7 +79,7 @@ public Builder supportedVersion(String supportedVersion) {
 		}
 
 		public WebConfigIndexElement buildFor(Location location) {
-			return new WebConfigIndexElement(this.pathPrefix, this.isVersioningSupported, this.versionSupportStrategy, (String[]) this.supportedVersions.toArray(new String[this.supportedVersions.size()]), location);
+			return new WebConfigIndexElement(this.pathPrefix, this.isVersioningSupported, this.versionSupportStrategies, this.supportedVersions, location);
 		}
 
 	}

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

@@ -11,15 +11,13 @@
 package org.springframework.ide.vscode.boot.java.requestmapping.test;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
@@ -78,14 +76,10 @@ void codeLensOverMethod() throws Exception {
 		Editor editor = harness.newEditor(LanguageId.JAVA, new String(Files.readAllBytes(filePath), StandardCharsets.UTF_8), filePath.toUri().toASCIIString());
 
 		List<CodeLens> cls = editor.getCodeLenses("MappingClassWithMultipleVersions", 1);
+		assertEquals(1, cls.size());
 
-		Optional<CodeLens> lens1 = cls.stream().filter(lens -> lens.getCommand().getTitle().equals("Web Config - Versioning via Request Header: X-API-Version - Supported Versions: 1")).findFirst();
-		assertTrue(lens1.isPresent());
-
-		Optional<CodeLens> lens2 = cls.stream().filter(lens -> lens.getCommand().getTitle().equals("Web Config - Path Prefix: /{version} - Versioning via Path Segment: 0 - Supported Versions: 1.1, 1.2")).findFirst();
-		assertTrue(lens2.isPresent());
-		
-		assertEquals(2, cls.size());
+		assertEquals("Web Config - Path Prefix: /{version} - Versioning via Request Header: X-API-Version, Path Segment: 0 - Supported Versions: 1.1, 1.2",
+				cls.get(0).getCommand().getTitle());
 	}
 
 }

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

@@ -49,7 +49,7 @@
 @Import(SymbolProviderTestConf.class)
 public class WebMvcVersionSupportTest {
 
-	private static final String PROJECT_NAME = "test-request-mapping-version-support-symbols";
+	private static final String PROJECT_NAME = "test-web-config-support";
 
 	@Autowired private BootLanguageServerHarness harness;
 	@Autowired private JavaProjectFinder projectFinder;
@@ -130,9 +130,16 @@ void testWebConfigIndexElement() throws Exception {
 
     	WebConfigIndexElement webConfigElement = webConfigElements.get(0);
     	assertTrue(webConfigElement.isVersioningSupported());
-    	assertEquals("Request Header: X-API-Version", webConfigElement.getVersionSupportStrategy());
-    	assertEquals(1, webConfigElement.getSupportedVersions().length);
-    	assertEquals("1", webConfigElement.getSupportedVersions()[0]);
+    	
+    	List<String> versionSupportStrategies = webConfigElement.getVersionSupportStrategies();
+    	assertEquals(2, versionSupportStrategies.size());
+    	assertTrue(versionSupportStrategies.contains("Request Header: X-API-Version"));
+    	assertTrue(versionSupportStrategies.contains("Path Segment: 0"));
+    	
+    	List<String> supportedVersions = webConfigElement.getSupportedVersions();
+		assertEquals(2, supportedVersions.size());
+    	assertTrue(supportedVersions.contains("1.1"));
+    	assertTrue(supportedVersions.contains("1.2"));
     }
 
 	private boolean containsSymbol(List<? extends WorkspaceSymbol> symbols, String name, String uri) {

headless-services/spring-boot-language-server/src/test/resources/test-projects/test-web-config-support/src/main/java/org/test/versions/WebConfig.java

@@ -2,15 +2,21 @@
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ApiVersionConfigurer;
+import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
 public class WebConfig implements WebMvcConfigurer {
 
+	@Override
+	public void configurePathMatch(PathMatchConfigurer configurer) {
+		configurer.addPathPrefix("/{version}", (aClass) -> true);
+	}
+	
 	@Override
 	public void configureApiVersioning(ApiVersionConfigurer configurer) {
-		configurer.useRequestHeader("X-API-Version").addSupportedVersions("1");
-//		configurer.usePathSegment(0).addSupportedVersions("1");
+		configurer.useRequestHeader("X-API-Version");
+		configurer.usePathSegment(0).addSupportedVersions("1.1", "1.2");
 	}
 
 }