Resolve boot version wildcards in requests

Signed-off-by: sijun-yang <yangsijun5528@gmail.com>

Author: YangSiJun528

initializr-metadata/src/main/java/io/spring/initializr/metadata/InitializrMetadata.java

@@ -20,13 +20,10 @@
 import java.util.List;
 import java.util.Map;
 
-import io.spring.initializr.generator.version.Version;
 import io.spring.initializr.generator.version.VersionParser;
 import io.spring.initializr.generator.version.VersionProperty;
 import org.jspecify.annotations.Nullable;
 
-import org.springframework.util.Assert;
-
 /**
  * Meta-data used to generate a project.
  *
@@ -41,7 +38,7 @@ public class InitializrMetadata {
 
 	private final TypeCapability types = new TypeCapability();
 
-	private final SingleSelectCapability bootVersions = new SingleSelectCapability("bootVersion", "Spring Boot Version",
+	private final VersionCapability bootVersions = new VersionCapability("bootVersion", "Spring Boot Version",
 			"spring boot version");
 
 	private final SingleSelectCapability packagings = new SingleSelectCapability("packaging", "Packaging",
@@ -88,7 +85,7 @@ public TypeCapability getTypes() {
 		return this.types;
 	}
 
-	public SingleSelectCapability getBootVersions() {
+	public VersionCapability getBootVersions() {
 		return this.bootVersions;
 	}
 
@@ -211,12 +208,7 @@ public void validate() {
 	 */
 	public void updateSpringBootVersions(List<DefaultMetadataElement> versionsMetadata) {
 		this.bootVersions.setContent(versionsMetadata);
-		List<Version> bootVersions = this.bootVersions.getContent().stream().map((it) -> {
-			String id = it.getId();
-			Assert.state(id != null, "'id' must not be null");
-			return Version.parse(id);
-		}).toList();
-		VersionParser parser = new VersionParser(bootVersions);
+		VersionParser parser = this.bootVersions.getVersionParser();
 		this.dependencies.updateCompatibilityRange(parser);
 		this.configuration.getEnv().updateCompatibilityRange(parser);
 	}

initializr-metadata/src/test/java/io/spring/initializr/metadata/InitializrMetadataTests.java

@@ -191,6 +191,19 @@ void updateSpringBootVersions() {
 			.resolveKotlinVersion(Version.parse("1.3.7.BUILD-SNAPSHOT"))).isEqualTo("1.2");
 	}
 
+	@Test
+	void bootVersionsParseWildcardToLatestMatchingVersion() {
+		InitializrMetadata metadata = initializeMetadata();
+		List<DefaultMetadataElement> bootVersions = Arrays.asList(DefaultMetadataElement.create("1.3.6", false),
+				DefaultMetadataElement.create("1.3.7", false), DefaultMetadataElement.create("1.4.0", false));
+		metadata.updateSpringBootVersions(bootVersions);
+		assertThat(metadata.getBootVersions().parseVersion("1.3.x")).hasToString("1.3.7");
+
+		metadata.updateSpringBootVersions(List.of(DefaultMetadataElement.create("1.3.8", false)));
+		assertThat(metadata.getBootVersions().parseVersion("1.3.x")).hasToString("1.3.8");
+		assertThat(metadata.getBootVersions().safeParseVersion("2.x.x")).isNull();
+	}
+
 	@Test
 	void invalidParentMissingVersion() {
 		InitializrMetadata metadata = initializeMetadata();

initializr-web/src/main/java/io/spring/initializr/web/controller/ProjectMetadataController.java

@@ -150,7 +150,7 @@ protected CacheControl determineCacheControlFor(InitializrMetadata metadata) {
 	protected ResponseEntity<String> dependenciesFor(InitializrMetadataVersion metadataVersion,
 			@Nullable String bootVersion) {
 		InitializrMetadata metadata = this.metadataProvider.get();
-		Version effectiveBootVersion = (bootVersion != null) ? Version.parse(bootVersion)
+		Version effectiveBootVersion = (bootVersion != null) ? metadata.getBootVersions().parseVersion(bootVersion)
 				: getDefaultBootVersion(metadata);
 		Platform platform = metadata.getConfiguration().getEnv().getPlatform();
 		if (!platform.isCompatibleVersion(effectiveBootVersion)) {

initializr-web/src/main/java/io/spring/initializr/web/project/DefaultProjectRequestToDescriptionConverter.java

@@ -128,7 +128,7 @@ private void validate(ProjectRequest request, InitializrMetadata metadata) {
 	}
 
 	private void validatePlatformVersion(ProjectRequest request, InitializrMetadata metadata) {
-		Version platformVersion = Version.safeParse(request.getBootVersion());
+		Version platformVersion = metadata.getBootVersions().safeParseVersion(request.getBootVersion());
 		Platform platform = metadata.getConfiguration().getEnv().getPlatform();
 		if (platformVersion != null && !platform.isCompatibleVersion(platformVersion)) {
 			throw new InvalidProjectRequestException("Invalid Spring Boot version '" + platformVersion
@@ -213,7 +213,7 @@ private BuildSystem getBuildSystem(ProjectRequest request, InitializrMetadata me
 	private Version getPlatformVersion(ProjectRequest request, InitializrMetadata metadata) {
 		String versionText = (request.getBootVersion() != null) ? request.getBootVersion()
 				: getDefaultBootVersion(metadata);
-		Version version = Version.parse(versionText);
+		Version version = metadata.getBootVersions().parseVersion(versionText);
 		return this.platformVersionTransformer.transform(version, metadata);
 	}
 

initializr-web/src/test/java/io/spring/initializr/web/controller/ProjectMetadataControllerIntegrationTests.java

@@ -91,6 +91,13 @@ void metadataWithInvalidPlatformVersion() {
 		}
 	}
 
+	@Test
+	void dependenciesWithWildcardBootVersion() {
+		ResponseEntity<String> response = execute("/dependencies?bootVersion=2.4.x", String.class, null,
+				"application/vnd.initializr.v2.1+json");
+		assertThat(response.getBody()).contains("\"bootVersion\":\"2.4.4\"");
+	}
+
 	@Test
 	void metadataWithCurrentAcceptHeader() {
 		getRequests().setFields("_links.maven-project", "dependencies.values[0]", "type.values[0]",

initializr-web/src/test/java/io/spring/initializr/web/project/DefaultProjectRequestToDescriptionConverterTests.java

@@ -21,6 +21,7 @@
 import io.spring.initializr.generator.buildsystem.gradle.GradleBuildSystem;
 import io.spring.initializr.generator.project.ProjectDescription;
 import io.spring.initializr.generator.test.InitializrMetadataTestBuilder;
+import io.spring.initializr.generator.version.InvalidVersionException;
 import io.spring.initializr.generator.version.Version;
 import io.spring.initializr.generator.version.VersionRange;
 import io.spring.initializr.metadata.Dependency;
@@ -159,6 +160,15 @@ void convertWhenSpringBootVersionInvalidShouldThrowException() {
 					"Invalid Spring Boot version '1.5.9.RELEASE', Spring Boot compatibility range is >=2.0.0.RELEASE and <2.3.0.M1");
 	}
 
+	@Test
+	void convertWhenWildcardSpringBootVersionDoesNotMatchShouldThrowException() {
+		ProjectRequest request = createProjectRequest();
+		request.setBootVersion("2.6.x");
+		assertThatExceptionOfType(InvalidVersionException.class)
+			.isThrownBy(() -> this.converter.convert(request, this.metadata))
+			.withMessage("Could not determine latest version based on '2.6.x'");
+	}
+
 	@Test
 	void convertWhenPackagingIsInvalidShouldThrowException() {
 		ProjectRequest request = createProjectRequest();
@@ -271,6 +281,14 @@ void convertShouldSetPlatformVersionFromRequest() {
 		assertThat(description.getPlatformVersion()).isEqualTo(Version.parse("2.0.3"));
 	}
 
+	@Test
+	void convertShouldSetLatestMatchingPlatformVersionFromWildcardBootVersion() {
+		ProjectRequest request = createProjectRequest();
+		request.setBootVersion("2.4.x");
+		ProjectDescription description = this.converter.convert(request, this.metadata);
+		assertThat(description.getPlatformVersion()).isEqualTo(Version.parse("2.4.1"));
+	}
+
 	@Test
 	void convertShouldSetLanguageForProjectDescriptionFromRequest() {
 		ProjectRequest request = createProjectRequest();