GH-1665: fix version validation for + wildcard at the end

Author: martinlippert

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

@@ -93,6 +93,7 @@ public boolean visit(NormalAnnotation annotation) {
 
 						Expression valueExpression = pair.getValue();
 						String versionValue = ASTUtils.getExpressionValueAsString(valueExpression, (d) -> {});
+						versionValue = updateVersion(versionValue);
 
 						SemanticApiVersionParser parser = new SemanticApiVersionParser();
 						try {
@@ -130,6 +131,11 @@ public boolean visit(TypeDeclaration type) {
 		};
 	}
 
+	private String updateVersion(String version) {
+		boolean baselineVersion = version.endsWith("+");
+		return (baselineVersion ? version.substring(0, version.length() - 1) : version);
+	}
+	
 	private boolean isApiVersioningConfiguredWithStanardVersionParser(IJavaProject project) {
 		List<WebConfigIndexElement> webConfigs = springIndex.getNodesOfType(project.getElementName(), WebConfigIndexElement.class);
 		for (WebConfigIndexElement webConfig : webConfigs) {

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

@@ -83,6 +83,67 @@ public class A {
 		assertEquals(0, problems.size());
 	}
 
+	@Test
+	void parseWildcardVersion() throws Exception {
+		String source = """
+				package example.demo;
+				
+				import org.springframework.web.bind.annotation.RestController;
+				import org.springframework.web.bind.annotation.RequestMapping;
+				
+				@RestController
+				@RequestMapping(path = "mypath", version = "1.1+")
+				public class A {
+				}
+				""";
+		List<ReconcileProblem> problems = reconcile(() -> {
+			SpringMetamodelIndex springIndex = new SpringMetamodelIndex();
+			
+			WebConfigIndexElement webConfig = new WebConfigIndexElement.Builder(ConfigType.WEB_CONFIG)
+					.versionStrategy("version-strategy-configured", new Range(new Position(1, 1), new Position(1, 4)))
+					.buildFor(null);
+			springIndex.updateElements(getProjectName(), "soneURI", new SpringIndexElement[] {webConfig});
+
+			WebApiVersionSyntaxReconciler r = new WebApiVersionSyntaxReconciler(springIndex);
+			return r;
+		}, "A.java", source, false);
+		
+		assertEquals(0, problems.size());
+	}
+
+	@Test
+	void parseWrongWildcardVersion() throws Exception {
+		String source = """
+				package example.demo;
+				
+				import org.springframework.web.bind.annotation.RestController;
+				import org.springframework.web.bind.annotation.RequestMapping;
+				
+				@RestController
+				@RequestMapping(path = "mypath", version = "1.1++")
+				public class A {
+				}
+				""";
+		List<ReconcileProblem> problems = reconcile(() -> {
+			SpringMetamodelIndex springIndex = new SpringMetamodelIndex();
+			
+			WebConfigIndexElement webConfig = new WebConfigIndexElement.Builder(ConfigType.WEB_CONFIG)
+					.versionStrategy("version-strategy-configured", new Range(new Position(1, 1), new Position(1, 4)))
+					.buildFor(null);
+			springIndex.updateElements(getProjectName(), "soneURI", new SpringIndexElement[] {webConfig});
+
+			WebApiVersionSyntaxReconciler r = new WebApiVersionSyntaxReconciler(springIndex);
+			return r;
+		}, "A.java", source, false);
+		
+		assertEquals(1, problems.size());
+		ReconcileProblem problem = problems.get(0);
+		assertEquals(Boot4JavaProblemType.API_VERSION_SYNTAX_ERROR, problem.getType());
+		
+		String markedStr = source.substring(problem.getOffset(), problem.getOffset() + problem.getLength());
+		assertEquals("\"1.1++\"", markedStr);
+	}
+
 	@Test
 	void parseWithConfiguredDefaultStandardVersionWithoutErrors() throws Exception {
 		String source = """