lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2025-04-24 18:04:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1113 from ggerbaud

Browse Source 
* pr/1113:
  Polish "Format default platform version when serving metadata v2.1"
  Format default platform version when serving metadata v2.1

Closes gh-1113
This commit is contained in:
Stephane Nicoll 2020-08-11 14:16:32 +02:00
commit 6075c08a0c
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
initializr-web/src/main/java/io/spring/initializr/web/mapper/InitializrMetadataV2JsonMapper.java
View File

@ -48,6 +48,7 @@ import org.springframework.util.StringUtils;
* A {@link InitializrMetadataJsonMapper} handling the metadata format for v2.
*
* @author Stephane Nicoll
* @author Guillaume Gerbaud
*/
public class InitializrMetadataV2JsonMapper implements InitializrMetadataJsonMapper {
@ -83,7 +84,7 @@ public class InitializrMetadataV2JsonMapper implements InitializrMetadataJsonMap
singleSelect(delegate, metadata.getPackagings());
singleSelect(delegate, metadata.getJavaVersions());
singleSelect(delegate, metadata.getLanguages());
singleSelect(delegate, metadata.getBootVersions(), this::mapVersionMetadata);
singleSelect(delegate, metadata.getBootVersions(), this::mapVersionMetadata, this::formatVersion);
text(delegate, metadata.getGroupId());
text(delegate, metadata.getArtifactId());
text(delegate, metadata.getVersion());
@ -137,16 +138,30 @@ public class InitializrMetadataV2JsonMapper implements InitializrMetadataJsonMap
}
protected void singleSelect(ObjectNode parent, SingleSelectCapability capability) {
singleSelect(parent, capability, this::mapValue);
singleSelect(parent, capability, this::mapValue, (id) -> id);
}
/**
* Map a {@link SingleSelectCapability} invoking the specified {@code valueMapper}.
* @param parent the parent node
* @param capability the capability to map
* @param valueMapper the function to invoke to transform one value of the capability
* @deprecated in favor of
* {@link #singleSelect(ObjectNode, SingleSelectCapability, Function, Function)}
*/
@Deprecated
protected void singleSelect(ObjectNode parent, SingleSelectCapability capability,
Function<MetadataElement, ObjectNode> valueMapper) {
singleSelect(parent, capability, valueMapper, (id) -> id);
}
protected void singleSelect(ObjectNode parent, SingleSelectCapability capability,
Function<MetadataElement, ObjectNode> valueMapper) {
Function<MetadataElement, ObjectNode> valueMapper, Function<String, String> defaultMapper) {
ObjectNode single = nodeFactory.objectNode();
single.put("type", capability.getType().getName());
DefaultMetadataElement defaultType = capability.getDefault();
if (defaultType != null) {
single.put("default", defaultType.getId());
single.put("default", defaultMapper.apply(defaultType.getId()));
}
ArrayNode values = nodeFactory.arrayNode();
values.addAll(capability.getContent().stream().map(valueMapper).collect(Collectors.toList()));

4
initializr-web/src/test/java/io/spring/initializr/web/mapper/InitializrMetadataV21JsonMapperTests.java
View File

@ -102,7 +102,9 @@ class InitializrMetadataV21JsonMapperTests {
.addBootVersion("2.5.0-M2", false).addBootVersion("2.4.2", true).build();
String json = this.jsonMapper.write(metadata, null);
JsonNode result = objectMapper.readTree(json);
JsonNode versions = result.get("bootVersion").get("values");
JsonNode platformVersions = result.get("bootVersion");
assertThat(platformVersions.get("default").textValue()).isEqualTo("2.4.2.RELEASE");
JsonNode versions = platformVersions.get("values");
assertThat(versions).hasSize(3);
assertVersionMetadata(versions.get(0), "2.5.0.BUILD-SNAPSHOT", "2.5.0-SNAPSHOT");
assertVersionMetadata(versions.get(1), "2.5.0.M2", "2.5.0-M2");

4
initializr-web/src/test/java/io/spring/initializr/web/mapper/InitializrMetadataV22JsonMapperTests.java
View File

@ -62,7 +62,9 @@ class InitializrMetadataV22JsonMapperTests {
.addBootVersion("2.5.0-M2", false).addBootVersion("2.4.2", true).build();
String json = this.jsonMapper.write(metadata, null);
JsonNode result = objectMapper.readTree(json);
JsonNode versions = result.get("bootVersion").get("values");
JsonNode platformVersions = result.get("bootVersion");
assertThat(platformVersions.get("default").textValue()).isEqualTo("2.4.2");
JsonNode versions = platformVersions.get("values");
assertThat(versions).hasSize(3);
assertVersionMetadata(versions.get(0), "2.5.0-SNAPSHOT", "2.5.0-SNAPSHOT");
assertVersionMetadata(versions.get(1), "2.5.0-M2", "2.5.0-M2");